12.3 ok

activityPages/activityDetail/activityDetail.vue

@@ -55,11 +55,7 @@
                 <image @click="myLeavingMessageHandler" src="https://hzchart.oss-cn-shanghai.aliyuncs.com/new_cygx/leaving_message.png"></image>
                 <image
                   @click="isCollectionHandeler"
-                  :src="
-                    detailData.IsCollect
-                      ? 'https://hzchart.oss-cn-shanghai.aliyuncs.com/new_cygx/collected_icon.png'
-                      : 'https://hzchart.oss-cn-shanghai.aliyuncs.com/new_cygx/not_collected.png'
-                  "
+                  :src="detailData.IsCollect ? '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>
             </view>
@@ -86,11 +82,7 @@
                 <image @click="myLeavingMessageHandler" src="https://hzchart.oss-cn-shanghai.aliyuncs.com/new_cygx/leaving_message.png"></image>
                 <image
                   @click="isCollectionHandeler"
-                  :src="
-                    detailData.IsCollect
-                     ? 'https://hzchart.oss-cn-shanghai.aliyuncs.com/new_cygx/collected_icon.png'
-                      : 'https://hzchart.oss-cn-shanghai.aliyuncs.com/new_cygx/not_collected.png'
-                  "
+                  :src="detailData.IsCollect ? '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>
             </view>
@@ -120,7 +112,7 @@
                   <block v-if="detailData.ChartPermissionName !== '买方研选'">（{{ detailData.ChartPermissionName }}）</block>
                   {{ detailData.ActivityTypeName }}
                 </text>
-                <image v-if="detailData.City" style="margin-left: 15rpx" src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/czbk/location.png" mode=""></image>
+                <image v-if="detailData.City" style="margin-left: 15rpx" src="https://hzchart.oss-cn-shanghai.aliyuncs.com/new_cygx/position.png" mode=""></image>
                 <text v-if="detailData.City">{{ detailData.City }}</text>
               </view>
             </view>
@@ -254,10 +246,8 @@
 
                   <view>(会前15分钟推送微信消息提醒)</view>
                 </view>
-                <view v-if="detailData.IsShowAppointment" @click="summaryIsHandel" class="make-generation make-conference global_content_center">{{
-                  detailData.IsAppointment == 1 ? "取消纪要" : "预约纪要"
-                }}</view>
-                <view v-if="detailData.IsShowHelpSsk" class="make-generation make-conference global_content_center" @click="askingGo"> 帮我带问 </view>
+                <view v-if="detailData.IsShowAppointment" @click="summaryIsHandel" class="make-conference global_content_center">{{ detailData.IsAppointment == 1 ? "取消纪要" : "预约纪要" }}</view>
+                <view v-if="detailData.IsShowHelpSsk" class="make-conference global_content_center" @click="askingGo"> 帮我带问 </view>
                 <view class="make-outbound global_content_center" @click="wanttosignup" v-if="!detailData.IsSignup && detailData.IsShowSignup">
                   {{ detailData.LimitPeopleNum > 0 ? `我要报名(${detailData.SignupNum}/${detailData.LimitPeopleNum})` : "我要报名" }}
                 </view>
@@ -939,7 +929,8 @@ export default {
       .make-conference {
         margin: 20rpx auto;
         width: 504rpx;
-        height: 90rpx;
+        padding: 12rpx;
+        line-height: 36rpx;
         background-color: #e5efff;
         color: $uni-color-new;
         border-radius: 8rpx;
@@ -950,7 +941,6 @@ export default {
       }
       .make-conference-remind {
         text-align: center;
-        padding-top: 20rpx;
       }
     }
   }

activityPages/components/selectCss.scss

@@ -29,7 +29,7 @@
         }
 
         .active {
-            background-color: #3385ff;
+            background-color: $uni-color-new;
             color: #fff;
         }
     }
