bding hai 1 ano
pai
achega
4ff119c439
Modificáronse 75 ficheiros con 801 adicións e 947 borrados
  1. 2 2
      activityPages/activityDetail/jurisdiction/components.vue
  2. 6 6
      activityPages/activityDetail/manageMixin.js
  3. 102 101
      activityPages/components/selectCss.scss
  4. 4 4
      activityPages/components/selectMixins.js
  5. 1 1
      activityPages/components/specialMixins.js
  6. 1 0
      activityPages/endActivity/endActivity.vue
  7. 1 1
      activityPages/playBack/playBack.vue
  8. 7 2
      activityPages/specialDetail/specialDetail.vue
  9. 13 5
      activityPages/specialResearchPage/specialResearchPage.vue
  10. 9 9
      activityPages/themeActivity/themeActivity.vue
  11. 8 8
      components/ItemComponent/activityItem.vue
  12. 4 4
      components/ItemComponent/reportItem.vue
  13. 2 9
      components/ItemComponent/roadshowItem.vue
  14. 5 5
      components/activity/indexActivity.js
  15. 1 1
      components/activity/indexActivity.scss
  16. 3 3
      components/activity/showResearchDlg.vue
  17. 2 2
      components/audioModule/index.vue
  18. 2 2
      components/audioVideo.scss
  19. 2 2
      components/isTrackFollow.vue
  20. 3 3
      components/modalDialog.vue
  21. 2 2
      components/notHaveLogin.vue
  22. 2 2
      components/report/timeLine.vue
  23. 2 2
      config/request.js
  24. 2 2
      config/util.js
  25. 1 1
      mixin/index.js
  26. 2 16
      pageMy/browseHistory/browseHistory.vue
  27. 2 2
      pageMy/launchScreen/launchScreen.vue
  28. 35 41
      pageMy/myCollection/myCollection.vue
  29. 21 22
      pageMy/myPage/myPage.vue
  30. 2 2
      pageMy/mySchedulepage/mySchedulepage.vue
  31. 1 1
      pageMy/reportDetail/reportDetail.vue
  32. 2 2
      pageMy/reportPage/reportPage.vue
  33. 1 1
      pages-message/activityTemplate/activityTemplate.vue
  34. 1 1
      pages-message/templateMsg/templateMsg.vue
  35. 1 1
      pages-purchaser/columnDetail/columnDetail.vue
  36. 0 239
      pages-purchaser/components/cssAuthorTheme.scss
  37. 0 35
      pages-purchaser/components/purchaser-report-list.scss
  38. 4 4
      pages-purchaser/contentAllPage/contentAllPage.vue
  39. 260 28
      pages-purchaser/lastestReport/lastestReport.vue
  40. 1 1
      pages-purchaser/purchaserActivity/purchaserActivity.vue
  41. 1 0
      pages-purchaser/researchAuthor/researchAuthor.vue
  42. 8 6
      pages-purchaser/researchList/researchList.vue
  43. 13 9
      pages-purchaser/researchTheme/researchTheme.vue
  44. 1 1
      pages-purchaser/toExamine/toExamine.vue
  45. 3 3
      pages-purchaser/writeNote/writeNote.vue
  46. 1 1
      pages-search/components/ItemContent.vue
  47. 3 3
      pages-search/components/activityBack.vue
  48. 1 1
      pages-search/components/morningDlg.vue
  49. 143 171
      pages-search/components/report.vue
  50. 5 5
      pages-search/indedxSearch/indedxSearch.vue
  51. 7 7
      pages/activity/activity.vue
  52. 1 1
      pages/activity/components/activityTypeList.vue
  53. 1 1
      pages/index/components/ItemContent.vue
  54. 1 1
      pages/index/components/morningDlg.vue
  55. 3 3
      pages/index/index.vue
  56. 4 4
      pages/material/material.vue
  57. 2 2
      pages/purchaser/purchaser.vue
  58. 7 1
      pages/reportForm/index.scss
  59. 26 26
      pages/reportForm/reportForm.vue
  60. 2 18
      reportPages/authorPages/authorPages.vue
  61. 6 7
      reportPages/hotList/hotList.vue
  62. 2 2
      reportPages/industrialReport/industrialReport.vue
  63. 2 2
      reportPages/internalDetials/internalDetials.vue
  64. 1 1
      reportPages/jurisdiction.scss
  65. 1 1
      reportPages/keyCompany/keyCompany.vue
  66. 1 1
      reportPages/morningDetails/morningDetails.vue
  67. 1 1
      reportPages/recentPages/recentPages.vue
  68. 1 1
      reportPages/reportSecretDetail/components/researchSummary.vue
  69. 5 22
      reportPages/researchTheme/researchTheme.vue
  70. 2 2
      reportPages/roadEssence/roadEssence.vue
  71. 1 1
      reportPages/selectedBulletin/selectedBulletin.vue
  72. 2 2
      store/index.js
  73. 22 1
      style/common.scss
  74. 0 63
      utils/styleClassify.js
  75. 1 1
      uview-ui/components/u-modal/u-modal.vue

+ 2 - 2
activityPages/activityDetail/jurisdiction/components.vue

@@ -157,7 +157,7 @@ export default {
             title: "",
             content: "您已经提交过申请了,请耐心等待",
             showCancel: false,
-            confirmColor: "#3385FF",
+            confirmColor: "#376cbb",
             success: function (res) {},
           });
     },
