修改bug

pageMy/followUs/followUs.vue

@@ -1,25 +1,30 @@
 <template>
-  <view class="container container-follow-us">
-    <view class="content">
-      <video
-        v-if="isPlay"
-        autoplay
-        id="myVideo"
-        src="https://hzstatic.hzinsights.com/static/yb/video/8617330c2a76e0c35999f6466b4470c4.mp4"
-        @ended="handleVideoEnd"
-      ></video>
-      <image class="video-img" @click="playHandler" v-else src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/my_video.png"></image>
-      <view class="text-introduce">三分钟了解弘则研究体系和方法论</view>
+  <block v-if="isUserBindingPhoneNumber">
+    <view class="container container-follow-us">
+      <view class="content">
+        <video
+          v-if="isPlay"
+          autoplay
+          id="myVideo"
+          src="https://hzstatic.hzinsights.com/static/yb/video/8617330c2a76e0c35999f6466b4470c4.mp4"
+          @ended="handleVideoEnd"
+        ></video>
+        <image class="video-img" @click="playHandler" v-else src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/my_video.png"></image>
+        <view class="text-introduce">三分钟了解弘则研究体系和方法论</view>
+      </view>
+      <view class="my-log">
+        <image src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/czbk/my_log.png"></image>
+      </view>
     </view>
-    <view class="my-log">
-      <image src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/czbk/my_log.png"></image>
-    </view>
-  </view>
+  </block>
+  <not-have-login v-else />
 </template>
 
 <script>
 import { Mine } from "@/config/api";
