9.0 审核

activityPages/activityDetail/activityDetail.vue

@@ -973,7 +973,8 @@ export default {
   .video-play {
     width: 100%;
     padding-left: 0rpx !important;
-    height: 456rpx;
+    padding-bottom: 15rpx;
+    height: 470rpx;
     border-radius: 8rpx;
     overflow: hidden;
     box-shadow: 0px 3px 8px 0px rgba(0, 0, 0, 0.05);

activityPages/generationAsk/generationAsk.vue

@@ -51,7 +51,7 @@ export default {
               ArticleId: Number(this.id),
               Content: this.advice_content,
             })
-          : activity.activityAskAdd({
+          : await activity.activityAskAdd({
               ActivityId: Number(this.id),
               Content: this.advice_content,
             });

components/ItemComponent/activityItem.vue

@@ -2,12 +2,15 @@
   <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 :class="[list.ActiveState === 1 ? 'is-down-state' : list.ActiveState === 2 ? 'is-up-state' : 'is-end', 'is-up-down', 'state']">
-        {{ list.ActiveState === 1 ? "未开始" : list.ActiveState === 2 ? "进行中" : "已结束" }}
+      <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>
+        <view v-if="list.TripStatus != 1" :class="['is-end', 'is-up-down', 'state']"> 已结束 </view>
+      </block>
     </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">
+    <view :class="['content-title', 'text-Line', list.ResearchTheme && 'content-min-hight']" v-if="list.ActivityName || list.ResearchTheme">
       {{ list.ActivityName || list.ResearchTheme }}
     </view>
     <view style="display: flex" class="content-text content-min-hight text_twoLine" v-if="list.ActivityTimeText && list.SourceType !== 1">
@@ -15,8 +18,8 @@
       <text> {{ list.ActivityTimeText }}</text>
     </view>
     <view class="content-text text-Line" v-else>
-      {{ list.Host ? "主持人:" : list.Expert ? "专家背景:" : "" }}
-      {{ list.Host ? list.Host : list.Expert ? list.Expert : "" }}
+      {{ list.Host ? "主持人:" : list.Expert ? "专家背景:" : list.Speaker ? "主讲人:" : list.DistinguishedGuest ? "嘉宾:" : "" }}
+      {{ list.Host ? list.Host : list.Expert ? list.Expert : list.Speaker ? list.Speaker : list.DistinguishedGuest ? list.DistinguishedGuest : "" }}
     </view>
     <view class="content-time" v-if="list.SourceType == 1">
       {{ list.ActivityTimeText }}
@@ -38,7 +41,9 @@
           <view class="item-btn" v-if="list.IsShowHelpSsk" style="width: 130rpx">
             <text @click.stop="askingGo(list)">帮我带问</text>
           </view>
-          <text class="item-btn" v-if="list.IsShowOutboundCall && list.ActivityTypeId != 1" @click.stop="signupIsAddOfCancel(list, 1)">{{ list.IsSignup == 1 ? "取消外呼" : "预约外呼" }}</text>
+          <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.IsShowDetails" @click.stop="goDetail(list)">查看详情</text>
           <block v-if="list.IsShowSignup">
             <block v-if="list.IsCClassMeeting">
@@ -50,7 +55,7 @@
             </block>
           </block>
         </block>
-        <text v-if="list.IsShowHelpSsk && list.ActiveState == 2" class="item-btn" @click="askingGo(list, '提问')">实时提问</text>
+        <text v-if="list.IsShowHelpSsk && list.ActiveState == 2" class="item-btn" @click.stop="askingGo(list, '提问')">实时提问</text>
       </block>
       <view class="bottom-box real-time" v-else>
         <view class="bottom-box">
@@ -591,10 +596,10 @@ export default {
       background: linear-gradient(90deg, #0151ff 0%, #01b9ff 100%);
     }
     .is-up-state {
-      background-color: #01a7ff;
+      background: #ff9110;
     }
     .is-down-state {
-      background: #ff9110;
+      background-color: #01a7ff;
     }
     .is-down {
       background: linear-gradient(90deg, #ff8a05 0%, #ffb74d 100%);
@@ -650,9 +655,7 @@ export default {
     width: 205rpx;
     height: 119rpx;
   }
-  .content-min-hight {
-    min-height: 88rpx;
-  }
+
   .content-btn {
     display: flex;
     overflow: hidden;
@@ -706,5 +709,17 @@ export default {
       border-bottom: 1rpx solid #ebebeb;
     }
   }
+  .content-min-hight {
+    min-height: 88rpx;
+    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;
+    -webkit-line-clamp: 2 !important;
+    line-clamp: 2 !important;
+  }
 }
 </style>

components/ItemComponent/reportItem.vue

@@ -1,7 +1,7 @@
 <template>
   <view class="container-report-item" @click="goDetail(list)">
     <view class="item-title">
-      <text class="title">{{ list.Title }}</text>
+      <mp-html :content="richTextClamp(3) + list.Title + '</div>'" />
     </view>
     <view class="item-image" v-if="list.BodyHtml">
       <image :src="list.BodyHtml"></image>
@@ -9,7 +9,7 @@
     <block v-if="list.Annotation">
       <text class="item-content">{{ list.ArticleResponse == 4 ? "核心观点" : "核心结论" }}:</text>
       <view class="item-rich-text">
-        <rich-text :nodes="richTextClamp + list.Annotation + '</div>'"></rich-text>
+        <mp-html :content="richTextClamp(7) + list.Annotation + '</div>'" />
       </view>
     </block>
     <view class="item-abstract text-Line" v-if="list.Abstract && list.ArticleResponse != 1"> 摘要：{{ list.Abstract }} </view>
@@ -36,10 +36,7 @@ export default {
     },
   },
   data() {
-    return {
-      richTextClamp:
-        '<div style="min-height: 50px;line-clamp: 7;-webkit-line-clamp: 7;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;">',
-    };
+    return {};
   },
   computed: {},
   watch: {},
@@ -52,6 +49,11 @@ export default {
         this.$store.dispatch("checkHandle", "/pageMy/reportDetail/reportDetail?id=" + item.ArticleId);
       }
     },
+    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;">`;
+    },
   },
 };
 </script>
