fixed

pages/index/index.vue

@@ -4,25 +4,14 @@
     <Brand v-if="globalStore.curTabIndex == 1 && !globalStore.isWxFriendCircle" :scroll-top="scrollTop" />
     <Integral v-if="globalStore.curTabIndex == 2 && !globalStore.isWxFriendCircle" :scrollTop="scrollTop" />
     <My v-if="globalStore.curTabIndex == 3 && !globalStore.isWxFriendCircle" />
-    <TabBar
-      v-if="!globalStore.isWxFriendCircle"
-      :curTabIndex="globalStore.curTabIndex"
-      @tabClick="handleTabClick"
-    />
+    <TabBar v-if="!globalStore.isWxFriendCircle" :curTabIndex="globalStore.curTabIndex" @tabClick="handleTabClick" />
     <WxFriendCircleSimplePage v-if="globalStore.isWxFriendCircle" />
 
     <!-- 邀请奖品弹窗 -->
-    <InvitePrizePanel
-      :visible="globalStore.isShowInvitePrizePanel"
-      :inviteCount="globalStore.inviteCount"
-      :prizeName="globalStore.prizeName"
-      :prizeImage="globalStore.prizeImage"
-      :prizeType="globalStore.prizeType"
-      :memberId="globalStore.memberId"
-      @close="handleCloseInvitePrizePanel"
-      @record="handleInvitePrizePanelRecord"
-      @prize="handleInvitePrizePanelPrize"
-    />
+    <InvitePrizePanel :visible="globalStore.isShowInvitePrizePanel" :inviteCount="globalStore.inviteCount"
+      :prizeName="globalStore.prizeName" :prizeImage="globalStore.prizeImage" :prizeType="globalStore.prizeType"
+      :memberId="globalStore.memberId" @close="handleCloseInvitePrizePanel" @record="handleInvitePrizePanelRecord"
+      @prize="handleInvitePrizePanelPrize" />
 
     <!-- 任务完成弹窗 -->
     <!-- <TaskComplete 
@@ -34,61 +23,32 @@
 	/> -->
 
     <!-- 任务弹窗 -->
-    <TaskPop
-      :visible="globalStore.isShowTaskPop"
-      :taskTodo="globalStore.taskTodo"
-      @close="handleCloseTaskPop"
-      @taskClick="handleTaskClick"
-    />
+    <TaskPop :visible="globalStore.isShowTaskPop" :taskTodo="globalStore.taskTodo" @close="handleCloseTaskPop"
+      @taskClick="handleTaskClick" />
 
     <!-- 任务完成提示弹窗 -->
-    <TaskCompleteTips
-      :visible="globalStore.isShowTaskComplete"
-      :points="globalStore.taskCompletePoints"
-      :taskTitle="globalStore.taskCompleteTitle"
-      @close="handleCloseTaskCompleteTips"
-    />
+    <TaskCompleteTips :visible="globalStore.isShowTaskComplete" :points="globalStore.taskCompletePoints"
+      :taskTitle="globalStore.taskCompleteTitle" @close="handleCloseTaskCompleteTips" />
 
     <!-- 任务信息弹窗 -->
-    <TaskPerson
-      :visible="globalStore.isShowTaskPerson"
-      @close="handleCloseTaskPerson"
-      @submit="handleTaskPersonSubmit"
-    />
+    <TaskPerson :visible="globalStore.isShowTaskPerson" @close="handleCloseTaskPerson"
+      @submit="handleTaskPersonSubmit" />
 
     <!-- 公众号弹窗 -->
-    <GongzhonghaoPop
-      :visible="showGongzhonghaoPop"
-      :title="gongzhonghaoTitle"
-      :description="gongzhonghaoDescription"
-      :qrCodeUrl="gongzhonghaoQrCodeUrl"
-      @close="handleCloseGongzhonghaoPop"
-      @download="handleDownloadQrCode"
-    />
+    <GongzhonghaoPop :visible="showGongzhonghaoPop" :title="gongzhonghaoTitle" :description="gongzhonghaoDescription"
+      :qrCodeUrl="gongzhonghaoQrCodeUrl" @close="handleCloseGongzhonghaoPop" @download="handleDownloadQrCode" />
 
     <!-- 视频弹窗 -->
     <view v-if="showVideo" class="video-popup1">
-      <video
-        :src="currentVideoUrl"
-        controls
-        autoplay
-        :style="{ width: videoWidth + 'px', height: videoHeight + 'px' }"
-        @loadedmetadata="onVideoLoadedMeta"
-        @play="onVideoPlay"
-      ></video>
+      <video :src="currentVideoUrl" controls autoplay :style="{ width: videoWidth + 'px', height: videoHeight + 'px' }"
+        @loadedmetadata="onVideoLoadedMeta" @play="onVideoPlay"></video>
       <view class="close-btn-bottom" @tap="closeVideo">×</view>
     </view>
 
-    <button
-      v-if="isBackApp"
-      class="back-app"
-      open-type="launchApp"
-      app-parameter="wechat"
-      @binderror="handleLaunchAppError"
-      :style="{
+    <button v-if="isBackApp" class="back-app" open-type="launchApp" app-parameter="wechat"
+      @binderror="handleLaunchAppError" :style="{
         backgroundImage: `url(${$baseUrl}homepage/backAppBtn.png)`,
-      }"
-    >
+      }">
       <!-- <text class="back-text">返回app</text> -->
     </button>
 
@@ -96,11 +56,7 @@
     <view class="auth-phone-module" v-if="!userStore.memberInfo?.mobile">
       <image class="auth-phone-bg" :src="$baseUrl + 'homepage/Q3Res/accessBg3.png'"></image>
       <view class="auth-phone-btn-container">
-        <image
-          class="auth-phone-btn"
-          :src="$baseUrl + 'homepage/Q3Res/accessBtn3.png'"
-          @tap="handleAuthPhoneClick"
-        >
+        <image class="auth-phone-btn" :src="$baseUrl + 'homepage/Q3Res/accessBtn3.png'" @tap="handleAuthPhoneClick">
         </image>
       </view>
     </view>
@@ -286,7 +242,7 @@ const handleTaskComplete = async (taskIdParam) => {
     globalStore.isShowTaskComplete = true;
     globalStore.taskCompletePoints = integralStore.queryTodoResult.data[0]?.actualCredits;
     globalStore.taskCompleteTitle = integralStore.queryTodoResult.data[0]?.taskName;
-  }else{
+  } else {
     console.info('taskCompleteJSON res error:', integralStore.queryTodoResult);
   }
 
@@ -308,6 +264,11 @@ onShow(async () => {
   //完成了浏览任务
   if (taskId.value > 0) {
     await handleTaskComplete(taskId.value);
+  } else {
+    const integralStore = useIntegralStore();
+    await integralStore.getSigninAndTaskInfo();
+    await integralStore.queryTodoResultServer();
+
   }
 });
 
@@ -503,6 +464,7 @@ const handleTaskClick = async (data) => {
       // console.log('extra66666:', extra1);
       break;
     case 'FirstOrder': //完成首单优选消费
+      globalStore.closeTaskPop(); // 先关闭TaskPop
       const extra2 = JSON.parse(data?.task?.taskTodoExtra?.extra);
       console.log('extra666661111:', extra2);
       jump({
@@ -512,6 +474,7 @@ const handleTaskClick = async (data) => {
       });
       break;
     case 'EXCHANGE_GOODS': //消费商品
+      globalStore.closeTaskPop(); // 先关闭TaskPop
       const extra3 = JSON.parse(data?.task?.taskTodoExtra?.extra);
 
       if (extra3.length > 0) {