8.2 准备审核

activityPages/components/specialMixins.js

@@ -18,15 +18,13 @@ export default {
       this.specialPopupMsg = "";
       this.specialIsHintShow = true;
       this.specialGoFollowShow = true;
-      this.show_cancel_button = false;
-      this.show_confirm_button = false;
       this.specialAccounts = item.Explain;
     },
     // 报名或者取消报名
     async applyOfcancel(item, type = "") {
-      this.show_cancel_button = false;
       this.show_confirm_button = true;
-      if ((type != "back" && item.IsTrip == 1) || (type == "back" && item.IsSignup == 1)) {  // 取消报名
+      if ((type != "back" && item.IsTrip == 1) || (type == "back" && item.IsSignup == 1)) {
+        // 取消报名
         const str = item.ActivityTime.replace(/-/g, "/");
         const date = new Date(str);
         const times = date.getTime();
@@ -52,18 +50,33 @@ export default {
             }
           },
         });
-      } else { // 报名
+      } else {
+        // 报名
         const res = await activity.activityApecialAdd({ ActivityId: item.ActivityId });
         if (res.Ret == 200) {
-          this.specialIsHintShow = false;
-          this.specialGoFollowShow = true;
-          this.specialAccounts = res.Data.PopupMsg;
-          this.specialPopupMsg = res.Data.PopupMsg2;
+          this.modalShow(res);
           if (res.Data.SignupStatus == 1) {
             type == "back" ? (item.IsSignup = 1) : (item.IsTrip = 1);
           }
         }
       }
     },
+
+    // 弹框的数据重置
+    ininModalHandler() {
+      this.show_cancel_button = false;
+      this.show_confirm_button = false;
+      this.specialIsHintShow = false;
+      this.specialGoFollowShow = false;
+      this.isCancelBtn = false;
+    },
+
+    // 显示弹框
+    modalShow(res) {
+      this.show_confirm_button = true;
+      this.specialGoFollowShow = true;
+      this.specialAccounts = res.Data.PopupMsg;
+      this.specialPopupMsg = res.Data.PopupMsg2;
+    },
   },
 };

activityPages/specialDetail/specialDetail.vue

@@ -61,7 +61,9 @@
       </view>
       <view class="interest-btn">
         <block v-if="detailData.TripStatus == 2">
-          <text class="button" @click="applyOfcancel(detailData)">{{ detailData.IsTrip == 0 ? `我要报名(${detailData.TripNum}/${detailData.LimitPeopleNum})` : "取消报名" }}</text>
+          <text v-if="detailData.ActiveState == 1" class="button" @click="applyOfcancel(detailData)">
+            {{ detailData.IsTrip == 0 ? `我要报名(${detailData.TripNum}/${detailData.LimitPeopleNum})` : "取消报名" }}
+          </text>
         </block>
         <block v-else>
           <text class="button" v-if="detailData.IsSignup !== 1" @click="interest">感兴趣</text>
@@ -79,12 +81,13 @@
       :content-style="{ fontSize: '32rpx' }"
       :show-cancel-button="show_cancel_button"
       confirm-text="知道了"
-      @cancel="isCancelBtn = false"
       :show-confirm-button="show_confirm_button"
       :show-title="false"
       :cancel-style="{ borderRight: '1rpx solid #EBEBEB' }"
       :confirm-style="{ fontWeight: '700' }"
       :mask-close-able="specialIsHintShow"
+      @confirm="ininModalHandler"
+      @cancel="ininModalHandler"
     >
       <view class="slot-content">
         <block v-if="specialPopupMsg">
@@ -142,12 +145,7 @@ export default {
       if (res.Ret === 200) {
         this.detailData.IsSignup = 1;
         this.currentPages();
-        uni.showModal({
-          content: "预报名成功，已通知您的销售",
-          confirmText: "知道了",
-          showCancel: false,
-          confirmColor: "#3385FF",
-        });
+        this.modalShow(res);
       }
     },
 

activityPages/specialResearchPage/specialResearchPage.vue

@@ -22,7 +22,7 @@
               <image :src="item.ImgUrl"> </image>
               <text v-if="item.ActiveState == 1" class="img-status begin">未开始</text>
               <text v-else-if="item.ActiveState == 2" class="img-status proceed">进行中</text>
-              <text v-else class="img-status">已结束</text>
+              <text v-else-if="item.ActiveState == 0 && item.TripStatus == 2" class="img-status">已结束</text>
             </view>
             <view class="item">
               <view class="item-text" @click="goDetail(item)">
@@ -36,7 +36,9 @@
               <view class="bottom-box">
                 <view class="" style="width: 130rpx"> </view>
                 <text @click="lookImg(item)">行程安排</text>
