Merge branch 'master' into 13.9

activityPages/activityDetail/activityDetail.vue

@@ -216,10 +216,16 @@
               <view class="item-left">链接参会：</view>
               <view class="item-right content-item-zoom" style="color: #376cbb">
                 <view>
-                  <view class="default text_zoom" v-if="!detailData.IsSignup && detailData.ActivityTypeName == '公司调研电话会' && detailData.IsLimitPeople">请报名获取 </view>
+                  <view class="default text_zoom" v-if="!detailData.IsSignup && detailData.ActivityTypeName == '公司调研电话会' && detailData.IsLimitPeople && detailData.IsZoom != 1"
+                    >请报名获取
+                  </view>
                   <blcok v-else>
-                    <text class="default text_zoom">{{ detailData.LinkParticipants }}</text>
-                    <view> 点击<text class="default copy-link copy-zoom" @click="copyLink(1)">复制链接</text>在手机浏览器打开，并输入会议密码 </view>
+                    <text class="default text_zoom" :style="{ color: detailData.IsZoom != 1 ? '#376cbb' : '#333' }">{{ detailData.LinkParticipants }}</text>
+                    <view class="click-copy">
+                      点击
+                      <view :class="['dustrial-li', 'dustrial-item','copy-link']" @click="copyLink(1)">复制链接 </view>
+                      <view>在手机浏览器打开</view>
+                    </view>
                   </blcok>
                 </view>
               </view>
@@ -230,8 +236,12 @@
                 <rich-text :nodes="detailData.AppAttendance"></rich-text>
               </view>
             </view>
+            <view v-if="detailData.MeetingId && isUserBindingPhoneNumber && haveAuth == 1 && detailData.IsZoom == 1" class="content-item">
+              <view class="item-left">会议 ID&nbsp;：</view>
+              <view class="item-right">{{ detailData.ActivityTypeName == "公司调研电话会" && detailData.IsLimitPeople && !detailData.IsSignup ? "请报名获取" : detailData.MeetingId }}</view>
+            </view>
             <view v-if="detailData.ConferencePassword && isUserBindingPhoneNumber && haveAuth == 1" class="content-item">
-              <view class="item-left">拨入密码：</view>
+              <view class="item-left">{{ detailData.IsZoom == 1 ? "会议密码" : "拨入密码" }}：</view>
               <view class="item-right">{{ detailData.ActivityTypeName == "公司调研电话会" && detailData.IsLimitPeople && !detailData.IsSignup ? "请报名获取" : detailData.ConferencePassword }}</view>
             </view>
             <view v-if="detailData.Address && isUserBindingPhoneNumber && haveAuth == 1" class="content-item">
@@ -692,7 +702,7 @@ export default {
             icon: "none",
             duration: 2000,
           });
-        },
+        }
       });
     },
     // 跳转产业标签
@@ -852,8 +862,6 @@ export default {
     this.id = option.id || "";
     this.isSendWx = option.IsSendWx || "";
     this.sourceType = option.sourceType || "";
-    console.log(option.detailDataShare);
-
     this.detailDataShare = option.detailDataShare ? JSON.parse(decodeURIComponent(option.detailDataShare) || {}) : "";
     // 详情页面不写路径
   },
@@ -889,8 +897,6 @@ export default {
       theme: this.detailData.ThemeText,
     };
     let detailDataShare = JSON.stringify(shaerObj).replace(/%/g, "%25");
-    console.log(detailDataShare, "--");
-
     return {
       title: this.detailData.ActivityName,
       query: "id=" + this.id + "&sourceType=微信分享&shareImag=" + this.detailData.MomentsImg + "&detailDataShare=" + encodeURIComponent(detailDataShare),
@@ -1032,23 +1038,6 @@ export default {
           padding-left: 0;
           margin-left: 0;
         }
-        .dustrial-li {
-          display: flex;
-          align-items: center;
-          font-size: 22rpx;
-          height: 40rpx;
-          padding: 0 13rpx;
-          margin: 0 20rpx 10rpx 0;
-          background-color: #f0f1f3;
-        }
-        .dustrial-item {
-          padding: 0 20rpx;
-          background: #e5efff;
-          border-radius: 4rpx;
-          color: $uni-color-new;
-          border-radius: 4rpx;
-          font-weight: 600;
-        }
       }
       .content-item-link {
         display: flex;
@@ -1126,6 +1115,23 @@ export default {
     overflow: hidden;
   }
 }