@@ -71,17 +73,6 @@ export default {
     color: #333333;
     line-height: 38rpx;
     text-indent: 0.5em;
-
-    .title {
-      text-overflow: -o-ellipsis-lastline;
-      overflow: hidden;
-      text-overflow: ellipsis;
-      display: -webkit-box;
-      -webkit-line-clamp: 3;
-      line-clamp: 3;
-      -webkit-box-orient: vertical;
-    }
-
     &::before {
       content: "";
       position: absolute;

pageMy/login/login.vue

@@ -200,6 +200,8 @@ export default {
             let prevPage = pages[pages.length - 2];
             let path = prevPage ? prevPage.$page.fullPath : "";
             if (path.includes("/pages/index/index")) {
+              uni.$emit("updateNewList");
+            } else if (path.includes("/pages/material/material")) {
               uni.$emit("updateAudioVideo");
             }
             uni.navigateBack({
@@ -214,7 +216,7 @@ export default {
         }
       });
     },
-    
+
     // 选择了地区的区号
     areacode(num) {
       this.showCountryCode = "+" + num;

pageMy/myCollection/myCollection.vue

@@ -234,7 +234,7 @@ export default {
       let title_share = item.AudioTitle || item.Title;
       return {
         title: this.isHorzMobile ? "好友向您推荐此内容，上传名片享查研观向免费月卡！" : title_share,
-        path: "/pages/index/index?topTabsActive=4" + "&audioShareId=" + audio_id + "&videoShareId=" + video_id + "&activityId=" + activity_id,
+        path: "/pages/material/material?topTabsActive=4" + "&audioShareId=" + audio_id + "&videoShareId=" + video_id + "&activityId=" + activity_id,
         imageUrl: item.AudioShareImg || item.ShareImg,
       };
     }

pages-search/indedxSearch/indedxSearch.vue

@@ -435,7 +435,7 @@ export default {
     }
   },
   onShow() {
-     this.$store.dispatch("checkHandle");
+    this.$store.dispatch("checkHandle");
   },
   /* 下拉刷新 */
   onPullDownRefresh: Throttle(function () {
@@ -452,19 +452,33 @@ export default {
     this.getDataList();
   }),
   // 分享
-  onShareAppMessage() {
-    return {
-      title: this.searchTxt || "搜索",
-      path:
-        "/pages-search/indedxSearch/indedxSearch?searchTxt=" +
-        this.searchTxt +
-        "&tabsActive=" +
-        this.tabsActive +
-        "&summaryActive=" +
-        this.summarySelectActive +
-        "&activityActive=" +
-        this.activitySelectActive,
-    };
+  onShareAppMessage({ from, target }) {
+    if (from === "button") {
+      let item = target.dataset.item;
+      let audio_id = item.Type == 1 || item.AudioType == 1 ? item.Id : "";
+      // type=2 -- 活动视频 type=3 -- 产业视频
+      let video_id = item.Type == 2 || item.Type == 3 ? item.Id : "";
+      let activity_id = item.Type == 2 && item.ActivityId > 0 ? item.ActivityId : "";
+      let title_share = item.AudioTitle || item.Title;
+      return {
+        title: this.isHorzMobile ? "好友向您推荐此内容，上传名片享查研观向免费月卡！" : title_share,
+        path: "/pages/material/material?topTabsActive=4" + "&audioShareId=" + audio_id + "&videoShareId=" + video_id + "&activityId=" + activity_id,
+        imageUrl: item.AudioShareImg || item.ShareImg,
+      };
+    } else {
+      return {
+        title: this.searchTxt || "搜索",
+        path:
+          "/pages-search/indedxSearch/indedxSearch?searchTxt=" +
+          this.searchTxt +
+          "&tabsActive=" +
+          this.tabsActive +
+          "&summaryActive=" +
+          this.summarySelectActive +
+          "&activityActive=" +
+          this.activitySelectActive,
+      };
+    }
   },
 };
 </script>

pages.json

@@ -398,17 +398,17 @@
         "iconPath": "static/img/tab/report_ico.png",
         "selectedIconPath": "static/img/tab/report_actico.png"
       },
-      {
-        "pagePath": "pages/purchaser/purchaser",
-        "text": "买方研选",
-        "iconPath": "static/img/tab/purchaser_ico.png",
-        "selectedIconPath": "static/img/tab/purchaser_act.png"
-      },
       {
         "pagePath": "pages/activity/activity",
         "text": "活动",
         "iconPath": "static/img/tab/activity_ico.png",
         "selectedIconPath": "static/img/tab/activity_act.png"
+      },
+      {
+        "pagePath": "pages/purchaser/purchaser",
+        "text": "买方研选",
+        "iconPath": "static/img/tab/purchaser_ico.png",
+        "selectedIconPath": "static/img/tab/purchaser_act.png"
       }
     ]
   },

