Browse Source

10.0 提测

bding 1 year ago
parent
commit
d7bd33bb67

+ 1 - 1
activityPages/playBack/playBack.vue

@@ -86,7 +86,7 @@
       <view v-if="showAudioBox">
         <audioModule :showAudioPop.sync="showAudioPop" />
       </view>
-      <videoModule :showVideoPop="showVideoPop" :videoPopList="videoPopList" />
+      <videoModule :showVideoPop.sync="showVideoPop" :videoPopList="videoPopList" />
 
       <!-- 所有自定义弹框 -->
       <modalDialog

+ 1 - 1
activityPages/themeActivity/themeActivity.vue

@@ -209,7 +209,7 @@
       <view v-if="showAudioBox">
         <audioModule :showAudioPop.sync="showAudioPop" />
       </view>
-      <videoModule :showVideoPop="showVideoPop" :videoPopList="videoPopList" />
+      <videoModule :showVideoPop.sync="showVideoPop" :videoPopList="videoPopList" />
     </view>
     <not-have-login v-else />
   </block>

+ 1 - 1
components/ItemComponent/roadshowItem.vue

@@ -48,7 +48,7 @@
     <view v-if="showAudioBox">
       <audioModule :showAudioPop.sync="showAudioPop" />
     </view>
-    <videoModule :showVideoPop="showVideoPop" :curVideoId="curVideoId" :videoPopList="videoPopList" />
+    <videoModule :showVideoPop.sync="showVideoPop" :curVideoId="curVideoId" :videoPopList="videoPopList" />
     <modalDialog
       :isShowhasPermission="isShowhasPermission"
       :applyForIsShow="applyForIsShow"

+ 3 - 1
components/videoModule/index.vue

@@ -89,7 +89,8 @@ export default {
       this.$store.commit("videoPlay/palyTimeUpdate", time);
     },
     handleShow() {
-      this.$parent.showVideoPop = false;
+      // this.$parent.showVideoPop = false;
+      this.$emit("update:showVideoPop",false);
     },
   },
 };
