|
|
@@ -2,10 +2,7 @@
|
|
|
<view class="container-activity-item" @click="goDetail(list)">
|
|
|
<view class="content-sign">
|
|
|
<view :class="[list.ActivityType === 0 ? 'is-down' : 'is-up', 'is-up-down']">{{ list.ActivityType === 0 ? "线下" : "线上" }}</view>
|
|
|
- <view
|
|
|
- v-if="list.ActiveState == 1 || list.ActiveState == 2"
|
|
|
- :class="[list.ActiveState == 1 ? 'is-down-state' : 'is-up-state', 'is-up-down', 'state']"
|
|
|
- >
|
|
|
+ <view v-if="list.ActiveState == 1 || list.ActiveState == 2" :class="[list.ActiveState == 1 ? 'is-down-state' : 'is-up-state', 'is-up-down', 'state']">
|
|
|
{{ list.ActiveState == 1 ? "未开始" : "进行中" }}
|
|
|
</view>
|
|
|
<block v-else>
|
|
|
@@ -14,11 +11,12 @@
|
|
|
</view>
|
|
|
<view class="content-type"> {{ list.ActivityTypeName || "专项产业调研" }}</view>
|
|
|
<view :class="['content-title', 'text-Line', list.ResearchTheme && 'content-min-hight']" v-if="list.ActivityName || list.ResearchTheme">
|
|
|
+ <image src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/Research_Points.png"></image>
|
|
|
+ <image src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/activity_external.png"></image>
|
|
|
{{ list.ActivityName || list.ResearchTheme }}
|
|
|
</view>
|
|
|
<view style="display: flex" class="content-text content-min-hight text_twoLine" v-if="list.ActivityTimeText && list.SourceType !== 1">
|
|
|
- <text style="flex-shrink: 0"> 活动时间：</text>
|
|
|
- <text> {{ list.ActivityTimeText }}</text>
|
|
|
+ <text> 活动时间：{{ list.ActivityTimeText }}</text>
|
|
|
</view>
|
|
|
<view class="content-text text-Line" v-else>
|
|
|
{{ list.Host ? "主持人:" : list.Expert ? "专家背景:" : list.Speaker ? "主讲人:" : list.DistinguishedGuest ? "嘉宾:" : "" }}
|
|
|
@@ -37,9 +35,7 @@
|
|
|
<text class="item-btn btn-solid" v-if="list.IsShowOutboundCall && list.ActivityTypeId == 1" @click.stop="signupIsAddOfCancel(list, 1)">{{
|
|
|
list.IsSignup == 1 ? "取消外呼" : "预约外呼"
|
|
|
}}</text>
|
|
|
- <text class="item-btn" v-if="list.IsShowAppointment" @click.stop="summaryIsHandel(list)">{{
|
|
|
- list.IsAppointment == 1 ? "取消纪要" : "预约纪要"
|
|
|
- }}</text>
|
|
|
+ <text class="item-btn" v-if="list.IsShowAppointment" @click.stop="summaryIsHandel(list)">{{ list.IsAppointment == 1 ? "取消纪要" : "预约纪要" }}</text>
|
|
|
<text class="item-btn" v-if="list.IsShowMeetingReminder" @click.stop="meetingReminderAdd(list, list.IsCancelMeetingReminder)">
|
|
|
{{ list.IsCancelMeetingReminder == 0 ? "消息提醒" : "取消提醒" }}
|
|
|
</text>
|
|
|
@@ -52,15 +48,11 @@
|
|
|
<text class="item-btn" v-if="list.IsShowDetails" @click.stop="goDetail(list)">查看详情</text>
|
|
|
<block v-if="list.IsShowSignup">
|
|
|
<block v-if="list.IsCClassMeeting && !list.IsYidongConduct">
|
|
|
- <text class="item-btn btn-solid" @click.stop="signupIsAddOfCancel(list, 3, 'CClass')">{{
|
|
|
- list.IsSignup == 1 ? "取消报名" : "我要报名"
|
|
|
- }}</text>
|
|
|
+ <text class="item-btn btn-solid" @click.stop="signupIsAddOfCancel(list, 3, 'CClass')">{{ list.IsSignup == 1 ? "取消报名" : "我要报名" }}</text>
|
|
|
</block>
|
|
|
<block v-else>
|
|
|
<text class="item-btn btn-solid" v-if="list.IsSignup !== 1" @click.stop="wanttosignup(list)">我要报名</text>
|
|
|
- <text class="item-btn btn-solid" v-else @click.stop="signupIsAddOfCancel(list, 2)">{{
|
|
|
- list.SignupType == 1 ? "取消外呼" : "取消报名"
|
|
|
- }}</text>
|
|
|
+ <text class="item-btn btn-solid" v-else @click.stop="signupIsAddOfCancel(list, 2)">{{ list.SignupType == 1 ? "取消外呼" : "取消报名" }}</text>
|
|
|
</block>
|
|
|
</block>
|
|
|
</block>
|
|
|
@@ -71,9 +63,7 @@
|
|
|
<view class="" style="width: 130rpx"> </view>
|
|
|
<text class="item-btn" @click.stop="lookImg(list)">行程安排</text>
|
|
|
<block v-if="list.TripStatus == 2">
|
|
|
- <text v-if="list.ActiveState == 1" class="item-btn btn-solid" @click.stop="applyOfcancel(list)">{{
|
|
|
- list.IsTrip == 0 ? "我要报名" : "取消报名"
|
|
|
- }}</text>
|
|
|
+ <text v-if="list.ActiveState == 1" class="item-btn btn-solid" @click.stop="applyOfcancel(list)">{{ list.IsTrip == 0 ? "我要报名" : "取消报名" }}</text>
|
|
|
</block>
|
|
|
<block v-else>
|
|
|
<text class="item-btn btn-solid" v-if="list.IsSignup !== 1" @click.stop="interest(list)">感兴趣</text>
|
|
|
@@ -123,6 +113,7 @@
|
|
|
</view>
|
|
|
</u-modal>
|
|
|
<SelectPopup :selectShow.sync="selectShow" @signupIsAddOfCancel="signupIsAddOfCancel" :selectYdong="selectYdong" />
|
|
|
+ <ShowResearchDlg :isResearchModalShow.sync="isResearchModalShow" :jurisdictionList="jurisdictionList" />
|
|
|
</view>
|
|
|
</template>
|
|
|
|
|
|
@@ -130,9 +121,11 @@
|
|
|
import modalDialog from "../modalDialog.vue";
|
|
|
import { activity, User } from "@/config/api.js";
|
|
|
import SelectPopup from "@/components/activity/selectPopup";
|
|
|
+import ShowResearchDlg from "@/components/activity/showResearchDlg.vue";
|
|
|
+
|
|
|
export default {
|
|
|
name: "",
|
|
|
- components: { modalDialog, SelectPopup },
|
|
|
+ components: { modalDialog, SelectPopup, ShowResearchDlg },
|
|
|
props: {
|
|
|
list: {
|
|
|
type: Object,
|
|
|
@@ -180,6 +173,7 @@ export default {
|
|
|
show_cancel_button: false, // 取消按钮的隐藏显示
|
|
|
show_confirm_button: false, // 确定按钮的隐藏显示
|
|
|
itemData: {},
|
|
|
+ isResearchModalShow: false,
|
|
|
};
|
|
|
},
|
|
|
computed: {},
|
|
|
@@ -204,10 +198,7 @@ export default {
|
|
|
if (item.YidongActivityId) {
|
|
|
this.goDetail(item);
|
|
|
return;
|
|
|
- } else if (
|
|
|
- (item.IsYidongConduct && item.IsCanOutboundCall) ||
|
|
|
- (!item.IsYidongConduct && item.IsLimitPeople == 1 && [1, 2, 3].includes(item.ActivityTypeId))
|
|
|
- ) {
|
|
|
+ } else if ((item.IsYidongConduct && item.IsCanOutboundCall) || (!item.IsYidongConduct && item.IsLimitPeople == 1 && [1, 2, 3].includes(item.ActivityTypeId))) {
|
|
|
this.selectShow = true;
|
|
|
this.selectYdong = item.IsYidongConduct;
|
|
|
} else {
|
|
|
@@ -216,7 +207,7 @@ export default {
|
|
|
}
|
|
|
},
|
|
|
|
|
|
- //报名/取消报名
|
|
|
+ //报名 取消报名 预约外呼/取消预约外呼报名
|
|
|
signupIsAddOfCancel(item, type, valName = "") {
|
|
|
let id = this.activityIdAdd || item.ActivityId;
|
|
|
let itemData = item || this.itemData;
|
|
|
@@ -270,48 +261,15 @@ export default {
|
|
|
clearTimeout(timer);
|
|
|
this.flag = true;
|
|
|
this.selectShow = false;
|
|
|
- activity
|
|
|
- .signupAdd({
|
|
|
- ActivityId: id,
|
|
|
- SignupType: type,
|
|
|
- PageRouter: this.$store.state.pageRouterActivity,
|
|
|
- })
|
|
|
- .then((res) => {
|
|
|
- if (res.Ret == 200) {
|
|
|
- this.hasPermission = res.Data.HasPermission;
|
|
|
- this.jurisdictionList = res.Data;
|
|
|
- if (this.hasPermission == 1) {
|
|
|
- this.signupType = valName == "CClass" ? "CClass" : res.Data.SignupType;
|
|
|
- this.countryCode = res.Data.CountryCode;
|
|
|
- this.mobileEdit = res.Data.Mobile;
|
|
|
- this.goOnNextStep = res.Data.GoFollow;
|
|
|
- this.idTypeCancel = {
|
|
|
- cutId: res.Data.ActivityId,
|
|
|
- state: 1,
|
|
|
- };
|
|
|
- if (res.Data.GoBindEmail) {
|
|
|
- this.mailboxBinding = true;
|
|
|
- return;
|
|
|
- }
|
|
|
- if (res.Data.SignupStatus !== "Success") {
|
|
|
- this.isShow = true;
|
|
|
- } else {
|
|
|
- if (res.Data.GoOutboundMobile) this.editIsShow = true;
|
|
|
- else if (res.Data.GoFollow) this.goFollow = res.Data.GoFollow;
|
|
|
- else if (res.Data.SignupStatus == "Success") this.isShow = true;
|
|
|
- this.parentDataEmit(itemData, "IsSignup", 1);
|
|
|
- this.parentDataEmit(itemData, "SignupType", type);
|
|
|
- }
|
|
|
- } else if (this.hasPermission == 2) {
|
|
|
- this.isShowhasPermission = true;
|
|
|
- } else if (this.hasPermission == 3 || this.hasPermission == 4 || this.hasPermission == 5) {
|
|
|
- this.applyForIsShow = true;
|
|
|
- }
|
|
|
- }
|
|
|
- });
|
|
|
+ if (1 == 1) {
|
|
|
+ this.researchPointsHandler(id, type, item);
|
|
|
+ } else {
|
|
|
+ this.myIsApplyHandler(id, type);
|
|
|
+
|
|
|
+ }
|
|
|
timer = setTimeout(() => {
|
|
|
- this.flag = false;
|
|
|
- }, 500);
|
|
|
+ this.flag = false;
|
|
|
+ }, 500);
|
|
|
}
|
|
|
},
|
|
|
// 弹框的初始化
|
|
|
@@ -583,6 +541,51 @@ export default {
|
|
|
let index = this.$parent.newDataList.findIndex((key) => key.Activity && key.Activity.ActivityId === item.ActivityId);
|
|
|
this.$parent.newDataList[index].Activity[value] = num;
|
|
|
},
|
|
|
+ // 我要报名的请求拆分出来了
|
|
|
+ async myIsApplyHandler(id, type) {
|
|
|
+ const res = await activity.signupAdd({
|
|
|
+ ActivityId: id,
|
|
|
+ SignupType: type,
|
|
|
+ PageRouter: this.$store.state.pageRouterActivity,
|
|
|
+ });
|
|
|
+ if (res.Ret == 200) {
|
|
|
+ this.hasPermission = res.Data.HasPermission;
|
|
|
+ this.jurisdictionList = res.Data;
|
|
|
+ if (this.hasPermission == 1) {
|
|
|
+ this.signupType = valName == "CClass" ? "CClass" : res.Data.SignupType;
|
|
|
+ this.countryCode = res.Data.CountryCode;
|
|
|
+ this.mobileEdit = res.Data.Mobile;
|
|
|
+ this.goOnNextStep = res.Data.GoFollow;
|
|
|
+ this.idTypeCancel = {
|
|
|
+ cutId: res.Data.ActivityId,
|
|
|
+ state: 1,
|
|
|
+ };
|
|
|
+ if (res.Data.GoBindEmail) {
|
|
|
+ this.mailboxBinding = true;
|
|
|
+ return;
|
|
|
+ }
|
|
|
+ if (res.Data.SignupStatus !== "Success") {
|
|
|
+ this.isShow = true;
|
|
|
+ } else {
|
|
|
+ if (res.Data.GoOutboundMobile) this.editIsShow = true;
|
|
|
+ else if (res.Data.GoFollow) this.goFollow = res.Data.GoFollow;
|
|
|
+ else if (res.Data.SignupStatus == "Success") this.isShow = true;
|
|
|
+ this.parentDataEmit(itemData, "IsSignup", 1);
|
|
|
+ this.parentDataEmit(itemData, "SignupType", type);
|
|
|
+ }
|
|
|
+ } else if (this.hasPermission == 2) {
|
|
|
+ this.isShowhasPermission = true;
|
|
|
+ } else if (this.hasPermission == 3 || this.hasPermission == 4 || this.hasPermission == 5) {
|
|
|
+ this.applyForIsShow = true;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ },
|
|
|
+ // 研选扣点的事件
|
|
|
+ async researchPointsHandler(id, type, item) {
|
|
|
+ console.log(id, type, item);
|
|
|
+ this.isResearchModalShow = true;
|
|
|
+ this.jurisdictionList = item;
|
|
|
+ },
|
|
|
},
|
|
|
};
|
|
|
</script>
|
|
|
@@ -639,6 +642,12 @@ export default {
|
|
|
font-weight: 400;
|
|
|
color: #333333;
|
|
|
line-height: 44rpx;
|
|
|
+ image {
|
|
|
+ width: 83rpx;
|
|
|
+ height: 33rpx;
|
|
|
+ vertical-align: middle;
|
|
|
+ margin-right: 5rpx;
|
|
|
+ }
|
|
|
}
|
|
|
.content-text {
|
|
|
font-size: 28rpx;
|
bding