查研观向11.0 测试bug修复

activityPages/themeActivity/themeActivity.vue

@@ -349,30 +349,6 @@ export default {
 		async playBack(item){
 			await this.$store.dispatch("showLoginModal")
 			this.PlayBackAll(item)
-		},
-		async signupCheck(item,type,valName = ""){
-			await this.$store.dispatch("showLoginModal")
-			this.signupIsAddOfCancel(item,type,valName)
-		},
-		async summaryHandelCheck(item){
-			await this.$store.dispatch("showLoginModal")
-			this.summaryIsHandel(item)
-		},
-		async meetingReminderCheck(id, type){
-			await this.$store.dispatch("showLoginModal")
-			this.meetingReminderAdd(id, type)
-		},
-		async askingCheck(item, type = ""){
-			await this.$store.dispatch("showLoginModal")
-			this.askingGo(item, type)
-		},
-		async wanttosignupCheck(item){
-			await this.$store.dispatch("showLoginModal")
-			this.wanttosignup(item)
-		},
-		async goDetailCheck(item){
-			await this.$store.dispatch("showLoginModal")
-			this.goDetail(item)
 		}
   },
   onLoad(option) {

components/ItemComponent/activityItem.vue

@@ -11,7 +11,7 @@
     </view>
     <view class="content-type"> {{ list.ActivityTypeName || "专项产业调研" }}</view>
     <view :class="['content-title', list.ResearchTheme && 'content-min-hight',
-    list.IsResearchPoints?'yan-xuan-point-tag':list.IsResearch?'yan-xuan-tag':'external-label']" 
+    list.IsResearchPoints?'yan-xuan-point-tag':list.IsResearch?'yan-xuan-tag':list.IsExternalLabel?'external-label':'']" 
     v-if="list.ActivityName || list.ResearchTheme">
       <mp-html :content="richTextClamp(3) + (list.ActivityName || list.ResearchTheme) + '</div>'" />
     </view>

components/activity/indexActivity.js

@@ -350,5 +350,29 @@ export default {
         this.isResearchModalShow = true;
       }
     },
+		async signupCheck(item,type,valName = ""){
+			await this.$store.dispatch("showLoginModal")
+			this.signupIsAddOfCancel(item,type,valName)
+		},
+		async summaryHandelCheck(item){
+			await this.$store.dispatch("showLoginModal")
+			this.summaryIsHandel(item)
+		},
+		async meetingReminderCheck(id, type){
+			await this.$store.dispatch("showLoginModal")
+			this.meetingReminderAdd(id, type)
+		},
+		async askingCheck(item, type = ""){
+			await this.$store.dispatch("showLoginModal")
+			this.askingGo(item, type)
+		},
+		async wanttosignupCheck(item){
+			await this.$store.dispatch("showLoginModal")
+			this.wanttosignup(item)
+		},
+		async goDetailCheck(item){
+			await this.$store.dispatch("showLoginModal")
+			this.goDetail(item)
+		}
   },
 };

components/activity/purchaserActivityList.vue

@@ -13,13 +13,13 @@
 						{{item.Label}}
 					</text>
 				</view>
-				<view class="activity-title text_twoLine" @click="goDetail(item)">
+				<view class="activity-title text_twoLine" @click="goDetailCheck(item)">
 					<image v-if="item.IsResearchPoints" src="https://hzstatic.hzinsights.com/cygx/icon/Research_Points.png"></image>
 					<!-- <image v-else-if="item.IsResearch" src="https://hzstatic.hzinsights.com/cygx/icon/Research_normal.png"></image> -->
-					<image v-if="item.IsExternalLabel" src="https://hzstatic.hzinsights.com/cygx/icon/activity_external.png"></image>
+					<image v-else-if="item.IsExternalLabel" src="https://hzstatic.hzinsights.com/cygx/icon/activity_external.png"></image>
 					{{ item.ActivityName }}
 				</view>
-				<view class="activity-time-city-row" @click="goDetail(item)">
+				<view class="activity-time-city-row" @click="goDetailCheck(item)">
 					<text class="activity-time">{{ item.SourceType == 2 ? "" : item.ActivityTimeText }}</text>
 					<view class="activity-city" v-if="item.City">
 						<image src="https://hzstatic.hzinsights.com/cygx/icon/location-new.png"></image>
@@ -29,29 +29,29 @@
 				<view class="activity-buttons-row">
 					<block v-if="item.ActiveState == 1">
 						<text v-if="item.IsShowOutboundCall && item.ActivityTypeId == 1"