@@ -133,6 +134,7 @@ export default {
     z-index: 112;
     display: flex;
     justify-content: flex-end;
+    z-index: inherit;
     image {
       height: 48rpx;
       width: 48rpx;

+ 9 - 0
config/modules/Home.js

@@ -36,4 +36,13 @@ export const Home = {
   microRoadshowCollect: (params) => {
     return postHttp("/micro_roadshow/collect", params);
   },
+  /* banner 列表 */
+  bannerList: (params) => {
+    return getHttp("/banner/list", params, 0);
+  },
+  /* banner 记录点击信息 */
+  bannerHistory: (params) => {
+    return postHttp("/banner/add/history", params, 0);
+  },
+  
 };

+ 1 - 1
pageMy/mySchedulepage/mySchedulepage.vue

@@ -127,7 +127,7 @@
     <view v-if="showAudioBox">
       <audioModule :showAudioPop.sync="showAudioPop" />
     </view>
-    <videoModule :showVideoPop="showVideoPop" :videoPopList="videoPopList" />
+    <videoModule :showVideoPop.sync="showVideoPop" :videoPopList="videoPopList" />
   </view>
 </template>
 

+ 1 - 1
pages-search/components/activityBack.vue

@@ -124,7 +124,7 @@
       <audioModule :showAudioPop.sync="showAudioPop" />
     </view>
     <freeCharge class="free-charge" :isShowFreeBtn="isShowFree" />
-    <videoModule :showVideoPop="showVideoPop" :videoPopList="videoPopList" />
+    <videoModule :showVideoPop.sync="showVideoPop" :videoPopList="videoPopList" />
     <u-modal
       v-model="specialGoFollowShow"
       :content-style="{ fontSize: '32rpx' }"

+ 1 - 1
pages-search/components/report.vue

@@ -157,7 +157,7 @@
       </view>
     </u-modal>
     <!-- 视频模块 -->
-    <videoModule :showVideoPop="showVideoPop" :videoPopList="videoPopList" class="industry-video-module" />
+    <videoModule :showVideoPop.sync="showVideoPop" :videoPopList="videoPopList" class="industry-video-module" />
     <!-- 权限弹窗 -->
     <modalDialog
       :isShowhasPermission="isShowhasPermission"

+ 64 - 23
pages/index/index.vue

@@ -1,17 +1,17 @@
 <template>
   <page-meta :page-style="isMorningShow ? 'overflow: hidden;' : ''">
     <view class="container New-container">
-      <view :class="[1 == 2 ? 'banne-content' : 'content-search']">
-        <swiper v-if="1 == 2" autoplay :interval="4000" circular indicator-dots>
-          <block v-for="item in banerList" :key="item.name">
+      <view :class="[!bannerDataList.length ? 'banne-content' : 'content-search']">
+        <swiper v-if="bannerDataList.length" autoplay :interval="4000" circular indicator-dots>
+          <view v-for="item in bannerDataList" :key="item.BannerId" @click="bannerSwiperHandler(item)">
             <swiper-item>
-              <image :src="item.img"></image>
-              <view class="banner-title">
-                {{ item.name }}
-                <text class="time"> 时间</text>
+              <image :src="item.IndexImg"></image>
+              <view class="banner-title text_twoLine">
+                {{ item.Title }}
+                <text class="time text_twoLine"> {{ item.Subtitle }}</text>
               </view>
             </swiper-item>
-          </block>
+          </view>
         </swiper>
         <view class="top-content-box">
           <search-bar @goSearch="goSearch" :searchTitle="searchPlaceholderList.SummarySearch" :width="44">
@@ -83,6 +83,7 @@
       </view>
       <morning-dlg v-if="isMorningShow" :isMorningShow.sync="isMorningShow" :morningItem.sync="morningItem" />
     </view>
+    <videoModule :showVideoPop.sync="showVideoPopUp" :videoPopList="videoPopListUp" />
   </page-meta>
 </template>
 
@@ -95,6 +96,8 @@ import ActivityItem from "@/components/ItemComponent/activityItem.vue";
 import SearchBar from "@/components/search-bar/searchBar.vue";
 import MorningDlg from "./components/morningDlg.vue";
 import ItemContent from "./components/ItemContent.vue";
+import videoModule from "@/components/videoModule/index";
+
 export default {
   data() {
     return {
@@ -109,22 +112,11 @@ export default {
         nomore: "已经到底了",
       },
       info: {},
-      banerList: [
-        {
-          img: "https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/test/Group%20150.png",
-          name: "test1",
-        },
-        {
-          img: "https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/test/Group%20152.png",
-          name: "test2",
-        },
-        {
-          img: "https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/test/Group%20154.png ",
-          name: "test3",
-        },
-      ],
       isMorningShow: false, // 晨会的弹框
       morningItem: {}, // 晨会的弹框
+      bannerDataList: [], // banner数据
+      showVideoPopUp: false, //
+      videoPopListUp: {},
     };
   },
   components: {
@@ -135,6 +127,7 @@ export default {
     SearchBar,
     MorningDlg,
     ItemContent,
+    videoModule,
   },
   methods: {
     // 获取最先数据
@@ -228,6 +221,53 @@ export default {
       let obj = item.ThreeSummary ? { ...item.ThreeSummary, Source: item.Source } : {};
       return obj;
     },
+    // 获取banner 列表
+    async getBannerList() {
+      const res = await Home.bannerList();
+      if (res.Ret === 200) {
+        this.bannerDataList = res.Data.List || [];
+      }
+    },
+    // bannaer 点击事件
+    async bannerSwiperHandler(item) {
+      let { Type, SourceId } = item.BannerUrlResp;
+      if (Type == 1) return;
+      await Home.bannerHistory({
+        BannerId: item.BannerId,
+      });
+      switch (Type) {
+        case 2:
+          uni.navigateTo({
+            url: "/pageMy/reportDetail/reportDetail?id=" + SourceId,
+          });
+          break;
+        case 3:
+          uni.navigateTo({
+            url: "/activityPages/activityDetail/activityDetail?id=" + SourceId,
+          });
+          break;
+        case 4:
+          uni.navigateTo({
+            url: "/reportPages/IndustryReport/IndustryReport?id=" + SourceId,
+          });
+          break;
+        case 5:
+          let obj = {
+            BackgroundImg: "https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/czbk/my_log.png",
+            Id: SourceId,
+            PlaySeconds: "15",
+            ResourceUrl: "https://hzstatic.hzinsights.com/static/yb/video/8617330c2a76e0c35999f6466b4470c4.mp4",
+            Title: "关于我们",
+            Type: "关于我们",
+          };
+          this.videoPopListUp = obj;
+          this.showVideoPopUp = true;
+          await Mine.addHistory();
+          break;
+        default:
+          "";
+      }
+    },
   },
   mounted() {
     uni.$on("updateNewList", (data) => {
@@ -235,6 +275,7 @@ export default {
     });
   },
   onLoad() {
+    this.getBannerList();
     this.getNewList();
   },
   onShow() {
@@ -327,7 +368,7 @@ export default {
       font-size: 50rpx;
       line-height: 70rpx;
       .time {
-        font-size: 27rpx;
+        font-size: 28rpx;
         line-height: 38rpx;
       }
     }

+ 1 - 1
pages/reportForm/reportForm.vue

@@ -178,7 +178,7 @@
     </u-modal>
     <freeCharge class="free-charge" :isShowFreeBtn="isShowFree" />
     <!-- 视频模块 -->
-    <videoModule :showVideoPop="showVideoPop" :videoPopList="videoPopList" />
+    <videoModule :showVideoPop.sync="showVideoPop" :videoPopList="videoPopList" />
     <modalDialog
       :isShowhasPermission="isShowhasPermission"
       :applyForIsShow="applyForIsShow"

+ 1 - 1
reportPages/hotList/hotList.vue

@@ -92,7 +92,7 @@
         <rich-text :nodes="accounts"></rich-text>
       </view>
     </u-modal>
-    <videoModule :showVideoPop="showVideoPop" :videoPopList="videoPopList" />
+    <videoModule :showVideoPop.sync="showVideoPop" :videoPopList="videoPopList" />
     <modalDialog
       :isShowhasPermission="isShowhasPermission"
       :applyForIsShow="applyForIsShow"