@@ -172,7 +172,7 @@ export default {
             title: "",
             content: "提交申请成功,请耐心等待",
             showCancel: false,
-            confirmColor: "#3385FF",
+            confirmColor: "#376cbb",
             success: function (res) {
               this.backIndex();
             },

+ 6 - 6
activityPages/activityDetail/manageMixin.js

@@ -12,7 +12,7 @@ export default {
             uni.showModal({
               confirmText: "知道了",
               showCancel: false,
-              confirmColor: "#3385FF",
+              confirmColor: "#376cbb",
               content: "当前时间点已无法取消报名,若想取消,请联系对口销售",
             });
             return;
@@ -22,14 +22,14 @@ export default {
           uni.showModal({
             confirmText: "知道了",
             showCancel: false,
-            confirmColor: "#3385FF",
+            confirmColor: "#376cbb",
             content: type == 1 ? "活动开始前1小时内无法取消预约外呼,请联系对口销售处理" : "活动开始前1小时内无法取消报名,请联系对口销售处理",
           });
           return;
         }
         uni.showModal({
           content: type == 1 ? "您要取消此次活动预约外呼吗?" : "您要取消此次活动的报名吗?",
-          confirmColor: "#3385FF",
+          confirmColor: "#376cbb",
           cancelColor: "#606266",
           success: async (res) => {
             if (res.confirm) {
@@ -87,7 +87,7 @@ export default {
       } else {
         uni.showModal({
           content: "确定要取消预约本场调研的纪要吗?",
-          confirmColor: "#3385FF",
+          confirmColor: "#376cbb",
           cancelColor: "#606266",
           success: async (res) => {
             if (res.confirm) {
@@ -112,7 +112,7 @@ export default {
             if (res.Ret == 200) {
               uni.showModal({
                 confirmText: "知道了",
-                confirmColor: "#3385FF",
+                confirmColor: "#376cbb",
                 content: res.Msg,
                 showCancel: false,
                 success: (res) => {
@@ -138,7 +138,7 @@ export default {
           if (res.Ret == 200) {
             uni.showModal({
               confirmText: "知道了",
-              confirmColor: "#3385FF",
+              confirmColor: "#376cbb",
               content: res.Msg,
               showCancel: false,
               success: (res) => {

+ 102 - 101
activityPages/components/selectCss.scss

@@ -1,124 +1,125 @@
 .select-content-activity {
-    position: sticky;
-    top: 0;
-    left: 0;
-    z-index: 9;
-
-    .screen-item {
-        background-color: #fff;
-        height: 111rpx;
-        padding: 0 34rpx;
-        font-size: 24rpx;
-        color: #333;
-        display: flex;
-        align-items: center;
-        justify-content: space-between;
-
-        .text-item {
-            width: 150rpx;
-            text-align: center;
-            line-height: 51rpx;
-            box-sizing: border-box;
-            border-radius: 26rpx;
-            background-color: #f8f8fa;
-            // margin-right: 20rpx;
-        }
-
-        .medium-item {
-            width: 135rpx;
-        }
-
-        .active {
-            background-color: $uni-color-new;
-            color: #fff;
-        }
+  position: sticky;
+  top: 0;
+  left: 0;
+  z-index: 9;
+
+  .screen-item {
+    background-color: #fff;
+    height: 111rpx;
+    padding: 0 34rpx;
+    font-size: 24rpx;
+    color: #333;
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+
+    .text-item {
+      width: 150rpx;
+      text-align: center;
+      line-height: 51rpx;
+      box-sizing: border-box;
+      border-radius: 26rpx;
+      background-color: #f8f8fa;
+      // margin-right: 20rpx;
+    }
+
+    .medium-item {
+      width: 135rpx;
+    }
+
+    .active {
+      background-color: $uni-color-new;
+      color: #fff;
     }
+  }
 
-    .select-conyent {
-        .items-box {
-            width: 40rpx;
-        }
-
-        .menu-items {
-            background-color: #f8f8fa;
-            width: 100%;
-            display: flex;
-            flex-wrap: wrap;
-            padding: 30rpx 30rpx 0;
-
-            .menu-items-box {
-                display: flex;
-                width: 50%;
-                font-size: 28rpx;
-                font-weight: 400;
-                margin-bottom: 40rpx;
-            }
-        }
-
-        .replacement {
-            margin: 0rpx 30rpx 20rpx;
-            display: flex;
-            background-color:  $uni-color-new;
-            height: 60rpx;
-            line-height: 58rpx;
-            font-size: 28rpx;
-            font-weight: 400;
-            color: #ffffff;
-            border-radius: 30rpx;
-
-            text {
-                flex: 1;
-                text-align: center;
-                line-height: 60rpx;
-            }
-
-            .replacement-box {
-                border: 1rpx solid  $uni-color-new;
-                line-height: 58rpx;
-                color:  $uni-color-new;
-                background: #ffffff;
-                border-radius: 28rpx 0rpx 28rpx 28rpx;
-            }
-        }
+  .select-conyent {
+    .items-box {
+      width: 40rpx;
     }
 
-    .select-item-multiple {
-        padding: 8rpx 15rpx;
-        border-radius: 26rpx;
-        background-color: #f8f8fa;
+    .menu-items {
+      background-color: #f8f8fa;
+      width: 100%;
+      display: flex;
+      flex-wrap: wrap;
+      padding: 30rpx 30rpx 0;
+
+      .menu-items-box {
+        display: flex;
+        width: 50%;
+        font-size: 28rpx;
+        font-weight: 400;
+        margin-bottom: 40rpx;
+      }
     }
 
-    .screen-item-ul {
-        height: 80rpx !important;
-        margin-top: -35rpx;
+    .replacement {
+      margin: 0rpx 30rpx 20rpx;
+      display: flex;
+      background-color: $uni-color-new;
+      height: 60rpx;
+      line-height: 58rpx;
+      font-size: 28rpx;
+      font-weight: 400;
+      color: #ffffff;
+      border-radius: 30rpx;
+
+      text {
+        flex: 1;
+        text-align: center;
+        line-height: 60rpx;
+      }
+
+      .replacement-box {
+        border: 1rpx solid $uni-color-new;
+        line-height: 58rpx;
+        color: $uni-color-new;
+        background: #ffffff;
+        border-radius: 28rpx 0rpx 28rpx 28rpx;
+      }
     }
+  }
+
+  .select-item-multiple {
+    padding: 10rpx 24rpx;
+    border-radius: 26rpx;
+    background-color: #f8f8fa;
+    flex-shrink: 0;
+  }
+
+  .screen-item-ul {
+    height: 80rpx !important;
+    margin-top: -35rpx;
+  }
 }
 
 /deep/.van-dropdown-menu {
-    background-color: #fff;
-    box-shadow: none !important;
-    display: flex;
-    align-items: center;
+  background-color: #fff;
+  box-shadow: none !important;
+  display: flex;
+  align-items: center;
 }
 
 /deep/.van-dropdown-menu__item {
-    box-sizing: border-box;
-    width: 190rpx;
-    // margin-right: 20rpx;
-    padding-right: 20rpx;
-    height: 51rpx;
-    border-radius: 26rpx;
-    background: #f8f8fa;
+  box-sizing: border-box;
+  width: 160rpx;
+  // margin-right: 20rpx;
+  padding-right: 20rpx;
+  height: 51rpx;
+  border-radius: 26rpx;
+  background: #f8f8fa;
 }
 
 /deep/.van-dropdown-item {
-    margin-top: -10rpx;
+  margin-top: -10rpx;
 }
 
 /deep/[data-index="2"] {
-    margin-right: 0rpx;
+  margin-right: 0rpx;
 }
 
 /deep/ .van-ellipsis {
-    font-size: 24rpx;
-}
+  font-size: 24rpx;
+}

+ 4 - 4
activityPages/components/selectMixins.js

@@ -7,7 +7,7 @@ export default {
       isGetJurisdiction: 0, // 权限
       listChartPermission: [], // 行业
       listChartPermissionInit: [],
-      chartPermissionName: "所有行业",
+      chartPermissionName: "行业",
       chartPermissionIds: "",
       whichDay: "", //选择今日/明日\本、上周 月
       selectActiveId: "", //专家、分析师的id
@@ -76,7 +76,7 @@ export default {
             item.IsChoose = false;
           }
         });
-        this.chartPermissionName = str.length == 6 ? "所有行业" : str.join(",");
+        this.chartPermissionName = str.length == 6 ? "行业" : str.join(",");
       }
     },
     // 是否有权限的点击事件
@@ -111,7 +111,7 @@ export default {
           }
         });
       if ((str.length == this.listChartPermission.length) || str.length <= 0) {
-        this.chartPermissionName = "所有行业";
+        this.chartPermissionName = "行业";
       } else {
         this.chartPermissionName = str.join(",");
       }
@@ -127,7 +127,7 @@ export default {
       this.chartPermissionIds = "";
       this.isShowJurisdiction = false;
       this.listChartPermission.map((item) => (item.IsChoose = false));
-      this.chartPermissionName = "所有行业";
+      this.chartPermissionName = "行业";
       this.getActivityList();
     },
 

+ 1 - 1
activityPages/components/specialMixins.js

@@ -32,7 +32,7 @@ export default {
         let twoDays = times - num <= 3600000 * 48;
         uni.showModal({
           content: twoDays ? "活动开始前48小时内,取消报名仍会维持扣点,确定要取消报名吗?" : "您要取消此次专项调研的预报名吗?",
-          confirmColor: "#3385FF",
+          confirmColor: "#376cbb",
           cancelColor: "#606266",
           success: async (res) => {
             if (res.confirm) {

+ 1 - 0
activityPages/endActivity/endActivity.vue

@@ -115,6 +115,7 @@ export default {
       color: $uni-color-new;
       border-radius: 8rpx;
       margin-bottom: 30rpx;
+      padding: 0 20rpx;
     }
   }
   @import "../components/selectCss.scss";

+ 1 - 1
activityPages/playBack/playBack.vue

@@ -241,7 +241,7 @@ export default {
         align-items: center;
         border-radius: 20rpx;
         padding-left: 4rpx;
-        background-color: #3385ff;
+        background-color: #376cbb;
         .audio-img {
           width: 30rpx;
           height: 30rpx;

+ 7 - 2
activityPages/specialDetail/specialDetail.vue

@@ -161,7 +161,7 @@ export default {
     beNotInterested() {
       uni.showModal({
         content: "您要取消此次专研调研的预报名吗?",
-        confirmColor: "#3385FF",
+        confirmColor: "#376cbb",
         cancelColor: "#606266",
         success: async (res) => {
           if (res.confirm) {
@@ -202,7 +202,7 @@ export default {
       if (this.specialIsFollow) {
         uni.showModal({
           content: "您要取消【专项调研】新活动通知吗?",
-          confirmColor: "#3385FF",
+          confirmColor: "#376cbb",
           cancelColor: "#606266",
           success: async (res) => {
             if (res.confirm) {
@@ -216,6 +216,7 @@ export default {
       } else {
         const res = await activity.postSpecialFollow();
         if (res.Ret === 200) {
+          this.show_confirm_button = true;
           this.specialIsFollow = !this.specialIsFollow;
           this.specialGoFollowShow = true;
         }
@@ -252,6 +253,10 @@ export default {
     padding-right: 20rpx;
     background-color: #fff1e9;
     position: relative;
+    display: flex;
+    align-items: center;
+    height: 60rpx;
+    overflow: hidden;
     .notice {
       width: 80%;
     }

+ 13 - 5
activityPages/specialResearchPage/specialResearchPage.vue

@@ -35,11 +35,11 @@
               <view class="item">
                 <view class="item-text" @click="goDetail(item)">
                   <text class="activity-title"> {{ item.ResearchTheme }} </text>
-                  <view style="display: flex" class="text_twoLine" v-if="item.TripStatus == 2">
+                  <view style="display: flex" class="global_activity_content text_twoLine" v-if="item.TripStatus == 2">
                     <text style="flex-shrink: 0"> 活动时间:</text>
                     <text> {{ item.ActivityTimeTextByDay }}</text>
                   </view>
-                  <text class="text_twoLine" v-else>预期时间:{{ item.ActivityTimeText }} </text>
+                  <text class="global_activity_content text_twoLine" v-else>预期时间:{{ item.ActivityTimeText }} </text>
                 </view>
                 <view class="bottom-box">
                   <view class="" style="width: 130rpx"> </view>
@@ -167,7 +167,7 @@ export default {
     beNotInterested(item) {
       uni.showModal({
         content: "您要取消此次专研调研的预报名吗?",
-        confirmColor: "#3385FF",
+        confirmColor: "#376cbb",
         cancelColor: "#606266",
         success: async (res) => {
           if (res.confirm) {
@@ -189,7 +189,7 @@ export default {
       if (this.specialIsFollow) {
         uni.showModal({
           content: "您要取消【专项调研】新活动通知吗?",
-          confirmColor: "#3385FF",
+          confirmColor: "#376cbb",
           cancelColor: "#606266",
           success: async (res) => {
             if (res.confirm) {
@@ -243,10 +243,17 @@ export default {
 <style lang="scss" scoped>
 .special-research {
   background-color: $uni-bg-color;
+  padding-top: 70rpx;
   position: relative;
   .top-notice {
+    position: fixed;
+    top: 0;
+    left: 0;
+    z-index: 9;
     display: flex;
-    padding: 20rpx 34rpx 0;
+    background-color: #fff;
+    width: 100%;
+    height: 62rpx;
     .notice {
       width: 80%;
     }
@@ -255,6 +262,7 @@ export default {
       align-items: center;
       border-radius: 0 8rpx 8rpx 0;
       background-color: #fff1e9;
+      height: 60rpx;
     }
     .inform-btn {
       width: 140rpx;

+ 9 - 9
activityPages/themeActivity/themeActivity.vue

@@ -387,7 +387,7 @@ export default {
     background-color: #fff;
     display: flex;
     align-items: center;
-    color: #3385ff;
+    color: #376cbb;
     font-size: 30rpx;
     padding: 30rpx 30rpx 20rpx;
     border-bottom: 2rpx solid #dcdfe6;
@@ -397,12 +397,12 @@ export default {
       .jump-text {
         margin-left: 10rpx;
         font-size: 24rpx;
-        color: #3385ff;
+        color: #376cbb;
       }
       .jump-label {
         font-size: 28rpx;
         padding: 6rpx 18rpx;
-        background-color: #3385ff;
+        background-color: #376cbb;
         border-radius: 52rpx;
         color: #fff;
       }
@@ -426,14 +426,17 @@ export default {
     width: 100%;
     background-color: #fff;
     height: 60rpx;
-    padding: 0 34rpx;
+    padding: 0 34rpx 10rpx;
     font-size: 24rpx;
     margin-top: -15rpx;
     color: #333;
     display: flex;
     align-items: center;
+    .select-item-multiple {
+      margin-right: 20rpx;
+    }
     .active {
-      background-color: #3385ff !important;
+      background-color: #376cbb !important;
       color: #fff !important;
     }
   }
@@ -441,9 +444,6 @@ export default {
     flex-wrap: wrap !important;
     justify-content: flex-start !important;
   }
-  .select-item-multiple {
-    margin-right: 38rpx;
-  }
   @import "../components/selectCss.scss";
   @import "@/components/activity/indexActivity.scss";
 
@@ -468,7 +468,7 @@ export default {
         align-items: center;
         border-radius: 20rpx;
         padding-left: 4rpx;
-        background-color: #3385ff;
+        background-color: #376cbb;
       }
     }
     .audio-img {

+ 8 - 8
components/ItemComponent/activityItem.vue

@@ -237,7 +237,7 @@ export default {
             uni.showModal({
               confirmText: "知道了",
               showCancel: false,
-              confirmColor: "#3385FF",
+              confirmColor: "#376cbb",
               content: "当前时间点已无法取消报名,若想取消,请联系对口销售",
             });
             return;
@@ -247,14 +247,14 @@ export default {
           uni.showModal({
             confirmText: "知道了",
             showCancel: false,
-            confirmColor: "#3385FF",
+            confirmColor: "#376cbb",
             content: type == 1 ? "活动开始前1小时内无法取消预约外呼,请联系对口销售处理" : "活动开始前1小时内无法取消报名,请联系对口销售处理",
           });
           return;
         }
         uni.showModal({
           content: type == 1 ? "您要取消此次活动预约外呼吗?" : "您要取消此次活动的报名吗?",
-          confirmColor: "#3385FF",
+          confirmColor: "#376cbb",
           cancelColor: "#606266",
           success: async (res) => {
             if (res.confirm) {
@@ -349,7 +349,7 @@ export default {
           if (res.Ret == 200) {
             uni.showModal({
               confirmText: "知道了",
-              confirmColor: "#3385FF",
+              confirmColor: "#376cbb",
               content: res.Msg,
               showCancel: false,
               success: (res) => {
@@ -413,7 +413,7 @@ export default {
       } else {
         uni.showModal({
           content: "确定要取消预约本场调研的纪要吗?",
-          confirmColor: "#3385FF",
+          confirmColor: "#376cbb",
           cancelColor: "#606266",
           success: async (res) => {
             if (res.confirm) {
@@ -470,7 +470,7 @@ export default {
         let twoDays = times - num <= 3600000 * 48;
         uni.showModal({
           content: twoDays ? "活动开始前48小时内,取消报名仍会维持扣点,确定要取消报名吗?" : "您要取消此次专项调研的预报名吗?",
-          confirmColor: "#3385FF",
+          confirmColor: "#376cbb",
           cancelColor: "#606266",
           success: async (res) => {
             if (res.confirm) {
@@ -521,7 +521,7 @@ export default {
     beNotInterested(item) {
       uni.showModal({
         content: "您要取消此次专研调研的预报名吗?",
-        confirmColor: "#3385FF",
+        confirmColor: "#376cbb",
         cancelColor: "#606266",
         success: async (res) => {
           if (res.confirm) {
@@ -543,7 +543,7 @@ export default {
       if (this.specialIsFollow) {
         uni.showModal({
           content: "您要取消【专项调研】新活动通知吗?",
-          confirmColor: "#3385FF",
+          confirmColor: "#376cbb",
           cancelColor: "#606266",
           success: async (res) => {
             if (res.confirm) {

+ 4 - 4
components/ItemComponent/reportItem.vue

@@ -22,7 +22,7 @@
     <view class="item-time">
       <text>{{ list.PublishDate }}</text>
       <view class="item-examine" v-if="list.IsResearch">
-        <image src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/czbk/examine_icon.png"></image>
+        <image src="https://hzchart.oss-cn-shanghai.aliyuncs.com/new_cygx/examine_icon.png"></image>
         <text>{{ list.Pv }}</text>
       </view>
     </view>
@@ -99,7 +99,7 @@ export default {
     margin-top: 10rpx;
   }
   .item-rich-text {
-    margin: 6rpx 0;
+    margin: 28rpx 0;
   }
   .item-image {
     height: 238rpx;
@@ -139,8 +139,8 @@ export default {
       display: flex;
       align-items: center;
       image {
-        width: 31rpx;
-        height: 14rpx;
+        width: 30rpx;
+        height: 30rpx;
         margin: 0 10rpx 0 15rpx;
       }
     }

+ 2 - 9
components/ItemComponent/roadshowItem.vue

@@ -47,7 +47,7 @@
 
 <script>
 import { Search, activity, Report, Home } from "@/config/api";
-import { color_word_bg, MultimediaIcon } from "@/utils/styleClassify";
+import { MultimediaIcon } from "@/utils/styleClassify";
 import audioModule from "@/components/audioModule/index";
 import videoModule from "@/components/videoModule/index";
 import modalDialog from "@/components/modalDialog.vue";
@@ -155,13 +155,6 @@ export default {
       }
       this.showAudioPop = true;
     },
-    //音视频的背景色 文字颜色
-    classifyColor(item) {
-      let text_color = color_word_bg.color_word.find((key) => key.name == item).color;
-      let back_ground = color_word_bg.color_bg.find((key) => key.name == item).color;
-      let _isColor = { color: text_color, "background-color": back_ground };
-      return _isColor;
-    },
     //音视频的图标
     classifyIcon(item) {
       let srcItem = MultimediaIcon.find((key) => key.name == (item.AudioChartPermissionName || item.ChartPermissionName));
@@ -204,7 +197,7 @@ export default {
   background: #ffffff;
   box-shadow: 0rpx 3rpx 8rpx 0rpx rgba(0, 0, 0, 0.05);
   overflow: hidden;
-  padding-top: 10rpx;
+  padding-top: 25rpx;
   .cover-item {
     margin-top: 10rpx;
     width: calc(100% + 28rpx);

+ 5 - 5
components/activity/indexActivity.js

@@ -76,7 +76,7 @@ export default {
             uni.showModal({
               confirmText: "知道了",
               showCancel: false,
-              confirmColor: "#3385FF",
+              confirmColor: "#376cbb",
               content: "当前时间点已无法取消报名,若想取消,请联系对口销售",
             });
             return;
@@ -86,14 +86,14 @@ export default {
           uni.showModal({
             confirmText: "知道了",
             showCancel: false,
-            confirmColor: "#3385FF",
+            confirmColor: "#376cbb",
             content: type == 1 ? "活动开始前1小时内无法取消预约外呼,请联系对口销售处理" : "活动开始前1小时内无法取消报名,请联系对口销售处理",
           });
           return;
         }
         uni.showModal({
           content: type == 1 ? "您要取消此次活动预约外呼吗?" : "您要取消此次活动的报名吗?",
-          confirmColor: "#3385FF",
+          confirmColor: "#376cbb",
           cancelColor: "#606266",
           success: async (res) => {
             if (res.confirm) {
@@ -197,7 +197,7 @@ export default {
           if (res.Ret == 200) {
             uni.showModal({
               confirmText: "知道了",
-              confirmColor: "#3385FF",
+              confirmColor: "#376cbb",
               content: res.Msg,
               showCancel: false,
               success: (res) => {
@@ -268,7 +268,7 @@ export default {
       } else {
         uni.showModal({
           content: "确定要取消预约本场调研的纪要吗?",
-          confirmColor: "#3385FF",
+          confirmColor: "#376cbb",
           cancelColor: "#606266",
           success: async (res) => {
             if (res.confirm) {

+ 1 - 1
components/activity/indexActivity.scss

@@ -111,7 +111,7 @@
       display: flex;
       justify-content: flex-end;
       align-items: center;
-      color: #3385ff;
+      color: #376cbb;
       overflow: hidden;
       overflow-x: auto;
 

+ 3 - 3
components/activity/showResearchDlg.vue

@@ -20,7 +20,7 @@
         <block v-else-if="!checkResearchList.CheckPoints">
           <view class="title-box txt-check">
             点数不足,若想报名,<br />请联系对口销售
-            <text style="display: inline-block; color: #3385ff" @click="promptTextHandler">升级套餐</text>
+            <text style="display: inline-block; color: #376cbb" @click="promptTextHandler">升级套餐</text>
           </view>
           <view class="content-box">
             <text>当前剩余点数:</text>
@@ -168,7 +168,7 @@ export default {
     display: flex;
     justify-content: center;
     text:nth-child(2) {
-      color: #3385ff;
+      color: #376cbb;
     }
   }
   .content-input {
@@ -201,7 +201,7 @@ export default {
 }
 .seller-mobile {
   display: inline-block;
-  color: #2979ff;
+  color: #376cbb;
 }
 .u-model__footer__button.data-v-3626fcec {
   border-right: 1rpx solid #333;

+ 2 - 2
components/audioModule/index.vue

@@ -15,7 +15,7 @@
         <view class="slider-paly">
           <view style="flex: 1; padding-top: 20rpx">
             <slider
-              activeColor="#3385FF"
+              activeColor="#376cbb"
               :max="audioTime"
               :value="curTime"
               @touchstart="touchstartHandler"
@@ -351,7 +351,7 @@ export default {
       align-items: center;
     }
     .card-title {
-      color: #3385ff;
+      color: #376cbb;
       font-size: 28rpx;
       padding: 0 40rpx;
       text-align: center;

+ 2 - 2
components/audioVideo.scss

@@ -22,7 +22,7 @@
         right:0;
         width: 0;
         height: 0;
-        border-top: 90rpx solid #3385ff;
+        border-top: 90rpx solid #376cbb;
         border-left: 90rpx solid transparent;
       }
       .identification-img {
@@ -78,7 +78,7 @@
           left: 0;
           width: 0;
           height: 0;
-          border-top: 60rpx solid #3385ff;
+          border-top: 60rpx solid #376cbb;
           border-right: 60rpx solid transparent;
         }
       }

+ 2 - 2
components/isTrackFollow.vue

@@ -102,13 +102,13 @@ export default {
     width: 100%;
     height: 60rpx;
     padding-right: 30rpx;
-    background-color: #3385ff;
+    background-color: #376cbb;
     color: #fff;
     .cancel-follow {
       width: 136rpx;
       height: 44rpx;
       background-color: #fff;
-      color: #3385ff;
+      color: #376cbb;
       text-align: center;
       line-height: 46rpx;
       margin: 0 20rpx 0 15rpx;

+ 3 - 3
components/modalDialog.vue

@@ -288,7 +288,7 @@ export default {
             title: "",
             content: "提交申请成功,请耐心等待",
             showCancel: false,
-            confirmColor: "#3385FF",
+            confirmColor: "#376cbb",
           });
         }
       }
@@ -420,7 +420,7 @@ export default {
           content: "申请已提交,请等待销售人员与您联系",
           confirmText: "知道了",
           showCancel: false,
-          confirmColor: "#3385FF",
+          confirmColor: "#376cbb",
         });
       } else if (this.hasPermission == 5) {
         this.showhasPermissionBtn();
@@ -456,7 +456,7 @@ export default {
 }
 .seller-mobile {
   display: inline-block;
-  color: #2979ff;
+  color: #376cbb;
 }
 .u-model__footer__button.data-v-3626fcec {
   border-right: 1rpx solid #333;

+ 2 - 2
components/notHaveLogin.vue

@@ -22,7 +22,7 @@ export default {
     goLogin() {
       uni.showModal({
         title: "即将前往登录页面,请确认是否继续",
-        confirmColor: "#3385FF",
+        confirmColor: "#376cbb",
         cancelColor: "#606266",
         success: function (res) {
           if (res.confirm) {
@@ -61,7 +61,7 @@ export default {
     padding: 6rpx 50rpx;
     width: 323rpx;
     height: 61rpx;
-    background: #3385ff;
+    background: #376cbb;
     border-radius: 4rpx;
     font-size: 24rpx;
     margin: 0 auto;

+ 2 - 2
components/report/timeLine.vue

@@ -157,7 +157,7 @@ export default {
   background-color: #ffffff;
   position: relative;
   .texe-color {
-    color: #3385ff;
+    color: #376cbb;
   }
   .loadTimeLine {
     top: 0;
@@ -181,7 +181,7 @@ export default {
     &:first-child {
       .time {
         &::after {
-          background-color: #3385ff;
+          background-color: #376cbb;
         }
       }
     }

+ 2 - 2
config/request.js

@@ -82,7 +82,7 @@ export const getHttp = (url, data, status = 1) => {
         res.data.Ret === 403 &&
           uni.showModal({
             title: "",
-            confirmColor: "#3385FF",
+            confirmColor: "#376cbb",
             content: res.data.Msg,
             showCancel: false,
           });
@@ -129,7 +129,7 @@ export const postHttp = (url, data, status = 1) => {
         res.data.Ret === 403 &&
           uni.showModal({
             title: "",
-            confirmColor: "#3385FF",
+            confirmColor: "#376cbb",
             content: res.data.Msg,
             showCancel: false,
           });

+ 2 - 2
config/util.js

@@ -65,7 +65,7 @@ export const modal = (title = "", content, callback = function () {}) => {
   uni.showModal({
     title: title,
     content: content,
-    confirmColor: "#3385FF",
+    confirmColor: "#376cbb",
     success: function (res) {
       if (res.confirm) {
         callback();
@@ -81,7 +81,7 @@ export const modalShow = (title = "", content, confirm, callback = function () {
     content: content,
     showCancel: false,
     confirmText: confirm == "" ? "确定" : "知道了",
-    confirmColor: "#3385FF",
+    confirmColor: "#376cbb",
     success: function (res) {
       if (res.confirm) {
         callback();

+ 1 - 1
mixin/index.js

@@ -73,7 +73,7 @@ export default {
     pleaseGoLogin() {
       uni.showModal({
         title: "即将前往登录页面,请确认是否继续",
-        confirmColor: "#3385FF",
+        confirmColor: "#376cbb",
         cancelColor: "#606266",
         success: function (res) {
           if (res.confirm) {

+ 2 - 16
pageMy/browseHistory/browseHistory.vue

@@ -16,9 +16,9 @@
         </view>
         <view class="item-more">
           <text>{{ item.PublishDate }}</text>
-          <view class="pv-ollect" v-if="item.Source == 2">
+          <view class="global_pv-ollect" v-if="item.Source == 2">
             <view>
-              <image class="pv" src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/czbk/examine_icon.png"></image>
+              <image class="pv" src="https://hzchart.oss-cn-shanghai.aliyuncs.com/new_cygx/examine_icon.png"></image>
               {{ item.Pv }}
             </view>
             <view @click="collectClick(item)">
@@ -186,20 +186,6 @@ export default {
         color: #cecece;
         margin: 20rpx 0 0;
         padding-bottom: 30rpx;
-        .pv-ollect {
-          display: flex;
-          align-items: center;
-          width: 40%;
-          justify-content: space-between;
-          image {
-            width: 22rpx;
-            height: 21rpx;
-            margin-right: 10rpx;
-          }
-          .pv {
-            height: 16rpx;
-          }
-        }
       }
     }
   }

+ 2 - 2
pageMy/launchScreen/launchScreen.vue

@@ -60,7 +60,7 @@ export default {
 
 <style lang="scss">
 .launch-container {
-  background-color: #3385ff;
+  background-color: #376cbb;
   .lauch-min {
     width: 100%;
     position: absolute;
@@ -95,7 +95,7 @@ export default {
     transform: translateX(-50%);
     color: #fff;
     font-size: 38rpx;
-    background-color: #3385ff;
+    background-color: #376cbb;
     border: 1rpx solid #fff;
     border-radius: 90rpx;
   }

+ 35 - 41
pageMy/myCollection/myCollection.vue

@@ -1,6 +1,6 @@
 <template>
   <view class="container myCollection-container">
-    <view class="global_one_tabs">
+    <view class="global_one_tabs top-tabs">
       <view :class="['item', item.id == tabsActive && 'tabs-active']" v-for="item in tabsList" :key="item.id" @click="handleClickTopSub(item)">
         {{ item.name }}
       </view>
@@ -26,24 +26,27 @@
               <text> {{ item.NickName }}</text>
             </view>
           </blok>
-          <view class="global_title" :class="item.CategoryId == 0 ? 'yan-xuan-tag' : ''" @click="goDetailReport(item)">
-            {{ item.Title }}
-            <block v-if="item.SpecialTags && item.IsSpecial == 1">
-              <text @click.stop="themeDetails(item, val)" style="color: #90aeda" v-for="it in item.SpecialTags.split(',')" class="item-industry" :key="it">#{{ it }}</text>
-            </block>
-            <text @click.stop="themeDetails(item, val)" class="item-industry" v-for="val in item.List" :key="val.IndustrialManagementId"> # {{ val.IndustryName }} </text>
+          <view class="title-content-box">
+            <view v-if="item.ArticleTypeName" class="tag global_content_center">{{ item.ArticleTypeName }}</view>
+            <view class="item-title global_title" @click="goDetailReport(item)">
+              {{ item.Title }}
+              <block v-if="item.SpecialTags && item.IsSpecial == 1">
+                <text @click.stop="themeDetails(item, val)" style="color: #90aeda" v-for="it in item.SpecialTags.split(',')" class="item-industry" :key="it">#{{ it }}</text>
+              </block>
+              <text @click.stop="themeDetails(item, val)" class="item-industry" v-for="val in item.List" :key="val.IndustrialManagementId"> # {{ val.IndustryName }} </text>
+            </view>
           </view>
           <view class="item-more">
             <text>{{ item.PublishDate }}</text>
-            <view class="pv-ollect" v-if="item.Source == 2 || item.IsSpecial == 1">
+            <view class="global_pv-ollect" v-if="item.Source == 2 || item.IsSpecial == 1">
               <view>
-                <image class="pv" src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/czbk/examine_icon.png"></image>
+                <image class="pv" src="https://hzchart.oss-cn-shanghai.aliyuncs.com/new_cygx/examine_icon.png"></image>
                 {{ item.Pv }}
               </view>
               <view @click="collectClick(item)">
-                <image v-if="item.IsCollect" src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/czbk/collect_act.png"></image>
-                <image v-else src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/czbk/collect_ico.png"></image>
-                {{ item.CollectNum }}人收藏
+                <image v-if="item.IsCollect" src="https://hzchart.oss-cn-shanghai.aliyuncs.com/new_cygx/collect_act.png"></image>
+                <image v-else src="https://hzchart.oss-cn-shanghai.aliyuncs.com/new_cygx/collect_ico.png"></image>
+                {{ item.CollectNum }}
               </view>
             </view>
           </view>
@@ -230,7 +233,7 @@ export default {
     myChartCollect(id) {
       uni.showModal({
         content: "确认要将该图表移除我的收藏吗?",
-        confirmColor: "#3385FF",
+        confirmColor: "#376cbb",
         cancelColor: "#606266",
         success: async (res) => {
           if (res.confirm) {
@@ -315,6 +318,11 @@ export default {
 <style lang="scss">
 .myCollection-container {
   background-color: $uni-bg-color;
+  .top-tabs {
+    .item {
+      flex: 1;
+    }
+  }
   .collect-ul {
     padding: 4rpx 25rpx 20rpx;
     .content-item {
@@ -322,6 +330,20 @@ export default {
       margin-top: 20rpx;
       padding: 35rpx 20rpx 0;
       border-top: 4rpx solid #376cbb;
+      .title-content-box {
+        display: flex;
+        .tag {
+          width: 126rpx;
+          height: 42rpx;
+          color: #928563;
+          font-size: 24rpx;
+          font-weight: 500;
+          border-radius: 38rpx;
+          background-color: #f2e8cc;
+          flex-shrink: 0;
+          margin-right: 10rpx;
+        }
+      }
       .item-title {
         font-weight: 500;
         position: relative;
@@ -333,20 +355,6 @@ export default {
           display: inline-block;
         }
       }
-      .yan-xuan-tag {
-        text-indent: 82rpx;
-        &::before {
-          content: "";
-          position: absolute;
-          top: 5rpx;
-          background-image: url(https://hzstatic.hzinsights.com/cygx/icon/Research_normal.png);
-          background-size: 100% 100%;
-          background-repeat: no-repeat;
-          left: 0;
-          width: 73rpx;
-          height: 30rpx;
-        }
-      }
       .item-user {
         display: flex;
         align-items: center;
@@ -365,20 +373,6 @@ export default {
         color: #cecece;
         margin: 20rpx 0 0;
         padding-bottom: 30rpx;
-        .pv-ollect {
-          display: flex;
-          align-items: center;
-          width: 40%;
-          justify-content: space-between;
-          image {
-            width: 22rpx;
-            height: 21rpx;
-            margin-right: 10rpx;
-          }
-          .pv {
-            height: 16rpx;
-          }
-        }
       }
     }
   }

+ 21 - 22
pageMy/myPage/myPage.vue

@@ -69,30 +69,29 @@
         </block>
       </view>
       <view class="info-bot">
-        <view class="list-item border_bottom" v-for="type in typeArr" :key="type" @click="itemClickHandle(type)">
-          <text>{{ 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">{{ userInfo.OutboundCountryCode }}-{{ userInfo.OutboundMobile }}</text>
-              <text v-else style="margin-right: 40rpx; font-size: 28rpx">未设置</text>
-            </block>
-            <block v-if="type == '关注公众号'">
-              <text style="margin-right: 20rpx; font-size: 28rpx">查研观向小助手</text>
-            </block>
-            <block v-if="type == 'PC网页版'">
-              <text @click="copyPcWebUrl" style="margin-right: 20rpx; font-size: 28rpx; color: #376cbb">web.hzinsights.com</text>
-            </block>
-            <u-icon v-if="type != 'PC网页版'" name="arrow-right" color="#BDBDBD" size="34"></u-icon>
+        <block v-for="type in typeArr" :key="type">
+          <view class="list-item border_bottom" v-if="(type === '关于我们' && wholeShowListData.IsShowAboutVideo) || type != '关于我们'" @click="itemClickHandle(type)">
+            <text>{{ 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"
+                  >{{ userInfo.OutboundCountryCode }}-{{ userInfo.OutboundMobile }}</text
+                >
+                <text v-else style="margin-right: 40rpx; font-size: 28rpx">未设置</text>
+              </block>
+              <block v-if="type == '关注公众号'">
+                <text style="margin-right: 20rpx; font-size: 28rpx">查研观向小助手</text>
+              </block>
+              <block v-if="type == 'PC网页版'">
+                <text @click="copyPcWebUrl" style="margin-right: 20rpx; font-size: 28rpx; color: #376cbb">web.hzinsights.com</text>
+              </block>
+              <u-icon v-if="type != 'PC网页版'" name="arrow-right" color="#BDBDBD" size="34"></u-icon>
+            </view>
           </view>
-        </view>
+        </block>
       </view>
       <view class="bottom-text">您手边的研究素材库</view>
     </view>
-    <!-- <view v-else class="not-bind-login">
-      <not-have-login />
-      <view class="bottom-text">您手边的研究素材库</view>
-    </view> -->
-
     <freeCharge class="free-charge" :isShowFreeBtn="isShowFree" />
     <Loading />
   </view>
@@ -455,10 +454,10 @@ export default {
           width: 181rpx;
           height: 49rpx;
           margin: 0 auto;
-          color: #3385ff;
+          color: #376cbb;
           font-size: 24rpx;
           line-height: 47rpx;
-          border: 2rpx solid #3385ff;
+          border: 2rpx solid #376cbb;
         }
       }
       .info-item {

+ 2 - 2
pageMy/mySchedulepage/mySchedulepage.vue

@@ -224,7 +224,7 @@ export default {
       let twoDays = times - num <= 3600000 * 48;
       uni.showModal({
         content: twoDays ? "活动开始前48小时内,取消报名仍会维持扣点,确定要取消报名吗?" : "您要取消此次专项调研的预报名吗?",
-        confirmColor: "#3385FF",
+        confirmColor: "#376cbb",
         cancelColor: "#606266",
         success: async (res) => {
           if (res.confirm) {
@@ -294,7 +294,7 @@ export default {
       color: #fff;
       display: flex;
       align-items: center;
-      background-color: #3385ff;
+      background-color: #376cbb;
       border-radius: 20rpx;
       padding-left: 4rpx;
       .audio-img {

+ 1 - 1
pageMy/reportDetail/reportDetail.vue

@@ -291,7 +291,7 @@ export default {
       uni.showModal({
         confirmText: "知道了",
         showCancel: false,
-        confirmColor: "#3385FF",
+        confirmColor: "#376cbb",
         content: "网络不好,请刷新重试",
         success: (res) => {
           uni.navigateBack({

+ 2 - 2
pageMy/reportPage/reportPage.vue

@@ -401,7 +401,7 @@ export default {
       uni.showModal({
         confirmText: "知道了",
         showCancel: false,
-        confirmColor: "#3385FF",
+        confirmColor: "#376cbb",
         content: "网络不好,请刷新重试",
         success: (res) => {
           uni.navigateBack({
@@ -539,7 +539,7 @@ export default {
       display: flex;
       align-items: center;
       justify-content: center;
-      background: #3385ff;
+      background: #376cbb;
       color: #fff;
       height: 60rpx;
       z-index: 99999;

+ 1 - 1
pages-message/activityTemplate/activityTemplate.vue

@@ -112,7 +112,7 @@ export default {
     width: 304rpx;
     height: 78rpx;
     margin: 50rpx auto 0;
-    background: #3385ff;
+    background: #376cbb;
     border-radius: 4rpx;
     color: #fff;
     font-size: 32rpx;

+ 1 - 1
pages-message/templateMsg/templateMsg.vue

@@ -63,7 +63,7 @@ export default {
     width: 304rpx;
     height: 78rpx;
     margin: 360rpx auto 0;
-    background: #3385ff;
+    background: #376cbb;
     border-radius: 4rpx;
     color: #fff;
     font-size: 32rpx;

+ 1 - 1
pages-purchaser/columnDetail/columnDetail.vue

@@ -112,7 +112,7 @@ export default {
               content: "请关注【查研观向小助手】 公众号,及时获取专栏下内容更新提醒",
               confirmText: "知道了",
               showCancel: false,
-              confirmColor: "#3385FF",
+              confirmColor: "#376cbb",
             });
         }
       }

+ 0 - 239
pages-purchaser/components/cssAuthorTheme.scss

@@ -1,239 +0,0 @@
-.tab-bar-ul {
-    position: sticky;
-    top: 0;
-    left: 0;
-    height: 111rpx;
-    align-items: center;
-    display: flex;
-    justify-content: flex-end;
-    padding: 10px 20rpx;
-    background-color: #fff;
-    border-bottom: 2rpx solid #f6f6f6;
-
-    .item-content {
-        display: flex;
-        height: 51rpx;
-        background: #f8f8fa;
-        width: 260rpx;
-        font-size: 24rpx;
-        border-radius: 64rpx;
-        color: #999999;
-    }
-
-    .item {
-        display: flex;
-        align-items: center;
-        justify-content: center;
-        width: 130rpx;
-        height: 51rpx;
-        border-radius: 47rpx;
-    }
-
-    .item-act {
-        background-color: #3385ff;
-        color: #fff;
-        font-weight: 500;
-    }
-}
-
-.content-ul {
-    padding: 0 30rpx;
-
-    .user-li,
-    .hot-li,
-    .kol-li {
-        padding: 30rpx 0 20rpx;
-        border-bottom: 1px solid #f6f6f6;
-    }
-
-    .user-img {
-        width: 38%;
-        justify-content: space-between;
-
-        .img-box {
-            display: flex;
-            align-items: center;
-        }
-
-        .user-pv {
-            width: 21rpx;
-            height: 16rpx;
-        }
-    }
-
-    .kol-li {
-        display: flex;
-        align-items: center;
-        padding-bottom: 30rpx;
-
-        image {
-            width: 120rpx;
-            height: 120rpx;
-            border-radius: 8rpx;
-            margin: 0 20rpx 0 15rpx;
-            overflow: hidden;
-            flex-shrink: 0;
-        }
-    }
-
-    .kol-item {
-        display: flex;
-        flex-wrap: wrap;
-        width: 480rpx;
-        height: 120rpx;
-        align-items: baseline;
-        margin-bottom: 20rpx;
-
-        .item-top {
-            width: 100%;
-            display: flex;
-            align-items: center;
-            justify-content: space-between;
-            font-size: 29rpx;
-            font-weight: 700;
-        }
-
-        .kol-text {
-            width: 50%;
-            margin-top: 10rpx;
-            flex-shrink: 0;
-        }
-    }
-
-    .li-serial {
-        width: 26rpx;
-        height: 26rpx;
-        line-height: 26rpx;
-        color: #fff;
-        font-size: 20rpx;
-        text-align: center;
-        border-radius: 4rpx 4rpx 4rpx 4rpx;
-        margin: 7rpx 10rpx 0 20rpx;
-        flex-shrink: 0;
-    }
-
-    .li-type {
-        min-width: 126rpx;
-        padding: 0 15rpx;
-        height: 34rpx;
-        // margin-top: 6rpx;
-        display: flex;
-        align-items: center;
-        justify-content: center;
-        border-radius: 4rpx;
-        color: #fff;
-        font-size: 24rpx;
-        flex-wrap: 500;
-        background: linear-gradient(90deg, #fecd18 0%, #ffdc5b 100%);
-    }
-
-    .serial-number {
-        margin-top: 0 !important;
-    }
-
-    .li-item {
-        display: flex;
-
-        .title {
-            font-size: 28rpx;
-            line-height: 39rpx;
-            font-weight: 500;
-            color: #333;
-        }
-
-        .li-industry {
-            color: #3385ff;
-            margin-left: 20rpx;
-            display: inline-block;
-            font-weight: 400;
-        }
-
-        .time-user {
-            display: flex;
-            align-items: center;
-            font-size: 24rpx;
-        }
-
-        .li-user {
-            display: flex;
-            align-items: center;
-            flex-shrink: 0;
-            width: 170rpx;
-            margin-left: 75rpx;
-        }
-
-        .li-title {
-            display: flex;
-        }
-    }
-
-    .li-bottom {
-        display: flex;
-        justify-content: space-between;
-        align-items: center;
-        margin-top: 30rpx;
-        width: 100%;
-
-        image {
-            width: 23rpx;
-            height: 26rpx;
-            margin-right: 10rpx;
-        }
-    }
-
-    .read-more {
-        margin-left: 30rpx;
-        margin-top: 20rpx;
-        display: flex;
-        flex-wrap: wrap;
-
-        .text-box {
-            margin-bottom: 27rpx;
-            margin-right: 40rpx;
-            padding: 0;
-            font-size: 24rpx;
-            color: #408fff;
-            width: 170rpx;
-            height: 46rpx;
-            line-height: 46rpx;
-            text-align: center !important;
-            background: url(~@/static/img/report_bg.png) no-repeat;
-            background-size: 100% 100%;
-            text-indent: 0em;
-        }
-    }
-
-    .attention {
-        flex-shrink: 0;
-        padding: 5rpx 28rpx;
-        border-radius: 37rpx 37rpx 37rpx 37rpx;
-        color: #fff;
-        background: #3385ff;
-        font-weight: 400;
-        font-size: 24rpx;
-    }
-
-    .hot-item {
-        justify-content: space-between;
-        align-items: center;
-
-        .hot-new {
-            align-items: center;
-            flex: 1;
-            padding-right: 20rpx;
-        }
-
-        .new-img {
-            width: 60rpx;
-            height: 30rpx;
-            margin-left: 15rpx;
-            flex-shrink: 0;
-        }
-    }
-
-    .hot-icon {
-        width: 30rpx;
-        height: 30rpx;
-        margin-left: 15rpx;
-    }
-}

+ 0 - 35
pages-purchaser/components/purchaser-report-list.scss

@@ -1,35 +0,0 @@
-@import  "./cssAuthorTheme.scss";
-
-.announcement{
-	background: #fff;
-	padding: 0 30rpx;
-	.content-ul {
-		border-top: 1px solid #f6f6f6;
-		padding:0;
-		// .li-type {
-		// 	min-width: 126rpx;
-		// 	padding: 0 15rpx;
-		// 	// width: 91rpx;
-		// 	height: 34rpx;
-		// 	// margin-top: 6rpx;
-		// 	display: flex;
-		// 	align-items: center;
-		// 	justify-content: center;
-		// 	flex-shrink: 0;
-		// 	border-radius: 4rpx;
-		// 	color: #fff;
-		// 	font-size: 20rpx;
-		// 	font-weight: 500;
-		// }
-		.li-item {
-			.li-user {
-				width: 200rpx;
-				.user_report-img {
-					width: 23rpx;
-					height: 26rpx;
-					flex-shrink: 0;
-				}
-			}
-		}
-	}
-}

+ 4 - 4
pages-purchaser/contentAllPage/contentAllPage.vue

@@ -68,7 +68,7 @@ export default {
       if (item.ContentHasStyle) {
         uni.showModal({
           content: "此内容包含较多文本格式或文档,请前往网页版编辑",
-          confirmColor: "#3385FF",
+          confirmColor: "#376cbb",
           confirmText: "知道了",
           showCancel: false,
           cancelColor: "#606266",
@@ -85,7 +85,7 @@ export default {
       uni.showModal({
         title: "驳回理由",
         content: item.Reason,
-        confirmColor: "#3385FF",
+        confirmColor: "#376cbb",
         confirmText: "知道了",
         showCancel: false,
         cancelColor: "#606266",
@@ -97,7 +97,7 @@ export default {
       uni.showModal({
         title: "提醒",
         content: "取消发布后,内容将进入草稿箱,想要重新发布需重新提交审核,确定要取消发布吗?",
-        confirmColor: "#3385FF",
+        confirmColor: "#376cbb",
         cancelColor: "#606266",
         success: async (res) => {
           if (res.confirm) {
@@ -129,7 +129,7 @@ export default {
     async deleteHandler(item) {
       uni.showModal({
         content: "确定要删除此内容吗?",
-        confirmColor: "#3385FF",
+        confirmColor: "#376cbb",
         cancelColor: "#606266",
         success: async (res) => {
           if (res.confirm) {

+ 260 - 28
pages-purchaser/lastestReport/lastestReport.vue

@@ -1,48 +1,50 @@
 <template>
   <view class="lastest-report-container">
     <view class="announcement">
-      <van-checkbox-group class="checkbox-ui" :value="newCheckboxValue" @change="checkboxChange">
-        <van-checkbox style="margin-right: 30rpx; flex-shrink: 0" shape="square" icon-size="14" :name="item.ArticleTypeId" v-for="item in checkboxGroup" :key="item.ArticleTypeId">{{
-          item.ArticleTypeName
-        }}</van-checkbox>
-      </van-checkbox-group>
+      <view class="checkbox-content">
+        <van-checkbox-group class="checkbox-ui" :value="newCheckboxValue" @change="checkboxChange">
+          <van-checkbox style="margin-right: 30rpx; flex-shrink: 0" shape="square" icon-size="14" :name="item.ArticleTypeId" v-for="item in checkboxGroup" :key="item.ArticleTypeId">
+            {{ item.ArticleTypeName }}
+          </van-checkbox>
+        </van-checkbox-group>
+      </view>
       <view class="content-ul">
         <blok v-if="haveData">
-          <view class="user-li" v-for="(item, index) in collectionList" :key="item.ArticleId">
+          <view class="global_card_content user-li" v-for="item in collectionList" :key="item.ArticleId">
             <view class="li-item">
-              <text class="li-type" :style="{ background: item.ButtonStyle }">
+              <text class="li-type global_content_center">
                 {{ item.ArticleTypeName }}
               </text>
               <view>
-                <text class="title" @click="goDetail(item)" :style="{ display: 'inline', marginLeft: item.Title.substr(0, 1) != '【' ? '14rpx' : 0 }">{{ item.Title }}</text>
+                <text class="global_title" @click="goDetail(item)" :style="{ display: 'inline', marginLeft: item.Title.substr(0, 1) != '【' ? '14rpx' : 0 }">{{ item.Title }}</text>
                 <block v-if="item.SpecialTags">
                   <text style="color: #90aeda" @click="themeDetails(key, '月度收藏榜')" v-for="it in item.SpecialTags.split(',')" class="li-industry" :key="it">#{{ it }}</text>
                 </block>
                 <text class="li-industry" @click="themeDetails(key, '月度收藏榜')" v-for="key in item.List" :key="key.IndustrialManagementId"> # {{ key.IndustryName }} </text>
               </view>
             </view>
-            <view class="li-item li-bottom" style="color: #999999">
+            <view class="li-bottom" style="color: #999999">
               <viwe class="time-user">
-                <text>
+                <view class="time">
                   {{ item.PublishDate }}
-                </text>
+                </view>
                 <view class="li-user" @click="authorDetails(item)">
-                  <image class="user_report-img" src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/czbk/user_report.png"></image>
+                  <image class="user_report-img" src="https://hzchart.oss-cn-shanghai.aliyuncs.com/new_cygx/user_report.png"></image>
                   <text class="text_oneLine"> {{ item.NickName }}</text>
                 </view>
               </viwe>
 
-              <view class="li-item user-img">
+              <view class="user-img">
                 <view class="img-box">
-                  <image class="user-pv" src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/czbk/examine_icon.png"></image>
+                  <image class="user-pv" src="https://hzchart.oss-cn-shanghai.aliyuncs.com/new_cygx/examine_icon.png"></image>
                   <text>
                     {{ item.Pv }}
                   </text>
                 </view>
                 <view class="img-box" @click="collectClick(item)">
-                  <image v-if="item.IsCollect" src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/czbk/collect_act.png"></image>
-                  <image v-else src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/czbk/collect_ico.png"></image>
-                  <text class=""> {{ item.CollectNum }}人收藏 </text>
+                  <image v-if="item.IsCollect" src="https://hzchart.oss-cn-shanghai.aliyuncs.com/new_cygx/collect_act.png"></image>
+                  <image v-else src="https://hzchart.oss-cn-shanghai.aliyuncs.com/new_cygx/collect_ico.png"></image>
+                  <text class=""> {{ item.CollectNum }} </text>
                 </view>
               </view>
             </view>
@@ -137,24 +139,254 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-@import "../components/purchaser-report-list.scss";
 .lastest-report-container {
   background-color: $uni-bg-color;
-  padding-top: 20rpx;
   box-sizing: border-box;
-  .checkbox-ui {
+  padding: 116rpx 30rpx 30rpx;
+  .checkbox-content {
+    position: fixed;
+    top: 0;
+    left: 0;
+    z-index: 9;
     width: 100%;
-    padding: 30rpx 0;
+    // height: 80rpx;
+    background-color: #fff;
+    padding: 30rpx;
+  }
+
+  /deep/ .van-checkbox-group {
+    display: flex;
     overflow: hidden;
     overflow-x: auto;
+  }
+  .content-ul {
+    margin: 20rpx 0 0;
+    border-top: 1px solid #f6f6f6;
+    .user-li,
+    .kol-li,
+    .hot-li {
+      margin-bottom: 20rpx;
+      background-color: #fff;
+    }
+    .li-serial {
+      width: 26rpx;
+      height: 26rpx;
+      line-height: 26rpx;
+      color: #fff;
+      font-size: 20rpx;
+      text-align: center;
+      border-radius: 4rpx 4rpx 4rpx 4rpx;
+      margin: 7rpx 10rpx 0 20rpx;
+      flex-shrink: 0;
+    }
+    .serial-number {
+      margin-top: 0 !important;
+    }
+    .li-item {
+      display: flex;
+      .li-industry {
+        color: $uni-color-new;
+        margin-left: 20rpx;
+        display: inline-block;
+        font-size: 32rpx;
+        font-weight: 600;
+      }
+
+      .li-title {
+        display: flex;
+      }
+    }
+    .li-type {
+      width: 126rpx;
+      height: 42rpx;
+      color: #928563;
+      font-size: 24rpx;
+      font-weight: 500;
+      border-radius: 38rpx;
+      background-color: #f2e8cc;
+      flex-shrink: 0;
+      margin-right: 10rpx;
+    }
+    .kol-item {
+      display: flex;
+      flex-wrap: wrap;
+      width: 480rpx;
+      height: 120rpx;
+      align-items: baseline;
+      margin-bottom: 20rpx;
+
+      .item-top {
+        width: 100%;
+        display: flex;
+        align-items: center;
+        justify-content: space-between;
+        font-size: 29rpx;
+        font-weight: 700;
+      }
+
+      .kol-text {
+        width: 50%;
+        margin-top: 10rpx;
+        flex-shrink: 0;
+        font-size: 24rpx;
+        font-weight: 400;
+        color: #333;
+      }
+    }
+    .li-bottom {
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+      margin-top: 30rpx;
+      width: 100%;
+      font-size: 24rpx;
+      .user-img {
+        display: flex;
+        align-items: center;
+        justify-content: flex-end;
+        width: 39%;
+        image {
+          width: 26rpx;
+          height: 26rpx;
+          margin-right: 10rpx;
+        }
+        view {
+          display: flex;
+          align-items: center;
+          flex-shrink: 0;
+          margin-left: 20rpx;
+        }
+        .user-pv {
+          width: 30rpx;
+          height: 30rpx;
+        }
+      }
+      .time-user {
+        display: flex;
+        align-items: center;
+        flex: 1;
+        .time {
+          width: 200rpx;
+        }
+        view {
+          display: flex;
+          align-items: center;
+          flex-shrink: 0;
+        }
+        image {
+          width: 24rpx;
+          height: 24rpx;
+          margin-right: 10rpx;
+        }
+      }
+    }
+    .read-more {
+      margin-top: 10rpx;
+      display: flex;
+      flex-wrap: wrap;
+      .industry-video-item {
+        height: 106rpx;
+        width: 150rpx;
+        margin: 0 10rpx 10rpx 0;
+        border-radius: 8rpx;
+        background-size: cover;
+        background-position: center;
+        background-repeat: no-repeat;
+        font-weight: 500;
+        font-size: 32rpx;
+        color: white;
+        line-height: 45rpx;
+        padding: 20rpx;
+        position: relative;
+        overflow: hidden;
+
+        .industry-video-icon {
+          height: 0rpx;
+          width: 0rpx;
+          border-style: solid;
+          border-color: #376cbb #376cbb transparent transparent;
+          border-width: 28rpx;
+          position: absolute;
+          right: 0;
+          top: 0;
+          image {
+            position: absolute;
+            right: -24rpx;
+            bottom: 0;
+            height: 20rpx;
+            width: 20rpx;
+          }
+        }
+      }
+      .text-box {
+        padding: 0;
+        margin: 0 10rpx 10rpx 0;
+        font-size: 24rpx;
+        color: $uni-color-new;
+        width: 150rpx;
+        height: 48rpx;
+        text-indent: 0em;
+        line-height: 48rpx;
+        text-align: center;
+        background-color: #f8f8fa;
+        border-radius: 200rpx;
+      }
+    }
+    .hot-item {
+      justify-content: space-between;
+      align-items: center;
+      .hot-new {
+        align-items: center;
+        flex: 1;
+        padding-right: 20rpx;
+      }
+      .new-img {
+        width: 26rpx;
+        height: 28rpx;
+        margin-left: 15rpx;
+        flex-shrink: 0;
+      }
+    }
+  }
+
+  .kol-li {
     display: flex;
-    border-bottom: 1rpx solid #ececec;
+    align-items: center;
+    padding-bottom: 30rpx;
+    image {
+      width: 120rpx;
+      height: 120rpx;
+      border-radius: 8rpx;
+      margin: 0 20rpx 0 15rpx;
+      overflow: hidden;
+      flex-shrink: 0;
+    }
+  }
+  .content-bottom {
+    background-color: $uni-bg-color;
+    text-align: center;
+    line-height: 100rpx;
+    color: #c4c4c4;
+    font-size: 20rpx;
+  }
+  .industry-color {
+    font-size: 26rpx;
+    padding: 0rpx 20rpx;
+    border-radius: 4rpx;
+    margin-left: 20rpx;
+  }
+  .follw {
+    color: #fff;
+    border-radius: 4rpx;
+    font-size: 24rpx;
+    width: 110rpx;
+    height: 42rpx;
+    background-color: $uni-color-new;
+  }
+  .cancel-follw {
+    background-color: #e5efff;
+    color: $uni-color-new;
   }
 }
 </style>
-<style lang="scss">
-.van-checkbox-group {
-  display: flex;
-  flex-wrap: wrap;
-}
-</style>
+<style lang="scss"></style>

+ 1 - 1
pages-purchaser/purchaserActivity/purchaserActivity.vue

@@ -137,7 +137,7 @@
 				white-space: nowrap;
 			}
 			.active {
-			  background-color: #3385ff;
+			  background-color: #376cbb;
 			  color: #fff;
 			}
 		}

+ 1 - 0
pages-purchaser/researchAuthor/researchAuthor.vue

@@ -224,6 +224,7 @@ export default {
       left: 0 !important;
       margin: 0 !important;
       padding: 0 !important;
+      border-radius: 0!important;
     }
   }
 }

+ 8 - 6
pages-purchaser/researchList/researchList.vue

@@ -265,7 +265,7 @@ export default {
     margin: 20rpx 0 0;
     border-top: 1px solid #f6f6f6;
     .user-li,
-	.kol-li,
+    .kol-li,
     .hot-li {
       margin-bottom: 20rpx;
       background-color: #fff;
@@ -290,6 +290,8 @@ export default {
         color: $uni-color-new;
         margin-left: 20rpx;
         display: inline-block;
+        font-size: 32rpx;
+        font-weight: 600;
       }
 
       .li-title {
@@ -335,8 +337,8 @@ export default {
         justify-content: flex-end;
         width: 39%;
         image {
-          width: 24rpx;
-          height: 24rpx;
+          width: 26rpx;
+          height: 26rpx;
           margin-right: 10rpx;
         }
         view {
@@ -346,8 +348,8 @@ export default {
           margin-left: 20rpx;
         }
         .user-pv {
-          width: 24rpx;
-          height: 24rpx;
+          width: 30rpx;
+          height: 30rpx;
         }
       }
       .time-user {
@@ -393,7 +395,7 @@ export default {
           height: 0rpx;
           width: 0rpx;
           border-style: solid;
-          border-color: #3385ff #3385ff transparent transparent;
+          border-color: #376cbb #376cbb transparent transparent;
           border-width: 28rpx;
           position: absolute;
           right: 0;

+ 13 - 9
pages-purchaser/researchTheme/researchTheme.vue

@@ -97,9 +97,9 @@ export default {
     display: flex;
     justify-content: flex-end;
     padding: 10px 20rpx;
-    background-color: #fff;
+    background-color: $uni-bg-color;
     border-bottom: 2rpx solid #f6f6f6;
-
+    z-index: 9;
     .item-content {
       display: flex;
       height: 48rpx;
@@ -127,7 +127,7 @@ export default {
   }
 
   .content-ul {
-    padding: 0 30rpx;
+    padding: 10rpx 30rpx;
     .hot-li {
       background-color: #fff;
       margin-bottom: 20rpx;
@@ -145,10 +145,11 @@ export default {
       }
 
       .li-industry {
-        color: #3385ff;
+        color: $uni-color-new;
         margin-left: 20rpx;
         display: inline-block;
-        font-weight: 400;
+        font-size: 32rpx;
+        font-weight: 600;
       }
 
       .time-user {
@@ -203,10 +204,13 @@ export default {
 
     .hot-icon {
       position: absolute;
-      width: 106rpx;
-      height: 48rpx;
-      top: 0;
-      left: 0;
+      width: 106rpx !important;
+      height: 48rpx !important;
+      top: 0 !important;
+      left: 0 !important;
+      margin: 0 !important;
+      padding: 0 !important;
+      border-radius: 0 !important;
     }
     .follw {
       color: #fff;

+ 1 - 1
pages-purchaser/toExamine/toExamine.vue

@@ -74,7 +74,7 @@ export default {
       uni.showModal({
         title: "提醒",
         content: "确定通过此内容在小程序展示吗?",
-        confirmColor: "#3385FF",
+        confirmColor: "#376cbb",
         cancelColor: "#606266",
         success: async (res) => {
           if (res.confirm) {

+ 3 - 3
pages-purchaser/writeNote/writeNote.vue

@@ -226,7 +226,7 @@ export default {
       uni.showModal({
         title: "确认发布",
         content: "内容将提交给管理员审核后发布,确定要提交审核吗?",
-        confirmColor: "#3385FF",
+        confirmColor: "#376cbb",
         cancelColor: "#606266",
         success: async (res) => {
           if (res.confirm) {
@@ -250,7 +250,7 @@ export default {
                   content: "提交成功,审核结果将通过公众号消息提醒您,请留意【查研观向小助手】公众号",
                   confirmText: "知道了",
                   showCancel: false,
-                  confirmColor: "#3385FF",
+                  confirmColor: "#376cbb",
                   success: function (r) {
                     if (r.confirm) {
                       uni.navigateBack();
@@ -270,7 +270,7 @@ export default {
       uni.showModal({
         title: "是否保存当前修改",
         content: "保存的草稿可在【内容中心】查看",
-        confirmColor: "#3385FF",
+        confirmColor: "#376cbb",
         cancelColor: "#606266",
         cancelText: "不保存",
         confirmText: "保存",

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

@@ -93,7 +93,7 @@ export default {
       left: 0;
       width: 6rpx;
       height: 31rpx;
-      background-color: #3385ff;
+      background-color: #376cbb;
     }
   }
   .item-rich-text {

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

@@ -266,7 +266,7 @@ export default {
       background-color: #f8f8fa;
     }
     .state-active-item {
-      background: #3385ff;
+      background: #376cbb;
       color: #fff;
       border-radius: 47rpx;
     }
@@ -284,7 +284,7 @@ export default {
       color: #fff;
       display: flex;
       align-items: center;
-      background-color: #3385ff;
+      background-color: #376cbb;
       border-radius: 20rpx;
       padding-left: 4rpx;
       .audio-img {
@@ -338,7 +338,7 @@ export default {
         right: 59rpx;
         top: 50%;
         transform: translateY(-50%);
-        color: #3385ff;
+        color: #376cbb;
         .line {
           margin: 0 21rpx;
           color: #e0e0e0;

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

@@ -90,7 +90,7 @@ export default {
       align-items: center;
       background-color: #fff;
       border-top: 1rpx solid #f0f0f0;
-      color: #3385ff;
+      color: #376cbb;
       .btn {
         flex: 1;
         display: flex;

+ 143 - 171
pages-search/components/report.vue

@@ -2,35 +2,29 @@
   <view class="container-report-page">
     <view class="content-list">
       <block v-if="reportPageData.ListHzResource.length">
-        <view class="resource">
+        <view class="resource global_title">
           <image src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/czbk/zybico.jpg"></image>
           <text>弘则资源包</text>
         </view>
         <text style="height: 1rpx; background: #ececec"></text>
-        <view class="list-ui" v-for="item in reportPageData.ListHzResource" :key="item.IndustrialManagementId" @click="themeDetails(item)">
-          <view class="item-title">
-            <view style="display: flex; align-items: center">
-              <view class="industry-box-left" @click.stop="reportFllow(item.IndustrialManagementId, '弘则')">
-                <image src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/attention_act.png" v-if="item.IsFollw"></image>
-                <image src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/attention_icon.png" v-else></image>
-              </view>
-              {{ item.IndustryName }}
-              <image class="hot-icon" v-if="item.IsHot" src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/hot_report.png" mode=""></image>
-              <image v-if="item.IsNew" src="https://hzstatic.hzinsights.com/cygx/icon/new_report.png" mode=""></image>
+        <view class="global_card_content list-ui" v-for="item in reportPageData.ListHzResource" :key="item.IndustrialManagementId" @click.stop="themeDetails(item)">
+          <view class="industry-content">
+            <view class="industry-box-left">
+              <image
+                class="follw-image"
+                @click.stop="reportFllow(item.IndustrialManagementId, '弘则')"
+                :src="item.IsFollw ? 'https://hzchart.oss-cn-shanghai.aliyuncs.com/new_cygx/collected_icon.png' : 'https://hzchart.oss-cn-shanghai.aliyuncs.com/new_cygx/not_collected.png'"
+              ></image>
+              <view class="global_title">{{ item.IndustryName }} </view>
             </view>
-            <view class="publish">
-              <text class="reg-hint" v-if="item.IsRed"></text>
-              {{ item.PublishDate }}
-              <u-icon name="arrow-right" color="#BDBDBD" size="34"></u-icon>
+            <view class="ndustry-box-tiem global_content_center">
+              <text v-if="item.IsRed" class="read"></text>
+              <text class="ndustry-box-text">{{ item.UpdateTime }}</text>
+              <u-icon name="arrow-right" color="#333" size="28"></u-icon>
             </view>
           </view>
           <view class="read-more">
-            <view
-              class="industry-video-item"
-              @click.stop="handelVideoPlay(item)"
-              :style="{ 'background-image': 'url(' + item.IndustryVideo.BackgroundImg + ')' }"
-              v-if="item.IndustryVideo"
-            >
+            <view class="industry-video-item" @click.stop="handelVideoPlay(item)" :style="{ 'background-image': 'url(' + item.IndustryVideo.BackgroundImg + ')' }" v-if="item.IndustryVideo">
               5min
               <br />
               逻辑解析
@@ -39,101 +33,97 @@
               </view>
             </view>
             <block v-if="item.IndustrialSubjectList">
-              <view v-if="item.IndustryVideo" style="display: flex; flex-wrap: wrap; width: 420rpx">
-                <view v-for="val in item.IndustrialSubjectList.slice(0, 4)" :key="val.IndustrialSubjectId" class="text-box text_oneLine">
-                  {{ val.SubjectName }}
-                </view>
+              <view v-if="item.IndustryVideo" style="display: flex; flex-wrap: wrap; width: 502rpx">
+                <view v-for="val in item.IndustrialSubjectList.slice(0, 6)" :key="val.IndustrialSubjectId" class="text-box text_oneLine">{{ val.SubjectName }}</view>
               </view>
-              <block v-if="item.IndustryVideo && item.IndustrialSubjectList.length > 4">
-                <view v-for="val in item.IndustrialSubjectList.slice(4)" :key="val.IndustrialSubjectId" class="text-box text_oneLine">
-                  {{ val.SubjectName }}
-                </view>
+              <block v-if="item.IndustryVideo && item.IndustrialSubjectList.length > 6">
+                <view v-for="val in item.IndustrialSubjectList.slice(6)" :key="val.IndustrialSubjectId" class="text-box">{{ val.SubjectName }}</view>
               </block>
               <block v-if="!item.IndustryVideo">
-                <view v-for="val in item.IndustrialSubjectList" :key="val.IndustrialSubjectId" class="text-box text_oneLine">
-                  {{ val.SubjectName }}
-                </view>
+                <view v-for="val in item.IndustrialSubjectList" :key="val.IndustrialSubjectId" class="text-box text_oneLine">{{ val.SubjectName }}</view>
               </block>
             </block>
           </view>
         </view>
       </block>
       <block v-if="reportPageData.ListYxResource.length">
-        <view class="resource">
+        <view class="resource global_title">
           <image src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/czbk/zybico.jpg"></image>
           <text>买方研选主题</text>
         </view>
         <text style="height: 1rpx; background: #ececec"></text>
-        <view class="list-ui" v-for="item in reportPageData.ListYxResource" :key="item.IndustrialManagementId" @click="themeDetails(item)">
-          <view class="item-title">
-            <view style="display: flex; align-items: center">
-              <view class="industry-box-left" @click.stop="reportFllow(item.IndustrialManagementId, '研选')">
-                <image src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/attention_act.png" v-if="item.IsFollw"></image>
-                <image src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/attention_icon.png" v-else></image>
-              </view>
-              {{ item.IndustryName }}
-              <image class="hot-icon" v-if="item.IsHot" src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/hot_report.png" mode=""></image>
-              <image v-if="item.IsNew" src="https://hzstatic.hzinsights.com/cygx/icon/new_report.png" mode=""></image>
+        <view class="global_card_content list-ui" v-for="item in reportPageData.ListYxResource" :key="item.IndustrialManagementId" @click.stop="themeDetails(item)">
+          <view class="industry-content">
+            <view class="industry-box-left">
+              <image
+                class="follw-image"
+                @click.stop="reportFllow(item.IndustrialManagementId, '研选')"
+                :src="item.IsFollw ? 'https://hzchart.oss-cn-shanghai.aliyuncs.com/new_cygx/collected_icon.png' : 'https://hzchart.oss-cn-shanghai.aliyuncs.com/new_cygx/not_collected.png'"
+              ></image>
+              <view class="global_title">{{ item.IndustryName }} </view>
             </view>
-            <view class="publish">
-              {{ item.PublishDate }}
-              <u-icon name="arrow-right" color="#BDBDBD" size="34"></u-icon>
+            <view class="ndustry-box-tiem global_content_center">
+              <text class="ndustry-box-text">{{ item.UpdateTime }}</text>
+              <u-icon name="arrow-right" color="#333" size="28"></u-icon>
             </view>
           </view>
+
           <view class="read-more" v-if="item.IndustrialSubjectList">
-            <text class="text-box text_oneLine" v-for="val in item.IndustrialSubjectList" :key="val.IndustrialSubjectId">
-              {{ val.SubjectName }}
-            </text>
+            <view v-for="val in item.IndustrialSubjectList" :key="val.IndustrialSubjectId" class="text-box text_oneLine">{{ val.SubjectName }}</view>
           </view>
         </view>
       </block>
     </view>
     <view class="content-report">
       <block v-if="reportPageData.ListYxReport.length">
-        <view class="resource">
+        <view class="resource global_title">
           <image src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/czbk/report_Yx.png"></image>
           <text>买方研选报告</text>
         </view>
         <text style="height: 1rpx; background: #ececec"></text>
-        <view class="content-item" v-for="item in reportPageData.ListYxReport" :key="item.ArticleId">
-          <view class="item-user">
-            <image src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/czbk/user_report.png"></image>
+        <view class="global_card_content content-item" v-for="item in reportPageData.ListYxReport" :key="item.ArticleId">
+          <view class="item-user" v-if="item.NickName">
+            <image src="https://hzchart.oss-cn-shanghai.aliyuncs.com/new_cygx/user_report.png"></image>
             <text> {{ item.NickName }}</text>
           </view>
-					<view class="item-title yan-xuan-tag" @click="goDetailReport(item)">
-							{{item.Title}}
-							<text @click.stop="themeDetails(item, val)" class="item-industry" v-for="val in item.List" :key="val.IndustrialManagementId">
-							  # {{ val.IndustryName }}&nbsp;&nbsp;&nbsp;
-							</text>
-					</view>
+          <view class="title-content-box">
+            <view v-if="item.ArticleTypeName" class="tag global_content_center">{{ item.ArticleTypeName }}</view>
+            <view class="item-title global_title" @click="goDetailReport(item)">
+              {{ item.Title }}
+              <block v-if="item.List.length">
+                <text @click.stop="themeDetails(item, val)" class="item-industry" v-for="val in item.List" :key="val.IndustrialManagementId"> # {{ val.IndustryName }} </text>
+              </block>
+              <block v-if="item.SpecialTags.length">
+                <text @click.stop="themeDetails(item, val)" class="item-industry" style="color:#90aeda" v-for="val in item.SpecialTags.split(',')" :key="val"> # {{ val }} </text>
+              </block>
+            </view>
+          </view>
           <view class="item-more">
             <text>{{ item.PublishDate }}</text>
-            <view class="pv-ollect">
+            <view class="global_pv-ollect">
               <view>
-                <image class="pv" src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/czbk/examine_icon.png"></image>
+                <image class="pv" src="https://hzchart.oss-cn-shanghai.aliyuncs.com/new_cygx/examine_icon.png"></image>
                 {{ item.Pv }}
               </view>
               <view @click="collectClick(item)">
-                <image v-if="item.IsCollect" src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/czbk/collect_act.png"></image>
-                <image v-else src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/czbk/collect_ico.png"></image>
-                {{ item.CollectNum }}人收藏
+                <image v-if="item.IsCollect" src="https://hzchart.oss-cn-shanghai.aliyuncs.com/new_cygx/collect_act.png"></image>
+                <image v-else src="https://hzchart.oss-cn-shanghai.aliyuncs.com/new_cygx/collect_ico.png"></image>
+                {{ item.CollectNum }}
               </view>
             </view>
           </view>
         </view>
       </block>
       <block v-if="reportPageData.ListHzReport.length">
-        <view class="resource">
+        <view class="resource global_title">
           <image src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/czbk/report_Hz.png"></image>
           <text>弘则报告</text>
         </view>
         <text style="height: 1rpx; background: #ececec"></text>
-        <view class="content-item" v-for="item in reportPageData.ListHzReport" :key="item.ArticleId">
-          <view class="item-title">
+        <view class="global_card_content content-item" v-for="item in reportPageData.ListHzReport" :key="item.ArticleId">
+          <view class="item-title global_title">
             <text style="display: inline; margin-right: 10rpx" @click="goDetailReport(item)"> {{ item.Title }} </text>
-            <text class="item-industry" v-for="key in item.List" :key="key.IndustrialManagementId" @click="themeDetails(key)"
-              >#{{ key.IndustryName }}&nbsp;&nbsp;&nbsp;</text
-            >
+            <text class="item-industry" v-for="key in item.List" :key="key.IndustrialManagementId" @click="themeDetails(key)">#{{ key.IndustryName }}&nbsp;&nbsp;&nbsp;</text>
           </view>
           <view class="item-more">
             <text>{{ item.PublishDate }}</text>
@@ -159,12 +149,7 @@
     <!-- 视频模块 -->
     <videoModule :showVideoPop.sync="showVideoPop" :videoPopList="videoPopList" class="industry-video-module" />
     <!-- 权限弹窗 -->
-    <modalDialog
-      :isShowhasPermission="isShowhasPermission"
-      :applyForIsShow="applyForIsShow"
-      :jurisdictionList="jurisdictionList"
-      :hasPermission="hasPermission"
-    />
+    <modalDialog :isShowhasPermission="isShowhasPermission" :applyForIsShow="applyForIsShow" :jurisdictionList="jurisdictionList" :hasPermission="hasPermission" />
   </view>
 </template>
 
@@ -320,10 +305,12 @@ export default {
 <style scoped lang="scss">
 .container-report-page {
   background-color: $uni-bg-color;
+  padding: 0 24rpx;
   .content-list {
     .list-ui {
       background-color: #fff;
       margin-top: 2rpx;
+      margin-bottom: 20rpx;
     }
     .item-title {
       display: flex;
@@ -333,53 +320,19 @@ export default {
       border-bottom: 1px solid #f6f6f6;
       padding: 0 30rpx;
       background-color: #fff;
-      .publish {
-        position: relative;
-        display: flex;
-        align-items: center;
-        color: #999999;
-        font-style: 26rpx;
-        padding-left: 30rpx;
-        .reg-hint {
-          position: absolute;
-          top: 50%;
-          left: 0rpx;
-          width: 14rpx;
-          height: 14rpx;
-          transform: translateY(-50%);
-          background-color: #ff0000;
-          border-radius: 50%;
-        }
-      }
       image {
         margin-left: 10rpx;
         width: 60rpx;
         height: 30rpx;
       }
-
-      .hot-icon {
-        width: 30rpx;
-      }
-      .industry-box-left {
-        width: 50rpx;
-        display: flex;
-        align-items: center;
-        margin-right: 10rpx;
-        image {
-          width: 38rpx;
-          height: 34rpx;
-        }
-      }
     }
     .read-more {
-      margin-top: 20rpx;
       display: flex;
       flex-wrap: wrap;
-      margin-left: 80rpx;
       .industry-video-item {
-        height: 126rpx;
-        width: 170rpx;
-        margin: 0 40rpx 30rpx 0;
+        height: 106rpx;
+        width: 150rpx;
+        margin: 0 10rpx 10rpx 0;
         border-radius: 8rpx;
         background-size: cover;
         background-position: center;
@@ -391,11 +344,12 @@ export default {
         padding: 20rpx;
         position: relative;
         overflow: hidden;
+
         .industry-video-icon {
           height: 0rpx;
           width: 0rpx;
           border-style: solid;
-          border-color: #3385ff #3385ff transparent transparent;
+          border-color: #376cbb #376cbb transparent transparent;
           border-width: 28rpx;
           position: absolute;
           right: 0;
@@ -410,33 +364,25 @@ export default {
         }
       }
       .text-box {
-        margin-bottom: 30rpx;
-        margin-right: 40rpx;
         padding: 0;
+        margin: 0 10rpx 10rpx 0;
         font-size: 24rpx;
-        color: #408fff;
-        width: 170rpx;
-        height: 46rpx;
-        line-height: 46rpx;
-        text-align: center !important;
-        background: url(~@/static/img/report_bg.png) no-repeat;
-        background-size: 100% 100%;
+        color: $uni-color-new;
+        width: 150rpx;
+        height: 48rpx;
         text-indent: 0em;
+        line-height: 48rpx;
+        text-align: center;
+        background-color: #f8f8fa;
+        border-radius: 200rpx;
       }
     }
   }
   .resource {
-    padding: 0 30rpx;
-    background-color: #fff;
-    margin-top: 4rpx;
-    height: 91rpx;
-    width: 100%;
     display: flex;
     align-items: center;
-    justify-content: center;
-    color: #333333;
-    font-size: 30rpx;
-    margin-top: 20rpx;
+    height: 66rpx;
+    width: 100%;
     image {
       width: 34rpx;
       height: 36rpx;
@@ -446,40 +392,29 @@ export default {
   .content-report {
     .content-item {
       background-color: #fff;
-      padding: 35rpx 20rpx 0;
+      padding: 20rpx;
+      margin-bottom: 20rpx;
+      border-top: 4rpx solid #376cbb;
       .item-title {
         font-weight: 500;
-				position: relative;
+        position: relative;
         .item-industry {
-					text-indent: 0;
+          text-indent: 0;
           margin-right: 10rpx;
-          color: #3385ff;
+          color: #376cbb;
           display: inline-block;
         }
       }
-			.yan-xuan-tag{
-				text-indent: 82rpx;
-				&::before {
-				  content: "";
-				  position: absolute;
-				  top: 5rpx;
-					background-image: url(https://hzstatic.hzinsights.com/cygx/icon/Research_normal.png);
-					background-size: 100% 100%;
-					background-repeat: no-repeat;
-				  left: 0;
-				  width: 73rpx;
-				  height: 30rpx;
-				}
-			}
       .item-user {
         display: flex;
         align-items: center;
         color: #999999;
-        font-size: 28rpx;
-        margin-bottom: 20rpx;
+        font-size: 24rpx;
+        margin-bottom: 10rpx;
+        margin-top: -10rpx;
         image {
-          width: 23rpx;
-          height: 26rpx;
+          width: 24rpx;
+          height: 24rpx;
           margin-right: 20rpx;
         }
       }
@@ -487,25 +422,62 @@ export default {
         display: flex;
         justify-content: space-between;
         color: #cecece;
-        margin: 20rpx 0 0;
-        padding-bottom: 30rpx;
-        border-bottom: 1rpx solid #ececec;
-        .pv-ollect {
-          display: flex;
-          align-items: center;
-          width: 40%;
-          justify-content: space-between;
-          image {
-            width: 22rpx;
-            height: 21rpx;
-            margin-right: 10rpx;
-          }
-          .pv {
-            height: 16rpx;
-          }
-        }
+        margin-top: 20rpx;
       }
     }
   }
+
+  .industry-content {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    margin-bottom: 15rpx;
+    .industry-box-left {
+      display: flex;
+      align-items: center;
+      .follw {
+        color: #fff;
+        border-radius: 4rpx;
+        font-size: 24rpx;
+        width: 110rpx;
+        height: 42rpx;
+        margin-right: 10rpx;
+        background-color: $uni-color-new;
+      }
+    }
+    .ndustry-box-tiem {
+      font-size: 24rpx;
+      color: #999;
+      .read {
+        width: 14rpx;
+        height: 14rpx;
+        background-color: #ff0000;
+        border-radius: 50%;
+        margin-right: 10rpx;
+      }
+      .ndustry-box-text {
+        margin: 0 10rpx;
+      }
+    }
+  }
+  .follw-image {
+    width: 32rpx;
+    height: 32rpx;
+    margin-right: 10rpx;
+  }
+  .title-content-box {
+    display: flex;
+    .tag {
+      width: 126rpx;
+      height: 42rpx;
+      color: #928563;
+      font-size: 24rpx;
+      font-weight: 500;
+      border-radius: 38rpx;
+      background-color: #f2e8cc;
+      flex-shrink: 0;
+      margin-right: 10rpx;
+    }
+  }
 }
 </style>

+ 5 - 5
pages-search/indedxSearch/indedxSearch.vue

@@ -17,7 +17,7 @@
           <view class="ipt-right">
             <icon type="clear" size="16" color="#E0E0E0" v-show="searchTxt" @click="clearIpt" />
             <text class="line">|</text>
-            <text @click="searchHandle" style="color: #3385ff">搜索</text>
+            <text @click="searchHandle" style="color: #376cbb">搜索</text>
           </view>
         </view>
         <!-- // 综合及各种类型的的tabs -->
@@ -539,7 +539,7 @@ export default {
       right: 59rpx;
       top: 50%;
       transform: translateY(-50%);
-      color: #3385ff;
+      color: #376cbb;
       .line {
         margin: 0 21rpx;
         color: #e0e0e0;
@@ -626,7 +626,7 @@ export default {
     .bind-mobile {
       width: 244rpx;
       height: 58rpx;
-      background: #3385ff;
+      background: #376cbb;
       border-radius: 8rpx;
       font-size: 28rpx;
       line-height: 58rpx;
@@ -659,7 +659,7 @@ export default {
       }
     }
     .more-rivet {
-      color: #3385ff;
+      color: #376cbb;
       margin-left: 20rpx;
     }
   }
@@ -683,7 +683,7 @@ export default {
       border-radius: 47rpx;
     }
     .active-item {
-      background-color: #3385ff;
+      background-color: #376cbb;
       color: #fff;
     }
   }

+ 7 - 7
pages/activity/activity.vue

@@ -81,7 +81,7 @@ export default {
       whichDay: "",
       activityTypeId: "",
       chartPermissionIds: "",
-      chartPermissionName: "所有行业",
+      chartPermissionName: "行业",
       isGetJurisdiction: 0,
       isrefresh: true,
       isShowJurisdiction: false, //
@@ -100,8 +100,8 @@ export default {
       // 计算分享时候的title
       let arr = this.whichDay ? this.whichDay.split(",") : [];
       let whichData = arr.length == 2 ? "今日活动,明日活动" : arr == "1" ? "今日活动" : arr == "2" ? "明日活动" : "";
-      let title = whichData ? whichData + "," + this.chartPermissionName : this.chartPermissionName !== "所有行业" ? this.chartPermissionName : "";
-      return title || "近期所有行业活动预告";
+      let title = whichData ? whichData + "," + this.chartPermissionName : this.chartPermissionName !== "行业" ? this.chartPermissionName : "";
+      return title || "近期行业活动预告";
     },
   },
   methods: {
@@ -155,7 +155,7 @@ export default {
             item.IsChoose = false;
           }
         });
-        this.chartPermissionName = str.length == 6 ? "所有行业" : str.join(",");
+        this.chartPermissionName = str.length == 6 ? "行业" : str.join(",");
       }
     },
 
@@ -175,7 +175,7 @@ export default {
       this.chartPermissionIds = "";
       this.isShowJurisdiction = false;
       this.listChartPermission.map((item) => (item.IsChoose = false));
-      this.chartPermissionName = "所有行业";
+      this.chartPermissionName = "行业";
       this.getActivityLabelTypeList();
     },
 
@@ -191,7 +191,7 @@ export default {
           }
         });
       if (str.length == this.listChartPermission.length || str.length <= 0) {
-        this.chartPermissionName = "所有行业";
+        this.chartPermissionName = "行业";
       } else {
         this.chartPermissionName = str.join(",");
       }
@@ -433,7 +433,7 @@ export default {
 }
 /deep/.van-dropdown-menu__item {
   box-sizing: border-box;
-  width: 166rpx;
+  width: 160rpx;
   padding-right: 20rpx;
   height: 51rpx;
   border-radius: 26rpx;

+ 1 - 1
pages/activity/components/activityTypeList.vue

@@ -213,7 +213,7 @@
 	//   width: 100%;
 	//   text-align: center;
 	//   font-size: 34rpx;
-	//   color: #3385ff;
+	//   color: #376cbb;
 	//   margin-top: 90rpx;
 	// }
 	.activity-ui {

+ 1 - 1
pages/index/components/ItemContent.vue

@@ -100,7 +100,7 @@ export default {
       left: 0;
       width: 6rpx;
       height: 31rpx;
-      background-color: #3385ff;
+      background-color: #376cbb;
     }
   }
   .item-rich-text {

+ 1 - 1
pages/index/components/morningDlg.vue

@@ -90,7 +90,7 @@ export default {
       align-items: center;
       background-color: #fff;
       border-top: 1rpx solid #f0f0f0;
-      color: #3385ff;
+      color: #376cbb;
       .btn {
         flex: 1;
         display: flex;

+ 3 - 3
pages/index/index.vue

@@ -243,7 +243,7 @@ export default {
       uni.showModal({
         title: "即将前往登录页面,请确认是否继续",
         content: "为了给您提供更好的使用体验,请登录后再进行查看或操作",
-        confirmColor: "#3385FF",
+        confirmColor: "#376cbb",
         cancelColor: "#606266",
         success: function (res) {
           if (res.confirm) {
@@ -565,7 +565,7 @@ export default {
     padding-bottom: 100rpx;
     .login-text {
       display: inline-block;
-      color: #3385ff;
+      color: #376cbb;
     }
   }
   .lable-select-content {
@@ -595,7 +595,7 @@ export default {
       color: #999999;
     }
     .item-active {
-      border:none;
+      border: none;
       font-weight: 500;
       background: #e5efff;
       color: $uni-color-new;

+ 4 - 4
pages/material/material.vue

@@ -24,7 +24,7 @@
           </view>
         </view>
         <block v-if="topTabsActive == '3'">
-          <view class="children-ul">
+          <view class="children-ul" v-if="chartChildren.length">
             <view :class="['chart-children', chartChildrenActive == item.CtagId ? 'children-active' : '']" v-for="item in chartChildren" :key="item.CtagId" @click="handleChartChildren(item)">{{
               item.Name
             }}</view>
@@ -393,7 +393,7 @@ export default {
     myChartCollect(id) {
       uni.showModal({
         content: "确认要将该图表移除我的收藏吗?",
-        confirmColor: "#3385FF",
+        confirmColor: "#376cbb",
         cancelColor: "#606266",
         success: async (res) => {
           if (res.confirm) {
@@ -427,7 +427,7 @@ export default {
       uni.showModal({
         title: "即将前往登录页面,请确认是否继续",
         content: "为了给您提供更好的使用体验,请登录后再进行查看或操作",
-        confirmColor: "#3385FF",
+        confirmColor: "#376cbb",
         cancelColor: "#606266",
         success: function (res) {
           if (res.confirm) {
@@ -623,7 +623,7 @@ export default {
     .bind-mobile {
       width: 244rpx;
       height: 58rpx;
-      background: #3385ff;
+      background: #376cbb;
       border-radius: 8rpx;
       font-size: 28rpx;
       line-height: 58rpx;

+ 2 - 2
pages/purchaser/purchaser.vue

@@ -242,7 +242,7 @@ export default {
         padding: 20rpx;
         font-size: 28rpx;
         font-weight: 400;
-        color: #3385ff;
+        color: #376cbb;
         .content-box-head-title {
           display: flex;
           align-items: center;
@@ -329,7 +329,7 @@ export default {
             color: #333333;
             line-height: 46rpx;
             .purchaser-content-row-object {
-              color: #3385ff;
+              color: #376cbb;
               display: inline-block;
               margin-left: 8rpx;
             }

+ 7 - 1
pages/reportForm/index.scss

@@ -219,6 +219,7 @@
       display: flex;
       align-items: center;
       justify-content: space-between;
+      margin-bottom: 15rpx;
       .industry-box-left {
         display: flex;
         align-items: center;
@@ -417,7 +418,7 @@
         height: 0rpx;
         width: 0rpx;
         border-style: solid;
-        border-color: #3385ff #3385ff transparent transparent;
+        border-color: #376cbb #376cbb transparent transparent;
         border-width: 28rpx;
         position: absolute;
         right: 0;
@@ -451,3 +452,8 @@
   width: 100%;
   text-align: center;
 }
+.follw-image {
+  width: 32rpx;
+  height: 32rpx;
+  margin-right: 10rpx;
+}

+ 26 - 26
pages/reportForm/reportForm.vue

@@ -79,7 +79,7 @@
             </view>
             <view class="box-right">
               <text>{{ item.UpdateTime }}</text>
-              <u-icon name="arrow-right" color="#BDBDBD" size="34"></u-icon>
+              <u-icon name="arrow-right" color="#333333" size="34"></u-icon>
             </view>
           </view>
         </view>
@@ -115,9 +115,11 @@
           <!-- 火锅底料这个位置 -->
           <view class="industry-content">
             <view class="industry-box-left">
-              <view :class="['follw', 'global_content_center', item.IsFollow && 'cancel-follw']" @click.stop="reportFllow(item.IndustrialManagementId)">
-                {{ item.IsFollow ? "取消关注" : "+ 关注" }}
-              </view>
+              <image
+                class="follw-image"
+                @click.stop="reportFllow(item.IndustrialManagementId)"
+                :src="item.IsFollow ? 'https://hzchart.oss-cn-shanghai.aliyuncs.com/new_cygx/collected_icon.png' : 'https://hzchart.oss-cn-shanghai.aliyuncs.com/new_cygx/not_collected.png'"
+              ></image>
               <view class="global_title">{{ item.IndustryName }} </view>
             </view>
             <view class="ndustry-box-tiem global_content_center">
@@ -126,28 +128,26 @@
               <u-icon name="arrow-right" color="#333" size="28"></u-icon>
             </view>
           </view>
-          <view class="content-box">
-            <view class="read-more">
-              <view class="industry-video-item" @click.stop="handelVideoPlay(item)" :style="{ 'background-image': 'url(' + item.IndustryVideo.BackgroundImg + ')' }" v-if="item.IndustryVideo">
-                5min
-                <br />
-                逻辑解析
-                <view class="industry-video-icon">
-                  <image src="https://hzstatic.hzinsights.com/cygx/video-right-top-icon.svg"></image>
-                </view>
+          <view class="read-more">
+            <view class="industry-video-item" @click.stop="handelVideoPlay(item)" :style="{ 'background-image': 'url(' + item.IndustryVideo.BackgroundImg + ')' }" v-if="item.IndustryVideo">
+              5min
+              <br />
+              逻辑解析
+              <view class="industry-video-icon">
+                <image src="https://hzstatic.hzinsights.com/cygx/video-right-top-icon.svg"></image>
               </view>
-              <block v-if="item.IndustrialSubjectList">
-                <view v-if="item.IndustryVideo" style="display: flex; flex-wrap: wrap; width: 502rpx">
-                  <view v-for="val in item.IndustrialSubjectList.slice(0, 6)" :key="val.IndustrialSubjectId" class="text-box text_oneLine">{{ val.SubjectName }}</view>
-                </view>
-                <block v-if="item.IndustryVideo && item.IndustrialSubjectList.length > 6">
-                  <view v-for="val in item.IndustrialSubjectList.slice(6)" :key="val.IndustrialSubjectId" class="text-box">{{ val.SubjectName }}</view>
-                </block>
-                <block v-if="!item.IndustryVideo">
-                  <view v-for="val in item.IndustrialSubjectList" :key="val.IndustrialSubjectId" class="text-box text_oneLine">{{ val.SubjectName }}</view>
-                </block>
-              </block>
             </view>
+            <block v-if="item.IndustrialSubjectList">
+              <view v-if="item.IndustryVideo" style="display: flex; flex-wrap: wrap; width: 502rpx">
+                <view v-for="val in item.IndustrialSubjectList.slice(0, 6)" :key="val.IndustrialSubjectId" class="text-box text_oneLine">{{ val.SubjectName }}</view>
+              </view>
+              <block v-if="item.IndustryVideo && item.IndustrialSubjectList.length > 6">
+                <view v-for="val in item.IndustrialSubjectList.slice(6)" :key="val.IndustrialSubjectId" class="text-box">{{ val.SubjectName }}</view>
+              </block>
+              <block v-if="!item.IndustryVideo">
+                <view v-for="val in item.IndustrialSubjectList" :key="val.IndustrialSubjectId" class="text-box text_oneLine">{{ val.SubjectName }}</view>
+              </block>
+            </block>
           </view>
         </view>
         <u-loadmore :status="status" icon-type="flower" :load-text="loadText" margin-top="20" v-if="totalPage > 1" />
@@ -793,7 +793,7 @@ export default {
     }
     view {
       flex: 1;
-      background-color: #3385ff;
+      background-color: #376cbb;
       font-size: 30rpx;
       color: #fff;
       padding-top: 15rpx;
@@ -826,7 +826,7 @@ export default {
     text-align: center;
   }
   .items-act {
-    background-color: #3385ff;
+    background-color: #376cbb;
     color: #fff;
     border-radius: 47rpx;
   }

+ 2 - 18
reportPages/authorPages/authorPages.vue

@@ -35,9 +35,9 @@
       </view>
       <view class="item-more">
         <text>{{ item.PublishDate }}</text>
-        <view class="pv-ollect">
+        <view class="global_pv-ollect">
           <view>
-            <image class="pv" src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/czbk/examine_icon.png"></image>
+            <image class="pv" src="https://hzchart.oss-cn-shanghai.aliyuncs.com/new_cygx/examine_icon.png"></image>
             {{ item.Pv }}
           </view>
           <view @click="collectClick(item)">
@@ -268,22 +268,6 @@ export default {
       justify-content: space-between;
       color: #cecece;
       margin: 20rpx 0 0;
-      .pv-ollect {
-        display: flex;
-        align-items: center;
-        justify-content: space-between;
-        :nth-child(1) {
-          margin-right: 15rpx;
-        }
-        image {
-          width: 22rpx;
-          height: 21rpx;
-          margin-right: 10rpx;
-        }
-        .pv {
-          height: 16rpx;
-        }
-      }
     }
   }
 }

+ 6 - 7
reportPages/hotList/hotList.vue

@@ -64,7 +64,7 @@
             </view>
           </view>
         </view>
-      </view> 
+      </view>
     </view>
     <view class="content-bottom">最新榜单您已掌握,明天再刷刷看~</view>
     <u-modal
@@ -90,7 +90,6 @@
 
 <script>
 import { Reports } from "@/config/api.js";
-import { color_word_bg } from "@/utils/styleClassify";
 import videoModule from "@/components/videoModule/index";
 import modalDialog from "@/components/modalDialog.vue";
 export default {
@@ -241,9 +240,7 @@ export default {
       this.showVideoPop = true;
     },
     classifyColor(item) {
-      let text_color = color_word_bg.color_word.find((key) => key.name == item).color;
-      let back_ground = color_word_bg.color_bg.find((key) => key.name == item).color;
-      let _isColor = { color: text_color, "background-color": back_ground };
+      let _isColor = { color: "#376CBB", "background-color": "#E5EFFF" };
       return _isColor;
     },
   },
@@ -298,6 +295,8 @@ export default {
         color: $uni-color-new;
         margin-right: 20rpx;
         display: inline-block;
+        font-size: 32rpx;
+        font-weight: 600;
       }
       .li-user {
         margin-left: 46rpx;
@@ -344,7 +343,7 @@ export default {
           height: 0rpx;
           width: 0rpx;
           border-style: solid;
-          border-color: #3385ff #3385ff transparent transparent;
+          border-color: #376cbb #376cbb transparent transparent;
           border-width: 28rpx;
           position: absolute;
           right: 0;
@@ -397,7 +396,7 @@ export default {
   }
   .industry-color {
     font-size: 26rpx;
-    padding: 0rpx 20rpx;
+    padding: 2rpx 20rpx;
     border-radius: 4rpx;
     margin-left: 20rpx;
   }

+ 2 - 2
reportPages/industrialReport/industrialReport.vue

@@ -12,7 +12,7 @@
           <view class="desc">
             <text :class="item.IsResearch ? 'publishDate' : ''">{{ item.PublishDate }}</text>
             <view class="item-examine" v-if="item.IsResearch">
-              <image src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/czbk/examine_icon.png"></image>
+              <image src="https://hzchart.oss-cn-shanghai.aliyuncs.com/new_cygx/examine_icon.png"></image>
               <text>{{ item.Pv }}</text>
             </view>
             <text v-if="item.IsResearch" class="text_oneLine text-name">{{ item.IndustryName }}</text>
@@ -199,7 +199,7 @@ export default {
   margin-right: 30rpx;
   image {
     width: 30rpx;
-    height: 24rpx;
+    height: 30rpx;
     margin: 0 10rpx 0 15rpx;
   }
 }

+ 2 - 2
reportPages/internalDetials/internalDetials.vue

@@ -150,7 +150,7 @@ export default {
     color: #707070;
     .statement {
       margin-left: 10rpx;
-      color: #3385ff;
+      color: #376cbb;
     }
   }
   .content-abstract {
@@ -167,7 +167,7 @@ export default {
       position: absolute;
       top: 11rpx;
       left: 0;
-      background-color: #3385ff;
+      background-color: #376cbb;
     }
     // .abstract {
     //   display: inline-block;

+ 1 - 1
reportPages/jurisdiction.scss

@@ -30,7 +30,7 @@
     line-height: 80rpx;
     &.back-btn {
       background: linear-gradient(268deg, #2ddbff 0%, #1599ff 49%, #005eff 100%) !important;
-      // border: 2rpx solid #3385FF;
+      // border: 2rpx solid #376cbb;
       color: #fff;
       margin-top: 30rpx;
     }

+ 1 - 1
reportPages/keyCompany/keyCompany.vue

@@ -256,7 +256,7 @@ export default {
     applicationHandel(item) {
       uni.showModal({
         content: "路演申请会提交至您的对口销售,确定要申请吗?",
-        confirmColor: "#3385FF",
+        confirmColor: "#376cbb",
         cancelColor: "#606266",
         success: async (res) => {
           if (res.confirm) {

+ 1 - 1
reportPages/morningDetails/morningDetails.vue

@@ -134,7 +134,7 @@ export default {
       display: flex;
       justify-content: flex-end;
       font-size: 28rpx;
-      color: #3385ff;
+      color: #376cbb;
       margin-bottom: 70rpx;
     }
   }

+ 1 - 1
reportPages/recentPages/recentPages.vue

@@ -183,7 +183,7 @@ export default {
     padding: 5rpx 28rpx;
     border-radius: 37rpx 37rpx 37rpx 37rpx;
     color: #fff;
-    background: #3385ff;
+    background: #376cbb;
     font-weight: 400;
     font-size: 24rpx;
   }

+ 1 - 1
reportPages/reportSecretDetail/components/researchSummary.vue

@@ -104,7 +104,7 @@ export default {
       font-weight: 400;
     }
     .list-subject {
-       background: #3385ff;
+       background: #376cbb;
         padding: 3rpx 34rpx;
         color: #fff;
         border-radius: 0rpx 50rpx 50rpx 0rpx;

+ 5 - 22
reportPages/researchTheme/researchTheme.vue

@@ -14,7 +14,7 @@
       </view>
     </view>
     <view class="all-theme" @click="goThemeAll"> 全部主题>> </view>
-    <view class="content-item" :id="'tabItem-' + item.IndustrialSubjectId" v-for="item in themeList.List" :key="item.ArticleId">
+    <view class="global_card_content content-item" :id="'tabItem-' + item.IndustrialSubjectId" v-for="item in themeList.List" :key="item.ArticleId">
       <view class="item-user" v-if="item.NickName" @click="authorDetails(item)">
         <image src="https://hzchart.oss-cn-shanghai.aliyuncs.com/new_cygx/user_report.png"></image>
         <text> {{ item.NickName }}</text>
@@ -27,9 +27,9 @@
       </view>
       <view class="item-more">
         <text>{{ item.PublishDate }}</text>
-        <view class="pv-ollect">
+        <view class="global_pv-ollect">
           <view>
-            <image class="pv" src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/czbk/examine_icon.png"></image>
+            <image class="pv" src="https://hzchart.oss-cn-shanghai.aliyuncs.com/new_cygx/examine_icon.png"></image>
             {{ item.Pv }}
           </view>
           <view @click="collectClick(item)">
@@ -184,7 +184,7 @@ export default {
 
 <style lang="scss" scoped>
 .theme-content {
-  padding: 20rpx;
+  padding: 30rpx;
   background-color: $uni-bg-color;
   .box-content-top {
     position: relative;
@@ -246,6 +246,7 @@ export default {
     background-color: #fff;
     border-top: 4rpx solid #376cbb;
     margin-bottom: 20rpx;
+    padding: 20rpx 30rpx;
     .item-title {
       .item-industry {
         font-size: 32rpx;
@@ -272,24 +273,6 @@ export default {
       justify-content: space-between;
       color: #cecece;
       margin: 20rpx 0 0;
-      padding-bottom: 30rpx;
-      border-bottom: 1rpx solid #ececec;
-      .pv-ollect {
-        display: flex;
-        align-items: center;
-        justify-content: space-between;
-        :nth-child(1) {
-          margin-right: 15rpx;
-        }
-        image {
-          width: 22rpx;
-          height: 21rpx;
-          margin-right: 10rpx;
-        }
-        .pv {
-          height: 16rpx;
-        }
-      }
     }
   }
 }

+ 2 - 2
reportPages/roadEssence/roadEssence.vue

@@ -21,7 +21,7 @@
             <view class="slider-paly">
               <view style="flex: 1; padding-top: 20rpx">
                 <slider
-                  activeColor="#3385FF"
+                  activeColor="#376cbb"
                   :max="detali.VideoPlaySeconds"
                   :value="curTime"
                   @touchstart="touchstartHandler"
@@ -377,7 +377,7 @@ export default {
       color: #707070;
       .statement {
         margin-left: 10rpx;
-        color: #3385ff;
+        color: #376cbb;
       }
     }
     .content-audio {

+ 1 - 1
reportPages/selectedBulletin/selectedBulletin.vue

@@ -61,7 +61,7 @@ export default {
       display: flex;
       align-items: center;
       justify-content: center;
-      background: #3385ff;
+      background: #376cbb;
       color: #fff;
       height: 126rpx;
       z-index: 99999;

+ 2 - 2
store/index.js

@@ -58,7 +58,7 @@ const store = new Vuex.Store({
                   uni.showModal({
                     title: "即将前往登录页面,请确认是否继续",
                     content: "为了给您提供更好的使用体验,请登录后再进行查看或操作",
-                    confirmColor: "#3385FF",
+                    confirmColor: "#376cbb",
                     cancelColor: "#606266",
                     success: function (res) {
                       if (res.confirm) {
@@ -102,7 +102,7 @@ const store = new Vuex.Store({
           uni.showModal({
             title: "即将前往登录页面,请确认是否继续",
             content: "为了给您提供更好的使用体验,请登录后再进行查看或操作",
-            confirmColor: "#3385FF",
+            confirmColor: "#376cbb",
             cancelColor: "#606266",
             success: function (res) {
               if (res.confirm) {

+ 22 - 1
style/common.scss

@@ -185,7 +185,7 @@ button {
 
 // 统一顶部蓝色的卡片
 .global_card_content {
-  padding: 22rpx 12rpx;
+  padding: 22rpx 20rpx;
   border-radius: 8rpx;
   border-top: 10rpx solid #376cbb;
 }
@@ -289,3 +289,24 @@ button {
     }
   }
 }
+.global_pv-ollect {
+  flex: end;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  image {
+    width: 26rpx;
+    height: 26rpx;
+    margin-right: 10rpx;
+  }
+  .pv {
+    width: 30rpx;
+    height: 30rpx;
+    margin-right: 10rpx;
+  }
+  view {
+    display: flex;
+    align-items: center;
+    margin-left: 20rpx;
+  }
+}

+ 0 - 63
utils/styleClassify.js

@@ -1,66 +1,3 @@
-export const color_word_bg = {
-  color_bg: [
-    {
-      name: "医药",
-      color: "#FFEFFA",
-    },
-    {
-      name: "科技",
-      color: "#EEF5FF",
-    },
-    {
-      name: "消费",
-      color: "#FFFAF3",
-    },
-    {
-      name: "智造",
-      color: "#F4F0FF",
-    },
-    {
-      name: "策略",
-      color: "#FFFAF2",
-    },
-    {
-      name: "买方研选",
-      color: "#FFEDED",
-    },
-    {
-      name: "宏观",
-      color: "#E4F9FF",
-    },
-  ],
-  color_word: [
-    {
-      name: "医药",
-      color: "#EE99D4",
-    },
-    {
-      name: "科技",
-      color: "#3385FF",
-    },
-    {
-      name: "消费",
-      color: "#F1BA70",
-    },
-    {
-      name: "智造",
-      color: "#8F72E1",
-    },
-    {
-      name: "策略",
-      color: "#F1925C",
-    },
-    {
-      name: "买方研选",
-      color: "#FF4242",
-    },
-    {
-      name: "宏观",
-      color: "#16C7FF",
-    },
-  ],
-};
-
 export const MultimediaIcon = [
   {
     name: "医药",

+ 1 - 1
uview-ui/components/u-modal/u-modal.vue

@@ -117,7 +117,7 @@
 			// 确认按钮颜色
 			confirmColor: {
 				type: String,
-				default: '#2979ff'
+				default: '#376cbb'
 			},
 			// 取消文字颜色
 			cancelColor: {