Merge branch 'dev_1.3' of http://222.85.201.140:10002//xuyunhui/chain_jje_uniapp into dev1.4

 Conflicts:

	myPages/recharge/index.vue

	orderPages/storeService/index.vue

App.vue

@@ -11,23 +11,7 @@
                     that.$api.wxLogin({code:re.code}).then(res=>{
                         uni.setStorageSync('userInfo',res.data.data.userInfo)
                         uni.setStorageSync('accessToken',res.data.data.access_token)
-                        uni.setStorageSync('phoneIsBind',res.data.data.phoneIsBind)
-
                         uni.removeStorageSync('parent_member_id');
-                        if (!res.data.data.phoneIsBind){
-                            uni.showModal({
-                                title:'温馨提示',
-                                content:'请绑定手机号，以便为你提供服务',
-                                success:res=>{
-                                    if (res.confirm){
-                                        uni.navigateTo({
-                                            url: '/myPages/setting/setting-telphone',
-                                        })
-                                    }
-                                }
-                            })
-                        }
-
                     })
 
                 },

common/js/env.js

@@ -1,9 +1,9 @@
 "use strict";
 
 // let baseUrl = `https://jje.admin.xinyuekj.com.cn`
-let baseUrl = `https://jje.xinyuekj.com.cn/prod-api`
+// let baseUrl = `https://jje.xinyuekj.com.cn/prod-api`
 /** 测试环境 */
-// let baseUrl = `https://jje.admin.xinyuekj.com.cn/test-api`
+let baseUrl = `https://jje.admin.xinyuekj.com.cn/test-api`
 /** 开发环境*/
 // let baseUrl = `http://65i1sxopd9qp.ngrok.xiaomiqiu123.top`
 

myPages/systemSwitch/index.vue

