10.3 ok

pageMy/myPage/myPage.vue

@@ -63,7 +63,8 @@
       </view>
       <view class="info-bot">
         <view class="list-item border_bottom" v-for="type in typeArr" :key="type" @click="itemClickHandle(type)">
-          <text>{{ type }}</text>
+          <text v-if="type !== '产品内测'">{{ type }}</text>
+          <text v-if="type == '产品内测' && wholeShowListData.IsBelongRai">{{ type }}</text>
           <view class="my-bot-box">
             <block v-if="type == '外呼号码'">
               <text v-if="userInfo.OutboundCountryCode && userInfo.OutboundMobile" style="margin-right: 40rpx; font-size: 28rpx"
@@ -106,13 +107,13 @@ export default {
     return {
       isLogin: false, //是否绑定且授权
       haveData: null, //显示页面
-      typeArr: ["外呼号码", "活动提问", "我的留言", "优化建议", "关注我们", "产品内测", "关注公众号", "PC网页版"],
+      typeArr: ["外呼号码", "活动提问", "我的留言", "优化建议", "关于我们", "产品内测", "关注公众号", "PC网页版"],
       typeObj: new Map([
         ["外呼号码", "editOutbound"],
         ["活动提问", "myAskPage"],
         ["我的留言", "myLeavingMessage"],
         ["优化建议", "advice"],
-        ["关注我们", "followUs"],
+        ["关于我们", "followUs"],
         ["产品内测", "internalTesting"],
         ["关注公众号", "accountsOfficial"],
         ["我的足迹", "browseHistory"],

pages/index/components/ItemContent.vue

@@ -15,17 +15,27 @@
       <view class="item-title" v-if="list.Title">
         <mp-html :content="richTextClamp(3) + list.Title + '</div>'" />
       </view>
-      <view class="item-rich-text">
+      <view class="item-rich-text" v-if="list.Source == 'productinterior'">
+        <mp-html :content="richTextClamp(10) + list.Body + '</div>'" />
+      </view>
+      <view class="item-rich-text" v-else>
         <mp-html :content="richTextClamp(10) + list.Abstract + '</div>'" />
       </view>
       <view class="item-time">
-        <text>{{ list.PublishDate }}</text>
+        <text>{{ list.Source == "productinterior" ? list.PublishTime : list.PublishDate }}</text>
       </view>
     </block>
   </view>
 </template>
 
 <script>
+/*
+Source 字段的分别代表 
+researchsummary     本周研究汇总
+minutessummary      上周纪要汇总
+meetingreviewchapt  晨会精华
+productnterior      产品内测
+*/
 export default {
   name: "",
   props: {
@@ -35,23 +45,17 @@ export default {
       required: true,
     },
   },
-  data() {
-    return {};
-  },
-  watch: {
-    list: {
-      handler(newval) {
-        console.log(newval);
-      },
-      deep: true,
-    },
-  },
   methods: {
     // 判断是跳转本周||上周||晨会弹框
     isGoDetalisOfDlgHandler(item) {
       // 判断是晨会文章、弹出弹框 通过传统方式进行操控兄弟之间传值
       if (item.Source == "meetingreviewchapt") {
         this.$emit("showMorningDialog", item);
+      } else if (item.Source == "productinterior") {
+        // 跳转产品内测详情
+        uni.navigateTo({
+          url: "/reportPages/internalDetials/internalDetials?id=" + item.ProductInteriorId,
+        });
       } else {
         let isType = item.Source == "researchsummary" ? 2 : 3;
         this.$store.dispatch("checkHandle", "/reportPages/reportSecretDetail/reportSecretDetail?type=" + isType + "&id=" + item.ArticleId);
@@ -60,7 +64,7 @@ export default {
     // 对返回的文本进行处理 多少行进行省略
     richTextClamp(val) {
       return `<div style="${
-        val == 7 ? "min-height: 50px;" : ""
+        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;">`;
     },
   },

pages/index/index.vue

@@ -46,7 +46,7 @@
               <block v-if="item.Source === 'activity' || item.Source === 'activityspecial'">
                 <ActivityItem :list="item.Activity" />
               </block>
-              <block v-if="['researchsummary', 'minutessummary', 'meetingreviewchapt'].includes(item.Source)">
+              <block v-if="['researchsummary', 'minutessummary', 'meetingreviewchapt', 'productinterior'].includes(item.Source)">
                 <item-content :list="dataListItem(item)" @showMorningDialog="showMorningDialog" />
               </block>
             </view>
@@ -70,7 +70,7 @@
               <block v-if="item.Source === 'activity' || item.Source === 'activityspecial'">
                 <ActivityItem :list="item.Activity" />
               </block>
-              <block v-if="['researchsummary', 'minutessummary', 'meetingreviewchapt'].includes(item.Source)">
+              <block v-if="['researchsummary', 'minutessummary', 'meetingreviewchapt', 'productinterior'].includes(item.Source)">
                 <item-content :list="dataListItem(item)" @showMorningDialog="showMorningDialog" />
               </block>
             </view>
@@ -78,8 +78,9 @@
         </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" @click="goLogin">绑定联系方式后查看更多内容>></view>
-      <!-- <suspenButton :show.sync="wholeShowListData.IsShow" v-if="wholeShowListData.IsShow" /> -->
+      <view v-if="newDataList.length === 4" class="bind-btn">
+        <view @click="goLogin"> 为了给您提供更好的使用体验，<br />请 <text class="login-text">登录</text>后再查看此页面内容</view>
+      </view>
       <morning-dlg v-if="isMorningShow" :isMorningShow.sync="isMorningShow" :morningItem.sync="morningItem" />
     </view>
   </page-meta>
@@ -153,7 +154,7 @@ export default {
               Newchart: item.Newchart,
               Activity: item.Activity || item.Activityspecial,
               Roadshow: item.Roadshow || item.Activityvideo || item.Activityvoice,
-              ThreeSummary: item.Researchsummary || item.Minutessummary || item.Meetingreviewchapt,
+              ThreeSummary: item.Researchsummary || item.Minutessummary || item.Meetingreviewchapt || item.ProductInterior,
             });
           });
         this.newDataList = this.page_no === 1 ? listArr : [...this.newDataList, ...listArr];

pages/material/material.vue

@@ -41,12 +41,7 @@
         </block>
         <view v-if="topTabsActive == '4'" class="medium-ul">
           <view class="item-content">
-            <view
-              @click="mediumClickHandler(item)"
-              :class="['item', mediumActive === item.value && 'item-act']"
-              v-for="item in mediumSelect"
-              :key="item.value"
-            >
+            <view @click="mediumClickHandler(item)" :class="['item', item.isSelect && 'item-act']" v-for="item in mediumSelect" :key="item.value">
               {{ item.name }}
             </view>
           </view>

pages/reportForm/reportForm.vue

@@ -1,6 +1,6 @@
 <template>
   <view class="reportForm-container">
-    <view class="nav-bar-wrap">
+    <view id="nav-bar-wrap-id" class="nav-bar-wrap">
       <search-bar @goSearch="goSearch" :searchTitle="searchPlaceholderList.SummarySearch" :width="50">
         <template slot="content-left">
           <view class="content">
@@ -92,7 +92,7 @@
       <!-- 产业报告 -->
       <view class="industry">
         <view style="height: 12rpx" v-if="!tradeList"></view>
-        <view class="industry-top industry-sticky">
+        <view class="industry-top industry-sticky" :style="{ top: stickyHeight + 'rpx' }">
           <view class="img-top-box">
             <image src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/czbk/property_ico.png" style="height: 50rpx"></image>
             <text class="text-sub">细分产业</text>
@@ -259,6 +259,7 @@ export default {
           Content: "<p>hello,world</p><p>hello,world</p><p>hello,world</p>",
         }, //第一项是为了获取当前手机下,三行是多少相对高度
       ],
+      stickyHeight: 0,
     };
   },
   onLoad(option) {
@@ -292,6 +293,15 @@ export default {
             ChartPermissionId: Number(this.tabAct_id),
           });
         }
+        this.$nextTick(() => {
+          const query = wx.createSelectorQuery();
+          query.select("#nav-bar-wrap-id").boundingClientRect();
+          query.exec((res) => {
+            this.stickyHeight = Math.floor(res[0].height * 2) || 230;
+            console.log(this.stickyHeight);
+            
+          });
+        });
         this.getHomeStockName();
       });
     },

