init

activityPages/activityDetail/activityDetail.vue

@@ -248,7 +248,6 @@
         :signupStatus="signupStatus"
         :isCancelShow="isCancelShow"
         :idTypeCancel="idTypeCancel"
-        @cancelShowBtn="cancelEnsure"
         :editIsShow="editIsShow"
         :countryCode="countryCode"
         :mobileEdit="mobileEdit"
@@ -439,9 +438,6 @@ export default {
         });
       }
     },
-    cancelEnsure() {
-      this.getActivityDetail();
-    },
     goDetail(id) {
       uni.navigateTo({
         url: "/pageMy/reportDetail/reportDetail?id=" + id,

activityPages/activityDetail/manageMixin.js

@@ -46,6 +46,7 @@ export default {
           });
       }
       this.selectShow = false;
+      this.getActivityDetail();
     },
     //取消报名
     signupCancel(type) {
@@ -87,6 +88,7 @@ export default {
               this.isShow = true;
             }
           }
+          this.getActivityDetail();
         }
         this.selectShow = false;
       } else {

activityPages/themeActivity/themeActivity.vue

@@ -84,7 +84,6 @@
         :editIsShow="editIsShow"
         :isCancelShow="isCancelShow"
         :idTypeCancel="idTypeCancel"
-        @cancelShowBtn="cancelEnsure"
         :countryCode="countryCode"
         :mobileEdit="mobileEdit"
         :goOnNextStep="goOnNextStep"

components/activity/indexActivity.js

@@ -28,13 +28,7 @@ export default {
       goFollow: false, //是否关注公众号
       signupStatus: "Success", //4个不同的类型提示文案
       hasPermission: "", //是否有权限
-      jurisdictionList: {
-        SellerMobile: "",
-        PopupMsg: "",
-        OperationMode: "",
-        SellerName: "",
-        ActivityId: "",
-      },
+      jurisdictionList: {},
       editIsShow: false, //外呼莫泰框
       isCancelShow: false,
       idTypeCancel: {
@@ -140,8 +134,7 @@ export default {
             .then((res) => {
               if (res.Ret == 200) {
                 this.hasPermission = res.Data.HasPermission;
-                this.jurisdictionList.ActivityId = res.Data.ActivityId;
-
+                this.jurisdictionList = res.Data;
                 if (this.hasPermission == 1) {
                   const index = this.collectList.findIndex((key) => key.ActivityId == id);
                   this.collectList[index].SignupType = type;
@@ -171,12 +164,8 @@ export default {
                     }
                   }
                 } else if (this.hasPermission == 2) {
-                  this.jurisdictionList.SellerMobile = res.Data.SellerMobile;
-                  this.jurisdictionList.SellerName = res.Data.SellerName;
-                  this.jurisdictionList.PopupMsg = res.Data.PopupMsg;
                   this.isShowhasPermission = true;
                 } else if (this.hasPermission == 3 || this.hasPermission == 4 || this.hasPermission == 5) {
-                  this.jurisdictionList.PopupMsg = res.Data.PopupMsg;
                   this.applyForIsShow = true;
                 }
               }
@@ -208,7 +197,7 @@ export default {
         .then((res) => {
           if (res.Ret == 200) {
             this.hasPermission = res.Data.HasPermission;
-            this.jurisdictionList.ActivityId = res.Data.ActivityId;
+            this.jurisdictionList = res.Data;
             if (this.hasPermission == 1) {
               if ((res.Data.GoFollow && res.Data.SignupStatus !== "Success") || !res.Data.GoFollow) {
                 this.isShow = true;
@@ -228,12 +217,8 @@ export default {
                 }
               });
             } else if (this.hasPermission == 2) {
-              this.jurisdictionList.SellerMobile = res.Data.SellerMobile;
-              this.jurisdictionList.SellerName = res.Data.SellerName;
-              this.jurisdictionList.PopupMsg = res.Data.PopupMsg;
               this.isShowhasPermission = true;
             } else if (this.hasPermission == 3 || this.hasPermission == 4 || this.hasPermission == 5) {
-              this.jurisdictionList.PopupMsg = res.Data.PopupMsg;
               this.applyForIsShow = true;
             }
           }
@@ -272,18 +257,14 @@ export default {
       const res = await activity.checkAskActivity({ ActivityId: item.ActivityId });
       if (res.Ret == 200) {
         this.hasPermission = res.Data.HasPermission;
-        this.jurisdictionList.ActivityId = res.Data.ActivityId;
+        this.jurisdictionList = res.Data;
         if (this.hasPermission == 1) {
           uni.navigateTo({
             url: "/activityPages/generationAsk/generationAsk?id=" + item.ActivityId + "&type=" + type,
           });
         } else if (this.hasPermission == 2) {
-          this.jurisdictionList.SellerMobile = res.Data.SellerMobile;
-          this.jurisdictionList.SellerName = res.Data.SellerName;
-          this.jurisdictionList.PopupMsg = res.Data.PopupMsg;
           this.isShowhasPermission = true;
         } else if (this.hasPermission == 3 || this.hasPermission == 4 || this.hasPermission == 5) {
-          this.jurisdictionList.PopupMsg = res.Data.PopupMsg;
           this.applyForIsShow = true;
         }
       }
@@ -302,9 +283,8 @@ export default {
         const res = await activity.postAppointmentAdd({ ActivityId: item.ActivityId });
         if (res.Ret == 200) {
           this.hasPermission = res.Data.HasPermission;
-          this.jurisdictionList.ActivityId = res.Data.ActivityId;
+          this.jurisdictionList = res.Data;
           if (this.hasPermission == 1) {
-            item.IsAppointment = 1;
             this.signupType = "summaryIsHandel";
             this.signupStatus = res.Data.SignupStatus;
             this.goOnNextStep = res.Data.GoFollow;
@@ -315,15 +295,12 @@ export default {
                 this.goFollow = res.Data.GoFollow;
               } else if (res.Data.SignupStatus == "Success") {
                 this.isShow = true;
+                item.IsAppointment = 1;
               }
             }
           } else if (this.hasPermission == 2) {
-            this.jurisdictionList.SellerMobile = res.Data.SellerMobile;
-            this.jurisdictionList.SellerName = res.Data.SellerName;
-            this.jurisdictionList.PopupMsg = res.Data.PopupMsg;
             this.isShowhasPermission = true;
           } else if (this.hasPermission == 3 || this.hasPermission == 4 || this.hasPermission == 5) {
-            this.jurisdictionList.PopupMsg = res.Data.PopupMsg;
             this.applyForIsShow = true;
           }
         }
@@ -347,7 +324,6 @@ export default {
         });
       }
     },
-    cancelEnsure() {},
     //去往详情页面
     goDetail(item) {
       this.$store.dispatch("checkHandle", "/activityPages/activityDetail/activityDetail?id=" + item.ActivityId);

components/modalDialog.vue

@@ -52,34 +52,6 @@
       </view>
     </u-modal>
 
-    <!-- 拨打电话 -->
-    <u-modal
-      v-model="showhasPermission"
-      :content-style="{ fontSize: '32rpx' }"
-      @confirm="showhasPermissionBtn"
-      :show-cancel-button="true"
-      confirm-text="提交申请"
-      @cancel="showhasPermissionCancel"
-      :show-title="false"
-      :cancel-style="{ borderRight: '1rpx solid #EBEBEB' }"
-      :confirm-style="{ fontWeight: '700' }"
-    >
-      <view class="slot-content">
-        <block v-if="jurisdictionList.isAudioVideo == 2">
-          <text>您暂无权限查看此视频</text>
-          <text>若想查看可以联系对口销售</text>
-        </block>
-        <block v-else>
-          <text>您暂无权限参加此活动</text>
-          <text>若想参加可以联系对口销售</text>
-        </block>
-
-        <view
-          >{{ jurisdictionList.SellerName }} : <text @click="mobileDial" class="seller-mobile"> {{ jurisdictionList.SellerMobile }}</text></view
-        >
-        <text>申请开通对应的试用权限</text>
-      </view>
-    </u-modal>
     <u-modal v-model="showRelation" confirm-text="知道了" :confirm-style="{ fontWeight: '700' }" :content="contentRelation"></u-modal>
 
     <!-- 修改手机号 -->
@@ -116,6 +88,35 @@
         <rich-text :nodes="mailboxText"></rich-text>
       </view>
     </u-modal>
+
+    <!-- 拨打电话 -->
+    <u-modal
+      v-model="showhasPermission"
+      :content-style="{ fontSize: '32rpx' }"
+      @confirm="showhasPermissionBtn"
+      :show-cancel-button="true"
+      confirm-text="提交申请"
+      @cancel="showhasPermissionCancel"
+      :show-title="false"
+      :cancel-style="{ borderRight: '1rpx solid #EBEBEB' }"
+      :confirm-style="{ fontWeight: '700' }"
+    >
+      <view class="slot-content">
+        <block v-if="jurisdictionList.isAudioVideo == 2">
+          <text>您暂无权限查看此视频</text>
+          <text>若想查看可以联系对口销售</text>
+        </block>
+        <block v-else>
+          <text>您暂无权限参加此活动</text>
+          <text>若想参加可以联系对口销售</text>
+        </block>
+
+        <view
+          >{{ jurisdictionList.SellerName }} : <text @click="mobileDial" class="seller-mobile"> {{ jurisdictionList.SellerMobile }}</text></view
+        >
+        <text>申请开通对应的试用权限</text>
+      </view>
+    </u-modal>
   </view>
 </template>
 
@@ -189,7 +190,6 @@ export default {
     mobileEdit: {
       type: String,
     },
-
     goOnNextStep: {
       type: Boolean,
       default: false,
@@ -251,15 +251,7 @@ export default {
     },
     signupStatus() {
       if (this.signupStatus == "Success") return;
-      if (this.signupStatus == "FullStarffed") {
-        this.content = "此活动报名人数已满，请留意下期活动";
-      } else if (this.signupStatus == "TwoPeople") {
-        this.content = "单机构最多2人报名同一活动，您所在机构报名人数已满";
-      } else if (this.signupStatus == "BreakPromise") {
-        this.content = "由于爽约次数过多，您暂时被限制报名资格";
-      } else if (this.signupStatus == "Overtime") {
-        this.content = "活动开始前1小时内无法预约，请联系对口销售处理";
-      }
+      this.content = this.jurisdictionList.PopupMsg;
     },
     "idTypeCancel.type": {
       handler: function () {
@@ -287,27 +279,15 @@ export default {
     contentBtn() {
       this.$parent.isShow = false;
       this.show = false;
-      this.$emit("cancelShowBtn", this.idTypeCancel, this.signupType, this.idTypeCancel.isNum);
     },
     //去关注
     goFollowShowBtn() {
       this.$parent.goFollow = false;
       this.goFollowShow = false;
-      this.$emit("cancelShowBtn", this.idTypeCancel, this.signupType, this.idTypeCancel.isNum);
       uni.navigateTo({
         url: "/activityPages/accountsOfficial/accountsOfficial",
       });
     },
-    cancel() {
-      this.$parent.goFollow = false;
-      this.goFollowShow = false;
-
-      this.$emit("cancelShowBtn", this.idTypeCancel, this.signupType, this.idTypeCancel.isNum);
-    },
-    cancelBtn() {
-      this.$parent.isCancelShow = false;
-      this.cancelShow = false;
-    },
     cancelShowBtn() {
       activity
         .signupCancel({
@@ -328,7 +308,6 @@ export default {
                 duration: 2000,
               });
             }
-            this.$emit("cancelShowBtn", this.idTypeCancel, this.signupType, this.idTypeCancel.isNum);
           }
           this.$parent.isCancelShow = false;
           this.cancelShow = false;
@@ -368,10 +347,7 @@ export default {
       this.showhasPermission = false;
       this.$parent.isShowhasPermission = false;
     },
-    showhasPermissionCancel() {
-      this.showhasPermission = false;
-      this.$parent.isShowhasPermission = false;
-    },
+
     GoOutboundMobileBtn() {
       this.$parent.editIsShow = false;
       this.editIsShowDlg = false;
@@ -381,10 +357,33 @@ export default {
         this.show = true;
       }
     },
+
+    gmailboxBindingDlgBtn() {
+      this.$parent.mailboxBinding = false;
+      this.mailboxBindingDlg = false;
+      this.$parent.signupType = "";
+      uni.navigateTo({
+        url: "/activityPages/editOutbound/editOutbound?title=设置外呼号码&identification=邮箱&goOnNextStep=" + this.goOnNextStep + "&id=" + this.idTypeCancel.cutId,
+      });
+    },
+    //获取权限弹窗是否展示免费月卡接口
+    async userIsShowAlert() {
+      const res = await FreeButton.userIsShowAlert();
+      if (res.Ret === 200) {
+        this.isShowAlert = res.Data.IsShow;
+      }
+    },
+
+    /**
+     * 取消
+     *  */
+    cancelMailboxBindingDlg() {
+      this.$parent.mailboxBinding = false;
+      this.mailboxBindingDlg = false;
+    },
     GoOutboundMobileIsGo() {
       this.$parent.editIsShow = false;
       this.editIsShowDlg = false;
-      this.$emit("cancelShowBtn", this.idTypeCancel, this.signupType, this.idTypeCancel.isNum);
       uni.navigateTo({
         url:
           "/activityPages/editOutbound/editOutbound?title=修改外呼号码&identification=修改&goOnNextStep=" +
@@ -397,24 +396,17 @@ export default {
           this.mobileEdit,
       });
     },
-    gmailboxBindingDlgBtn() {
-      this.$parent.mailboxBinding = false;
-      this.mailboxBindingDlg = false;
-      this.$parent.signupType = "";
-      uni.navigateTo({
-        url: "/activityPages/editOutbound/editOutbound?title=设置外呼号码&identification=邮箱&goOnNextStep=" + this.goOnNextStep + "&id=" + this.idTypeCancel.cutId,
-      });
+    showhasPermissionCancel() {
+      this.showhasPermission = false;
+      this.$parent.isShowhasPermission = false;
     },
-    cancelMailboxBindingDlg() {
-      this.$parent.mailboxBinding = false;
-      this.mailboxBindingDlg = false;
+    cancelBtn() {
+      this.$parent.isCancelShow = false;
+      this.cancelShow = false;
     },
-    //获取权限弹窗是否展示免费月卡接口
-    async userIsShowAlert() {
-      const res = await FreeButton.userIsShowAlert();
-      if (res.Ret === 200) {
-        this.isShowAlert = res.Data.IsShow;
-      }
+    cancel() {
+      this.$parent.goFollow = false;
+      this.goFollowShow = false;
     },
   },
   mounted() {
@@ -423,7 +415,7 @@ export default {
 };
 </script>
 
-<style  lang="scss">
+<style lang="scss">
 .slot-content {
   width: 100%;
   padding: 50rpx;

pageMy/mySchedulepage/mySchedulepage.vue

@@ -98,7 +98,6 @@
       :editIsShow="editIsShow"
       :isCancelShow="isCancelShow"
       :idTypeCancel="idTypeCancel"
-      @cancelShowBtn="cancelEnsure"
       :countryCode="countryCode"
       :mobileEdit="mobileEdit"
       :goOnNextStep="goOnNextStep"

pages-search/components/activityBack.vue

@@ -96,7 +96,6 @@
       :editIsShow="editIsShow"
       :isCancelShow="isCancelShow"
       :idTypeCancel="idTypeCancel"
-      @cancelShowBtn="cancelEnsure"
       :countryCode="countryCode"
       :mobileEdit="mobileEdit"
       :goOnNextStep="goOnNextStep"