小彬 2 年之前
父节点
当前提交
a32496b05e

+ 17 - 7
activityPages/activityDetail/activityDetail.vue

@@ -47,10 +47,11 @@
           </view>
           <view v-if="detailData.Listndustrial.length" class="network dustrial-ui">
             <view class="network-left">产业标签:</view>
-            <view class="network-right">
-              <view :class="['dustrial-li', item.IsJump && 'dustrial-item']" @click="goDustrialHandler(item)" v-for="item in detailData.Listndustrial" :key="item.IndustrialManagementId">{{
-                item.IndustryName
-              }}</view>
+            <view class="network-right dustrial-content">
+              <view :class="['dustrial-li', item.IsJump && 'dustrial-item']" @click="goDustrialHandler(item)" v-for="item in detailData.Listndustrial" :key="item.IndustrialManagementId"
+                >{{ item.IndustryName }}
+                <image class="new_icon" src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/czbk/new_icon.png" mode=""></image>
+              </view>
             </view>
           </view>
           <view v-if="detailData.ActivityTimeText" class="network">
@@ -282,7 +283,7 @@ export default {
       //当前音频是否暂停状态
       return this.$store.state.audioBg.paused;
     },
-      curTime() {
+    curTime() {
       //当前音频的播放时间
       return this.$store.state.audioBg.curTime;
     },
@@ -547,7 +548,11 @@ export default {
       display: inline-block;
       color: #2c83ff;
     }
-
+    .new_icon {
+      width: 26rpx;
+      height: 28rpx;
+      margin-left: 10rpx;
+    }
     .dialog-title {
       width: 682rpx;
       padding: 20rpx;
@@ -596,6 +601,10 @@ export default {
     .network-right {
       width: 480rpx;
     }
+    .dustrial-content {
+      display: flex;
+      flex-wrap: wrap;
+    }
     .network-zoom {
       .text_zoom {
         width: 100%;
@@ -732,7 +741,8 @@ export default {
     margin-bottom: 10rpx !important;
   }
   .dustrial-li {
-    display: inline-block;
+    display:flex;
+    align-items: center;
     padding: 0 13rpx;
     margin: 0 20rpx 20rpx 0;
   }

+ 15 - 5
activityPages/themeActivity/themeActivity.vue

@@ -1,8 +1,10 @@
 <template>
   <view class="container theme-container">
     <view class="top-title" v-if="!type">
-      <image class="img" />
-      <text>{{ contentLabel }}</text>
+      <view class="content-title">
+        <text>{{ contentLabel }}</text>
+        <image class="new_icon" src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/czbk/new_icon.png" mode=""></image>
+      </view>
     </view>
     <!-- 活动列表 -->
     <view>
@@ -211,9 +213,17 @@ export default {
     height: 96rpx;
     color: #3385ff;
     font-size: 30rpx;
-    .img {
-      width: 38rpx;
-      height: 38rpx;
+    .content-title {
+      display: flex;
+      align-items: center;
+      padding: 7rpx 12rpx;
+      background-color: #f8f8fa;
+      margin-left: 30rpx;
+      .new_icon {
+        width: 26rpx;
+        height: 28rpx;
+        margin-left: 10rpx;
+      }
     }
   }
   .collect-ul {

+ 25 - 24
pages/activity/activity.vue

@@ -49,9 +49,10 @@
             <view class="content">
               <view class="item-img" @click="goDetails(item)"> </view>
               <view :style="{ 'background-image': 'url(' + item.ImgUrlBg + ')' }" class="activity-ui">
-                <view class="activity-li" v-for="val in item.List" :key="val.KeyWord" @click="goDetails(val, item.Resource)">
-                  <image class="item-image" lazy-load :src="val.ImgUrlBg"></image>
+                <view class="activity-li" :style="{ 'background-image': 'url(' + val.ImgUrlBg + ')' }" v-for="val in item.List" :key="val.KeyWord" @click="goDetails(val, item.Resource)">
+                  <!-- <image class="item-image" lazy-load :src="val.ImgUrlBg"></image> -->
                   <text class="text_oneLine"> {{ val.KeyWord }}</text>
+                  <image class="new_img" src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/czbk/new_icon.png" mode=""></image>
                 </view>
               </view>
             </view>
@@ -499,29 +500,28 @@ export default {
     .activity-li {
       width: 100%;
       height: 86rpx;
-      position: relative;
-      .item-image {
-        width: 100%;
-        height: 100%;
-      }
-      .text_oneLine {
-        position: absolute;
-        width: 100%;
-        height: 50rpx;
-        padding: 0 30rpx;
-        text-align: center;
-        font-size: 28rpx;
-        top: 15rpx;
-        color: #fff;
+      display: flex;
+      text-align: center;
+      background-repeat: no-repeat;
+      background-size: 100% 100%;
+      padding-top: 20rpx;
+      // .item-image {
+      //   width: 100%;
+      //   height: 100%;
+      // }
+      .new_img {
+        width: 26rpx;
+        height: 28rpx;
       }
-      // &::before {
-      //   content: "";
-      //   width: 0;
-      //   height: 0;
-      //   border-top: 8rpx solid transparent;
-      //   border-left: 17rpx solid #fff;
-      //   border-bottom: 8rpx solid transparent;
-      //   margin-right: 10rpx;
+      // .text_oneLine {
+      //   // position: absolute;
+      //   // width: 100%;
+      //   // height: 50rpx;
+      //   // padding: 0 30rpx;
+      //   // text-align: center;
+      //   // font-size: 28rpx;
+      //   // top: 15rpx;
+      //   // color: #fff;
       // }
     }
   }
@@ -533,6 +533,7 @@ export default {
     margin-top: 90rpx;
   }
   .activity-ui {
+    padding: 20rpx;
     background-repeat: no-repeat;
     background-size: 100% 100%;
   }

+ 10 - 7
pages/reportForm/index.scss

@@ -160,16 +160,15 @@
 
     .industry-top {
       display: flex;
-      justify-content: space-between;
       background-color: #fff;
+      justify-content:space-between;
       height: 90rpx;
-      padding: 0 30rpx;
+      padding: 0 35rpx 0 30rpx;
       color: #333333;
       font-weight: 700;
       font-size: 32rpx;
       line-height: 90rpx;
       overflow: hidden;
-
       .img-top-box {
         display: flex;
         align-items: center;
@@ -197,7 +196,11 @@
           }
         }
       }
-
+      .checkbox-content {
+        color: #333333;
+        font-size: 28rpx;
+        font-weight: 400;
+      }
       .menu-items-tow {
         display: flex;
         padding: 30rpx 30rpx 20rpx;
@@ -322,11 +325,11 @@
           color: #333;
           font-size: 30rpx;
           padding-left: 10rpx;
-
+          align-items: center;
           image {
             margin-left: 10rpx;
-            width: 28rpx;
-            height: 36rpx;
+            width: 26rpx;
+            height: 28rpx;
           }
         }
 

+ 88 - 83
pages/reportForm/reportForm.vue

@@ -57,7 +57,7 @@
             <text v-if="item.IsRed"></text>
           </view>
           <view class="box-right">
-            <text>{{ item.UpdateTime }}更新</text>
+            <text>{{ item.UpdateTime }}</text>
             <u-icon name="arrow-right" color="#BDBDBD" size="34"></u-icon>
           </view>
         </view>
@@ -70,7 +70,7 @@
             <image src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/czbk/property_ico.png" style="height: 50rpx"></image>
             <text class="text-sub">细分产业</text>
           </view>
-          <van-dropdown-menu active-color="#333333">
+          <!-- <van-dropdown-menu active-color="#333333">
             <van-dropdown-item id="menuItem" @open="isscroll" :title="overallArrangementName">
               <view class="menu-items">
                 <view class="menu-items-box" @click="overallBtn(index, item)" v-for="(item, index) in overallArrangement" :key="item.id">
@@ -87,27 +87,32 @@
                 </view>
               </view>
             </van-dropdown-item>
-          </van-dropdown-menu>
-          <view class="new-recommend">
+          </van-dropdown-menu> -->
+          <!-- <view class="new-recommend">
             <text :class="[pitchOnId == item.id ? 'items-act' : '']" v-for="(item, index) in pitchOn" :key="item.id" @click="pitchClick(item, index)">{{ item.name }}</text>
-          </view>
+          </view> -->
+          <checkbox-group class="checkbox-content">
+            <label style="margin-right:30rpx"> <checkbox value="cb" color="#3385FF" style="transform:scale(0.6)" />深度覆盖 </label>
+            <label> <checkbox value="cb" color="#3385FF" style="transform:scale(0.6)" />推荐关注</label>
+          </checkbox-group>
         </view>
         <!-- 需要循环的地方 -->
         <view class="forindustry" v-for="item in industryList" :key="item.IndustrialManagementId">
           <!-- 火锅底料这个位置 -->
           <view class="industry-content">
             <view class="industry-box-left" @click="reportFllow(item.IndustrialManagementId)">
-              <image src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/czbk/top_ico.png" v-if="item.IsFollow"></image>
-              <image src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/czbk/top_no_ico.png" v-else></image>
+              <image src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/attention_act.png" v-if="item.IsFollow"></image>
+              <image src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/attention_icon.png" v-else></image>
             </view>
             <view class="industry-box-right" @click="goIndustryReport(item.IndustrialManagementId)">
               <view class="ndustry-box-read">
                 <text>{{ item.IndustryName }}</text>
-                <image v-if="item.IsHot" src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/czbk/ammunition_ico.png" mode=""></image>
+                <image v-if="item.IsHot" src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/czbk/host_report.png" mode=""></image>
+                <image src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/czbk/new_icon.png" mode=""></image>
               </view>
               <view class="ndustry-box-arrow">
                 <text v-if="item.IsRed" class="read"></text>
-                <text class="ndustry-box-text">{{ item.UpdateTime }}更新</text>
+                <text class="ndustry-box-text">{{ item.UpdateTime }}</text>
                 <u-icon name="arrow-right" color="#BDBDBD" size="34"></u-icon>
               </view>
             </view>
@@ -176,17 +181,17 @@ export default {
         backgroundImage: "none",
       },
       tabBarsTow: [],
-      pitchOn: [
-        {
-          name: "最新",
-          id: "NewTime",
-        },
-        {
-          name: "关注度",
-          id: "Recommend",
-        },
-      ],
-      pitchOnId: "NewTime",
+      // pitchOn: [
+      //   {
+      //     name: "最新",
+      //     id: "NewTime",
+      //   },
+      //   {
+      //     name: "关注度",
+      //     id: "Recommend",
+      //   },
+      // ],
+      // pitchOnId: "NewTime",
       //pitchOnName: '按最近更新排序',
       isNum: 1,
       strategyIndex: "",
@@ -207,20 +212,20 @@ export default {
       haveData: true,
       totalPage: "",
       matchTypeName: "",
-      overallArrangement: [
-        {
-          name: "新布局产业",
-          id: "1",
-          isShow: false,
-        },
-        {
-          name: "深度研究产业",
-          id: "2",
-          isShow: false,
-        },
-      ],
-      overallArrangementId: "",
-      overallArrangementName: "全部产业",
+      // overallArrangement: [
+      //   {
+      //     name: "新布局产业",
+      //     id: "1",
+      //     isShow: false,
+      //   },
+      //   {
+      //     name: "深度研究产业",
+      //     id: "2",
+      //     isShow: false,
+      //   },
+      // ],
+      // overallArrangementId: "",
+      // overallArrangementName: "全部产业",
       isScrollShow: false,
       isGuideShow: false,
       limitIsShow: false, //限免显示隐藏
@@ -323,16 +328,16 @@ export default {
       }
     },
     //点击产业报告的筛选条件
-    pitchClick(item) {
-      this.pitchOnName = item.name;
-      this.OrderColumn = item.id;
-      if (this.pitchOnId !== item.id) {
-        this.pitchOnId = item.id;
-      }
-      this.page_no = 1;
-      this.status = "loadmore";
-      this.getIndustryList();
-    },
+    // pitchClick(item) {
+    //   this.pitchOnName = item.name;
+    //   this.OrderColumn = item.id;
+    //   if (this.pitchOnId !== item.id) {
+    //     this.pitchOnId = item.id;
+    //   }
+    //   this.page_no = 1;
+    //   this.status = "loadmore";
+    //   this.getIndustryList();
+    // },
     //获取报告所有品种接口
     getTradeList() {
       Reports.getTradeList({
@@ -350,8 +355,8 @@ export default {
         OrderColumn: this.OrderColumn,
         PageSize: this.pageSize,
         CurrentIndex: this.page_no,
-        IsNewLabel: this.overallArrangementId.includes(1) ? "1" : "0",
-        IsDeepLabel: this.overallArrangementId.includes(2) ? "1" : "0",
+        // IsNewLabel: this.overallArrangementId.includes(1) ? "1" : "0",
+        // IsDeepLabel: this.overallArrangementId.includes(2) ? "1" : "0",
       }).then((res) => {
         // this.industryList=res.Data.List
         this.status = this.page_no < res.Data.Paging.Pages ? "loadmore" : "nomore";
@@ -433,41 +438,41 @@ export default {
       this.tabBarsTow[this.strategyIndexTwo].IsRed = is;
     },
     /* 新布局产业选项*/
-    overallBtn(index, item) {
-      this.overallArrangement.forEach((key) => {
-        if (key.id == item.id) {
-          key.isShow = !key.isShow;
-        }
-      });
-    },
+    // overallBtn(index, item) {
+    //   this.overallArrangement.forEach((key) => {
+    //     if (key.id == item.id) {
+    //       key.isShow = !key.isShow;
+    //     }
+    //   });
+    // },
     /* 新布局产业选项确定按钮 */
-    replacementConfirm() {
-      const arr = [];
-      const arrName = [];
-      this.overallArrangement.forEach((key) => {
-        if (key.isShow) {
-          arr.push(key.id);
-          arrName.push(key.name);
-        }
-      });
-      this.overallArrangementId = arr.join(",");
-      this.overallArrangementName = arrName.join(",") || "全部产业";
-      this.page_no = 1;
-      this.status = "loadmore";
-      this.getIndustryList();
-      this.selectComponent("#menuItem").toggle();
-    },
+    // replacementConfirm() {
+    //   const arr = [];
+    //   const arrName = [];
+    //   this.overallArrangement.forEach((key) => {
+    //     if (key.isShow) {
+    //       arr.push(key.id);
+    //       arrName.push(key.name);
+    //     }
+    //   });
+    //   this.overallArrangementId = arr.join(",");
+    //   this.overallArrangementName = arrName.join(",") || "全部产业";
+    //   this.page_no = 1;
+    //   this.status = "loadmore";
+    //   this.getIndustryList();
+    //   this.selectComponent("#menuItem").toggle();
+    // },
     /* 新布局产业选项重置按钮 */
-    replacementBtn() {
-      this.OrderColumn = "NewTime";
-      this.pitchOnId = "NewTime";
-      this.overallArrangement.forEach((key) => (key.isShow = false));
-      this.overallArrangementName = "全部产业";
-    },
+    // replacementBtn() {
+    //   this.OrderColumn = "NewTime";
+    //   this.pitchOnId = "NewTime";
+    //   this.overallArrangement.forEach((key) => (key.isShow = false));
+    //   this.overallArrangementName = "全部产业";
+    // },
     /* 判断页面滚动 */
-    isscroll: Debounce(function () {
-      this.isScrollShow = true;
-    }),
+    // isscroll: Debounce(function () {
+    //   this.isScrollShow = true;
+    // }),
     /* 搜索 */
     async goSearch() {
       await this.$store.dispatch("checkHandle", "/reportPages/reportSearch/reportSearch?id=报告");
@@ -475,15 +480,15 @@ export default {
     /* 初始 */
     initList() {
       if (this.tabAct_id && this.strategyIndex !== 4 && this.strategyIndex !== 5) {
-        this.OrderColumn = "NewTime";
-        this.pitchOnId = "NewTime";
-        this.overallArrangementName = "全部产业";
-        this.overallArrangementId = "";
+        // this.OrderColumn = "NewTime";
+        // this.pitchOnId = "NewTime";
+        // this.overallArrangementName = "全部产业";
+        // this.overallArrangementId = "";
         this.page_no = 1;
         this.refresh = true;
         this.getIndustryList();
         this.getTradeList();
-        this.overallArrangement.forEach((key) => (key.isShow = false));
+        // this.overallArrangement.forEach((key) => (key.isShow = false));
       }
       this.strategyIndex == 4 ? this.getstrategyAll() : (this.tabAct_idTwo = "");
       if (this.isScrollShow) {