20260706

src/pages/index/index.vue

@@ -503,15 +503,14 @@ export default {
 			/**
 			 * 服务标签（1：按摩推拿 2：陪玩）
 			 */
-			this.serviceTag = merchantInfo.merchant.serviceTag
-			// uni.setStorageSync('serviceTag', normalizeStorageValue(merchantInfo.merchant.serviceTag))
-			// uni.setStorageSync('userId', normalizeStorageValue(merchantInfo.merchant.id))
-
-			uni.setStorageSync('serviceTag', merchantInfo.serviceTag)
-			uni.setStorageSync('userId', merchantInfo.merchantId)
+			this.serviceTag = merchantInfo.serviceTag
+			uni.setStorageSync('serviceTag', normalizeStorageValue(merchantInfo.serviceTag))
+			uni.setStorageSync('userId', normalizeStorageValue(merchantInfo.merchantId))
+			//uni.setStorageSync('serviceTag', merchantInfo.serviceTag)
+			//uni.setStorageSync('userId', merchantInfo.merchantId)
 			uni.setStorageSync('merchantId', merchantInfo.merchantId)
 			uni.setStorageSync('auditStatus', merchantInfo.auditStatus)
-			return merchantInfo.merchant.auditStatus//用户状态
+			return merchantInfo.auditStatus//用户状态
 
 
 		},

src/pages/my/dynamic/index.vue

@@ -90,16 +90,17 @@ export default {
       /**
        * 服务标签（1：按摩推拿 2：陪玩）
        */
-      // this.serviceTag = merchantInfo.merchant.serviceTag
-      // uni.setStorageSync('serviceTag', normalizeStorageValue(merchantInfo.merchant.serviceTag))
-      // uni.setStorageSync('userId', normalizeStorageValue(merchantInfo.merchant.id))
-      // return merchantInfo.merchant.auditStatus//用户状态
-
-
       this.serviceTag = merchantInfo.serviceTag
-      uni.setStorageSync('serviceTag', merchantInfo.serviceTag)
-      uni.setStorageSync('userId', merchantInfo.id)
+      uni.setStorageSync('serviceTag', normalizeStorageValue(merchantInfo.serviceTag))
+      uni.setStorageSync('userId', normalizeStorageValue(merchantInfo.id))
       uni.setStorageSync('auditStatus', merchantInfo.auditStatus)
+      return merchantInfo.auditStatus//用户状态
+
+
+      // this.serviceTag = merchantInfo.serviceTag
+      // uni.setStorageSync('serviceTag', merchantInfo.serviceTag)
+      // uni.setStorageSync('userId', merchantInfo.id)
+      
 
     },
     // 我在想想：关闭弹窗