|
|
@@ -30,11 +30,11 @@
|
|
|
<view class="user-li" v-for="(item, index) in collectionList" :key="item.ArticleId">
|
|
|
<view class="li-item">
|
|
|
<text class="li-serial" :style="{ background: serialBackground(index) }">
|
|
|
- {{ index }}
|
|
|
+ {{ index + 1 }}
|
|
|
</text>
|
|
|
<view>
|
|
|
<text @click="goDetail(item)" style="display: inline">{{ item.Title }}</text>
|
|
|
- <text class="li-industry" @click="themeDetails(item)"> # {{ item.IndustryName }} </text>
|
|
|
+ <text class="li-industry" @click="themeDetails(item)"> # {{ item.IndustryName }} </text>
|
|
|
</view>
|
|
|
</view>
|
|
|
<view class="li-item li-bottom" style="color: #999999">
|
|
|
@@ -52,7 +52,7 @@
|
|
|
<view class="img-box" @click="collectClick(item)">
|
|
|
<image v-if="item.IsCollect" src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/czbk/collect_act.png"></image>
|
|
|
<image v-else src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/czbk/collect_ico.png"></image>
|
|
|
- <text class=""> {{ item.MyCollectNum }}人收藏 </text>
|
|
|
+ <text class=""> {{ item.CollectNum }}人收藏 </text>
|
|
|
</view>
|
|
|
</view>
|
|
|
</view>
|
|
|
@@ -61,16 +61,16 @@
|
|
|
<view class="content-ul" v-if="hotList.length && tagActive == '主题'">
|
|
|
<view class="hot-li" v-for="(item, index) in hotList" :key="item.IndustrialManagementId">
|
|
|
<view class="li-item hot-item">
|
|
|
- <view style="display: flex" class="text_oneLine hot-new" @click="themeDetails(item)">
|
|
|
+ <view style="display: flex" class="text_oneLine hot-new" @click="themeDetails(item)">
|
|
|
<text class="li-serial serial-number" :style="{ background: serialBackground(index) }">
|
|
|
- {{ index }}
|
|
|
+ {{ index + 1 }}
|
|
|
</text>
|
|
|
<text class="text_oneLine" style="display: inline"> # {{ item.IndustryName }} </text>
|
|
|
- <image class="new-img" v-if="item.IsNew" src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/czbk/new_icon.png" ></image>
|
|
|
+ <image class="new-img" v-if="item.IsNew" src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/czbk/new_icon.png"></image>
|
|
|
</view>
|
|
|
<text :class="item.IsFollw ? 'cancel-attention' : 'attention'" @click="isAttention(item, '主题')">{{ item.IsFollw ? "取消关注" : "+ 关注" }}</text>
|
|
|
</view>
|
|
|
- <view class="li-item read-more" @click="themeDetails(item)">
|
|
|
+ <view class="li-item read-more" @click="themeDetails(item)">
|
|
|
<text class="text-box text_oneLine" v-for="val in item.IndustrialSubjectList" :key="val.IndustrialSubjectId">
|
|
|
{{ val.SubjectName }}
|
|
|
</text>
|
|
|
@@ -80,17 +80,17 @@
|
|
|
<view class="content-ul" v-if="kolList.length && tagActive == '专家'">
|
|
|
<view class="kol-li" v-for="(item, index) in kolList" :key="item.DepartmentId">
|
|
|
<text class="li-serial serial-number" :style="{ background: serialBackground(index) }">
|
|
|
- {{ index }}
|
|
|
+ {{ index + 1 }}
|
|
|
</text>
|
|
|
- <image @click="authorDetails(item)" :src="item.ImgUrl"></image>
|
|
|
+ <image @click="authorDetails(item)" :src="item.ImgUrl" v-if="item.ImgUrl"></image>
|
|
|
<view class="li-item kol-item">
|
|
|
<view class="item-top">
|
|
|
- <text @click="authorDetails(item)">
|
|
|
+ <text @click="authorDetails(item)">
|
|
|
{{ item.NickName }}
|
|
|
</text>
|
|
|
<text :class="item.IsFollw ? 'cancel-attention' : 'attention'" @click="isAttention(item, '专家')">{{ item.IsFollw ? "取消关注" : "+ 关注" }}</text>
|
|
|
</view>
|
|
|
- <text @click="themeDetails(val)" class="kol-text text_oneLine" v-for="val in item.List" :key="val.IndustrialManagementId"> # {{ val.IndustryName }} </text>
|
|
|
+ <text @click="themeDetails(val)" class="kol-text text_oneLine" v-for="val in item.List" :key="val.IndustrialManagementId"> # {{ val.IndustryName }} </text>
|
|
|
</view>
|
|
|
</view>
|
|
|
</view>
|
|
|
@@ -214,10 +214,10 @@ export default {
|
|
|
this.$parent.goFollowShow = true;
|
|
|
this.$parent.confirmText = res.Data.GoFollow ? "去关注" : "知道了";
|
|
|
if (res.Data.GoFollow) {
|
|
|
- this.$parent.accounts = `${val === "主题" ? "产业" : "作者"}关注成功 <br> 想要及时获取该${val === "主题" ? "产业内容的更新推送" : "作者的报告更新提示"}，请关注【查研观向小助手】公众号`;
|
|
|
+ this.$parent.accounts = `${val == "主题" ? "产业" : "作者"}关注成功 <br> 想要及时获取该${val === "主题" ? "产业内容的更新推送" : "作者的报告更新提示"}，请关注【查研观向小助手】公众号`;
|
|
|
this.$parent.isCancelBtn = true;
|
|
|
} else {
|
|
|
- this.$parent.accounts = val === "主题" ? "产业" : "作者" + "关注成功<br>请关注【查研观向小助手】公众号，及时获取产业报告更新提醒";
|
|
|
+ this.$parent.accounts = `${val == "主题" ? "产业" : "作者"}` + `关注成功<br>请关注【查研观向小助手】公众号，及时获取${val === "主题" ? "产业" : "作者"}报告更新提醒`;
|
|
|
}
|
|
|
} else {
|
|
|
uni.showToast({
|
|
|
@@ -240,13 +240,13 @@ export default {
|
|
|
if (res.Ret === 200) {
|
|
|
item.IsCollect = !item.IsCollect;
|
|
|
item.IsCollect
|
|
|
- ? (item.MyCollectNum += 1) &&
|
|
|
+ ? (item.CollectNum += 1) &&
|
|
|
uni.showToast({
|
|
|
title: "收藏成功",
|
|
|
icon: "none",
|
|
|
duration: 2000,
|
|
|
})
|
|
|
- : (item.MyCollectNum -= 1);
|
|
|
+ : (item.CollectNum -= 1);
|
|
|
!item.IsCollect &&
|
|
|
uni.showToast({
|
|
|
title: "已取消收藏",
|
|
|
@@ -266,11 +266,12 @@ export default {
|
|
|
this.$store.dispatch("checkHandle", "/pageMy/reportDetail/reportDetail?id=" + item.ArticleId);
|
|
|
},
|
|
|
//去往主题详情
|
|
|
- themeDetails(item){
|
|
|
- this.$store.dispatch("checkHandle", "/reportPages/researchTheme/researchTheme?id=" + item.IndustrialManagementId);
|
|
|
+ themeDetails(item) {
|
|
|
+ this.$store.dispatch("checkHandle", "/reportPages/researchTheme/researchTheme?id=" + item.IndustrialManagementId);
|
|
|
},
|
|
|
//计算遍历的颜色
|
|
|
serialBackground(index) {
|
|
|
+ index += 1;
|
|
|
return index == 1 ? "#D7584F" : index == 2 ? "#E98033" : index == 3 ? "#FDD367" : "#D3D3D3";
|
|
|
},
|
|
|
},
|
|
|
@@ -348,12 +349,13 @@ export default {
|
|
|
border-radius: 8rpx;
|
|
|
margin: 0 20rpx 0 15rpx;
|
|
|
overflow: hidden;
|
|
|
+ flex-shrink: 0;
|
|
|
}
|
|
|
}
|
|
|
.kol-item {
|
|
|
display: flex;
|
|
|
flex-wrap: wrap;
|
|
|
- flex: 1;
|
|
|
+ width: 480rpx;
|
|
|
height: 120rpx;
|
|
|
align-items: baseline;
|
|
|
margin-bottom: 20rpx;
|
|
|
@@ -368,9 +370,10 @@ export default {
|
|
|
.kol-text {
|
|
|
width: 50%;
|
|
|
margin-top: 10rpx;
|
|
|
+ flex-shrink: 0;
|
|
|
}
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
.li-serial {
|
|
|
width: 26rpx;
|
|
|
height: 26rpx;
|
|
|
@@ -383,7 +386,7 @@ export default {
|
|
|
flex-shrink: 0;
|
|
|
}
|
|
|
.serial-number {
|
|
|
- margin-top: 0!important;
|
|
|
+ margin-top: 0 !important;
|
|
|
}
|
|
|
.li-item {
|
|
|
display: flex;
|
bd