@@ -58,7 +58,7 @@
         .replacement {
             margin: 0rpx 30rpx 20rpx;
             display: flex;
-            background-color: #2c83ff;
+            background-color:  $uni-color-new;
             height: 60rpx;
             line-height: 58rpx;
             font-size: 28rpx;
@@ -73,9 +73,9 @@
             }
 
             .replacement-box {
-                border: 1rpx solid #2c83ff;
+                border: 1rpx solid  $uni-color-new;
                 line-height: 58rpx;
-                color: #2c83ff;
+                color:  $uni-color-new;
                 background: #ffffff;
                 border-radius: 28rpx 0rpx 28rpx 28rpx;
             }

activityPages/endActivity/endActivity.vue

@@ -11,7 +11,7 @@
               <view class="menu-items">
                 <view class="menu-items-box" v-for="item in listChartPermission" :key="item.ChartPermissionId" @click="overallClick(item)">
                   <view class="items-box">
-                    <u-icon v-if="item.IsChoose" name="checkbox-mark" :color="isShowJurisdiction ? '#ccc' : '#2C83FF'" size="24"></u-icon>
+                    <u-icon v-if="item.IsChoose" name="checkbox-mark" :color="isShowJurisdiction ? '#ccc' : '#376cbb'" size="24"></u-icon>
                   </view>
                   <text>{{ item.PermissionName }}</text>
                 </view>

activityPages/playBack/playBack.vue

@@ -12,7 +12,7 @@
                 <view class="menu-items">
                   <view class="menu-items-box" v-for="item in listChartPermission" :key="item.ChartPermissionId" @click="overallClick(item)">
                     <view class="items-box">
-                      <u-icon v-if="item.IsChoose" name="checkbox-mark" :color="isShowJurisdiction ? '#ccc' : '#2C83FF'" size="24"></u-icon>
+                      <u-icon v-if="item.IsChoose" name="checkbox-mark" :color="isShowJurisdiction ? '#ccc' : '#376cbb'" size="24"></u-icon>
                     </view>
                     <text>{{ item.PermissionName }}</text>
                   </view>

activityPages/themeActivity/themeActivity.vue

@@ -20,7 +20,7 @@
                   <view class="menu-items">
                     <view class="menu-items-box" v-for="item in listChartPermission" :key="item.ChartPermissionId" @click="overallClick(item)">
                       <view class="items-box">
-                        <u-icon v-if="item.IsChoose" name="checkbox-mark" :color="isShowJurisdiction ? '#ccc' : '#2C83FF'" size="24"></u-icon>
+                        <u-icon v-if="item.IsChoose" name="checkbox-mark" :color="isShowJurisdiction ? '#ccc' : '#376cbb'" size="24"></u-icon>
                       </view>
                       <text>{{ item.PermissionName }}</text>
                     </view>

components/ItemComponent/activityItem.vue