+import notHaveLogin from "@/components/notHaveLogin.vue";
 export default {
+  components: { notHaveLogin },
   data() {
     return {
       videoContext: null,
@@ -43,6 +48,12 @@ export default {
   async onShow() {
     await this.$store.dispatch("checkHandle");
   },
+  onShareAppMessage() {
+    return {
+      title: "关于我们",
+      path: "/pageMy/followUs/followUs",
+    };
+  },
 };
 </script>
 

pages/material/material.vue

@@ -142,8 +142,8 @@ export default {
       activityShareId: "",
       roadshowPageList: [], //音频  视频 list
       mediumSelect: [
-        { name: "视频", value: "1", isSelect: false },
         { name: "音频", value: "2", isSelect: false },
+        { name: "视频", value: "1", isSelect: false },
         { name: "逻辑解析", value: "3", isSelect: false },
         { name: "路演回放", value: "4", isSelect: false },
       ],
@@ -614,7 +614,7 @@ export default {
       display: flex;
       flex-wrap: wrap;
       .children-active {
-        background-color: #3385ff;
+        background-color: #3385ff; 
         color: #fff;
       }
     }
@@ -625,7 +625,7 @@ export default {
         display: flex;
         height: 51rpx;
         border-radius: 64rpx;
-        color: #999999;
+        color: #333333;
       }
       .item {
         display: flex;
@@ -633,6 +633,7 @@ export default {
         justify-content: center;
         width: 136rpx;
         height: 44rpx;
+        font-size: 24rpx;
         background: #f8f8fa;
         border-radius: 48rpx;
         margin-right: 20rpx;

reportPages/internalDetials/internalDetials.vue

@@ -1,54 +1,58 @@
 <template>
-  <block v-if="hasPermission === 1">
-    <view class="container internal-detials" v-if="haveData">
-      <view class="report-content-title">{{ reportDetail.Title }}</view>
-      <view class="author-time">
-        <text>{{ reportDetail.Department }}</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 }}</view>
-      <statement :show="isShowStatement" />
-      <view>
-        <view
-          v-for="(item, index) in reportDetail.BodySlice"
-          :key="index"
-          @click="goIsTypeDetails(item)"
-          :style="{ color: item.Type > 1 && '#3385FF', 'word-wrap': 'break-word' }"
-        >
-          <mp-html :content="strFontSize(item.Body)" />
+  <block v-if="isUserBindingPhoneNumber">
+    <block v-if="hasPermission === 1">
+      <view class="container internal-detials" v-if="haveData">
+        <view class="report-content-title">{{ reportDetail.Title }}</view>
+        <view class="author-time">
+          <text>{{ reportDetail.Department }}</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 }}</view>
+        <statement :show="isShowStatement" />
+        <view>
+          <view
+            v-for="(item, index) in reportDetail.BodySlice"
+            :key="index"
+            @click="goIsTypeDetails(item)"
+            :style="{ color: item.Type > 1 && '#3385FF', 'word-wrap': 'break-word' }"
+          >
+            <mp-html :content="strFontSize(item.Body)" />
+          </view>
         </view>
       </view>
-    </view>
-    <view class="nodata" v-else>
-      <image src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/report_loading_icon.png" class="nodata_img"></image>
-      <view class="nodata-tip">正在努力编辑中，请耐心等待...</view>
+      <view class="nodata" v-else>
+        <image src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/report_loading_icon.png" class="nodata_img"></image>
+        <view class="nodata-tip">正在努力编辑中，请耐心等待...</view>
+      </view>
+    </block>
+    <view class="noauth-cont" v-else-if="hasPermission == 3 || hasPermission == 4">
+      <block v-if="!isShowAlert">
+        <image src="https://hzstatic.hzinsights.com/cygx/czbk/noauth.png" class="noauth-ico"></image>
+        <block>
+          <view class="tip">您暂无权限查看此文章内容，若想查看可以申请开通哦</view>
+          <view class="btn-cont" @click="applyAuth"> 立即申请 </view>
+        </block>
+        <view class="btn-cont back-btn" @click="backIndex"> 返回首页 </view>
+      </block>
+      <block v-else>
+        <text class="moneh-text"> 上传名片并填写简单信息，24小时内我们会为您开通一个月的免费月卡 </text>
+        <img src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/czbk/month_card.png" class="month_card" alt="" />
+        <view class="btn-cont btn-dl" @click="applyAuth"> 立即上传 </view>
+        <view class="btn-cont month-back" @click="backIndex"> 返回</view>
+      </block>
     </view>
   </block>
-  <view class="noauth-cont" v-else-if="hasPermission == 3 || hasPermission == 4">
-    <block v-if="!isShowAlert">
-      <image src="https://hzstatic.hzinsights.com/cygx/czbk/noauth.png" class="noauth-ico"></image>
-      <block>
-        <view class="tip">您暂无权限查看此文章内容，若想查看可以申请开通哦</view>
-        <view class="btn-cont" @click="applyAuth"> 立即申请 </view>
-      </block>
-      <view class="btn-cont back-btn" @click="backIndex"> 返回首页 </view>
-    </block>
-    <block v-else>
-      <text class="moneh-text"> 上传名片并填写简单信息，24小时内我们会为您开通一个月的免费月卡 </text>
-      <img src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/czbk/month_card.png" class="month_card" alt="" />
-      <view class="btn-cont btn-dl" @click="applyAuth"> 立即上传 </view>
-      <view class="btn-cont month-back" @click="backIndex"> 返回</view>
-    </block>
-  </view>
+  <not-have-login v-else />
 </template>
 
 <script>
 import { Reports } from "@/config/api.js";
 import statement from "@/reportPages/components/statement.vue";
+import NotHaveLogin from "@/components/notHaveLogin.vue";
 export default {
   data() {
     return {
@@ -60,7 +64,7 @@ export default {
       titleTxT: "",
     };
   },
-  components: { statement },
+  components: { statement, NotHaveLogin },
   methods: {
     async reportSelectionDetail() {
       const res = await Reports.getProductInteriorDetail({
@@ -70,7 +74,7 @@ export default {
         this.hasPermission = res.Data.HasPermission;
         this.reportDetail = res.Data.Detail;
         this.haveData = this.reportDetail ? true : false;
-        this.titleTxT = this.reportDetail.Title;
+        this.titleTxT = this.reportDetail.ColumnName;
         uni.setNavigationBarTitle({
           title: this.titleTxT,
         });

reportPages/morningAll/morningAll.vue

@@ -56,6 +56,12 @@ export default {
     this.status = "loading";
     this.getDataList();
   },
+  onShareAppMessage() {
+    return {
+      title: "晨会精华汇总",
+      path: "/reportPages/morningAll/morningAll",
+    };
+  },
 };
 </script>
 

reportPages/morningDetails/morningDetails.vue

@@ -1,17 +1,35 @@
 <template>
-  <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>
-      <text class="time">{{ reportDetails.PublishTime }} </text>
-    </view>
-    <!-- 这里是循环的盒子 -->
-    <view class="report-ul" v-for="item in reportDetails.List" :key="item.Id">
-      <view class="li-title">{{ item.IndustryName }}</view>
-      <view class="li-text">
-        <mp-html :content="strFontSize(item.Content)" />
+  <view class="container morning-details-content" v-if="isUserBindingPhoneNumber">
+    <block v-if="hasPermission == 1">
+      <view class="report-content-title">{{ reportDetails.Title }} </view>
+      <view class="content-time">
+        <text>{{ reportDetails.Department }} </text>
+        <text class="time">{{ reportDetails.PublishTime }} </text>
+      </view>
+      <!-- 这里是循环的盒子 -->
+      <view class="report-ul" v-for="item in reportDetails.List" :key="item.Id">
+        <view class="li-title">{{ item.IndustryName }}</view>
+        <view class="li-text">
+          <mp-html :content="strFontSize(item.Content)" />
+        </view>
+        <view class="li-look" @click="goDustrialHandler(item.IndustryId)">查看资源包</view>
       </view>
-      <view class="li-look" @click="goDustrialHandler(item.IndustryId)">查看资源包</view>
+    </block>
+    <view class="noauth-cont" v-else-if="hasPermission == 3 || hasPermission == 4">
+      <block v-if="!isShowAlert">
+        <image src="https://hzstatic.hzinsights.com/cygx/czbk/noauth.png" class="noauth-ico"></image>
+        <block>
+          <view class="tip">您暂无权限查看此文章内容，若想查看可以申请开通哦</view>
+          <view class="btn-cont" @click="applyAuth"> 立即申请 </view>
+        </block>
+        <view class="btn-cont back-btn" @click="backIndex"> 返回首页 </view>
+      </block>
+      <block v-else>
+        <text class="moneh-text"> 上传名片并填写简单信息，24小时内我们会为您开通一个月的免费月卡 </text>
+        <img src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/czbk/month_card.png" class="month_card" alt="" />
+        <view class="btn-cont btn-dl" @click="applyAuth"> 立即上传 </view>
+        <view class="btn-cont month-back" @click="backIndex"> 返回</view>
+      </block>
     </view>
   </view>
   <not-have-login v-else />
@@ -19,13 +37,14 @@
 
 <script>
 import { Reports } from "@/config/api.js";
-import notHaveLogin from '@/components/notHaveLogin.vue';
+import notHaveLogin from "@/components/notHaveLogin.vue";
 export default {
   components: { notHaveLogin },
   data() {
     return {
       reportDetails: {},
       reportId: "",
+      hasPermission: "", //权限判断
     };
   },
   methods: {
@@ -41,14 +60,49 @@ export default {
         Id: this.reportId,
       });
       if (res.Ret === 200) {
+        this.hasPermission = res.Data.HasPermission;
         this.reportDetails = res.Data.Detail || {};
       }
     },
+    /* 无权限申请开通权限 */
+    applyAuth() {
+      this.hasPermission === 4
+        ? uni.navigateTo({
+            url: "/pageMy/applyTrial/applyTrial?tryType=ProductInterior&detailId=" + this.id,
+          })
+        : uni.showModal({
+            title: "",
+            content: "您已经提交过申请了，请耐心等待",
+            showCancel: false,
+            confirmColor: "#365595",
+            success: function (res) {
+              uni.navigateBack({
+                fail() {
+                  uni.switchTab({
+                    url: "/pages/index/index",
+                  });
+                },
+              });
+            },
+          });
+    },
+    // 返回首頁
+    backIndex() {
+      uni.switchTab({
+        url: "/pages/index/index",
+      });
+    },
   },
   onLoad(options) {
     this.reportId = Number(options.id) || 8;
     this.getDetalis();
   },
+  onShareAppMessage() {
+    return {
+      title: "晨会精华汇总",
+      path: "/reportPages/morningDetails/morningDetails?id=" + this.reportId,
+    };
+  },
 };
 </script>