8.2 活动弹框优化完成

activityPages/activityDetail/activityDetail.vue

@@ -245,7 +245,6 @@
         :isShow="isShow"
         :signupType="signupType"
         :goFollow="goFollow"
-        :signupStatus="signupStatus"
         :isCancelShow="isCancelShow"
         :idTypeCancel="idTypeCancel"
         @cancelShowBtn="cancelEnsure"
@@ -294,7 +293,6 @@ export default {
       isGain: true,
       signupType: "", //关注类型
       goFollow: false, //是否关注公众号
-      signupStatus: "Success", //4个不同的类型提示文案
       isShow: false, //弹框
       isCancelShow: false,
       idTypeCancel: {

activityPages/activityDetail/manageMixin.js

@@ -19,7 +19,6 @@ export default {
           .then((res) => {
             if (res.Ret == 200) {
               this.signupType = res.Data.SignupType;
-              this.signupStatus = res.Data.SignupStatus;
               this.countryCode = res.Data.CountryCode;
               this.mobileEdit = res.Data.Mobile;
               this.goOnNextStep = res.Data.GoFollow;
@@ -67,7 +66,6 @@ export default {
         const res = await activity.postAppointmentAdd({ ActivityId: Number(this.id) });
         if (res.Ret == 200) {
           this.signupType = "summaryIsHandel";
-          this.signupStatus = res.Data.SignupStatus;
           this.idTypeCancel = {
             cutId: res.Data.ActivityId,
             state: 1,

activityPages/themeActivity/themeActivity.vue

@@ -78,7 +78,6 @@
         :isShow="isShow"
         :signupType="signupType"
         :goFollow="goFollow"
-        :signupStatus="signupStatus"
         :hasPermission="hasPermission"
         :jurisdictionList="jurisdictionList"
         :editIsShow="editIsShow"

components/activity/indexActivity.js

@@ -26,7 +26,6 @@ export default {
       isShow: false, //弹框
       signupType: "", //关注类型
       goFollow: false, //是否关注公众号
-      signupStatus: "Success", //4个不同的类型提示文案
       hasPermission: "", //是否有权限
       jurisdictionList: {},
       editIsShow: false, //外呼莫泰框
@@ -139,7 +138,6 @@ export default {
                   const index = this.collectList.findIndex((key) => key.ActivityId == id);
                   this.collectList[index].SignupType = type;
                   this.signupType = valName == "CClass" ? "CClass" : res.Data.SignupType;
-                  this.signupStatus = res.Data.SignupStatus;
                   this.countryCode = res.Data.CountryCode;
                   this.mobileEdit = res.Data.Mobile;
                   this.goOnNextStep = res.Data.GoFollow;
@@ -151,7 +149,6 @@ export default {
                     this.mailboxBinding = true;
                     return;
                   }
-                  console.log(this.signupStatus);
                   if (res.Data.SignupStatus !== "Success") {
                     this.isShow = true;
                   } else {
@@ -160,10 +157,9 @@ export default {
                     } else if (res.Data.GoFollow) {
                       this.goFollow = res.Data.GoFollow;
                     } else if (res.Data.SignupStatus == "Success") {
-                      console.log('进来了？');
-                      item.IsSignup = 1;
                       this.isShow = true;
                     }
+                    item.IsSignup = 1;
                   }
                 } else if (this.hasPermission == 2) {
                   this.isShowhasPermission = true;
@@ -182,7 +178,6 @@ export default {
     init() {
       this.signupType = "";
       this.goFollow = false;
-      this.signupStatus = "";
       this.isShow = false;
       this.isCancelShow = false;
     },
@@ -207,7 +202,6 @@ export default {
                 this.goFollow = res.Data.GoFollow;
               }
               this.signupType = 999;
-              this.signupStatus = res.Data.SignupStatus;
               this.idTypeCancel = {
                 cutId: res.Data.ActivityId,
                 state: 1,
@@ -275,7 +269,6 @@ export default {
     init() {
       this.signupType = "";
       this.goFollow = false;
-      this.signupStatus = "";
       this.isShow = false;
       this.isCancelShow = false;
     },
@@ -288,7 +281,6 @@ export default {
           this.jurisdictionList = res.Data;
           if (this.hasPermission == 1) {
             this.signupType = "summaryIsHandel";
-            this.signupStatus = res.Data.SignupStatus;
             this.goOnNextStep = res.Data.GoFollow;
             if (res.Data.SignupStatus !== "Success") {
               this.isShow = true;
@@ -297,8 +289,8 @@ export default {
                 this.goFollow = res.Data.GoFollow;
               } else if (res.Data.SignupStatus == "Success") {
                 this.isShow = true;
-                item.IsAppointment = 1;
               }
+              item.IsAppointment = 1;
             }
           } else if (this.hasPermission == 2) {
             this.isShowhasPermission = true;

components/modalDialog.vue

@@ -1,81 +1,5 @@
 <template>
   <view>
-    <!-- <u-modal v-model="show"
-     :content-style="{ fontSize: '32rpx' }"
-      @confirm="contentBtn"
-       :show-title="false" 
-       confirm-text="知道了" 
-       :confirm-style="{ fontWeight: '700' }"
-       >
-      <view class="slot-content">
-        <rich-text :nodes="content"></rich-text>
-      </view>
-    </u-modal> -->
-
-    <!-- 关注公众号 -->
-    <!-- <u-modal
-      v-model="goFollowShow"
-      :content-style="{ fontSize: '32rpx' }"
-      @confirm="goFollowShowBtn"
-      :show-cancel-button="true"
-      confirm-text="去关注"
-      @cancel="cancel"
-      :show-title="false"
-      :cancel-style="{ borderRight: '1rpx solid #EBEBEB' }"
-      :confirm-style="{ fontWeight: '700' }"
-    >
-      <view class="slot-content">
-        <rich-text :nodes="accounts"></rich-text>
-      </view>
-    </u-modal> -->
-
-    <!-- <u-modal
-      v-model="cancelcancelShow"
-      :content="canceltext"
-      :content-style="{ fontSize: '32rpx', lineHeight: '80rpx' }"
-      :confirm-style="{ fontWeight: '700' }"
-      @confirm="cancelShowBtn"
-      @cancel="cancelBtn"
-      :show-title="false"
-      :show-cancel-button="true"
-      :cancel-style="{ borderRight: '1rpx solid #EBEBEB' }"
-    ></u-modal> -->
-
-    <!-- 立即申请 -->
-    <!-- <u-modal
-      v-model="applyIsShow"
-      :content-style="{ fontSize: '32rpx' }"
-      @confirm="applyIsShowBtn"
-      :show-cancel-button="true"
-      :confirm-text="isShowAlert ? '立即上传' : '立即申请'"
-      @cancel="applyIsShowCancel"
-      :show-title="false"
-      :cancel-style="{ borderRight: '1rpx solid #EBEBEB' }"
-      :confirm-style="{ fontWeight: '700' }"
-    >
-      <view class="slot-content">
-        <rich-text :nodes="jurisdictionText"></rich-text>
-      </view>
-    </u-modal> -->
-
-    <!-- <u-modal v-model="showRelation" confirm-text="知道了" :confirm-style="{ fontWeight: '700' }" :content="contentRelation"></u-modal> -->
-
-    <!-- <u-modal
-      v-model="isModalShow"
-      :content-style="{ fontSize: '32rpx' }"
-      @confirm="gmailboxBindingDlgBtn"
-      :show-cancel-button="true"
-      :confirm-text="confirmText"
-      @cancel="cancelMailboxBindingDlg"
-      :show-title="false"
-      :cancel-style="{ borderRight: '1rpx solid #EBEBEB' }"
-      :confirm-style="{ fontWeight: '700' }"
-    >
-      <view class="slot-content">
-        <rich-text :nodes="content"></rich-text>
-      </view>
-    </u-modal> -->
-
     <u-modal
       v-model="isModalShow"
       :content-style="{ fontSize: '32rpx' }"
@@ -94,22 +18,6 @@
     </u-modal>
     <!-- 修改手机号 -->
 
-    <!-- <u-modal
-      width="650"
-      v-model="editIsShowDlg"
-      :content-style="{ fontSize: '32rpx' }"
-      @confirm="GoOutboundMobileBtn"
-      :show-cancel-button="true"
-      confirm-text="无需修改"
-      cancel-color="#3385FF"
-      @cancel="GoOutboundMobileIsGo"
-      :show-title="false"
-      :cancel-style="{ borderRight: '1rpx solid #EBEBEB' }"
-    >
-      <view class="slot-content">
-        <rich-text :nodes="editIsShowAccounts"></rich-text>
-      </view>
-    </u-modal> -->
     <!-- 拨打电话 -->
     <u-modal
       v-model="showhasPermission"
@@ -146,7 +54,7 @@ import { User, activity, FreeButton } from "@/config/api.js";
 export default {
   data() {
     return {
-      goFollowShow: false,
+      goFollowShow: false, 
       show: false,
       cancelShow: false,
       applyIsShow: false,
@@ -170,10 +78,6 @@ export default {
     signupType: {
       // type: Number,
     },
-    signupStatus: {
-      type: String,
-      default: "Success",
-    },
     goFollow: {
       type: Boolean,
     },
@@ -208,7 +112,6 @@ export default {
     mobileEdit: {
       type: String,
     },
-
     goOnNextStep: {
       type: Boolean,
       default: false,
@@ -238,43 +141,6 @@ export default {
     isShow() {
       this.show = this.isShow;
     },
-    signupType: {
-      handler(newVal) {
-        if (this.signupStatus !== "Success") return;
-        if (this.show) {
-          this.contentType =
-            newVal == 1
-              ? `${this.countryCode}-${this.mobileEdit}<br/>预约成功，已加入您的活动日程 <br/><br/> 请关注【查研观向小助手】公众号，及时获取活动信息变更提醒`
-              : newVal == 999
-              ? "设置成功<br /> <br/>请关注【查研观向小助手】公众号，会前15分钟为您推送微信提醒"
-              : newVal == "summaryIsHandel"
-              ? "会议纪要预约成功 <br/><br/> 请关注【查研观向小助手】公众号，若有调研纪要发布/更新，将及时为您推送微信消息"
-              : `报名成功，已加入您的活动日程 <br/><br/> 请关注【查研观向小助手】公众号，${this.signupType == "CClass" ? "及时获取活动信息变更提醒" : "会前1小时为您推送微信提醒"}`;
-        } else {
-          this.contentType =
-            newVal == 1
-              ? `${this.countryCode}-${this.mobileEdit}<br/>预约成功，已加入您的活动日程<br/><br/>想要及时获取活动时间变更通知，请关注【查研观向小助手】公众号`
-              : newVal == 999
-              ? `设置成功，会前15分钟会为您推送微信消息提醒<br/><br/>请关注【查研观向小助手】公众号，以获取微信消息提醒`
-              : newVal == "summaryIsHandel"
-              ? `会议纪要预约成功<br/><br/>请关注【查研观向小助手】公众号，若有调研纪要发布/更新，将及时为您推送微信消息`
-              : `报名成功，已加入您的活动日程<br/><br/>想要及时获取活动时间变更通知，请关注【查研观向小助手】公众号	`;
-        }
-      },
-    },
-    signupStatus: {
-      handler(newVal) {
-        if (newVal == "Success") return;
-        this.contentType =
-          newVal == "FullStarffed"
-            ? "此活动报名人数已满，请留意下期活动"
-            : newVal == "TwoPeople"
-            ? "单机构最多2人报名同一活动，您所在机构报名人数已满"
-            : newVal == "BreakPromise"
-            ? "由于爽约次数过多，您暂时被限制报名资格"
-            : '"活动开始前1小时内无法预约，请联系对口销售处理"';
-      },
-    },
     isCancelShow() {
       this.cancelShow = this.isCancelShow;
     },
@@ -316,10 +182,8 @@ export default {
         ? "申请已提交,请等待销售人员与您联系"
         : this.mailboxBindingDlg
         ? "您当前绑定的联系方式为邮箱，请先设置您的外呼号码"
-        : this.applyIsShow
+        : this.applyIsShow || this.goFollowShow || this.show
         ? this.jurisdictionList.PopupMsg
-        : this.goFollowShow || this.show
-        ? this.contentType
         : this.showRelation
         ? "申请已提交,请等待销售人员与您联系"
         : "";
@@ -372,7 +236,6 @@ export default {
      */
     initData() {
       this.$parent.isShow = false;
-      this.$parent.signupType = "";
       this.show = false;
       this.$parent.goFollow = false;
       this.goFollowShow = false;

pageMy/mySchedulepage/mySchedulepage.vue

@@ -108,7 +108,6 @@
       :isShow="isShow"
       :signupType="signupType"
       :goFollow="goFollow"
-      :signupStatus="signupStatus"
       :hasPermission="hasPermission"
       :jurisdictionList="jurisdictionList"
       :editIsShow="editIsShow"

pages-search/components/activityBack.vue

@@ -106,7 +106,6 @@
       :isShow="isShow"
       :signupType="signupType"
       :goFollow="goFollow"
-      :signupStatus="signupStatus"
       :hasPermission="hasPermission"
       :jurisdictionList="jurisdictionList"
       :editIsShow="editIsShow"