+.dustrial-li {
+  display: flex;
+  align-items: center;
+  font-size: 22rpx;
+  height: 40rpx;
+  padding: 0 13rpx;
+  margin: 0 20rpx 10rpx 0;
+  background-color: #f0f1f3;
+}
+.dustrial-item {
+  padding: 0 20rpx;
+  background: #e5efff;
+  border-radius: 4rpx;
+  color: $uni-color-new;
+  border-radius: 4rpx;
+  font-weight: 600;
+}
 .product-introduction-box {
   background-color: #f7f7f7;
   padding: 10rpx 0;
@@ -1253,4 +1259,20 @@ export default {
     margin-bottom: 20rpx;
   }
 }
+.click-copy {
+  display: flex;
+  flex-wrap: wrap;
+  view {
+    margin-left: 10rpx;
+    display: inline-block !important;
+  }
+  .copy-link {
+    margin-right: 0;
+  }
+}
+.text_zoom {
+  max-width: 80%;
+  word-wrap: break-word; /* 强制英文数字在边界处换行 */
+  overflow-wrap: break-word; /* 对于兼容性更好的情况 */
+}
 </style>

activityPages/activityDetail/manageMixin.js

@@ -161,9 +161,9 @@ export default {
     // 我要报名
     wanttosignup() {
       if (
-        (!this.detailData.IsResearchPoints && this.detailData.ActivityTypeId == 3 && !this.detailData.IsYidongConduct && this.detailData.IsLimitPeople == 1) ||
-        (this.detailData.IsYidongConduct && this.detailData.IsCanOutboundCall) ||
-        (!this.detailData.IsYidongConduct && this.detailData.IsLimitPeople == 1 && [1, 2].includes(this.detailData.ActivityTypeId))
+       ( (!this.detailData.IsResearchPoints && this.detailData.ActivityTypeId == 3 && !this.detailData.IsYidongConduct && this.detailData.IsLimitPeople == 1) ||
+       (this.detailData.IsYidongConduct && this.detailData.IsCanOutboundCall) ||
+       (!this.detailData.IsYidongConduct && this.detailData.IsLimitPeople == 1 && [1, 2].includes(this.detailData.ActivityTypeId))) &&  this.detailData.IsZoom !=1
       ) {
         this.selectShow = true;
         this.selectYdong = this.detailData.IsYidongConduct;

components/ItemComponent/activityItem.vue

@@ -215,9 +215,10 @@ export default {
         this.goDetail(item);
         return;
       } 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))
+        ((!item.IsResearchPoints && item.ActivityTypeId == 3 && !item.IsYidongConduct && item.IsLimitPeople == 1) ||
+          (item.IsYidongConduct && item.IsCanOutboundCall) ||
+          (!item.IsYidongConduct && item.IsLimitPeople == 1 && [1, 2].includes(item.ActivityTypeId))) &&
+        item.IsZoom != 1
       ) {
         this.selectShow = true;
         this.selectYdong = item.IsYidongConduct;

components/activity/indexActivity.js

@@ -53,9 +53,10 @@ export default {
         this.goDetail(item);
         return;
       } 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))
+        ((!item.IsResearchPoints && item.ActivityTypeId == 3 && !item.IsYidongConduct && item.IsLimitPeople == 1) ||
+          (item.IsYidongConduct && item.IsCanOutboundCall) ||
+          (!item.IsYidongConduct && item.IsLimitPeople == 1 && [1, 2].includes(item.ActivityTypeId))) &&
+        item.IsZoom != 1
       ) {
         this.selectShow = true;
         this.selectYdong = item.IsYidongConduct;

config/modules/Reports.js

@@ -10,10 +10,18 @@ export const Reports = {
   getstrategyAll: (params) => {
     return getHttp("/permission/strategyAll", params);
   },
+  /* 获取策略周期的分类 */
+  getZhouQistrategyAll: (params) => {
+    return getHttp("/report/zhouqi_tradeList", params);
+  },
   /* 获取策略的文章 */
   getTacticsList: (params) => {
     return getHttp("/tactics/list", params);
   },
+  /* 获取策略的文章 */
+  getZhouQiTacticsList: (params) => {
+    return getHttp("/report/tactics/zhouqi_list", params);
+  },
   /* 获取产业报告分类列表接口*/
   getTradeList: (params) => {
     return getHttp("/report/home/tradeList", params);

pages.json

@@ -269,6 +269,14 @@
             "navigationBarTitleText": "策略系列培训",
             "enablePullDownRefresh": false
           }
+        },
+        {
+        	"path" : "otherReport/otherReport",
+        	"style" : 
+        	{
+        		"navigationBarTitleText" : "报告",
+        		"enablePullDownRefresh" : false
+        	}
         }
       ]
     },