@@ -737,6 +737,7 @@ export default {
       border: 1rpx solid $uni-color-new;
       margin-left: 20rpx;
       flex-shrink: 0;
+      margin-bottom: 2rpx;
     }
     .btn-solid {
       background: $uni-color-new;

components/ItemComponent/reportItem.vue

@@ -1,7 +1,8 @@
 <template>
   <view class="container-report-item global_card_content" @click="goDetail(list)">
     <image v-if="list.CategoryId == '0'" src="https://hzchart.oss-cn-shanghai.aliyuncs.com/new_cygx/Research_normal.png" class="yan-xuan-tag"></image>
-    <view v-if="list.CategoryId == '0'" class="yan-xuan-tag-box"></view>
+    <image v-if="list.Source == 'yanxuanspecial'" src="https://hzchart.oss-cn-shanghai.aliyuncs.com/new_cygx/YX_zl.png" class="yan-xuan-tag"></image>
+    <view v-if="list.CategoryId == '0' || list.Source == 'yanxuanspecial'" class="yan-xuan-tag-box"></view>
     <view class="global_title" v-if="list.Title">
       <mp-html :content="richTextClamp(3) + isTypeTitle(list) + list.Title + '</div>'" />
     </view>
@@ -98,7 +99,7 @@ export default {
     margin-top: 10rpx;
   }
   .item-rich-text {
-    margin-bottom: 20rpx;
+    margin: 6rpx 0;
   }
   .item-image {
     height: 238rpx;
@@ -138,8 +139,8 @@ export default {
       display: flex;
       align-items: center;
       image {
-        width: 30rpx;
-        height: 16rpx;
+        width: 31rpx;
+        height: 14rpx;
         margin: 0 10rpx 0 15rpx;
       }
     }

components/ItemComponent/roadshowItem.vue

@@ -296,6 +296,7 @@ export default {
         justify-content: center;
         width: 50rpx;
         height: 50rpx;
+        background-color: rgba(0, 0, 0, 0);
       }
     }
 

pages.json

@@ -635,7 +635,7 @@
   },
   "tabBar": {
     "color": "#666666",
-    "selectedColor": "#3DA3FF",
+    "selectedColor": "#333333",
     "backgroundColor": "#fff",
     "list": [
       {

pages/activity/activity.vue

@@ -20,7 +20,7 @@
               <view class="menu-items">
                 <view class="menu-items-box" v-for="item in listChartPermission" :key="item.ChartPermissionId" @click="overallClick(item)">
                   <view class="items-box">
-                    <u-icon v-if="item.IsChoose" name="checkbox-mark" :color="isShowJurisdiction ? '#ccc' : '#2C83FF'" size="24"></u-icon>
+                    <u-icon v-if="item.IsChoose" name="checkbox-mark" :color="isShowJurisdiction ? '#ccc' : '#376cbb'" size="24"></u-icon>
                   </view>
                   <text>{{ item.PermissionName }}</text>
                 </view>
@@ -355,7 +355,7 @@ export default {
       border-radius: 26rpx;
     }
     .active {
-      background-color: #3385ff;
+      background-color: $uni-color-new;
       color: #fff;
     }
   }
@@ -392,7 +392,7 @@ export default {
     .replacement {
       margin: 0rpx 30rpx 20rpx;
       display: flex;
-      background-color: #2c83ff;
+      background-color:  $uni-color-new;
       height: 60rpx;
       font-size: 28rpx;
       font-weight: 400;
@@ -402,11 +402,11 @@ export default {
       text {
         flex: 1;
         line-height: 58rpx;
-        background-color: #2c83ff;
+        background-color:  $uni-color-new;
       }
       .replacement-box {
-        border: 1rpx solid #2c83ff;
-        color: #2c83ff;
+        border: 1rpx solid  $uni-color-new;
+        color:  $uni-color-new;
         background: #ffffff;
         border-radius: 28rpx 0rpx 28rpx 28rpx;
       }

pages/index/index.vue

@@ -10,7 +10,6 @@
                   <image v-if="info.Headimgurl" :src="info.Headimgurl" alt=""></image>
                   <image v-else src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/czbk/logo.png" class="avatar"></image>
                 </view>
-                <!-- <view class="content-my"> 我的 </view> -->
               </view>
             </template>
           </search-bar>
@@ -547,7 +546,7 @@ export default {
   }
 
   .content-ul {
-    padding: 30rpx 10rpx;
+    padding: 20rpx 10rpx;
     display: flex;
     justify-content: space-between;
     .item-ul {
@@ -577,7 +576,7 @@ export default {
     overflow-x: auto;
     width: 100%;
     background-color: #fff;
-    padding: 10rpx 0 10rpx 20rpx;
+    padding: 10rpx 0 20rpx 20rpx;
     z-index: 9;
 
     .lable-row {

pages/reportForm/index.scss

@@ -157,7 +157,7 @@
 
       .active {
         color: #ffffff !important;
-        background-color:  $uni-color-new !important;
+        background-color: $uni-color-new !important;
       }
     }
   }
@@ -166,7 +166,7 @@
     margin-top: 20rpx;
 
     .industry-sticky {
-      background-color: #fff;
+      background-color: $uni-bg-color;
       position: sticky;
       top: 260rpx;
       z-index: 90;
@@ -222,15 +222,19 @@
       .industry-box-left {
         display: flex;
         align-items: center;
-        .industry-follw {
-          height: 42rpx;
-          width: 101rpx;
-          font-size: 24rpx;
+        .follw {
           color: #fff;
           border-radius: 4rpx;
+          font-size: 24rpx;
+          width: 110rpx;
+          height: 42rpx;
           margin-right: 10rpx;
           background-color: $uni-color-new;
         }
+        .cancel-follw {
+          background-color: #e5efff;
+          color: $uni-color-new;
+        }
       }
       .ndustry-box-tiem {
         font-size: 24rpx;
@@ -367,7 +371,7 @@
     .replacement {
       margin: 0rpx 30rpx 20rpx;
       display: flex;
-      background-color: #2c83ff;
+      background-color: $uni-color-new;
       opacity: 1;
       height: 60rpx;
       line-height: 58rpx;
@@ -382,9 +386,9 @@
       }
 
       .replacement-box {
-        border: 1rpx solid #2c83ff;
+        border: 1rpx solid $uni-color-new;
         opacity: 1;
-        color: #2c83ff;
+        color: $uni-color-new;
         background: #ffffff;
         border-radius: 28rpx 0rpx 28rpx 28rpx;
       }

pages/reportForm/reportForm.vue

@@ -5,7 +5,7 @@
         <template slot="content-left">
           <view class="content">
             <view class="hot-top" @click="goHot" v-if="wholeShowListData.IsShowList">
-              <image class="hot-img" src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/czbk/hot_icon_report.png"></image>
+              <image class="hot-img" src="https://hzchart.oss-cn-shanghai.aliyuncs.com/new_cygx/hot_icon_report.png"></image>
               <text class="sea_ipt">榜单</text>
             </view>
           </view>
@@ -115,7 +115,9 @@
           <!-- 火锅底料这个位置 -->
           <view class="industry-content">
             <view class="industry-box-left">
-              <view class="industry-follw global_content_center" @click.stop="reportFllow(item.IndustrialManagementId)"> {{ item.IsFollow ? "取消关注" : "+关注" }} </view>
+              <view :class="['follw', 'global_content_center', item.IsFollow && 'cancel-follw']" @click.stop="reportFllow(item.IndustrialManagementId)">
+                {{ item.IsFollow ? "取消关注" : "+ 关注" }}
+              </view>
               <view class="global_title">{{ item.IndustryName }} </view>
             </view>
             <view class="ndustry-box-tiem global_content_center">
@@ -684,8 +686,9 @@ export default {
         font-size: 30rpx;
         flex-shrink: 0;
         .hot-img {
-          width: 28rpx;
-          height: 28rpx;
+          width: 40rpx;
+          height: 40rpx;
+          margin-right: 10rpx;
         }
       }
     }

reportPages/hotList/hotList.vue

@@ -19,8 +19,8 @@
               <view class="industry-color" :style="[classifyColor(item.PermissionName)]">{{ item.PermissionName }}</view>
               <image class="new-img" v-if="item.IsNew" src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/czbk/new_icon.png"></image>
             </view>
-            <view :class="['follw', 'global_content_center', item.IsFollw && 'cancel-follw']" @click="isAttention(item, '主题')">
-              {{ item.IsFollw ? "取消关注" : "+ 关注" }}
+            <view :class="['follw', 'global_content_center', item.IsFollow && 'cancel-follw']" @click="isAttention(item, '主题')">
+              {{ item.IsFollow ? "取消关注" : "+ 关注" }}
             </view>
           </view>
           <view class="li-item read-more">
@@ -295,7 +295,7 @@ export default {
     .li-item {
       display: flex;
       .li-industry {
-        color: #3385ff;
+        color: $uni-color-new;
         margin-right: 20rpx;
         display: inline-block;
       }