cygx 7.0

activityPages/accountsOfficial/accountsOfficial.vue

@@ -1,6 +1,29 @@
 <template>
   <!-- 去往公众号 -->
   <view>
-    <web-view src="https://mp.weixin.qq.com/s/imyaP4Ch33Ey4VMCUpFhSw"></web-view>
+    <web-view :src="linkUrl"></web-view>
   </view>
 </template>
+
+<script>
+import { Reports } from "@/config/api.js";
+export default {
+  data() {
+    return {
+      linkUrl: "",
+    };
+  },
+
+  methods: {
+    async getLink() {
+      const res = await Reports.reportIsShow();
+      if (res.Ret === 200) {
+        this.linkUrl = res.Data.LinkWxExplain;
+      }
+    },
+  },
+  onLoad() {
+    this.getLink();
+  },
+};
+</script>

activityPages/components/indexActivity.js

@@ -137,7 +137,7 @@ export default {
                 if (this.hasPermission == 1) {
                   const index = this.collectList.findIndex((key) => key.ActivityId == id);
                   this.collectList[index].SignupType = type;
-                  this.signupType = res.Data.SignupType;
+                  this.signupType = valName == "CClass" ? "CClass" : res.Data.SignupType;
                   this.signupStatus = res.Data.SignupStatus;
                   this.countryCode = res.Data.CountryCode;
                   this.mobileEdit = res.Data.Mobile;

activityPages/themeActivity/themeActivity.vue

@@ -43,7 +43,7 @@
                 </view>
                 <view class="bottom-box" :class="item.ActivityTypeId == 1 || item.ActivityTypeId == 2 ? 'four-btn' : ''" v-else-if="item.ActivityType == 1">
                   <block v-if="item.IsCClassMeeting">
-                    <text class="button" @click="signupIsAddOfCancel(item, 3)">{{ item.IsSignup == 1 ? "取消报名" : "我要报名" }}</text>
+                    <text class="button" @click="signupIsAddOfCancel(item, 3,'CClass')">{{ item.IsSignup == 1 ? "取消报名" : "我要报名" }}</text>
                   </block>
                   <block v-else>
                     <text class="button" @click="signupIsAddOfCancel(item, 1)">{{ item.IsSignup == 1 ? "取消外呼" : "预约外呼" }}</text>

components/modalDialog.vue

@@ -230,14 +230,13 @@ export default {
         this.accounts = `设置成功，会前15分钟会为您推送微信消息提醒<br/><br/>
 									请关注【查研观向小助手】公众号，以获取微信消息提醒`;
       } else if (this.signupType == "summaryIsHandel") {
-        console.log(123,'summaryIsHandel');
         this.content = "会议纪要预约成功 <br/><br/> 请关注【查研观向小助手】公众号，若有调研纪要发布/更新，将及时为您推送微信消息";
         this.accounts = `
 						会议纪要预约成功<br/><br/>
 
 						请关注【查研观向小助手】公众号，若有调研纪要发布/更新，将及时为您推送微信消息	`;
       } else {
-        this.content = "报名成功，已加入您的活动日程 <br/><br/> 请关注【查研观向小助手】公众号，会前1小时为您推送微信提醒";
+        this.content = `报名成功，已加入您的活动日程 <br/><br/> 请关注【查研观向小助手】公众号，${this.signupType == 'CClass' ? '及时获取活动信息变更提醒':'会前1小时为您推送微信提醒'}`;
         this.accounts = `
 						报名成功，已加入您的活动日程<br/><br/>
 

config/api.js

@@ -168,7 +168,7 @@ export const Search = {
 export const Reports = {
   /* 获取报告一级分类 */
   getClassify: (params) => {
-    return getHttp("/permission/reportall", params, 0);
+    return getHttp("/permission/reportallV7", params, 0);
   },
   /* 获取策略的分类 */
   getstrategyAll: (params) => {

pageMy/reportDetail/reportDetail.vue

@@ -79,7 +79,7 @@ export default {
           if (res.Data.HasPermission === 1) {
             //有访问权限
             if (res.Data.Detail.IsNeedJump) {
-              uni.navigateTo({
+              uni.redirectTo({
                 url: "/pageMy/reportPage/reportPage?id=" + this.id,
               });
             }

pages.json

@@ -12,7 +12,7 @@
     {
       "path": "pages/reportForm/reportForm",
       "style": {
-        "navigationBarTitleText": "报告",
+        "navigationBarTitleText": "产业报告",
         "enablePullDownRefresh": true,
         "navigationStyle": "custom"
       }
@@ -354,7 +354,7 @@
       },
       {
         "pagePath": "pages/reportForm/reportForm",
-        "text": "报告",
+        "text": "产业报告",
         "iconPath": "static/img/tab/report_ico.png",
         "selectedIconPath": "static/img/tab/report_actico.png"
       },

pages/activity/activity.vue

@@ -334,12 +334,13 @@ export default {
     replacementConfirm() {
       const arr = [];
       const str = [];
-      this.listChartPermission.forEach((key) => {
-        if (key.IsChoose) {
-          arr.push(key.ChartPermissionId);
-          str.push(key.PermissionName);
-        }
-      });
+      this.listChartPermission &&
+        this.listChartPermission.forEach((key) => {
+          if (key.IsChoose) {
+            arr.push(key.ChartPermissionId);
+            str.push(key.PermissionName);
+          }
+        });
       if ((str.length == 6 && this.listChartPermission.length == 6) || str.length <= 0) {
         this.chartPermissionName = "所有行业";
       } else {
@@ -384,7 +385,7 @@ export default {
     clickPermission() {
       if (this.isShowJurisdiction) {
         const arr = [];
-        this.listChartPermission.forEach((key) => {
+      this.listChartPermission&&  this.listChartPermission.forEach((key) => {
           if (key.IsChoose) {
             arr.push(key.ChartPermissionId);
           }

pages/index/index.vue

@@ -482,7 +482,7 @@ export default {
     top: 0;
     left: 0;
     width: 100%;
-    z-index: 999;
+    z-index: 99;
   }
   .nav-bar-wrap {
     background-color: #fff;

pages/pcWebViev/pcWebViev.vue

@@ -60,6 +60,7 @@ export default {
         "chartPage",
         "specialDetail",
         "specialResearchPage",
+        'purchaser'
       ];
       if (JSON.stringify(optios) !== "{}" && optios.path) {
         let pathUrl = optios.path.split("/")[2];

pages/purchaser/purchaser.vue

@@ -319,6 +319,7 @@ export default {
   onLoad() {
     this.researchNewList();
     this.initNavBar();
+    this.reportIsShow()
   },
   /* 下拉刷新 */
   onPullDownRefresh: Throttle(function () {

pages/reportForm/reportForm.vue

@@ -572,7 +572,7 @@ export default {
    */
   onShareAppMessage: function (res) {
     return {
-      title: this.isHorzMobile ? "好友向您推荐此内容，上传名片享查研观向免费月卡！" : "报告",
+      title: this.isHorzMobile ? "好友向您推荐此内容，上传名片享查研观向免费月卡！" : "产业报告",
       path: "/pages/reportForm/reportForm?tab=" + this.tabAct_id + "&tabs=" + this.tabAct_idTwo,
       success: (res) => {},
       fail: (err) => {},
@@ -606,7 +606,7 @@ export default {
     top: 0;
     left: 0;
     width: 100%;
-    z-index: 999;
+    z-index: 99;
     padding-left: 30rpx;
     .content {
       position: relative;

reportPages/hotList/hotList.vue

@@ -31,7 +31,7 @@
               <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>
             </view>
-            <text :class="item.IsFollw ? 'cancel-attention' : 'attention'" @click="isAttention(item, '主题')">{{ item.IsFollw ? "取消关注" : "+ 关注" }}</text>
+            <text :class="item.IsFollow ? 'cancel-attention' : 'attention'" @click="isAttention(item, '主题')">{{ item.IsFollow ? "取消关注" : "+ 关注" }}</text>
           </view>
           <view class="li-item read-more" @click="themeDetails(item)">
             <text class="text-box text_oneLine" v-for="val in item.IndustrialSubjectList" :key="val.IndustrialSubjectId">
@@ -149,7 +149,7 @@ export default {
     },
     //去往主题详情
     themeDetails(item) {
-      this.$store.dispatch("checkHandle", "/reportPages/researchTheme/researchTheme?id=" + item.IndustrialManagementId);
+      this.$store.dispatch("checkHandle", "/reportPages/researchTheme/researchTheme?id=" + item.IndustrialManagementId+"&source=2");
     },
     //计算遍历的颜色
     serialBackground(index) {
@@ -160,7 +160,8 @@ export default {
     async isAttention(item, val) {
       const res = val === "主题" ? await Reports.reportFllow({ IndustrialManagementId: item.IndustrialManagementId }) : await Reports.reportFllowDepartment({ DepartmentId: item.DepartmentId });
       if (res.Ret === 200) {
-        item.IsFollw = !item.IsFollw;
+        console.log(item);
+        item.IsFollow = !item.IsFollow;
         if (res.Data.Status == 1) {
           this.goFollowShow = true;
           this.confirmText = res.Data.GoFollow ? "去关注" : "知道了";
@@ -188,6 +189,11 @@ export default {
       }
       this.goFollowShow = false;
     },
+    goDetail(item) {
+      uni.navigateTo({
+        url: "/pageMy/reportDetail/reportDetail?id=" + item.ArticleId,
+      });
+    },
   },
   onLoad() {
     this.getTabList();

reportPages/reportSearch/reportSearch.vue

@@ -1,7 +1,16 @@
 <template>
   <view class="searchTarget-container container">
     <view class="searchTarget-header">
-      <input type="text" placeholder="请输入关键字" placeholder-class="sea_ipt_placeholder" class="sea_ipt" v-model="searchTxt" focus="true" confirm-type="search" @confirm="searchHandle" />
+      <input
+        type="text"
+        :placeholder="radioSelect == 1 ? '请输入报告标题/报告内容' : '请输入产业名/公司名'"
+        placeholder-class="sea_ipt_placeholder"
+        class="sea_ipt"
+        v-model="searchTxt"
+        focus="true"
+        confirm-type="search"
+        @confirm="searchHandle"
+      />
       <icon type="search" size="15" class="sea_ico" />
       <view class="ipt-right">
         <icon type="clear" size="16" color="#E0E0E0" v-show="searchTxt" @click="clearIpt" />
@@ -27,7 +36,7 @@
         </view>
         <view class="search-cont-top">
           <view class="cont-tit">
-            <text>弘则推荐：</text>
+            <text>高关注度：</text>
           </view>
           <view class="targetList">
             <view class="target-item" v-for="(item, index) in keywordList" :key="index" @click="chooseTarget(item)"># {{ item }}</view>
@@ -225,7 +234,7 @@ export default {
     onChangeRadio(value) {
       this.radioSelect = value.detail;
       let srt = this.searchTxt.replace(/^\s+|\s+$/g, "");
-      if (!srt) return this.$util.toast("请输入关键字");
+      if (!srt) return this.$util.toast(this.radioSelect == 1 ? '请输入报告标题/报告内容' : '请输入产业名/公司名');
       this.dataInit();
       this.getDataList();
     },
@@ -280,7 +289,7 @@ export default {
         this.indList = [];
         this.getDataList();
       } else {
-        this.$util.toast("请输入关键字");
+        this.$util.toast(this.radioSelect == 1 ? '请输入报告标题/报告内容' : '请输入产业名/公司名');
       }
     }),
     // 查找数据
@@ -382,7 +391,7 @@ export default {
     },
   },
   onLoad(options) {
-    this.radioSelect = options.id == '研选' ? "1" : "2";
+    this.radioSelect = options.id == "研选" ? "1" : "2";
     if (options.text) {
       this.searchTxt = options.text;
       this.getDataList();

reportPages/researchTheme/researchTheme.vue

@@ -12,7 +12,7 @@
       </text>
     </view>
     <view class="content-item" :id="'tabItem-' + item.IndustrialSubjectId" v-for="item in themeList.List" :key="item.ArticleId">
-      <view class="item-user" @click="authorDetails(item)">
+      <view class="item-user" v-if="item.NickName" @click="authorDetails(item)">
         <image src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/czbk/user_report.png"></image>
         <text> {{ item.NickName }}</text>
       </view>
@@ -69,8 +69,8 @@ export default {
     };
   },
   methods: {
-    async researchThemeDetail(id) {
-      const res = await Research.researchThemeDetail({ IndustrialManagementId: id });
+    async researchThemeDetail(id, source) {
+      const res = await Research.researchThemeDetail({ IndustrialManagementId: id, Source: source ? 2 : 1 });
       if (res.Ret === 200) {
         this.themeList = res.Data || {};
         this.isFollw = res.Data.IsFollw;
@@ -97,7 +97,7 @@ export default {
             duration: 2000,
           });
         }
-       uni.$emit('updateFllowTheme',{isFollw:this.isFollw,id:this.themeList.IndustrialManagementId})
+        uni.$emit("updateFllowTheme", { isFollw: this.isFollw, id: this.themeList.IndustrialManagementId });
       }
     },
     //点击了去关注
@@ -149,7 +149,8 @@ export default {
     },
   },
   onLoad(options) {
-    this.researchThemeDetail(options.id);
+    let source = options.source || "";
+    this.researchThemeDetail(options.id, source);
   },
 };
 </script>
@@ -183,7 +184,6 @@ export default {
       font-weight: 400;
       font-size: 24rpx;
       background-color: #999;
-
     }
     .cancel-attention {
       background: #3385ff;