Browse Source

修改bug

purui 2 months ago
parent
commit
151143aca5

+ 1 - 1
packages/app/src/pages-sub/home/spread/wx-agent-operation/index.vue

@@ -54,7 +54,7 @@ onShareTimeline(() => ({
                 {{ it.showFavourable ? it.favourablePoints : it.points }}
               </div>
               <div class="text-black/60 text-sm font-normal font-['PingFang_SC'] leading-[34px]">
-                {{ String(it.needPoints) == '1' ? '折' : '积分' }}
+                {{ it.needPoints == '1' ? '折' : '积分' }}
               </div>
               <div class="flex-1"></div>
               <div

+ 12 - 4
packages/app/src/pages-sub/mine/authentication/index.vue

@@ -198,7 +198,6 @@ onLoad(async (query?: Record<string | 'scene', string>) => {
     }
   }
   await setUserAuthInfo()
-  console.log(userAuthInfo.value)
   if (userAuthInfo.value) {
     formData.value = {
       ...pick(userAuthInfo.value, [
@@ -219,12 +218,13 @@ onLoad(async (query?: Record<string | 'scene', string>) => {
   }
   const { data } = await getByDictType('member_channel_source')
   const { data: res } = await getByDictType(DictType.memberSpatialExpertiseType)
-  console.log(res)
+  // console.log(res)
   schema.value.channelSource.props.columns = data
   schema.value.spatialExpertiseType.props.columns = res
   formInited.value = true
+  console.log(userInfo.value)
   if (userInfo.value.userAuthStatus === 1) {
-    console.log(formData.value)
+    // console.log(formData.value)
     Object.entries(schema.value).forEach(([key]) => {
       schema.value[key].props.disabled = true
     })
@@ -241,9 +241,17 @@ onLoad(async (query?: Record<string | 'scene', string>) => {
       msg: userAuthInfo.value?.remark || '由于系统原因,您提交的认证暂时无法通过,请修改后重新提交',
     })
   }
+  if(userInfo.value.userAuthStatus === 0){
+	await uni.showToast({ title: "您当前已是筑巢荟会员", icon: 'none' })
+	setTimeout(()=>{
+		uni.switchTab({
+			url:"/pages/mine/index"
+		})
+	},2000)
+  }
 })
 onShow(()=>{
-	console.log(!userInfo.value.nickname)
+	// console.log(!userInfo.value.nickname)
 	if(!userInfo.value.nickname){
 		router.push('/pages-sub/login/index')
 	}

+ 6 - 0
packages/app/src/pages-sub/mine/coupons/index.vue

@@ -18,6 +18,12 @@ const tabs = ref([
   { label: '商品优惠券', value: '2' },
 ])
 const query = computed(() => ({ couponType: tab.value }))
+onLoad(async (query)=>{
+	if(query?.type){
+		tab.value = query?.type
+		console.log(tab.value)
+	}
+})
 // const {data, run: set} = useRequest(() => getCoupons({}))
 </script>
 <template>

+ 1 - 1
packages/app/src/pages-sub/mine/homepage/index.vue

@@ -171,7 +171,7 @@ const shareMessage = () =>{
 			  reject()
 		  }else{
 			  const res: Page.CustomShareContent = {}
-			  res.title = `${userInfo.value?.nickname}: “${designerInfo.value?.designDesc}”`;
+			  res.title = `${designerInfo.value?.homePageName?designerInfo.value?.homePageName:userInfo.value?.nickname}: “${designerInfo.value?.designDesc}”`;
 			  res.imageUrl = designerInfo.value.sharePageUrl;
 			  res.path = `/pages-sub/mine/homepage/index?id=${userInfo.value?.id}&isShared=true`
 			  resolve(res)

+ 2 - 0
packages/app/src/pages/messages/components/message-card.vue

@@ -67,6 +67,8 @@ const handleJump = () => {
       query.createTime = String(props.options.createTime)
       query.viewsCount = props.options.viewCount
       break
+	case 14:
+	  query.type = 	props.options.couponType
     default:
       break
   }