@@ -553,6 +553,9 @@ export default {
     },
     nextStep(idx) {
       if (idx == 0) { // 点击确认
+        console.log(this.userInfo.phone)
+
+
         if (this.isSelect === true) {
           this.$refs.popup.close()
           // this.getOldMember();
@@ -574,6 +577,22 @@ export default {
       }
 
       if (idx == 1) { // 点击查询数据
+        const userInfo = uni.getStorageSync('userInfo')
+        // console.log(userInfo,'绑定手机号')
+        if (!userInfo.phone){
+          uni.showModal({
+            title:'温馨提示',
+            content:'资产找回涉及资金安全，需绑定手机号才能进行查询，是否确认绑定手机号',
+            success:res=>{
+              if (res.confirm){
+                uni.navigateTo({
+                  url: '/myPages/setting/setting-telphone',
+                })
+              }
+            }
+          })
+          return
+        }
         this.$refs.form1.validate().then(res => {
           this.getOldMember();
         }).catch(errors => {

orderPages/bookService/index.vue

@@ -192,7 +192,6 @@
 		},
 		onLoad() {
 			this.store = uni.getStorageSync('storeInfo')
-			this.userInfo = uni.getStorageSync('userInfo')
 			this.orderParam.serviceStoreId = this.store.storeId
 			//获取排班日期
 			this.selectDate()
@@ -215,7 +214,7 @@
 
 		},
 		onShow() {
-
+			this.userInfo = uni.getStorageSync('userInfo')
 		},
 		onUnload(){
 			clearTimeout(this.timeoutId);
@@ -599,6 +598,22 @@
 
 			//提交订单
 			commitOrder() {
+
+				if (!this.userInfo.phone){
+					uni.showModal({
+						title:'温馨提示',
+						content:'预约叫号是通过手机尾号进行查询，是否确认绑定手机号',
+						success:res=>{
+							if (res.confirm){
+								uni.navigateTo({
+									url: '/myPages/setting/setting-telphone',
+								})
+							}
+						}
+					})
+					return
+				}
+
 				if (this.subOrderNo){
 					this.$refs.myPay.openPopup()
 				}else {

orderPages/storeService/index.vue

@@ -311,6 +311,21 @@
 			},
 
 			commonGeneralOrder() {
+				if (!this.userInfo.phone){
+					uni.showModal({
+						title:'温馨提示',
+						content:'预约叫号是通过手机尾号进行查询，是否确认绑定手机号！',
+						success:res=>{
+							if (res.confirm){
+								uni.navigateTo({
+									url: '/myPages/setting/setting-telphone',
+								})
+							}
+						}
+					})
+					return
+				}
+
 				if (!this.orderParam.childService.length) {
 					uni.$u.toast('请选择服务对象')
 					return

pages/index/index.vue

@@ -28,7 +28,7 @@
                 <image  :src="userInfo.selfPhotoUrl || '/static/me/ud4.png'" mode=""></image>
               </view>
               <view class="text">
-                <view class="phone">{{ userInfo.cellPhone || ''}}</view>
+                <view class="phone">{{ userInfo.ncikName || ''}}</view>
 <!--                <view class="welcome">尊敬的{{ userInfo.ncikName || ''}}，下午好~</view>-->
               </view>
               <view  @click="goQrCode" class="arrow-right">
@@ -399,21 +399,6 @@ export default {
     },
 
     goRights(){
-      this.userInfo = uni.getStorageSync('userInfo')
-      if (!this.userInfo.phone){
-        uni.showModal({
-          title:'温馨提示',
-          content:'请绑定手机号，以便为你提供服务',
-          success:res=>{
-            if (res.confirm){
-              uni.navigateTo({
-                url: '/myPages/setting/setting-telphone',
-              })
-            }
-          }
-        })
-        return
-      }
       uni.navigateTo({
         url: '/storePages/rights/index'
       })
@@ -422,45 +407,12 @@ export default {
     // 去服务点单页面
     gotoServiceOrder() {
 
-      this.userInfo = uni.getStorageSync('userInfo')
-      if (!this.userInfo.phone){
-        uni.showModal({
-          title:'温馨提示',
-          content:'请绑定手机号，以便为你提供服务',
-          success:res=>{
-            if (res.confirm){
-              uni.navigateTo({
-                url: '/myPages/setting/setting-telphone',
-              })
-            }
-          }
-        })
-        return
-      }
-
       uni.navigateTo({
         url: '/orderPages/storeService/index'
       })
     },
 
     goBookService() {
-
-      this.userInfo = uni.getStorageSync('userInfo')
-      if (!this.userInfo.phone){
-        uni.showModal({
-          title:'温馨提示',
-          content:'请绑定手机号，以便为你提供服务',
-          success:res=>{
-            if (res.confirm){
-              uni.navigateTo({
-                url: '/myPages/setting/setting-telphone',
-              })
-            }
-          }
-        })
-        return
-      }
-
       uni.navigateTo({
         url: '/orderPages/bookService/index'
       })
@@ -589,23 +541,6 @@ export default {
     },
     // 去商品下单页面
     gotoGoods() {
-
-      this.userInfo = uni.getStorageSync('userInfo')
-      if (!this.userInfo.phone){
-        uni.showModal({
-          title:'温馨提示',
-          content:'请绑定手机号，以便为你提供服务',
-          success:res=>{
-            if (res.confirm){
-              uni.navigateTo({
-                url: '/myPages/setting/setting-telphone',
-              })
-            }
-          }
-        })
-        return
-      }
-
       uni.navigateTo({
         url: '/orderPages/bookService/index',
       })

pages/my/index.vue

@@ -157,23 +157,9 @@ export default {
   methods: {
     clickListItem(e){
       console.log(e)
-      if (!this.userInfo.phone && e.title==='资产找回'){
-        uni.showModal({
-          title:'温馨提示',
-          content:'资产找回请先绑定手机号',
-          success:res=>{
-            if (res.confirm){
-              uni.navigateTo({
-                url: '/myPages/setting/setting-telphone',
-              })
-            }
-          }
-        })
-      }else {
         uni.navigateTo({
           url:e.to
         })
-      }
     },
     getUserInfo() {
       this.$api.getUserInfo().then(res => {

storePages/rights/index.vue

@@ -59,31 +59,6 @@
 					<text class="payType">微信支付</text>
 					<image class="x" src="/static/common/ox.png" @click="closePayPopup"></image>
 				</view>
-				<!--				<view class="payTitle">-->
-				<!--					<text>选择微信支付或余额支付</text>-->
-				<!--				</view>-->
-
-
-				<!--				<view class="payItem flex-row justify-between" @click="payItem(1)">-->
-				<!--					<view class="flex-row">-->
-				<!--						<u-icon name="/static/me/u701.png" color="#38db38" size="36"></u-icon>-->
-				<!--						<view class="payName flex-col justify-center">-->
-				<!--							<text>余额支付</text>-->
-				<!--							<text class="balance">可以余额￥{{userInfo.balance || 0}}</text>-->
-				<!--						</view>-->
-				<!--					</view>-->
-
-				<!--					<view class="flex-col justify-center">-->
-				<!--						<view v-if="curServiceTab === 1" >-->
-				<!--							<u-icon name="checkmark-circle-fill" color="#38db38" size="25"></u-icon>-->
-				<!--						</view>-->
-				<!--						<view v-else>-->
-				<!--							<u-icon name="/static/order/ud9.png" color="green" size="25"></u-icon>-->
-				<!--						</view>-->
-				<!--					</view>-->
-
-				<!--				</view>-->
-
 				<view class="payItem flex-row justify-between" @click="payItem(2)">
 					<view class="flex-row">
 						<u-icon name="weixin-circle-fill" color="#38db38" size="36"></u-icon>
@@ -280,7 +255,7 @@ export default {
 			if (!this.userInfo.phone){
 				uni.showModal({
 					title:'温馨提示',
-					content:'请绑定手机号，以便为你提供服务',
+					content:'权益卡绑定信息需通过手机号进行获取，是否确认绑定手机号',
 					success:res=>{
 						if (res.confirm){
 							uni.navigateTo({