12.2 弹框修复

components/ItemComponent/activityItem.vue

@@ -329,7 +329,7 @@ export default {
                 state: 1,
                 name: "conference",
               };
-              this.parentDataEmit(item, "IsCancelMeetingReminder", 1);
+              res.Data.SignupStatus == "Success" && this.parentDataEmit(item, "IsCancelMeetingReminder", 1);
             } else if (this.hasPermission == 2) {
               this.isShowhasPermission = true;
             } else if (this.hasPermission == 3 || this.hasPermission == 4 || this.hasPermission == 5) {
@@ -370,9 +370,23 @@ export default {
         this.hasPermission = res.Data.HasPermission;
         this.jurisdictionList = res.Data;
         if (this.hasPermission == 1) {
-          uni.navigateTo({
-            url: "/activityPages/generationAsk/generationAsk?id=" + item.ActivityId + "&type=" + type,
-          });
+          if (res.Data.SignupStatus === "Success") {
+            uni.navigateTo({
+              url: "/activityPages/generationAsk/generationAsk?id=" + item.ActivityId + "&type=" + type,
+            });
+          } else {
+            uni.showModal({
+              confirmText: "知道了",
+              confirmColor: "#376cbb",
+              content: res.Msg || res.Data.PopupMsg,
+              showCancel: false,
+              success: (res) => {
+                if (res.confirm) {
+                  this.getActivityDetail();
+                }
+              },
+            });
+          }
         } else if (this.hasPermission == 2) {
           this.isShowhasPermission = true;
         } else if (this.hasPermission == 3 || this.hasPermission == 4 || this.hasPermission == 5) {

components/activity/purchaserActivityList.vue

@@ -17,7 +17,7 @@
           </text>
         </view>
         <view class="activity-title text_twoLine" @click="goDetailCheck(item)">
-          <image class="recommend-icon" v-if="item.TopTime >0" src="https://hzchart.oss-cn-shanghai.aliyuncs.com/new_cygx/recommend_YX.png"></image>
+          <image class="recommend-icon" v-if="item.TopTime > 0 && item.ActiveState == 1" src="https://hzchart.oss-cn-shanghai.aliyuncs.com/new_cygx/recommend_YX.png"></image>
           <image v-if="item.IsResearchPoints" src="https://hzstatic.hzinsights.com/cygx/icon/Research_Points.png"></image>
           <image v-else-if="item.IsExternalLabel" src="https://hzstatic.hzinsights.com/cygx/icon/activity_external.png"></image>
           {{ item.ActivityName }}

components/modalDialog.vue

@@ -4,9 +4,9 @@
       v-model="isModalShow"
       :content-style="{ fontSize: '32rpx' }"
       @confirm="confirmModal"
-      :show-cancel-button="true"
       :confirm-text="confirmText"
       :cancel-text="editIsShowDlg ? '前去修改' : '取消'"
+      :show-cancel-button="show_cancel_button"
       @cancel="cancelModal"
       :show-title="false"
       :cancel-style="{ borderRight: '1rpx solid #EBEBEB' }"
@@ -208,6 +208,9 @@ export default {
       },
       set() {},
     },
+    show_cancel_button() {
+      return this.content == "该活动为非公开活动，如有专家访谈需求请联系对口销售" ? false : true;
+    },
   },
   methods: {
     /**

pages-purchaser/purchaserActivity/purchaserActivity.vue

@@ -53,10 +53,9 @@ export default {
       const arr = [];
       this.activityTimeList.forEach((item) => item.IsChoose && arr.push(item.Id));
       this.whichDay = arr.join(",");
-      this.typeName = "";
-      this.activityTypeList.map((item) => {
-        item.IsChoose = false;
-      });
+      // this.activityTypeList.map((item) => {
+      //   item.IsChoose = false;
+      // });
       this.$nextTick(() => {
         this.$refs.purchaserActivityListRef.reloadActivityList();
       });
@@ -66,10 +65,9 @@ export default {
       const arr = [];
       this.activityTypeList.forEach((item) => item.IsChoose && arr.push(item.ActivityTypeId));
       this.typeName = arr.join(",");
-      this.whichDay = "";
-      this.activityTimeList.map((item) => {
-        item.IsChoose = false;
-      });
+      // this.activityTimeList.map((item) => {
+      //   item.IsChoose = false;
+      // });
       this.$nextTick(() => {
         this.$refs.purchaserActivityListRef.reloadActivityList();
       });

reportPages/industrialReport/industrialReport.vue

@@ -16,7 +16,7 @@
                 <image class="pv" src="https://hzchart.oss-cn-shanghai.aliyuncs.com/new_cygx/examine_icon.png"></image>
                 {{ item.Pv }}
               </view>
-              <view @click.stop="collectClick(item)">
+              <view @click.stop="collectClick(item)" v-if="item.Resource == 1">
                 <image v-if="item.IsCollect" src="https://hzchart.oss-cn-shanghai.aliyuncs.com/new_cygx/collect_act.png"></image>
                 <image v-else src="https://hzchart.oss-cn-shanghai.aliyuncs.com/new_cygx/collect_ico.png"></image>
                 {{ item.CollectNum }}