Browse Source

二维码跳转

zhanghui 2 năm trước cách đây
mục cha
commit
bcc686b80e

+ 3 - 2
common/js/env.js

@@ -1,8 +1,9 @@
 "use strict";
 
 // let baseUrl = `https://jje.admin.xinyuekj.com.cn`
-// let baseUrl = `https://jje.admin.xinyuekj.com.cn/test-api`
-let baseUrl = `http://65i1sxopd9qp.ngrok.xiaomiqiu123.top`
+// let baseUrl = `https://jje.xinyuekj.com.cn/prod-api`
+let baseUrl = `https://jje.admin.xinyuekj.com.cn/test-api`
+// let baseUrl = `http://65i1sxopd9qp.ngrok.xiaomiqiu123.top`
 
 // let baseUrl = `http://127.0.0.1:9000`
 // let baseUrl = `http://192.168.1.7:8080`

+ 0 - 6
myPages/recharge/index.vue

@@ -178,12 +178,6 @@
 			};
 		},
 		onLoad(option) {
-			if(option.q){
-				const q = decodeURIComponent(option.q)
-				let rechargeStoreId = q.replace('https://jje.admin.xinyuekj.com.cn/recharge/recharge?rechargeStoreId=', '');
-				uni.setStorageSync('rechargeStoreId',rechargeStoreId)
-
-			}
 			this.AboutByType()
 		},
 		onShow() {

+ 6 - 5
orderPages/bookService/index.vue

@@ -4,7 +4,7 @@
 			<text>服务日期:{{periodDate.label}}</text>
 		</view>
 
-		<view class="flex-col group">
+		<view class="flex-col group" v-if="serviceObjectList.length>1">
 			<view class="serob"><text>服务对象</text></view>
 			<u-grid :border="false" col="4">
 				<u-grid-item v-for="(item,index) in serviceObjectList" :key="index">
@@ -25,7 +25,7 @@
 		</view>
 
 		<view class="flex-col group " v-for="(item, index) in orderParam.childService">
-			<view class="flex-row " >
+			<view class="flex-row " v-if="serviceObjectList.length>1">
 				<image class="selectSerobImg" mode="aspectFill" :src="item.facePhotoUrl || '/static/me/ud4.png'"></image>
 				<text class="selectSerobName">{{item.nickName || '未填写'}}</text>
 			</view>
@@ -225,11 +225,12 @@
 						}).then(res => {
 							items[i].facePhotoUrl = res.data.data[0].url.replace(/^http:/, "https:")
 							this.$set(this.serviceObjectList, i, items[i])
-							if (i === 0){
-								this.selectServiceObject(items[i])
-							}
+
 						})
 					}
+					if (i === 0){
+						this.selectServiceObject(items[i])
+					}
 				}
 			},
 

+ 13 - 1
pages/index/index.vue

@@ -25,7 +25,7 @@
             <!-- 欢迎语 -->
             <view class="welcome-wrap">
               <view class="logo">
-                <image  :src="userInfo.selfPhotoUrl || '/../static/ud4.png'" mode=""></image>
+                <image  :src="userInfo.selfPhotoUrl || '/static/me/ud4.png'" mode=""></image>
               </view>
               <view class="text">
                 <view class="phone">{{ userInfo.cellPhone || ''}}</view>
@@ -275,6 +275,18 @@ export default {
     }
   },
   onLoad(e) {
+
+    if(e.q){
+      const q = decodeURIComponent(e.q)
+      const params = new URLSearchParams(q);
+      let promotionStoreId = params.get('promotionStoreId')
+      let promotionUserId = params.get('promotionUserId')
+      console.log('promotionStoreId=>',promotionStoreId)
+      console.log('promotionUserId=>',promotionUserId)
+      uni.setStorageSync('promotionStoreId',promotionStoreId)
+      uni.setStorageSync('promotionUserId',promotionUserId)
+    }
+
     uni.hideTabBar({
       animation: false
     })

+ 0 - 7
storePages/rights/index.vue

@@ -130,13 +130,6 @@
 			};
 		},
 		onLoad(option) {
-
-			if(option.q){
-				const q = decodeURIComponent(option.q)
-				let cardStoreId = q.replace('https://jje.admin.xinyuekj.com.cn/card/card?cardStoreId=', '');
-				uni.setStorageSync('cardStoreId',cardStoreId)
-			}
-
 			this.userInfo = uni.getStorageSync('userInfo')
 			let sysInfo = uni.getSystemInfoSync()
 			this.windowHeight =sysInfo.windowHeight -50  +'px'//除标题栏栏外的屏幕可用高度