|
@@ -10,15 +10,8 @@
|
|
|
</block>
|
|
|
</view>
|
|
|
<view class="content-type"> {{ list.ActivityTypeName || "专项产业调研" }}</view>
|
|
|
-<<<<<<< HEAD
|
|
|
<view :class="['content-title', list.ResearchTheme && 'content-min-hight']" v-if="list.ActivityName || list.ResearchTheme">
|
|
|
<mp-html :content="richTextClamp(3) + (list.ActivityName || list.ResearchTheme) + '</div>'" />
|
|
|
-=======
|
|
|
- <view :class="['content-title', 'text-Line', list.ResearchTheme && 'content-min-hight']" v-if="list.ActivityName || list.ResearchTheme">
|
|
|
- <image style="width:83rpx;height:33rpx" v-if="list.IsResearchPoints" src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/Research_Points.png"></image>
|
|
|
- <image v-if="!list.IsResearchPoints && list.IsExternalLabel" src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/activity_external.png"></image>
|
|
|
- {{ list.ActivityName || list.ResearchTheme }}
|
|
|
->>>>>>> master
|
|
|
</view>
|
|
|
<view style="display: flex" class="content-text content-min-hight text_twoLine" v-if="list.ActivityTimeText && list.SourceType !== 1">
|
|
|
<text> 活动时间:{{ list.ActivityTimeText }}</text>
|
|
@@ -206,15 +199,11 @@ export default {
|
|
|
if (item.YidongActivityId) {
|
|
|
this.goDetail(item);
|
|
|
return;
|
|
|
-<<<<<<< HEAD
|
|
|
- } else if ((item.IsYidongConduct && item.IsCanOutboundCall) || (!item.IsYidongConduct && item.IsLimitPeople == 1 && [1, 2, 3].includes(item.ActivityTypeId))) {
|
|
|
-=======
|
|
|
} else if (
|
|
|
(!item.IsResearchPoints && item.ActivityTypeId == 3 && !item.IsYidongConduct && item.IsLimitPeople == 1) ||
|
|
|
(item.IsYidongConduct && item.IsCanOutboundCall) ||
|
|
|
(!item.IsYidongConduct && item.IsLimitPeople == 1 && [1, 2].includes(item.ActivityTypeId))
|
|
|
) {
|
|
|
->>>>>>> master
|
|
|
this.selectShow = true;
|
|
|
this.selectYdong = item.IsYidongConduct;
|
|
|
} else {
|
|
@@ -563,12 +552,11 @@ export default {
|
|
|
let index = this.$parent.newDataList.findIndex((key) => key.Activity && key.Activity.ActivityId === item.ActivityId);
|
|
|
this.$parent.newDataList[index].Activity[value] = num;
|
|
|
},
|
|
|
-<<<<<<< HEAD
|
|
|
- richTextClamp(val) {
|
|
|
+ richTextClamp(val) {
|
|
|
return `<div style="${
|
|
|
val == 7 ? "min-height: 50px;" : ""
|
|
|
}line-clamp: ${val};-webkit-line-clamp: ${val};text-overflow: -o-ellipsis-lastline;overflow: hidden;text-overflow: ellipsis;display: -webkit-box;-webkit-box-orient: vertical;word-wrap: break-word;word-break: break-all;">`;
|
|
|
-=======
|
|
|
+ },
|
|
|
// 我要报名的请求拆分出来了
|
|
|
async myIsApplyHandler(id, type, valName = "") {
|
|
|
const res = await activity.signupAdd({
|
|
@@ -620,7 +608,6 @@ export default {
|
|
|
this.jurisdictionList = item;
|
|
|
this.isResearchModalShow = true;
|
|
|
}
|
|
|
->>>>>>> master
|
|
|
},
|
|
|
},
|
|
|
};
|