2023-10-11

App.vue

@@ -32,7 +32,9 @@
 		'--view-theme: #FE5C2D;--view-priceColor:#FE5C2D;--view-minorColor:rgba(254, 92, 45, 0.5);--view-minorColorT:rgba(254, 92, 45, 0.1);--view-bntColor:#FDB000;--view-assistColor:#FDB000;'
 	let gold =
 	    '--view-theme: #E0A558;--view-priceColor:#DA8C18;--view-minorColor:rgba(224, 165, 88, 0.5);--view-minorColorT:rgba(224, 165, 88, 0.1);--view-bntColor:#1A1A1A;'
-
+		// #ifdef APP
+	import { getUpApp } from './utils/upApp.js';
+		// #endif
 
 	export default {
 		globalData: {
@@ -297,6 +299,9 @@
 					});
 			}
 			// #endif
+			// #ifdef APP
+			getUpApp();
+			// #endif
 		},
 		onShow(options) {
 			let that = this;

api/user.js

@@ -197,7 +197,30 @@ export function moneyList(q, types) {
 export function getIntegralList(q) {
 	return request.get("integral/list", q);
 }
-
+/*
+ * 绿积分记录
+ * */
+export function getGreedIntegralList(q) {
+	return request.get("green_integral/list", q);
+}
+/*
+ * 绿积分转账
+ * */
+export function setGreedIntegralList(q) {
+	return request.post("green/transfer", q);
+}
+/*
+ * 绿积分购买
+ * */
+export function getGreedUserList(q) {
+	return request.get("green/list", q);
+}
+/*
+ * 母积分记录
+ * */
+export function getBaseIntegralList(q) {
+	return request.get("base_integral/list", q);
+}
 /**
  * 获取分销海报图片
  * 

manifest.json

@@ -2,8 +2,8 @@
     "name" : "壹柒科技",
     "appid" : "__UNI__B0B5BE7",
     "description" : "壹柒科技",
-    "versionName" : "2.6.0",
-    "versionCode" : 263,
+    "versionName" : "2.6.2",
+    "versionCode" : 265,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {

pages.json

@@ -43,7 +43,6 @@
           }
           // #endif
         }
-    
       }
     },
     {
@@ -385,6 +384,66 @@
             }
           }
         },
+		{
+		  "path": "user_integral/greed",
+		  "style": {
+		    "navigationBarTitleText": "绿积分详情"
+		
+		      // #ifdef MP
+		      ,
+		    "navigationBarTextStyle": "black",
+		    "navigationBarBackgroundColor": "#FFFFFF"
+		      // #endif
+		      ,
+		    "app-plus": {
+		      // #ifdef APP-PLUS
+		      "titleNView": {
+		        "type": "default"
+		      }
+		      // #endif
+		    }
+		  }
+		},
+		{
+		  "path": "user_integral/itemuser",
+		  "style": {
+		    "navigationBarTitleText": "购买绿积分"
+		      // #ifdef MP
+		      ,
+		    "navigationBarTextStyle": "black",
+		    "navigationBarBackgroundColor": "#FFFFFF"
+		      // #endif
+		      ,
+		    "app-plus": {
+		      // #ifdef APP-PLUS
+		      "titleNView": {
+		        "type": "default"
+		      }
+		      // #endif
+		    }
+		  }
+		},
+		
+		{
+		  "path": "user_integral/base",
+		  "style": {
+		    "navigationBarTitleText": "母积分详情"
+		
+		      // #ifdef MP
+		      ,
+		    "navigationBarTextStyle": "black",
+		    "navigationBarBackgroundColor": "#FFFFFF"
+		      // #endif
+		      ,
+		    "app-plus": {
+		      // #ifdef APP-PLUS
+		      "titleNView": {
+		        "type": "default"
+		      }
+		      // #endif
+		    }
+		  }
+		},
         {
           "path": "user_coupon/index",
           "style": {

pages/annex/offline_pay/index.vue

@@ -21,11 +21,13 @@
 					</text>
 					<radio value="yue" :checked="payType === 'yue'" />
 				</label>
+				<!-- #ifndef APP-PLUS -->
 				<label v-if="wxpay" class="item">
 					<text class="iconfont icon-weixinzhifu"></text>
 					<text class="name">微信支付</text>
 					<radio value="weixin" :checked="payType === 'weixin'" />
 				</label>
+				<!-- #endif -->
 			</radio-group>
 		</view>
 		<button class="button" form-type="submit">确认</button>

pages/annex/vip_paid/index.vue

@@ -173,13 +173,16 @@
 				password: '',
 				goodsList: [],
 				pay_order_id: '',
-				payMode: [{
+				payMode: [
+					// #ifndef APP-PLUS
+					{
 						name: '微信支付',
 						icon: 'icon-weixinzhifu',
 						value: 'weixin',
 						title: '微信快捷支付',
 						payStatus: true
 					}
+					// #endif
 					// #ifdef H5 ||APP-PLUS
 					,
 					{

pages/goods/lottery/grids/order.vue

@@ -357,13 +357,16 @@
 				isaddress: false,
 				textareaStatus: true,
 				//支付方式
-				cartArr: [{
+				cartArr: [
+					// #ifndef APP
+					{
 						"name": "微信支付",
 						"icon": "icon-weixin2",
 						value: 'weixin',
 						title: '使用微信快捷支付',
 						payStatus: 1,
 					},
+					// #endif
 					{
 						"name": "支付宝支付",
 						"icon": "icon-zhifubao",

pages/goods/order_confirm/index.vue

@@ -431,13 +431,16 @@
         isaddress: false,
         textareaStatus: true,
         //支付方式
-        cartArr: [{
+        cartArr: [
+			// #ifndef APP-PLUS
+			{
             "name": "微信支付",
             "icon": "icon-weixin2",
             value: 'weixin',
             title: '使用微信快捷支付',
             payStatus: 1,
           },
+		  // #endif
           {
             "name": "支付宝支付",
             "icon": "icon-zhifubao",

pages/goods/order_details/index.vue

@@ -1131,13 +1131,16 @@
 				status: {}, //订单底部按钮状态
 				refund_close: false,
 				isClose: false,
-				payMode: [{
+				payMode: [
+					// #ifndef APP-PLUS
+					{
 						name: "微信支付",
 						icon: "icon-weixinzhifu",
 						value: 'weixin',
 						title: '使用微信快捷支付',
 						payStatus: true,
 					},
+					// #endif
 					// #ifdef H5 || APP-PLUS
 					{
 						name: '支付宝支付',

pages/goods/order_list/index.vue

@@ -186,13 +186,16 @@
 				orderStatus: '', //订单状态
 				page: 1,
 				limit: 20,
-				payMode: [{
+				payMode: [
+					// #ifndef APP-PLUS
+					{
 						name: '微信支付',
 						icon: 'icon-weixinzhifu',
 						value: 'weixin',
 						title: '使用微信快捷支付',
 						payStatus: true
 					},
+					// #endif
 					{
 						name: '支付宝支付',
 						icon: 'icon-zhifubao',

pages/goods/order_pay/index.vue

@@ -64,13 +64,16 @@
 				cartInfo: [],
 				pay_close: false,
 				//支付方式
-				cartArr: [{
+				cartArr: [
+					// #ifndef APP-PLUS
+					{
 						"name": "微信支付",
 						"icon": "icon-weixin2",
 						value: 'weixin',
 						title: '使用微信快捷支付',
 						payStatus: 1,
 					},
+					// #endif
 					{
 						"name": "支付宝支付",
 						"icon": "icon-zhifubao",

pages/points_mall/integral_order.vue

@@ -285,13 +285,16 @@
 				confirm:[],
 				textareaStatus: true,
 				//支付方式
-				cartArr: [{
+				cartArr: [
+					// #ifndef APP-PLUS
+					{
 						"name": "微信支付",
 						"icon": "icon-weixin2",
 						value: 'weixin',
 						title: '使用微信快捷支付',
 						payStatus: 1,
 					},
+					// #endif
 					{
 						"name": "支付宝支付",
 						"icon": "icon-zhifubao",

pages/points_mall/integral_order_details.vue

@@ -183,13 +183,16 @@
 				isGoodsReturn: false, //是否为退款订单
 				status: {}, //订单底部按钮状态
 				isClose: false,
-				payMode: [{
+				payMode: [
+					// #ifndef APP-PLUS
+					{
 						name: "微信支付",
 						icon: "icon-weixinzhifu",
 						value: 'weixin',
 						title: '使用微信快捷支付',
 						payStatus: true,
 					},
+					// #endif
 					// #ifdef H5 || APP-PLUS
 					{
 						name: '支付宝支付',

pages/user/index.vue

@@ -110,18 +110,6 @@
 						</view>
 						<view class="achsac">
 						</view>
-						<view class="acea-row row-between-wrapper"
-							style="padding: 0 30rpx; color:#FFF;padding-top: 20rpx;">
-							<view class="left-box">
-								<view class="small">团队等级：{{userInfo.group_vip_name}}</view>
-							</view>
-							<view class="left-box">
-								<view class="small">分红额度：{{userInfo.award_range||0.00}}</view>
-							</view>
-							<view class="acea-row row-middle">
-								分红值：{{userInfo.award_piece||0.00}}
-							</view>
-						</view>
 						<view class="fix-position area_admin_box">
 							<text v-if="userInfo.area_admin==1">{{userInfo.area_district}}区代</text>
 							<text v-if="userInfo.area_admin==2">{{userInfo.area_city}}市代</text>
@@ -231,6 +219,30 @@
 							<text class="iconfont icon-xiangyou"></text>
 						</view>
 					</view>
+					<view class="num-wrapper" v-if="userInfo.uid">
+						<view class="num-item"  style="flex-grow:1"  @click="goMenuPage('/pages/users/user_integral/greed')">
+							<text class="num">{{userInfo.green_integral || 0}}</text>
+							<view class="txt">绿积分</view>
+						</view>
+						<view class="num-item" style="flex-grow:1" @click="goMenuPage('/pages/users/user_integral/base')">
+							<text class="num">{{userInfo.base_integral || 0}}</text>
+							<view class="txt">母积分</view>
+						</view>
+					</view>
+					<view class="num-wrapper" v-if="userInfo.uid">
+						<view class="num-item">
+							<text class="num">{{userInfo.group_vip_name}}</text>
+							<view class="txt">团队等级</view>
+						</view>
+						<view class="num-item">
+							<text class="num">{{userInfo.award_range||0.00}}</text>
+							<view class="txt">分红额度</view>
+						</view>
+						<view class="num-item">
+							<text class="num">{{userInfo.award_piece||0.00}}</text>
+							<view class="txt">分红值</view>
+						</view>
+					</view>
 					<view class="num-wrapper"
 						:class="[member_style==3?'unNum-wrapper':member_style==2?'Tnum-wrapper':'',((vip_type==2 && stu) || (vip_type==1 && memberStatus))?'':'height']"
 						v-if="userInfo.uid">
@@ -256,6 +268,7 @@
 							<view class="txt">浏览记录</view>
 						</view>
 					</view>
+					
 					<!-- 新人礼物 -->
 					<view class="num-wrapper on" v-if="!userInfo.uid">
 						<image :src="giftPic" mode="" class="img"></image>

pages/users/login/index.vue

@@ -68,7 +68,7 @@
 			<view class="logon" @click="loginMobile" v-if="current !== 0">登录</view>
 			<view class="logon" @click="submit" v-if="current === 0">登录</view>
 			<!-- #ifdef APP-PLUS -->
-			<view class="appLogin" v-if="!appLoginStatus && !appleLoginStatus">
+			<!-- <view class="appLogin" v-if="!appLoginStatus && !appleLoginStatus">
 				<view class="hds">
 					<span class="line"></span>
 					<p>其他方式登录</p>
@@ -82,7 +82,7 @@
 						<view class="iconfont icon-s-pingguo"></view>
 					</view>
 				</view>
-			</view>
+			</view> -->
 			<!-- #endif -->
 			<view class="protocol">
 				<checkbox-group @change='ChangeIsDefault'>

pages/users/user_integral/itemuser.vue

@@ -0,0 +1,265 @@
+<template>
+	<view :style="colorStyle">
+		<view class="promoter-list">
+			<view class='list' v-if="recordList.length">
+				<block v-for="(item,index) in recordList" :key="index">
+					<view class='item acea-row row-between-wrapper' :class="index == 0 ? 'radius15' : ''">
+						<view class="picTxt acea-row row-between-wrapper">
+							<view class='pictrue'>
+								<image :src='item.avatar'></image>
+							</view>
+							<view class='text'>
+								<view class='name line1'>{{item.nickname}}</view>
+								<view>手机号: {{item.phone}}</view>
+							</view>
+						</view>
+						<view class="right">
+							<view><text class="num">{{item.green_integral|| 0}}</text></view>
+						</view>
+					</view>
+				</block>
+			</view>
+			<view v-if="recordList.length == 0">
+				<emptyPage title="暂无数据～"></emptyPage>
+			</view>
+		</view>
+		<home v-if="navigation"></home>
+		<!-- #ifdef MP -->
+		<authorize v-if="isShowAuth" @authColse="authColse" @onLoadFun="onLoadFun"></authorize>
+		<!-- #endif -->
+	</view>
+</template>
+
+<script>
+	import {
+		getGreedUserList
+	} from '@/api/user.js';
+	import {
+		toLogin
+	} from '@/libs/login.js';
+	import {
+		mapGetters
+	} from "vuex";
+	import emptyPage from '@/components/emptyPage.vue'
+	import home from '@/components/home';
+	import colors from '@/mixins/color.js';
+	export default {
+		components: {
+			home,
+			emptyPage
+		},
+		mixins: [colors],
+		data() {
+			return {
+				page: 1,
+				limit: 20,
+				recordList: [],
+				isAuto: false, //没有授权的不会自动授权
+				isShowAuth: false, //是否隐藏授权
+				count:0,
+				status:false
+			};
+		},
+		computed: mapGetters(['isLogin']),
+		onLoad() {
+			if (this.isLogin) {
+				this.userSpreadNewList();
+			} else {
+				//#ifndef MP
+				toLogin();
+				//#endif
+				//#ifdef MP
+				this.isShowAuth = true;
+				//#endif
+			}
+		},
+		onShow: function() {
+			if (this.is_show) this.userSpreadNewList();
+		},
+		onHide: function() {
+			this.is_show = true;
+		},
+		methods: {
+			onLoadFun(e) {
+				this.userSpreadNewList();
+				this.isShowAuth = false;
+			},
+			// 授权关闭
+			authColse: function(e) {
+				this.isShowAuth = e
+			},
+			userSpreadNewList: function() {
+				let that = this;
+				if (that.status == true) return;
+				let page = that.page;
+				let limit = that.limit;
+				let recordList = that.recordList;
+				let recordListNew = [];
+				getGreedUserList({
+					page: page,
+					limit: limit,
+				}).then(res => {
+					let len = res.data.list.length;
+					let recordListData = res.data.list;
+					recordListNew = recordList.concat(recordListData);
+					that.status = limit > len;
+					that.page = page + 1;
+					that.$set(that, 'recordList', recordListNew);
+					that.count = res.data.count;
+				});
+			}
+		},
+		onReachBottom: function() {
+			this.userSpreadNewList();
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+	.promoter-list .nav {
+		background-color: #fff;
+		height: 86rpx;
+		line-height: 86rpx;
+		font-size: 28rpx;
+		color: #282828;
+		border-bottom: 1rpx solid #eee;
+	}
+
+	.promoter-list .nav .item.on {
+		border-bottom: 5rpx solid var(--view-theme);
+		color: var(--view-theme);
+	}
+
+	.promoter-list .search {
+		width: 100%;
+		background-color: var(--view-theme);
+		border-bottom: 1px solid #f2f2f2;
+		height: 86rpx;
+		padding: 0 30rpx;
+		box-sizing: border-box;
+	}
+
+	.promoter-list .search .input {
+		width: 100%;
+		height: 60rpx;
+		border-radius: 50rpx;
+		background-color: #f5f5f5;
+		position: relative;
+	}
+
+	.promoter-list .search .input input {
+		height: 100%;
+		font-size: 26rpx;
+		width: 100%;
+		padding-left: 30rpx;
+	}
+
+	.promoter-list .search .input .placeholder {
+		color: #bbb;
+	}
+
+	.promoter-list .search .input .iconfont {
+		position: absolute;
+		right: 28rpx;
+		color: #999;
+		font-size: 28rpx;
+		top: 50%;
+		transform: translateY(-50%);
+	}
+
+	.promoter-list .search .iconfont {
+		font-size: 45rpx;
+		color: #515151;
+		background-color: var(--view-theme);
+		width: 110rpx;
+		height: 60rpx;
+		line-height: 60rpx;
+	}
+
+	.promoter-list .list {
+		margin-top: 12rpx;
+	}
+
+	.promoter-list .list .sortNav {
+		background-color: #fff;
+		height: 76rpx;
+		border-bottom: 1rpx solid #eee;
+		color: #333;
+		font-size: 28rpx;
+	}
+
+	.promoter-list .list .sortNav .sortItem {
+		text-align: center;
+		flex: 1;
+	}
+
+	.promoter-list .list .sortNav .sortItem image {
+		width: 24rpx;
+		height: 24rpx;
+		margin-left: 6rpx;
+		vertical-align: -3rpx;
+	}
+
+	.promoter-list .list .item {
+		background-color: #fff;
+		border-bottom: 1rpx solid #eee;
+		height: 152rpx;
+		padding: 0 30rpx 0 20rpx;
+		font-size: 24rpx;
+		color: #666;
+		margin: 0 30rpx;
+	}
+
+	.promoter-list .list .item .picTxt {
+		width: 440rpx;
+	}
+
+	.promoter-list .list .item .picTxt .pictrue {
+		width: 106rpx;
+		height: 106rpx;
+		border-radius: 50%;
+	}
+
+	.promoter-list .list .item .picTxt .pictrue image {
+		width: 100%;
+		height: 100%;
+		border-radius: 50%;
+		border: 3rpx solid #fff;
+		box-shadow: 0 0 10rpx #aaa;
+		box-sizing: border-box;
+	}
+
+	.promoter-list .list .item .picTxt .text {
+		width: 304rpx;
+		font-size: 24rpx;
+		color: #666;
+	}
+
+	.promoter-list .list .item .picTxt .text .name {
+		font-size: 28rpx;
+		color: #333;
+		margin-bottom: 13rpx;
+	}
+
+	.promoter-list .list .item .right {
+		width: 190rpx;
+		text-align: right;
+		font-size: 22rpx;
+		color: #333;
+	}
+
+	.promoter-list .list .item .right .num {
+		margin-right: 7rpx;
+	}
+	.top_num{
+		padding: 30rpx;
+		font-size: 26rpx;
+		color: #666;
+	}
+	.main_color{
+		color: #E93323;
+	}
+	.radius15{
+		border-radius: 14rpx 14rpx 0 0;
+	}
+</style>

pages/users/user_invoice_order/index.vue

@@ -575,12 +575,15 @@
 				isGoodsReturn: false, //是否为退款订单
 				status: {}, //订单底部按钮状态
 				isClose: false,
-				payMode: [{
+				payMode: [
+					// #ifndef APP-PLUS
+					{
 						name: "微信支付",
 						icon: "icon-weixinzhifu",
 						value: 'weixin',
 						title: '微信快捷支付'
 					},
+					// #endif
 					// #ifdef H5 || APP-PLUS
 					{
 						name: '支付宝支付',

pages/users/user_payment/index.vue

@@ -107,13 +107,16 @@
 				password: '',
 				goodsList: [],
 				pay_order_id: '',
-				payMode: [{
+				payMode: [
+					// #ifndef APP-PLUS
+					{
 						name: '微信支付',
 						icon: 'icon-weixinzhifu',
 						value: 'weixin',
 						title: '微信快捷支付',
 						payStatus: true
-					}
+					},
+					// #endif
 					// #ifdef H5 ||APP-PLUS
 					,
 					{

pages/users/user_set/index.vue

@@ -1,6 +1,6 @@
 <template>
 	<!-- 设置 -->
-	<view class="userSet">
+	<view class="userSet" :style="colorStyle">
 		<navigator url="/pages/users/user_info/index" hover-class="none" class="userInfo acea-row row-between-wrapper">
 			<view class="picTxt acea-row row-middle">
 				<view class="pictrue">
@@ -74,12 +74,27 @@
 				</navigator>
 			</view>
 		</view>
+		
+		<view class="logOut cartcolor acea-row row-center-wrapper" @click="outLogin">退出登录</view>
 		<!-- #ifdef MP -->
 		<authorize v-if="isShowAuth" @authColse="authColse" @onLoadFun="onLoadFun"></authorize>
 		<!-- #endif -->	
 	</view>
 </template>
 <style lang="scss">
+	.logOut {
+		font-size: 32rpx;
+		text-align: center;
+		width: 690rpx;
+		height: 90rpx;
+		border-radius: 45rpx;
+		margin: 30rpx auto 0 auto;
+	}
+	.cartcolor {
+		color: #FFF;
+		// border: 1px solid var(--view-theme);
+		background-color:var(--view-theme) ;
+	}
 	.userSet {
 		.userInfo {
 			margin-top: 20rpx;
@@ -162,7 +177,8 @@
 </style>
 <script>
 	import {
-		getUserInfo
+		getUserInfo,
+		getLogout
 	} from '@/api/user.js';
 	import {
 		toLogin
@@ -171,10 +187,13 @@
 		mapGetters,
 		mapMutations
 	} from "vuex";
+	import colors from '@/mixins/color.js';
 	export default {
 		computed: mapGetters(['isLogin']),
+		mixins: [colors],
 		data() {
 			return {
+				loginType: 'h5', //app.globalData.loginType
 				userInfo:{},
 				isShowAuth: false,
 				autoplay: this.$store.state.app.autoplay
@@ -195,6 +214,33 @@
 		},
 		methods: {
 			...mapMutations(['SET_AUTOPLAY']),
+			/**
+			 * 退出登录
+			 * 
+			 */
+			outLogin: function() {
+				let that = this;
+				if (that.loginType == 'h5') {
+					uni.showModal({
+						title: '提示',
+						content: '确认退出登录?',
+						success: function(res) {
+							if (res.confirm) {
+								getLogout()
+									.then(res => {
+										that.$store.commit("LOGOUT");
+										uni.reLaunch({
+											url: '/pages/index/index'
+										})
+									})
+									.catch(err => {});
+							} else if (res.cancel) {
+								console.log('用户点击取消');
+							}
+						}
+					});
+				}
+			},
 			/**
 			 * 小程序设置
 			 */

unpackage/证书/资料.txt

@@ -0,0 +1,4 @@
+包名：yqkj.liuniu.cn
+别名：yqkj.17kj.cn
+密码：112233
+签名：2574d99e9428e212afc933779009f21b

utils/upApp.js

@@ -0,0 +1,126 @@
+import confige from '@/config/app.js'
+const getUpAppUrl =confige.HTTP_REQUEST_URL+ '/api/version'
+const iosAppStroeUrl =
+	'https://apps.apple.com/cn/app/%E6%BB%A1%E5%9B%AD%E6%98%A5%E7%BA%BF%E4%B8%8A%E5%95%86%E5%9F%8E/id1524593346';
+
+// 获取app是否需要升级
+export function getUpApp () {
+	// 获取当前运行系统
+	let hj = uni.getSystemInfoSync().platform;
+	// 获取仓库app数据对象
+	// let app = store.state.isShowIllegality;
+	// 当前系统为安卓则显示数据
+	if (hj === 'android') {
+		// 设置默认显示数据
+		// app = true;
+		// store.commit('changeState', {
+		// 	name: 'app',
+		// 	value: app
+		// });
+	}
+	uni.request({
+		url: getUpAppUrl,
+		method: 'GET',
+		data: {},
+		success: res => {
+			console.log(res,'升级数据');
+			
+			let r = res.data.data;
+			plus.runtime.getProperty(plus.runtime.appid, function(wgtinfo) {
+				console.log(r.version,'获取版本');
+				// 保存线上版本号
+				let version = r.version;
+				// 获取线上版本
+				const arr = r.version.split('.');
+				// 获取当前系统
+				const arr1 = wgtinfo.version.split('.');
+				console.log(version,'升级数据2');
+				console.log(arr,'升级数据3');
+				console.log(arr1,'升级数据4');
+				let up = false;
+				
+				for (let i = 0; i < arr.length; i++) {
+					// 线上版本号
+					const x = +arr[i];
+					// 线下版本号
+					const y = +arr1[i];
+					// 判断当前版本是否为小于等于线上版本
+					console.log(x,y,'循环');
+					if (x >= y) {
+						// 只有ios才需要显示
+						// if (hj === 'ios') {
+						// 	// 设置显示数据
+						// 	// app = true;
+						// 	// store.commit('changeState', {
+						// 	// 	name: 'app',
+						// 	// 	value: app
+						// 	// });
+						// }
+						// 当版本较低时更新数据
+						console.log(x,y);
+						if(up==true){
+							return;
+						}
+						if (x > y) {
+							up = true;
+							uni.showModal({
+								title: '提示',
+								content: '请更新应用',
+								showCancel: false,
+								success(e) {
+									// if (hj === 'ios') {
+									// 	plus.runtime.openURL(
+									// 		iosAppStroeUrl
+									// 	);
+									// }
+									if (hj === 'android') {
+										// plus.runtime.openURL('http://lxscimg.liuniu946.com/lxscV' + version + '.apk');
+										console.log(r.apk,'下載地址');
+										downApp(r.apk);
+									}
+								}
+							});
+						}
+						
+					}
+				}
+			});
+		},
+	});
+}
+// 下载app
+export function downApp (version) {
+	plus.nativeUI.showWaiting('下载升级包...');
+	plus.downloader
+		.createDownload(confige.HTTP_REQUEST_URL+version, {}, (d, status) => {
+			if (status == 200) {
+				installApp(d.filename); // 安装app
+			} else {
+				plus.nativeUI.alert('下载升级包失败！');
+			}
+			plus.nativeUI.closeWaiting();
+		})
+		.start();
+}
+// 安装app
+export function installApp (path) {
+	plus.nativeUI.showWaiting('安装升级包...');
+	plus.runtime.install(
+		path, {},
+		function() {
+			plus.nativeUI.closeWaiting();
+			uni.showToast({
+				icon: 'none',
+				title: '升级完成，准备重新载入'
+			});
+			setTimeout(_ => {
+				uni.hideToast();
+				plus.runtime.restart();
+			}, 1000);
+		},
+		function(e) {
+			plus.nativeUI.closeWaiting();
+			plus.nativeUI.alert('安装升级包失败[' + e.code + ']：' + e.message);
+		}
+	);
+}