reportPages/IndustryReport/IndustryReport.vue

@@ -260,13 +260,17 @@ export default {
       });
     },
     async goDetail(item, index) {
-      // 已授权已绑定
       if (item.SubCategoryName === "路演精华") {
         //跳转路演精华
         uni.navigateTo({
           url: "/reportPages/roadEssence/roadEssence?id=" + item.ArticleId,
         });
-      } else {
+      } else if (item.Resource === 2) {
+        // 跳转产品内测详情
+        uni.navigateTo({
+          url: "/reportPages/internalDetials/internalDetials?id=" + item.ArticleId,
+        });
+      } else if (item.Resource === 1) {
         this.setRouter();
         uni.navigateTo({
           url: "/pageMy/reportDetail/reportDetail?id=" + item.ArticleId,

reportPages/internalDetials/internalDetials.vue

@@ -4,13 +4,13 @@
       <view class="report-content-title">{{ reportDetail.Title }}</view>
       <view class="author-time">
         <text>{{ reportDetail.Department }}</text>
-        <text>{{ reportDetail.PublishDate }}</text>
+        <text>{{ reportDetail.PublishTime }}</text>
       </view>
       <view class="content-statement">
         <text>注：请务必阅读</text>
         <text class="statement" @click="isShowStatement = true">免责声明 </text>
       </view>
-      <view class="content-abstract"> 摘要:{{ reportDetail.Abstract }}</text> </view>
+      <view class="content-abstract"> 摘要:{{ reportDetail.Abstract }}</view>
       <statement :show="isShowStatement" />
       <view>
         <view
@@ -157,7 +157,7 @@ export default {
   }
   .content-abstract {
     position: relative;
-    margin-top: 30rpx;
+    margin: 30rpx 0 20rpx;
     text-indent: 0.5em;
     line-height: 50rpx;
     padding-bottom: 30rpx;

reportPages/morningDetails/morningDetails.vue

@@ -1,5 +1,5 @@
 <template>
-  <view class="container morning-details-content">
+  <view class="container morning-details-content"  v-if="isUserBindingPhoneNumber">
     <view class="report-content-title">{{ reportDetails.Title }} </view>
     <view class="content-time">
       <text>{{ reportDetails.Department }} </text>
@@ -14,11 +14,14 @@
       <view class="li-look" @click="goDustrialHandler(item.IndustryId)">查看资源包</view>
     </view>
   </view>
+  <not-have-login v-else />
 </template>
 
 <script>
 import { Reports } from "@/config/api.js";
+import notHaveLogin from '@/components/notHaveLogin.vue';
 export default {
+  components: { notHaveLogin },
   data() {
     return {
       reportDetails: {},