pages/reportForm/components/strategy.vue

@@ -9,7 +9,7 @@
             >{{ item.Title }}
             <text class="reg-text" v-if="item.IsRed"></text>
           </text>
-          <view style="margin-top: 10rpx" v-if="matchTypeName == '每日复盘'" :class="threeFour ? 'text-threeFour' : 'text_one'">
+          <view style="margin-top: 10rpx" v-if="matchTypeName == '每日复盘' || item.IsShowAbstract" :class="threeFour ? 'text-threeFour' : 'text_one'">
             <!-- <mp-html :content="'摘要：' + item.Abstract" /> -->
             摘要：{{ item.Abstract }}
           </view>
@@ -47,6 +47,9 @@ export default {
     matchTypeName: {
       type: String,
     },
+    tabAct_id: {
+      type: Number,
+    },
   },
   data() {
     return {
@@ -113,27 +116,23 @@ export default {
   mounted() {},
   methods: {
     /* 获取列表 */
-    getCollectList() {
-      Reports.getTacticsList({
-        PageSize: this.pageSize,
-        CurrentIndex: this.page_no,
-        CategoryId: this.tabAct_idTwo,
-      }).then((res) => {
-        if (res.Ret === 200) {
-          this.status = this.page_no < res.Data.Paging.Pages ? "loadmore" : "nomore";
-          this.totalPage = res.Data.Paging.Pages; //总页数
-          if (this.page_no === 1) {
-            this.collectList = res.Data.List || [];
-            this.haveData = this.collectList.length ? true : false;
-            if (this.refresh) {
-              uni.stopPullDownRefresh();
-              this.refresh = false;
-            }
-          } else {
-            this.collectList = this.collectList.concat(res.Data.List);
+    async getCollectList() {
+      let params = { PageSize: this.pageSize, CurrentIndex: this.page_no, CategoryId: this.tabAct_idTwo };
+      const res = this.tabAct_id == 148 || this.tabAct_id == 62 ? await Reports.getZhouQiTacticsList(params) : await Reports.getTacticsList(params);
+      if (res.Ret === 200) {
+        this.status = this.page_no < res.Data.Paging.Pages ? "loadmore" : "nomore";
+        this.totalPage = res.Data.Paging.Pages; //总页数
+        if (this.page_no === 1) {
+          this.collectList = res.Data.List || [];
+          this.haveData = this.collectList.length ? true : false;
+          if (this.refresh) {
+            uni.stopPullDownRefresh();
+            this.refresh = false;
           }
+        } else {
+          this.collectList = this.collectList.concat(res.Data.List);
         }
-      });
+      }
     },
     goDetail(item, index) {
       /* 无需授权且已绑定 检验是或否有权限 */
@@ -149,7 +148,7 @@ export default {
         });
       } else if (item.Resource === 1) {
         uni.navigateTo({ url: "/pageMy/reportDetail/reportDetail?id=" + item.ArticleId });
-      }else if (item.Resource === 3) {
+      } else if (item.Resource === 3) {
         uni.navigateTo({ url: "/pages-ficc/reportDetail/reportDetail?id=" + item.ReportId });
       }
     },

pages/reportForm/reportForm.vue

@@ -46,6 +46,7 @@
           :matchTypeName="matchTypeName"
           :tabAct_idTwo="tabAct_idTwo"
           :isNum="isNum"
+          :tabAct_id="tabAct_id"
           :isSwitchover="isSwitchover"
           @hideIsred="hideIsred"
         />
@@ -289,10 +290,16 @@ export default {
       });
     },
     //获取二级事件
-    getstrategyAll() {
-      Reports.getstrategyAll({
-        ChartPermissionId: this.tabAct_id,
-      }).then((res) => {
+    async getstrategyAll() {
+      const res =
+        this.tabAct_id == 148 || this.tabAct_id == 62
+          ? await Reports.getZhouQistrategyAll({
+              ChartPermissionId: this.tabAct_id,
+            })
+          : await Reports.getstrategyAll({
+              ChartPermissionId: this.tabAct_id,
+            });
+      if (res.Ret === 200) {
         this.tabAct_id == 23 &&
           res.Data.List.push({
             CategoryId: 100001,
@@ -327,7 +334,7 @@ export default {
           Items: items, // 当前 GroupId 对应的所有项目
         }));
         this.tabBarsTow = arrayResult;
-      });
+      }
     },
     //tabs切换事件
     toggleTab(item, index) {

reportPages/keyCompany/keyCompany.vue

@@ -36,7 +36,7 @@
                     :class="['subject-item', 'text_oneLine', item.ListSubject.length < 3 && 'subject-item-top-border']"
                     @click="positionSubject(key)"
                     v-for="key in item.ListSubject"
-                    :key="key.IndustrialSubjectId"
+                    :key="key.Md5String"
                   >
                     {{ key.SubjectName }}
                     <image v-if="key.IsNew" class="icon_subject" src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/new_subject.png"></image>
@@ -53,9 +53,9 @@
                 <mp-html :content="strFontSize(item.BodyChartSummary)" />
                 <view class="li-list">
                   <view class="li-item" v-for="key in item.List" :key="key.IndustrialSubjectId">
-                    <view :id="'subject' + key.IndustrialSubjectId" class="li-subject">
+                    <view :id="'subject' + key.Md5String" class="li-subject">
                       <view class="item-name">
-                        <text style="display: inline-block; vertical-align: middle; font-weight: 600">{{ key.SubjectName }}</text>
+                        <text style="display: inline-block; vertical-align: middle; font-weight: 600">{{ key.ShowName }}</text>
                         <image v-if="key.IsNew" src="https://hzstatic.hzinsights.com/cygx/icon/new_report.png"></image>
                       </view>
                       <text class="itel-label" v-for="val in key.CompanyLabel" :key="val"># {{ val }}</text>
@@ -162,7 +162,7 @@ export default {
     },
     // 锚点
     positionSubject: Throttle(function (item) {
-      let className = `#subject${item.IndustrialSubjectId}`;
+      let className = `#subject${item.Md5String}`;
       uni
         .createSelectorQuery()
         .select(className)
@@ -184,6 +184,8 @@ export default {
       const res = Reports.reportClickHistory({
         ArticleId: this.reportDetail.ArticleId,
         IndustrialSubjectId: item.IndustrialSubjectId,
+        IndustrialManagementId: item.IndustrialManagementId,
+        ThirdId: item.ThirdId,
       });
     }),
     // 公司综述报告请

reportPages/otherReport/otherReport.vue

@@ -0,0 +1,48 @@
+<template>
+  <block>
+    <view class="container reportDetail-container">
+      <web-view :src="linkUrl">
+        <cover-view class="search-view"> </cover-view>
+      </web-view>
+    </view>
+  </block>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+      linkUrl: "",
+    };
+  },
+
+  methods: {},
+  onLoad(option) {
+    this.linkUrl = decodeURIComponent(option.reportUrl) || "";
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.reportDetail-container {
+  background-color: #fff;
+  padding-bottom: 200rpx;
+  padding-bottom: calc(200rpx + constant(safe-area-inset-bottom));
+  padding-bottom: calc(200rpx + env(safe-area-inset-bottom));
+  .search-view {
+    position: fixed;
+    width: 100%;
+    height: 100rpx;
+    background: #fff;
+    z-index: 99999;
+    font-size: 24rpx;
+    box-sizing: border-box;
+    .search-icon {
+      width: 147rpx;
+      height: 40rpx;
+      margin: 0 15rpx;
+      z-index: 99999;
+    }
+  }
+}
+</style>