chore: 合并master

views/Integral.vue

@@ -636,6 +636,7 @@
 import MonthGift from '../components/pointRightsCom/monthGift.vue';
 import YearGift from '../components/pointRightsCom/yearGift.vue';
 import ShengriliTipPanel from '../components/quanyi/shengriliTipPanel.vue';
+  import {onShow} from "@dcloudio/uni-app";
 
 	// 进度条图片加载错误处理
 	const onProgressBarError = (e) => {
@@ -1464,6 +1465,7 @@ import ShengriliTipPanel from '../components/quanyi/shengriliTipPanel.vue';
 		points:0
 	});
 
+const needReinit = ref(false)
 
 	const willExpiredPoints = ref(0);//即将过期积分
 
@@ -1708,6 +1710,13 @@ import ShengriliTipPanel from '../components/quanyi/shengriliTipPanel.vue';
 
 	})
 
+  onShow(async () => {
+    if (needReinit.value) {
+      needReinit.value = false
+      initNetData()
+    }
+  })
+
 		
 	onMounted(async() => {
 		showLoading();
@@ -2233,8 +2242,16 @@ import ShengriliTipPanel from '../components/quanyi/shengriliTipPanel.vue';
 		})
 	}
 
-	//会员权益点击跳转
-	const handlePrivilegeClick = (item, index) => {
+//会员权益点击跳转
+const handlePrivilegeClick = (item, index) => {
+  if (!islogin.value) {
+    needReinit.value = true
+    jump({
+      type: JumpType.INNER,
+      url: "/pages/activity/register",
+    })
+    return;
+  }
 
 		// jump({
 		// 	type: JumpType.H5,
@@ -2473,10 +2490,14 @@ import ShengriliTipPanel from '../components/quanyi/shengriliTipPanel.vue';
 	};
 
 	const handleVipClick = () => {
-
-        if(!islogin.value){
-            return;
-        }
+    if (!islogin.value) {
+      needReinit.value = true
+      jump({
+        type: JumpType.INNER,
+        url: "/pages/activity/register",
+      })
+      return;
+    }
 
 		vipCardMd(vipLevel.value, false);
 		const item = vipIntegral.value.vipCardInfo;

views/My.vue

@@ -16,8 +16,7 @@
       <image class="banner_cover" :src="$baseUrl + 'my/cover_white.png'" mode="aspectFill" />
     </view>
 
-    <button v-if="!cfgStatus.isRegister" type="primary" class="phone-button" open-type="getPhoneNumber"
-      @getphonenumber="getRealtimePhoneNumber" />
+    <button v-if="!cfgStatus.isRegister" type="primary" class="phone-button" @click="clickRegisterShield"/>
 
     <!-- 用户信息区域 -->
     <view class="user-info" :style="{ 'min-height': cfgStatus.showDetail ? '343rpx' : '180rpx' }">
@@ -206,6 +205,12 @@ const handleHot = (e) => {
   }
 };
 
+function clickRegisterShield(){
+  jump({
+    type: JumpType.INNER,
+    url: "/pages/activity/register",
+  })
+}
 
 // 页面跳转
 const navigateTo = (url) => {
@@ -306,12 +311,12 @@ const handleEditProfile = (e) => {
     componentContent: "资料编辑"
   })
 
-  const type = userStore.babyInfo?.allBabyBaseInfo?.length == 0 ? "add" : "edit";
-  babyId.value = userStore.babyInfo?.allBabyBaseInfo.find(
-    (item) => item.selected
-  )?.id;
+  const type = userStore.babyInfo?.allBabyBaseInfo?.length ? "edit" : "add";
 
   if (type === "edit") {
+    babyId.value = userStore.babyInfo?.allBabyBaseInfo.find(
+      (item) => item.selected
+    )?.id;
     navigateTo(`/pages/person/person?type=${type}&id=${babyId.value}`);
   } else {
     navigateTo(`/pages/person/person?type=${type}`);