Merge branch 'wwz_d' of https://e.coding.net/g-cphe0354/xiaochengxusaomadiancan/cashier_weapp into dev

pages/index/indexs.vue

@@ -14,7 +14,7 @@
 						</image>
 						<view class="contentboxitemright_itembox flex-colum">
 							<text>会员</text>
-							<text>入会项权益</text>
+							<text>入会享权益</text>
 						</view>
 					</view>
 					<view class="contentboxitemright_item flex-between" @click="memberindex(0)">
@@ -67,9 +67,16 @@
 						}
 					})
 				} else {
-					uni.pro.navigateTo('member/memberdetails', {
-						shopId_id: uni.cache.get('shopUser'),
-					})
+					if (this.usershopUserinfo.isVip == 0) {
+						// 跳转到开通页面
+						uni.navigateTo({
+							url: '/pages/member/activatedmemberone?shopId=' + uni.cache.get('shopUser')
+						})
+					} else {
+						uni.pro.navigateTo('member/memberdetails', {
+							shopId_id: uni.cache.get('shopUser'),
+						})
+					}
 				}
 			},
 			memberindex(i) {

pages/order_detail/indexs.vue

@@ -381,8 +381,8 @@
 			},
 			goRecharge() { // 去充值
 				// 判断是否绑定手机,只有下单时候有,会员列表肯定有
-				console.log(uni.cache.get('userInfo').telephone, '调试1')
-				if (uni.cache.get('userInfo').telephone == '') {
+				// console.log(this.amountVIP.isVip, '调试1')
+				if (this.amountVIP.isVip == 0) {
 					// 跳转到开通页面
 					uni.navigateTo({
 						url: '/pages/member/activatedmemberone?shopId=' + uni.cache.get('shopUser')
@@ -480,7 +480,7 @@
 				let res = await this.api.accountPay({
 					orderId: this.listinfoid,
 					memberId: this.amountVIP.id,
-					pwd:pwd
+					pwd: pwd
 				})
 				if (res.code == 0) {
 					// data ->1 支付成功

pages/user/information.vue

@@ -170,7 +170,7 @@
 				let res = await this.api.upUserInfo({
 					headImg: this.userHeadImg,
 					nickName: this.nickName,
-					telephone: this.phonetitle
+					telephone: this.phonetitle == '请授权手机号' ? '' : this.phonetitle
 				})
 				if (res.code == 0) {
 					uni.navigateBack()