-                <text v-if="item.TripStatus == 2" class="button" @click="applyOfcancel(item)">{{ item.IsTrip == 0 ? "我要报名" : "取消报名" }}</text>
+                <block v-if="item.TripStatus == 2">
+                  <text v-if="item.ActiveState == 1" class="button" @click="applyOfcancel(item)">{{ item.IsTrip == 0 ? "我要报名" : "取消报名" }}</text>
+                </block>
                 <block v-else>
                   <text class="button" v-if="item.IsSignup !== 1" @click="interest(item)">感兴趣</text>
                   <text class="button" @click="beNotInterested(item)" v-else>已预报名</text>
@@ -61,12 +63,13 @@
       :content-style="{ fontSize: '32rpx' }"
       :show-cancel-button="show_cancel_button"
       confirm-text="知道了"
-      @cancel="isCancelBtn = false"
       :show-confirm-button="show_confirm_button"
       :show-title="false"
       :cancel-style="{ borderRight: '1rpx solid #EBEBEB' }"
       :confirm-style="{ fontWeight: '700' }"
       :mask-close-able="specialIsHintShow"
+      @confirm="ininModalHandler"
+      @cancel="ininModalHandler"
     >
       <view class="slot-content">
         <block v-if="specialPopupMsg">
@@ -144,12 +147,7 @@ export default {
       });
       if (res.Ret === 200) {
         item.IsSignup = 1;
-        uni.showModal({
-          content: "预报名成功，已通知您的销售",
-          confirmText: "知道了",
-          showCancel: false,
-          confirmColor: "#3385FF",
-        });
+        this.modalShow(res);
       }
     },
 

pageMy/mySchedulepage/mySchedulepage.vue

@@ -26,7 +26,9 @@
             <image :src="item.ImgUrl"></image>
             <text v-if="item.ActiveState == 1" class="img-status begin">未开始</text>
             <text v-else-if="item.ActiveState == 2" class="img-status proceed">进行中</text>
-            <text v-else class="img-status">已结束</text>
+            <block v-else>
+              <text v-if="item.TripStatus != 1" class="img-status">已结束</text>
+            </block>
             <view class="img-type">
               <image :src="item.ImgUrlText" mode=""></image>
             </view>
@@ -88,7 +90,7 @@
               <view class="bottom-box">
                 <view class="" style="width: 130rpx"> </view>
                 <text @click="lookImg(item)">行程安排</text>
-                <text class="button" @click="applyOfcancel(item, index)">{{ item.IsSignup == 0 ? "我要报名" : "取消报名" }}</text>
+                <text v-if="item.ActiveState == 1" class="button" @click="applyOfcancel(item, index)">{{ item.IsSignup == 0 ? "我要报名" : "取消报名" }}</text>
               </view>
             </block>
           </view>
@@ -197,7 +199,7 @@ export default {
         urls: [item.TripImgLink], //查看图片的数组
       });
     },
-    
+
     //报名或者取消报名
     async applyOfcancel(item, index) {
       const str = item.ActivityTime.replace(/-/g, "/");

pages-search/components/activityBack.vue

@@ -90,7 +90,7 @@
                 <view class="bottom-box">
                   <view class="" style="width: 130rpx"> </view>
                   <text @click="lookImg(item)">行程安排</text>
-                  <text class="button" @click="applyOfcancel(item, 'back')">{{ item.IsSignup == 0 ? "我要报名" : "取消报名" }}</text>
+                  <text v-if="item.ActiveState == 1" class="button" @click="applyOfcancel(item, 'back')">{{ item.IsSignup == 0 ? "我要报名" : "取消报名" }}</text>
                 </view>
               </block>
             </view>

pages-search/indedxSearch/indedxSearch.vue

@@ -78,9 +78,7 @@
               <view class="more-rivet" @click="tabsActiveMore(3)"> 更多 <u-icon name="arrow-right" color="#3385FF" size="28"></u-icon> </view>
             </view>
           </view>
-          <reportPage :reportPageData="reportPageData" id="container-report-page"
-		  v-if="Object.keys(reportPageData).length && (tabsActive == 3 || tabsActive == 1)" />
-
+          <reportPage :reportPageData="reportPageData" id="container-report-page" v-if="Object.keys(reportPageData).length && (tabsActive == 3 || tabsActive == 1)" />
           <view class="more-activity more-box" v-if="tabsActive === 1 && haveResultActivity">
             <text class="more-text"> 活动/回放 </text>
             <view>
@@ -615,16 +613,16 @@ export default {
 }
 </style>
 <style lang="scss">
-	#container-report-page{
-		.industry-video-module{
-			  .global-video-box{
-				  .video-content{
-					  top: 400rpx!important;
-				  }
-				  .close-icon{
-					  top: 330rpx!important;
-				  }
-			  }
-		}
-	}
+#container-report-page {
+  .industry-video-module {
+    .global-video-box {
+      .video-content {
+        top: 400rpx !important;
+      }
+      .close-icon {
+        top: 330rpx !important;
+      }
+    }
+  }
+}
 </style>