-						class="main-button" @click="signupIsAddOfCancel(item, 1)">{{ item.IsSignup == 1 ? "取消外呼" : "预约外呼" }}</text>
-						<text v-if="item.IsShowAppointment" @click="summaryIsHandel(item)">{{ item.IsAppointment == 1 ? "取消纪要" : "预约纪要" }}</text>
-						<text v-if="item.IsShowMeetingReminder" @click="meetingReminderAdd(item.ActivityId, item.IsCancelMeetingReminder)">
+						class="main-button" @click="signupCheck(item, 1)">{{ item.IsSignup == 1 ? "取消外呼" : "预约外呼" }}</text>
+						<text v-if="item.IsShowAppointment" @click="summaryHandelCheck(item)">{{ item.IsAppointment == 1 ? "取消纪要" : "预约纪要" }}</text>
+						<text v-if="item.IsShowMeetingReminder" @click="meetingReminderCheck(item.ActivityId, item.IsCancelMeetingReminder)">
 							{{ item.IsCancelMeetingReminder == 0 ? "消息提醒" : "取消提醒" }}
 						</text>
 						<view v-if="item.IsShowHelpSsk">
-							<text @click="askingGo(item)">帮我带问</text>
+							<text @click="askingCheck(item)">帮我带问</text>
 						</view>
 						<text v-if="item.IsShowOutboundCall && item.ActivityTypeId != 1"
-						 class="main-button" @click="signupIsAddOfCancel(item, 1)">{{ item.IsSignup == 1 ? "取消外呼" : "预约外呼" }}</text>
-						<text v-if="item.IsShowDetails" @click="goDetail(item)" class="main-button">查看详情</text>
+						 class="main-button" @click="signupCheck(item, 1)">{{ item.IsSignup == 1 ? "取消外呼" : "预约外呼" }}</text>
+						<text v-if="item.IsShowDetails" @click="goDetailCheck(item)" class="main-button">查看详情</text>
 						<block v-if="item.IsShowSignup">
 							<block v-if="item.IsCClassMeeting && !item.IsYidongConduct">
-								<text class="main-button" @click="signupIsAddOfCancel(item, 3, 'CClass')">{{ item.IsSignup == 1 ? "取消报名" : "我要报名" }}</text>
+								<text class="main-button" @click="signupCheck(item, 3, 'CClass')">{{ item.IsSignup == 1 ? "取消报名" : "我要报名" }}</text>
 							</block>
 							<block v-else>
-								<text class="main-button" v-if="item.IsSignup !== 1" @click="wanttosignup(item)">我要报名</text>
-								<text class="main-button" v-else @click="signupIsAddOfCancel(item, 2)">{{ item.SignupType == 1 ? "取消外呼" : "取消报名" }}</text>
+								<text class="main-button" v-if="item.IsSignup !== 1" @click="wanttosignupCheck(item)">我要报名</text>
+								<text class="main-button" v-else @click="signupCheck(item, 2)">{{ item.SignupType == 1 ? "取消外呼" : "取消报名" }}</text>
 							</block>
 						</block>
 					</block>
 					<view class="bottom-box real-time" v-if="item.ActiveState == 2 && item.ActivityTypeId == 1">
-						<text class="main-button" @click="askingGo(item, '提问')">实时提问</text>
+						<text class="main-button" @click="askingCheck(item, '提问')">实时提问</text>
 					</view>
 				</view>
 			</view>

pages/activity/components/activityTypeList.vue

@@ -98,19 +98,26 @@
 		methods:{
 			// 去往详情
 			goDetails(item, key) {
-			  if (item.Resource === 1 || key === 1) {
-			    let type = item.ActivityTypeName || "";
-			    let key = item.ActivityTypeId || item.KeyWord;
-			    let id = typeof key == "string" ? item.ActivityId : "";
-			    let str = type ? "&permissionIds=" + this.chartPermissionIds + "&showJurisdiction=" + (this.isShowJurisdiction ? "show" : "") : "";
-			    this.$store.dispatch("checkHandle", "/activityPages/themeActivity/themeActivity?title=" + key + "&type=" + type + "&id=" + id + "&whichDay=" + this.whichDay + str);
-			  } else {
-			    if (key) {
-			      uni.navigateTo({ url: "/activityPages/specialDetail/specialDetail?id=" + item.ActivityId });
-			    } else {
-			      uni.navigateTo({ url: "/activityPages/specialResearchPage/specialResearchPage" });
-			    }
-			  }
+				if (item.Resource === 1 || key === 1) {
+					let type = item.ActivityTypeName || "";
+					let key = item.ActivityTypeId || item.KeyWord;
+					let id = typeof key == "string" ? item.ActivityId : "";
+					let str = type ? "&permissionIds=" + this.chartPermissionIds + "&showJurisdiction=" + (this.isShowJurisdiction ? "show" : "") : "";
+					// this.$store.dispatch(
+					//   "checkHandle",
+					//   "/activityPages/themeActivity/themeActivity?title=" + key + "&type=" + type + "&id=" + id + "&whichDay=" + this.whichDay + str
+					// );
+					let url ="/activityPages/themeActivity/themeActivity?title=" + key + "&type=" + type + "&id=" + id + "&whichDay=" + this.whichDay + str
+					uni.navigateTo({
+						url,
+					});
+				} else {
+					if (key) {
+						uni.navigateTo({ url: "/activityPages/specialDetail/specialDetail?id=" + item.ActivityId });
+					} else {
+						uni.navigateTo({ url: "/activityPages/specialResearchPage/specialResearchPage" });
+					}
+				}
 			},
 		}
 	}