pages/index/index.vue

@@ -47,7 +47,7 @@
       </view>
     </view>
     <u-loadmore :status="status" icon-type="flower" :load-text="loadText" margin-top="20" v-if="page_no > 1" />
-    <view v-if="newDataList.length === 4" class="bind-btn">绑定联系方式后查看更多内容>></view>
+    <view v-if="newDataList.length === 4" class="bind-btn" @click="goLogin">绑定联系方式后查看更多内容>></view>
   </view>
 </template>
 
@@ -136,6 +136,16 @@ export default {
         url: "/pageMy/myPage/myPage",
       });
     },
+    // 跳转绑定页面
+    goLogin() {
+      uni.navigateTo({
+        url: "/pageMy/login/login",
+      });
+    },
+    /* 搜索 */
+    goSearch() {
+      this.$store.dispatch("checkHandle", "/pages-search/indedxSearch/indedxSearch?isType=" + this.topTabsActive);
+    },
     async getUserInfo() {
       const res = await Mine.getInfo();
       if (res.Ret === 200) {
@@ -143,6 +153,11 @@ export default {
       }
     },
   },
+  mounted() {
+    uni.$on("updateNewList", (data) => {
+      this.getNewList();
+    });
+  },
   onLoad() {
     this.getUserInfo();
     this.initNavBar();
@@ -150,7 +165,7 @@ export default {
   },
   // 加载数据
   onReachBottom() {
-    if (this.status === "nomore") return;
+    if (this.status === "nomore" || this.newDataList.length < 8) return;
     this.status = "loading";
     this.page_no++;
     this.getNewList();
@@ -161,6 +176,30 @@ export default {
     this.refresh = true;
     this.getNewList();
   },
+  /** 用户点击分享*/
+  onShareAppMessage: function ({ from, target }) {
+    if (from === "button") {
+      let item = target.dataset.item;
+      let audio_id = item.Type == 1 || item.AudioType == 1 ? item.Id : "";
+      // type=2 -- 活动视频 type=3 -- 产业视频
+      let video_id = item.Type == 2 || item.Type == 3 ? item.Id : "";
+      let activity_id = item.Type == 2 && item.ActivityId > 0 ? item.ActivityId : "";
+      let title_share = item.AudioTitle || item.Title;
+      return {
+        title: this.isHorzMobile ? "好友向您推荐此内容，上传名片享查研观向免费月卡！" : title_share,
+        path: "/pages/material/material?topTabsActive=4" + "&audioShareId=" + audio_id + "&videoShareId=" + video_id + "&activityId=" + activity_id,
+        imageUrl: item.AudioShareImg || item.ShareImg,
+      };
+    } else {
+      return {
+        title: this.isHorzMobile ? "好友向您推荐此内容，上传名片享查研观向免费月卡！" : "您手边的弘则研究素材检索库",
+        path: "/pages/index/index",
+        imageUrl: "https://hzstatic.hzinsights.com/cygx/czbk/home_share.png",
+        success: (res) => {},
+        fail: (err) => {},
+      };
+    }
+  },
 };
 </script>
 
@@ -224,9 +263,10 @@ export default {
   .bind-btn {
     padding-top: 110rpx;
     text-align: center;
-    font-size: 20rpx;
+    font-size: 24rpx;
     color: #3385ff;
     line-height: 23rpx;
+    padding-bottom: 100rpx;
   }
 }
 </style>

pages/material/material.vue

@@ -501,14 +501,13 @@ export default {
       let title_share = item.AudioTitle || item.Title;
       return {
         title: this.isHorzMobile ? "好友向您推荐此内容，上传名片享查研观向免费月卡！" : title_share,
-        path: "/pages/index/index?topTabsActive=4" + "&audioShareId=" + audio_id + "&videoShareId=" + video_id + "&activityId=" + activity_id,
+        path: "/pages/material/material?topTabsActive=4" + "&audioShareId=" + audio_id + "&videoShareId=" + video_id + "&activityId=" + activity_id,
         imageUrl: item.AudioShareImg || item.ShareImg,
       };
     } else {
       return {
-        title: this.isHorzMobile ? "好友向您推荐此内容，上传名片享查研观向免费月卡！" : "您手边的弘则研究素材检索库",
-        path: "/pages/index/index?topTabsActive=" + this.topTabsActive + "&secondActive=" + this.secondActive + "&childrenActive=" + this.chartChildrenActive,
-        imageUrl: this.topTabsActive == 1 ? "https://hzstatic.hzinsights.com/cygx/czbk/home_share.png" : "",
+        title: this.isHorzMobile ? "好友向您推荐此内容，上传名片享查研观向免费月卡！" : "素材库",
+        path: "/pages/material/material?topTabsActive=" + this.topTabsActive + "&secondActive=" + this.secondActive + "&childrenActive=" + this.chartChildrenActive,
         success: (res) => {},
         fail: (err) => {},
       };