中场ok

activityPages/activityDetail/activityDetail.vue

@@ -777,7 +777,7 @@ export default {
 <style scoped lang="scss">
 .activity-detail {
   background-color: $uni-color-new;
-  padding: 25rpx 34rpx;
+  padding: 25rpx 34rpx 150rpx;
   .audio-card-activity {
     width: 100%;
     padding: 25rpx;

activityPages/editOutbound/editOutbound.vue

@@ -1,71 +1,63 @@
 <template>
   <view class="container outbound-content">
     <!-- 这里顶部安全是状态栏 -->
-    <view class="status_bar" color="#000000" :style="'height:' + demoTop + 'px;'"> </view>
-    <!-- 自定义状态栏 -->
-    <view class="status_title">
-      <u-icon name="arrow-left" size="38" @click="backArrowleft"></u-icon>
-      <view class="status_center">{{ isShowTitle }}</view>
-    </view>
-    <!-- 文本提示 -->
-    <view class="top-box" v-if="isShowTitle == '修改外呼号码' || identification == '邮箱'">
-      修改后的外呼号码，将作为您的默认外呼号码，若后期还需修改，可在【我的】-【外呼号码】页面设置
-    </view>
-    <!-- 输入外呼手机号 -->
-    <view class="item-box">
-      <view class="ipt-item">
-        <label class="item-label item-iphone" @click="areaCode"
-          >+{{ telephone }} <u-icon :name="areacodeShow ? 'arrow-up' : 'arrow-down'" color="#3385FF" size="28"></u-icon
-        ></label>
-        <input type="text" v-model="phoneIpt" class="ipt" placeholder="请输入外呼号码" />
+    <view class="nav-bar-wrap" :style="{ height: navBarStyle.height, paddingTop: navBarStyle.paddingTop, paddingBottom: navBarStyle.paddingBottom }">
+      <view class="content-box" :style="{ color: '#333' }">
+        <text>{{ isShowTitle }}</text>
+        <view class="arrow-left-icon">
+          <van-icon name="arrow-left" size="20px" @click="backArrowleft" />
+        </view>
       </view>
-      <text class="text-box">座机号请填写区号，分机号用"-"分隔，例：02150509999-8888</text>
-    </view>
-    <!-- 底部确认 和取消 -->
-    <view class="bottom-btn">
-      <view class="submit-box" @click="submit"> 提交 </view>
-      <view class="cancel" v-if="isShowTitle !== '设置外呼号码'" @click="cancelModification"> 取消修改 </view>
     </view>
-    <!-- 选择区号部分 -->
-    <view class="select-box">
-      <u-popup v-model="areacodeShow" mode="bottom" @close="areacodeShow = false">
-        <view class="box" style="color: #333333; font-size: 28rpxrpx">请选择您的国际区号</view>
-        <view class="box" v-for="item in mobileAreaCode" :key="item.code" style="color: #2c83ff" @click="areacode(item.code)">{{ item.name }}</view>
-        <view class="box box-bottom" style="color: #a9afb8" @click="areacodeShow = false">取消</view>
-      </u-popup>
-    </view>
-    <!-- 关注公众号 弹框 -->
-    <u-modal
-      v-model="goFollowShow"
-      :content-style="{ fontSize: '32rpx' }"
-      @confirm="goFollowShowBtn"
-      :show-cancel-button="true"
-      confirm-text="去关注"
-      @cancel="cancelDialog"
-      :show-title="false"
-      :cancel-style="{ borderRight: '1rpx solid #EBEBEB' }"
-      :confirm-style="{ fontWeight: '700' }"
-    >
-      <view class="slot-content">
-        <rich-text :nodes="accounts"></rich-text>
+    <view class="content-box-edit">
+      <!-- 文本提示 -->
+      <view class="top-box" v-if="isShowTitle == '修改外呼号码' || identification == '邮箱'"> 修改后的外呼号码，将作为您的默认外呼号码，若后期还需修改，可在【我的】-【外呼号码】页面设置 </view>
+      <!-- 输入外呼手机号 -->
+      <view class="item-box">
+        <view class="ipt-item">
+          <label class="item-label item-iphone" @click="areaCode">+{{ telephone }} <u-icon :name="areacodeShow ? 'arrow-up' : 'arrow-down'" color="#376cbb" size="28"></u-icon></label>
+          <input type="text" v-model="phoneIpt" class="ipt" placeholder="请输入外呼号码" />
+        </view>
+        <text class="text-box">座机号请填写区号，分机号用"-"分隔，例：02150509999-8888</text>
+      </view>
+      <!-- 底部确认 和取消 -->
+      <view class="bottom-btn">
+        <view class="submit-box" @click="submit"> 提交 </view>
+        <view class="cancel" v-if="isShowTitle !== '设置外呼号码'" @click="cancelModification"> 取消修改 </view>
       </view>
-    </u-modal>
-    <!-- 知道的弹框 -->
-    <u-modal
-      v-model="show"
-      :content="content"
-      :content-style="{ fontSize: '32rpx' }"
-      @confirm="cancelDialog"
-      :show-title="false"
-      confirm-text="知道了"
-      :confirm-style="{ fontWeight: '700' }"
-    >
-      <view class="slot-content">
-        <rich-text :nodes="content"></rich-text>
+      <!-- 选择区号部分 -->
+      <view class="select-box">
+        <u-popup v-model="areacodeShow" mode="bottom" @close="areacodeShow = false">
+          <view class="box" style="color: #333333; font-size: 28rpxrpx">请选择您的国际区号</view>
+          <view class="box" v-for="item in mobileAreaCode" :key="item.code" style="color: #2c83ff" @click="areacode(item.code)">{{ item.name }}</view>
+          <view class="box box-bottom" style="color: #a9afb8" @click="areacodeShow = false">取消</view>
+        </u-popup>
       </view>
-    </u-modal>
-    <freeCharge class="free-charge" :isShowFreeBtn="isShowFree" />
-    <Loading />
+      <!-- 关注公众号 弹框 -->
+      <u-modal
+        v-model="goFollowShow"
+        :content-style="{ fontSize: '32rpx' }"
+        @confirm="goFollowShowBtn"
+        :show-cancel-button="true"
+        confirm-text="去关注"
+        @cancel="cancelDialog"
+        :show-title="false"
+        :cancel-style="{ borderRight: '1rpx solid #EBEBEB' }"
+        :confirm-style="{ fontWeight: '700' }"
+      >
+        <view class="slot-content">
+          <rich-text :nodes="accounts"></rich-text>
+        </view>
+      </u-modal>
+      <!-- 知道的弹框 -->
+      <u-modal v-model="show" :content="content" :content-style="{ fontSize: '32rpx' }" @confirm="cancelDialog" :show-title="false" confirm-text="知道了" :confirm-style="{ fontWeight: '700' }">
+        <view class="slot-content">
+          <rich-text :nodes="content"></rich-text>
+        </view>
+      </u-modal>
+      <freeCharge class="free-charge" :isShowFreeBtn="isShowFree" />
+      <Loading />
+    </view>
   </view>
 </template>
 
@@ -86,10 +78,14 @@ export default {
       accounts: "",
       show: false,
       content: "",
-      demoTop: "",
       id: "",
       goOnNextStep: "",
       cellphone: "",
+      navBarStyle: {
+        height: 60 + "px",
+        paddingTop: 40 + "px",
+        paddingBottom: "4px",
+      },
     };
   },
   components: {
@@ -209,6 +205,15 @@ export default {
         uni.navigateBack();
       }
     },
+    // 初始获取导航栏
+    initNavBar() {
+      let menuButtonInfo = uni.getMenuButtonBoundingClientRect();
+      this.navBarStyle = {
+        height: menuButtonInfo.height + menuButtonInfo.top + 8 + "px",
+        paddingTop: menuButtonInfo.top - 4 + "px",
+        paddingBottom: "4px",
+      };
+    },
   },
   onLoad(option) {
     this.isShowTitle = option.title;
@@ -216,35 +221,51 @@ export default {
     this.id = option.id || "";
     this.goOnNextStep = option.goOnNextStep || "";
     this.cellphone = option.cellphone || "";
-    const res = uni.getSystemInfoSync();
-    this.demoTop = res.safeArea.top;
+    this.initNavBar();
   },
 };
 </script>
 
 <style scoped lang="scss">
 .outbound-content {
-  /* 自定义状态栏 */
-  .status_bar {
+  background-color: $uni-color-new;
+  padding: 200rpx 25rpx 25rpx;
+  .nav-bar-wrap {
+    position: fixed;
+    top: 0;
+    left: 0;
     width: 100%;
-  }
-
-  /* 自定义导航栏 */
-  .status_title {
-    box-sizing: border-box;
     display: flex;
     align-items: center;
-    width: 100%;
-    height: 88rpx;
-    padding: 10rpx 62rpx 15rpx 30rpx;
-    background-color: #ffffff;
-    box-sizing: border-box;
+    z-index: 999;
+    background-color: #fff;
+    .content-box {
+      position: relative;
+      display: flex;
+      align-items: center;
+      width: 100%;
+      justify-content: center;
+      color: #fff;
+      font-size: 34rpx;
+      .arrow-left-icon {
+        position: absolute;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        width: 40rpx;
+        height: 40rpx;
+        left: 39rpx;
+        top: 50%;
+        transform: translateY(-50%);
+        z-index: 99;
+      }
+    }
   }
-  .status_center {
-    margin: 0 auto;
-    font-size: 34rpx;
-    font-weight: 400;
-    color: #000000;
+  .content-box-edit {
+    margin-top: 100rpx;
+    padding: 20rpx;
+    background-color: #fff;
+    border-radius: 8rpx;
   }
   .top-box {
     width: 100%;
@@ -257,7 +278,6 @@ export default {
   }
   .item-box {
     width: 100%;
-    margin-top: 35rpx;
     padding: 0 32rpx;
     .text-box {
       height: 30rpx;
@@ -276,7 +296,7 @@ export default {
       display: flex;
       justify-content: space-between;
       width: 105rpx;
-      color: #3385ff;
+      color: $uni-color-new;
     }
     .ipt {
       margin-left: 40rpx;
@@ -291,11 +311,11 @@ export default {
     text-align: center;
     .submit-box {
       margin: 0 auto;
-      width: 368rpx;
-      height: 80rpx;
-      background: linear-gradient(268deg, #2ddbff 0%, #1599ff 49%, #005eff 100%);
+      width: 500rpx;
+      height: 60rpx;
+      background: $uni-color-new;
       color: #ffffff;
-      line-height: 80rpx;
+      line-height: 60rpx;
       border-radius: 4rpx;
     }
     .cancel {

activityPages/endActivity/endActivity.vue

@@ -95,7 +95,7 @@ export default {
 
 <style lang="scss" scoped>
 .container-end-actibity {
-  background-color: #f3f5f9;
+  background-color: $uni-bg-color;
   .content-box {
     padding: 25rpx;
   }

activityPages/generationAsk/generationAsk.vue

@@ -1,11 +1,13 @@
 <template>
   <view class="container ask-container">
-    <view class="advice-ipt-cont">
-      <u-input v-model="advice_content" type="textarea" maxlength="100" :clearable="false" :placeholder="titlePlaceholder" height="300" class="ipt" />
-      <text class="num-tag">{{ advice_content.length }}/100</text>
+    <view class="container-box">
+      <view class="advice-ipt-cont">
+        <u-input v-model="advice_content" type="textarea" maxlength="100" :clearable="false" :placeholder="titlePlaceholder" height="300" class="ipt" />
+        <text class="num-tag">{{ advice_content.length }}/100</text>
+      </view>
+      <view class="btn-cont" @click="submitHandle"> 提交 </view>
+      <freeCharge class="free-charge" :isShowFreeBtn="isShowFree" />
     </view>
-    <view class="btn-cont" @click="submitHandle"> 提交 </view>
-    <freeCharge class="free-charge" :isShowFreeBtn="isShowFree" />
     <Loading />
   </view>
 </template>
@@ -82,8 +84,13 @@ export default {
 
 <style scoped lang="scss">
 .ask-container {
-  background-color: #fff;
+  background-color: $uni-color-new;
   padding: 30rpx 34rpx;
+  .container-box {
+    background-color: #fff;
+    padding: 25rpx;
+    border-radius: 8rpx;
+  }
   .advice-ipt-cont {
     height: 420rpx;
     border: 1rpx solid #d0cfd5;
@@ -100,14 +107,13 @@ export default {
   }
   .btn-cont {
     margin: 80rpx auto;
-    width: 368rpx;
-    height: 80rpx;
-    font-size: 34rpx;
-    line-height: 80rpx;
+    width: 500rpx;
+    height: 60rpx;
+    font-size: 24rpx;
+    line-height: 60rpx;
     text-align: center;
     color: #ffffff;
-    background: linear-gradient(268deg, #2ddbff 0%, #1599ff 49%, #005eff 100%);
-    opacity: 1;
+    background: $uni-color-new;
     border-radius: 4rpx;
   }
 }

activityPages/playBack/playBack.vue

@@ -3,10 +3,10 @@
     <view class="container container-play-back">
       <!-- 筛选部分 -->
       <view class="select-content-activity">
-        <view class="screen-item">
+        <view class="screen-item" style="justify-content: flex-start;">
           <text :class="[isShowJurisdiction ? 'active' : '', 'text-item']" @click="permissioActivity">有权限行业</text>
           <!-- 各种状态选择 -->
-          <view class="select-conyent" ref="select-conyent">
+          <view class="select-conyent" ref="select-conyent" style="margin-left:20rpx">
             <van-dropdown-menu active-color="#333333">
               <van-dropdown-item id="industry" :title="chartPermissionName">
                 <view class="menu-items">
@@ -24,7 +24,13 @@
               </van-dropdown-item>
             </van-dropdown-menu>
           </view>
-          <text @click="mediumClickHandler(item)" v-for="item in mediumSelect" :key="item.value" :class="[item.IsChoose ? 'active' : '', 'text-item', 'medium-item']">{{ item.name }}</text>
+          <!-- <text
+            @click="mediumClickHandler(item)"
+            v-for="item in mediumSelect"
+            :key="item.value"
+            :class="[item.IsChoose ? 'active' : '', 'text-item', 'medium-item']"
+            >{{ item.name }}</text
+          > -->
         </view>
       </view>
       <!-- 活动列表 -->

pageMy/advice/advice.vue

@@ -140,6 +140,7 @@ export default {
     width: 100%;
     border-radius: 8rpx;
     background-color: #fff;
+    padding: 25rpx 25rpx 50rpx;
   }
   .advice-ipt-cont {
     height: 420rpx;

pageMy/browseHistory/browseHistory.vue

@@ -1,20 +1,18 @@
 <template>
   <view class="container browseHistory-container">
     <view class="history-ul" v-if="haveData">
-      <view class="content-item" v-for="item in historyList" :key="item.ArticleId">
+      <view class="global_card_content content-item" v-for="item in historyList" :key="item.ArticleId">
         <blok v-if="item.NickName">
           <view class="item-user" v-if="item.Source == 2">
             <image src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/czbk/user_report.png"></image>
             <text> {{ item.NickName }}</text>
           </view>
         </blok>
-        <view class="item-title">
+        <view class="item-title global_title">
           <text style="display: inline" @click="goDetailReport(item)">
             {{ item.Title }}
           </text>
-          <text @click="themeDetails(item, val)" class="item-industry" v-for="val in item.List" :key="val.IndustrialManagementId">
-            # {{ val.IndustryName }}
-          </text>
+          <text @click="themeDetails(item, val)" class="item-industry" v-for="val in item.List" :key="val.IndustrialManagementId"> # {{ val.IndustryName }} </text>
         </view>
         <view class="item-more">
           <text>{{ item.PublishDate }}</text>
@@ -152,18 +150,21 @@ export default {
 
 <style lang="scss" scoped>
 .browseHistory-container {
-  background-color: #f7f7f7;
+  background-color: $uni-bg-color;
   .history-ul {
     padding: 4rpx 30rpx;
     .content-item {
       background-color: #fff;
       margin-top: 20rpx;
       padding: 35rpx 20rpx 0;
+      border-top: 4rpx solid #376cbb;
+
       .item-title {
         font-weight: 500;
         .item-industry {
+          font-size: 28rpx;
           margin-left: 10rpx;
-          color: #3385ff;
+          color: $uni-color-new;
           display: inline-block;
         }
       }

pageMy/followUs/followUs.vue

@@ -50,7 +50,7 @@ export default {
 <style lang="scss" scoped>
 .container-follow-us {
   padding: 20rpx 10rpx;
-  background-color: #f3f5f9;
+  background-color: $uni-bg-color;
   .content {
     background-color: #fff;
   }

pageMy/myCollection/myCollection.vue

@@ -1,9 +1,8 @@
 <template>
   <view class="container myCollection-container">
-    <view class="second-tabs">
+    <view class="global_one_tabs">
       <view :class="['item', item.id == tabsActive && 'tabs-active']" v-for="item in tabsList" :key="item.id" @click="handleClickTopSub(item)">
         {{ item.name }}
-        <view class="active" v-if="item.id == tabsActive"></view>
       </view>
     </view>
     <view class="collect-ul" v-if="haveData">
@@ -20,14 +19,14 @@
         </viwe>
       </blok>
       <block v-else>
-        <view class="content-item" v-for="item in collectList" :key="item.ArticleId">
+        <view class="global_card_content content-item" v-for="item in collectList" :key="item.ArticleId">
           <blok v-if="item.NickName">
             <view class="item-user" v-if="item.Source == 2 || item.IsSpecial == 1">
               <image src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/czbk/user_report.png"></image>
               <text> {{ item.NickName }}</text>
             </view>
           </blok>
-          <view class="item-title" :class="item.CategoryId == 0 ? 'yan-xuan-tag' : ''" @click="goDetailReport(item)">
+          <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>
@@ -315,20 +314,22 @@ export default {
 
 <style lang="scss">
 .myCollection-container {
-  background-color: #f7f7f7;
+  background-color: $uni-bg-color;
   .collect-ul {
-    padding: 4rpx 10rpx 20rpx;
+    padding: 4rpx 25rpx 20rpx;
     .content-item {
       background-color: #fff;
       margin-top: 20rpx;
       padding: 35rpx 20rpx 0;
+      border-top: 4rpx solid #376cbb;
       .item-title {
         font-weight: 500;
         position: relative;
         .item-industry {
+          font-size: 28rpx;
           text-indent: 0;
           margin-left: 10rpx;
-          color: #3385ff;
+          color: $uni-color-new;
           display: inline-block;
         }
       }
@@ -381,44 +382,6 @@ export default {
       }
     }
   }
-  .second-tabs {
-    position: sticky;
-    top: 0;
-    left: 0;
-    width: 100%;
-    z-index: 9;
-    display: flex;
-    overflow: hidden;
-    overflow-x: auto;
-    background-color: #fff;
-    font-size: 32rpx;
-    color: #333333;
-    padding: 20rpx 35rpx;
-    &::-webkit-scrollbar {
-      width: 0;
-      height: 0;
-      display: none;
-    }
-    .item {
-      position: relative;
-      padding-bottom: 16rpx;
-      margin-right: 50rpx;
-      flex-shrink: 0;
-      .active {
-        position: absolute;
-        left: 0;
-        bottom: 0;
-        height: 4rpx;
-        width: 100%;
-        border-radius: 1rpx;
-        background: linear-gradient(90deg, #2e85ff 0%, #7eeaf6 100%);
-      }
-    }
-    .tabs-active {
-      color: #3385ff;
-      font-weight: 500;
-    }
-  }
   .audio-video-content {
     display: flex;
     flex-wrap: wrap;

pageMy/myLeavingMessage/myLeavingMessage.vue

@@ -1,7 +1,7 @@
 <template>
   <view class="container my-message">
     <view v-if="haveData">
-      <view class="collect-item" v-for="(item, index) in messageList" :key="index" @click="goDetail(item)">
+      <view class="global_card_content collect-item" v-for="(item, index) in messageList" :key="index" @click="goDetail(item)">
         <view class="item-row">
           <text class="item-content-title">留言内容:</text>
           <text>{{ item.Content }}</text>
@@ -80,12 +80,11 @@ export default {
 
 <style lang="scss" scoped>
 .my-message {
-  background: #f7f7f7;
+  background: $uni-bg-color;
   padding: 20rpx 30rpx;
   .collect-item {
+    border-top: 4rpx solid #376cbb;
     padding: 30rpx 30rpx;
-    color: #333333;
-    font-size: 28rpx;
     background: #fff;
     margin-bottom: 20rpx;
   }
@@ -95,16 +94,18 @@ export default {
     margin-bottom: 20rpx;
     border-radius: 4rpx;
     .item-content-title {
-      font-size: 24rpx;
+      font-size: 28rpx;
       color: #999;
+      line-height: 36rpx;
+      margin-bottom: 10rpx;
     }
     .item-content-text {
-      color: #3385ff;
+      font-weight: 500;
+      color: $uni-color-new;
     }
   }
   .item-title {
     padding-top: 20rpx;
-    border-top: 2px dashed #dcdfe6;
   }
   .time {
     text-align: right;

pageMy/myPage/myPage.vue

@@ -302,7 +302,7 @@ export default {
 
 <style lang="scss" scoped>
 .my-container {
-  background-color: #f3f5f9;
+  background-color: $uni-bg-color;
   position: relative;
   .top-content-box {
     position: sticky;

pages-purchaser/columnDetail/columnDetail.vue

@@ -159,7 +159,7 @@ export default {
 <style lang="scss" scope>
 .column-detail {
   position: relative;
-  background-color: #f3f5f9;
+  background-color: $uni-bg-color;
   .scroll-top-content,
   .position-content-bg {
     background-color: #fff;

pages-purchaser/contentAllPage/contentAllPage.vue

@@ -40,7 +40,7 @@ export default {
         { name: "审核中", value: "2" },
         { name: "已驳回", value: "4" },
       ],
-      tabActive: "1",
+      tabActive: "",
       specialCenter: [],
     };
   },
@@ -150,7 +150,8 @@ export default {
       uni.navigateTo({ url: "/pages-purchaser/noteAndViewpoint/noteAndViewpoint?id=" + item.Id });
     },
   },
-  onLoad() {
+  onLoad(options) {
+    this.tabActive = options.Status || "1";
     this.getDataList();
   },
 };
@@ -158,7 +159,7 @@ export default {
 
 <style lang="scss" scope>
 .content-all-page {
-  background-color: #f3f5f9;
+  background-color: $uni-bg-color;
   .tab-content {
     margin-top: 1rpx;
     background-color: #fff;

pages-purchaser/editSpecialColumn/editSpecialColumn.vue

@@ -124,7 +124,7 @@ export default {
 
 <style lang="scss" scoped>
 .edit_Special_Column {
-  background-color: #f3f5f9;
+  background-color: $uni-bg-color;
   input {
     height: 72rpx;
     background-color: #f0f1f3;

pages-purchaser/finishedActivity/finishedActivity.vue

@@ -39,7 +39,7 @@
 
 <style lang="scss" scoped>
 	.finished-activity-container{
-		background-color: #F3F5F9;
+		background-color: $uni-bg-color;
 		// height: 100vh;
 		min-height: 100vh;
 		padding: 20rpx 34rpx 36rpx;

pages-purchaser/noteAndViewpoint/noteAndViewpoint.vue

@@ -121,7 +121,7 @@ export default {
 <style lang="scss" scope>
 .note-and-viewpoint {
   padding: 30rpx;
-  background: #f3f5f9;
+  background: $uni-bg-color;
   .content-item {
     padding: 40rpx;
     background-color: #fff;

pages-purchaser/purchaserActivity/purchaserActivity.vue

@@ -110,7 +110,7 @@
 
 <style lang="scss" scoped>
 	.purchaser-activity-container{
-		background-color: #F3F5F9;
+		background-color: $uni-bg-color;
 		min-height: 100vh;
 		// height: 100vh;
 		.search-bar{

pages-purchaser/specialColumn/specialColumn.vue

@@ -107,6 +107,7 @@ export default {
       columnLableList: [],
       addLableName: "",
       isEditInfo: true,
+      refresh:false
     };
   },
   methods: {
@@ -153,6 +154,10 @@ export default {
         this.specialList = res.Data.List || [];
         this.isAuthor = res.Data.IsAuthor;
         this.isAuthor && this.getAuthorDetail();
+        if (this.refresh) {
+          uni.stopPullDownRefresh();
+          this.refresh = false;
+        }
       }
     },
     async getAuthorDetail() {
@@ -207,12 +212,17 @@ export default {
       path: "/pages-purchaser/specialColumn/specialColumn",
     };
   },
+  /* 下拉刷新 */
+  onPullDownRefresh() {
+    this.refresh = true;
+    this.getColumnList();
+  },
 };
 </script>
 
 <style lang="scss" scope>
 .special-column {
-  background-color: #f3f5f9;
+  background-color: $uni-bg-color;
   input {
     height: 72rpx;
     background-color: #f0f1f3;

pages-purchaser/toExamine/toExamine.vue

@@ -84,7 +84,13 @@ export default {
             });
             if (res.Ret === 200) {
               this.$util.toast("审核通过");
-              uni.navigateBack();
+              uni.navigateBack({
+                fail() {
+                  uni.navigateTo({
+                    url: "/pages-purchaser/specialColumn/specialColumn",
+                  });
+                },
+              });
             }
           }
         },
@@ -108,7 +114,13 @@ export default {
       });
       if (res.Ret === 200) {
         this.cancelModal();
-        uni.navigateBack();
+        uni.navigateBack({
+          fail() {
+            uni.navigateTo({
+              url: "/pages-purchaser/specialColumn/specialColumn",
+            });
+          },
+        });
       }
     },
     // 获取专栏详情
@@ -142,6 +154,7 @@ export default {
   },
   onLoad(options) {
     this.detailId = Number(options.id) || 0;
+    this.isShow = options.isMessage == "模板" ? true : false;
     this.detailId > 0 && this.getDetaliData();
   },
 };
@@ -150,7 +163,7 @@ export default {
 <style lang="scss" scope>
 .to-examine {
   padding: 30rpx;
-  background: #f3f5f9;
+  background: $uni-bg-color;
   .content-item {
     padding: 40rpx;
     background-color: #fff;

pages-purchaser/writeNote/writeNote.vue

@@ -415,7 +415,7 @@ export default {
       }
     }
   }
-  background-color: #f3f5f9;
+  background-color: $uni-bg-color;
   padding-bottom: 200rpx;
   .write-note-content {
     background-color: #fff;
@@ -426,7 +426,7 @@ export default {
       height: 112rpx;
       display: flex;
       align-items: center;
-      border-bottom: 2rpx solid #f3f5f9;
+      border-bottom: 2rpx solid $uni-bg-color;
       input {
         height: 100%;
         width: 100%;

pages.json

@@ -525,7 +525,7 @@
           "path": "specialColumn/specialColumn",
           "style": {
             "navigationBarTitleText": "研选专栏",
-            "enablePullDownRefresh": false
+            "enablePullDownRefresh": true
           }
         },
         {

pages/material/material.vue

@@ -30,13 +30,13 @@
             }}</view>
           </view>
         </block>
-        <view v-if="topTabsActive == '4'">
-          <view class="global_two_tabs">
-            <view @click="mediumClickHandler(item)" :class="['item', item.isSelect && 'tabs-active']" v-for="item in mediumSelect" :key="item.value">
+        <!-- <view v-if="topTabsActive == '4'" class="medium-ul">
+          <view class="item-content">
+            <view @click="mediumClickHandler(item)" :class="['item', item.isSelect && 'item-act']" v-for="item in mediumSelect" :key="item.value">
               {{ item.name }}
             </view>
           </view>
-        </view>
+        </view> -->
       </view>
     </view>
     <block v-if="haveData">
@@ -121,10 +121,10 @@ export default {
       videoShareId: "", //通过分享单个视频点进页面时使用
       activityShareId: "",
       roadshowPageList: [], //音频  视频 list
-      mediumSelect: [
-        { name: "音频", value: "2", isSelect: false },
-        { name: "视频", value: "1", isSelect: false },
-      ],
+      // mediumSelect: [
+      //   { name: "音频", value: "2", isSelect: false },
+      //   { name: "视频", value: "1", isSelect: false },
+      // ],
       mediumActive: "",
     };
   },

pages/purchaser/purchaser.vue

@@ -189,7 +189,7 @@ export default {
 </script>
 <style lang="scss">
 .resear-container {
-  background-color: #f3f5f9;
+  background-color: $uni-bg-color;
   .top-content-box {
     position: sticky;
     top: 0;

pages/reportForm/index.scss

@@ -1,5 +1,5 @@
 .reportForm-container {
-  background-color: #f3f5f9;
+  background-color: $uni-bg-color;
 
   .index-fixed {
     width: 750rpx;
@@ -218,6 +218,7 @@
       justify-content: space-between;
       .industry-box-left {
         display: flex;
+        align-items: center;
         .industry-follw {
           height: 42rpx;
           width: 101rpx;
@@ -272,7 +273,7 @@
   }
   .industry-top {
     display: flex;
-    background-color: #f3f5f9;
+    background-color: $uni-bg-color;
     justify-content: space-between;
     height: 90rpx;
 

pages/reportForm/reportForm.vue

@@ -710,6 +710,7 @@ export default {
     height: 164rpx;
     background-color: #fff;
     justify-content: space-between;
+    border-radius: 4rpx;
     &::after {
       content: "";
       width: 0rpx;

reportPages/companyTabulation/companyTabulation.vue

@@ -1,18 +1,18 @@
 <template>
   <view class="container container-secret">
     <view class="collect-ul" v-if="haveData">
-      <view class="collect-ltem" v-for="(item, index) in collectList" :key="index" @click="goDetail(item)">
-        <text class="title text_twoLine"
-          >{{ item.Title }}
-          <text class="reg-text" v-if="item.IsRed"></text>
-        </text>
-        <view class="content">
-          <view class="item-left">
-            <view class="abstract">{{ item.SubjectName ? "更新：" + item.SubjectName : "" }}</view>
-            <view class="desc">
-              <text class="publishDate">{{ item.PublishDate }}</text>
-            </view>
+      <view class="global_card_content collect-ltem" v-for="(item, index) in collectList" :key="index" @click="goDetail(item)">
+        <view>
+          <text class="title global_title text_twoLine">
+            {{ item.Title }}
+            <text class="reg-text" v-if="item.IsRed"></text>
+          </text>
+          <view class="content" v-if="item.SubjectName">
+            {{ "更新：" + item.SubjectName }}
           </view>
+          <view class="desc">{{ item.PublishDate }} </view>
+        </view>
+        <view class="right-icon">
           <u-icon name="arrow-right" color="#BDBDBD" size="34"></u-icon>
         </view>
       </view>
@@ -104,35 +104,32 @@ export default {
     this.refresh = true;
     this.getList();
   }),
-  /* 用户点击分享  */
-  //   onShareAppMessage: function (res) {
-  //     return {
-  //       title: this.isHorzMobile ? "好友向您推荐此内容，上传名片享查研观向免费月卡！" : "周度汇总",
-  //       path: "/reportPages/secretDetails/secretDetails?type=" + this.isType,
-  //       success: (res) => {},
-  //       fail: (err) => {},
-  //     };
-  //   },
 };
 </script>
 
 <style lang="scss" scoped>
 .container-secret {
-  background: #f7f7f7;
+  background: $uni-bg-color;
   padding-bottom: 30rpx;
   .collect-ul {
     padding-top: 4rpx;
     .collect-ltem {
-      padding: 30rpx 20rpx 30rpx 34rpx;
+      padding: 20rpx 20rpx;
+      border-top: 4rpx solid $uni-color-new;
       background: #fff;
       margin-bottom: 4rpx;
       width: 682rpx;
       margin: 20rpx auto 0;
+      display: flex;
+      justify-content: space-between;
+      .right-icon {
+        display: flex;
+        align-items: center;
+      }
       .title {
         position: relative;
-        color: #4a4a4a;
-        font-size: 34rpx;
         padding-left: 28rpx;
+        margin-bottom: 10rpx;
 
         .reg-text {
           position: absolute;
@@ -147,45 +144,22 @@ export default {
       }
 
       .content {
-        display: flex;
-        align-items: center;
-        justify-content: space-between;
+        width: 610rpx;
+        margin-right: 10rpx;
+        background-color: #f8f8fa;
+        padding: 10rpx 20rpx 10rpx 25rpx;
+        color: #999;
+        border-radius: 4rpx;
       }
 
       .desc {
         display: flex;
         align-items: center;
         margin-top: 17rpx;
-        padding-left: 28rpx;
+        padding-left: 24rpx;
         color: #999;
       }
-
-      .publishDate {
-        margin-right: 30rpx;
-        white-space: nowrap;
-      }
-
-      .text-name {
-        color: #2c83ff;
-        font-size: 26rpx;
-      }
     }
   }
-  .title {
-    color: #333333;
-    font-size: 30rpx;
-    font-weight: 400;
-    width: 100%;
-    padding-bottom: 15rpx;
-    border-bottom: 1px dashed #ccc;
-  }
-  .abstract {
-    margin: 20rpx 0 0 30rpx;
-    color: #666666;
-    font-size: 28rpx;
-    font-weight: 400;
-    padding-right: 10rpx;
-    min-height: 30rpx;
-  }
 }
 </style>

reportPages/industrialReport/industrialReport.vue

@@ -2,10 +2,10 @@
   <!-- 季度策略 -->
   <view class="container industrial-container">
     <view class="collect-ul" v-if="haveData">
-      <view class="collect-ltem" v-for="(item, index) in collectList" :key="index" @click="goDetail(item, index)">
+      <view class="global_card_content collect-ltem" v-for="(item, index) in collectList" :key="index" @click="goDetail(item, index)">
         <view class="item-left">
-          <text class="title text_twoLine"
-            >{{ item.Title }}
+          <text class="title global_title text_twoLine">
+            {{ item.Title }}
             <text class="reg-text" v-if="item.IsRed"></text>
           </text>
           <view class="desc">
@@ -101,23 +101,9 @@ export default {
           });
         }
         uni.setNavigationBarTitle({
-          title:
-            this.genreIs == "作者"
-              ? res.Data.NickName
-              : this.genreIs === "标的"
-              ? res.Data.IndustryName
-              : res.Data.IndustryName
-              ? res.Data.IndustryName
-              : res.Data.MatchTypeName,
+          title: this.genreIs == "作者" ? res.Data.NickName : this.genreIs === "标的" ? res.Data.IndustryName : res.Data.IndustryName ? res.Data.IndustryName : res.Data.MatchTypeName,
         });
-        this.titleReport =
-          this.genreIs == "作者"
-            ? res.Data.NickName
-            : this.genreIs === "标的"
-            ? res.Data.IndustryName
-            : res.Data.IndustryName
-            ? res.Data.IndustryName
-            : res.Data.MatchTypeName;
+        this.titleReport = this.genreIs == "作者" ? res.Data.NickName : this.genreIs === "标的" ? res.Data.IndustryName : res.Data.IndustryName ? res.Data.IndustryName : res.Data.MatchTypeName;
         this.status = this.page_no < res.Data.Paging.Pages ? "loadmore" : "nomore";
         this.totalPage = res.Data.Paging.Pages; //总页数
         if (res.Data.List.length > 0) {
@@ -178,16 +164,7 @@ export default {
     return {
       title: this.isHorzMobile ? "好友向您推荐此内容，上传名片享查研观向免费月卡！" : this.titleReport,
       path:
-        "/reportPages/industrialReport/industrialReport?id=" +
-        this.categoryId +
-        "&type=" +
-        this.typeIsPost +
-        "&isGenre=" +
-        this.genreIs +
-        "&idGenre=" +
-        this.idGenre +
-        "&idArticle=" +
-        this.articleId,
+        "/reportPages/industrialReport/industrialReport?id=" + this.categoryId + "&type=" + this.typeIsPost + "&isGenre=" + this.genreIs + "&idGenre=" + this.idGenre + "&idArticle=" + this.articleId,
       success: (res) => {},
       fail: (err) => {},
     };
@@ -199,7 +176,13 @@ export default {
 @import "../index.scss";
 
 .industrial-container {
-  background-color: #f6f6f6;
+  background-color: $uni-bg-color;
+  padding: 30rpx 25rpx;
+}
+.collect-ltem {
+  border-top: 4rpx solid $uni-color-new;
+  margin-bottom: 20rpx !important;
+  padding: 22rpx 12rpx !important;
 }
 .item-examine {
   display: flex;

reportPages/internalTesting/internalTesting.vue

@@ -71,10 +71,10 @@ export default {
 <style lang="scss" scoped>
 .intemal-container {
   padding: 30rpx;
-  background-color: #F3F5F9;
+  background-color: $uni-bg-color;
   .content-ul {
     border-top: 4rpx solid #376cbb;
-    padding: 20rpx 30rpx 20rpx 50rpx;
+    padding: 20rpx;
     margin-bottom: 20rpx;
     background-color: #fff;
     .li-tiem {

reportPages/myAskPage/myAskPage.vue

@@ -1,10 +1,10 @@
 <template>
   <view class="container ask-container">
     <view v-if="haveData">
-      <view class="collect-item" v-for="(item, index) in askList" :key="index" @click="goDetail(item)">
+      <view class="global_card_content collect-item" v-for="(item, index) in askList" :key="index" @click="goDetail(item)">
         <view class="item-row">
           <text class="item-content-title">问题内容:</text>
-          <text>{{ item.Content }}</text>
+          <text class="global_title">{{ item.Content }}</text>
         </view>
         <view class="item-title">
           <view class="item-row">
@@ -65,12 +65,11 @@ export default {
 
 <style lang="scss" scoped>
 .ask-container {
-  background: #f7f7f7;
+  background: $uni-bg-color;
   padding: 20rpx 30rpx;
   .collect-item {
+    border-top: 4rpx solid #376cbb;
     padding: 30rpx 30rpx;
-    color: #333333;
-    font-size: 28rpx;
     background: #fff;
     margin-bottom: 20rpx;
   }
@@ -80,16 +79,18 @@ export default {
     margin-bottom: 20rpx;
     border-radius: 4rpx;
     .item-content-title {
-      font-size: 24rpx;
+      font-size: 28rpx;
       color: #999;
+      line-height: 36rpx;
+      margin-bottom: 10rpx;
     }
     .item-content-text {
-      color: #3385ff;
+      font-weight: 500;
+      color: $uni-color-new;
     }
   }
   .item-title {
     padding-top: 20rpx;
-    border-top: 2px dashed #dcdfe6;
   }
   .time {
     text-align: right;

reportPages/secretDetails/secretDetails.vue

@@ -1,24 +1,23 @@
 <template>
   <view class="container container-secret">
-    <view class="tabs-content">
-      <view :class="['item-li', isType == item.value && 'item-active']" v-for="item in tabsList" :key="item.value" @click="tabsHandler(item)">
+    <view class="global_one_tabs">
+      <view :class="['item', isType == item.value && 'tabs-active']" v-for="item in tabsList" :key="item.value" @click="tabsHandler(item)">
         {{ item.name }}
-        <image v-if="isType == item.value" class="border_act" src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/czbk/border_act.png"></image>
       </view>
     </view>
     <view class="collect-ul" v-if="haveData">
-      <view class="collect-ltem" v-for="(item, index) in collectList" :key="index" @click="goDetail(item)">
-        <text class="title text_twoLine"
-          >{{ item.Title }}
-          <text class="reg-text" v-if="item.IsRed"></text>
-        </text>
-        <view class="content">
-          <view class="item-left">
-            <view class="abstract">{{ item.Abstract }}</view>
-            <view class="desc">
-              <text class="publishDate">{{ item.PublishDate }}</text>
-            </view>
+      <view class="global_card_content collect-ltem" v-for="(item, index) in collectList" :key="index" @click="goDetail(item)">
+        <view>
+          <text class="title global_title text_twoLine">
+            {{ item.Title }}
+            <text class="reg-text" v-if="item.IsRed"></text>
+          </text>
+          <view class="content">
+            {{ item.Abstract }}
           </view>
+          <view class="desc">{{ item.PublishDate }} </view>
+        </view>
+        <view class="right-icon">
           <u-icon name="arrow-right" color="#BDBDBD" size="34"></u-icon>
         </view>
       </view>
@@ -132,51 +131,33 @@ export default {
 
 <style lang="scss" scoped>
 .container-secret {
-  background: #f7f7f7;
+  background: $uni-bg-color;
   padding-bottom: 30rpx;
-  .tabs-content {
-    position: sticky;
-    top: -1rpx;
-    left: 0;
-    background-color: #fff;
-    height: 81rpx;
-    display: flex;
-    font-size: 30rpx;
-    font-weight: 400;
-    padding: 21rpx 35rpx 0;
-    color: #999999;
-    z-index: 99;
-    .item-li {
-      position: relative;
-      margin-right: 60rpx;
-      .border_act {
-        width: 60%;
-        height: 6rpx;
-        position: absolute;
-        bottom: 0rpx;
-        left: 50%;
-        transform: translateX(-50%);
-      }
-    }
-    .item-active {
-      color: #333333;
-      font-weight: 500;
+  .global_one_tabs {
+    .item {
+      flex: 1;
     }
   }
+
   .collect-ul {
     padding-top: 4rpx;
     .collect-ltem {
-      padding: 30rpx 20rpx 30rpx 34rpx;
+      padding: 20rpx 20rpx;
+      border-top: 4rpx solid $uni-color-new;
       background: #fff;
       margin-bottom: 4rpx;
       width: 682rpx;
       margin: 20rpx auto 0;
+      display: flex;
+      justify-content: space-between;
+      .right-icon {
+        display: flex;
+        align-items: center;
+      }
       .title {
         position: relative;
-        color: #4a4a4a;
-        font-size: 34rpx;
         padding-left: 28rpx;
-
+        margin-bottom: 10rpx;
         .reg-text {
           position: absolute;
           top: 15rpx;
@@ -190,44 +171,22 @@ export default {
       }
 
       .content {
-        display: flex;
-        align-items: center;
-        justify-content: space-between;
+        width: 610rpx;
+        margin-right: 10rpx;
+        background-color: #f8f8fa;
+        padding: 10rpx 20rpx 10rpx 25rpx;
+        color: #999;
+        border-radius: 4rpx;
       }
 
       .desc {
         display: flex;
         align-items: center;
         margin-top: 17rpx;
-        padding-left: 28rpx;
+        padding-left: 24rpx;
         color: #999;
       }
-
-      .publishDate {
-        margin-right: 30rpx;
-        white-space: nowrap;
-      }
-
-      .text-name {
-        color: #2c83ff;
-        font-size: 26rpx;
-      }
     }
   }
-  .title {
-    color: #333333;
-    font-size: 30rpx;
-    font-weight: 400;
-    width: 100%;
-    padding-bottom: 15rpx;
-    border-bottom: 1px dashed #ccc;
-  }
-  .abstract {
-    margin: 20rpx 0 0 30rpx;
-    color: #666666;
-    font-size: 28rpx;
-    font-weight: 400;
-    padding-right: 10rpx;
-  }
 }
 </style>

style/common.scss

@@ -200,11 +200,14 @@ button {
 
 // 统一内容
 .global_content {
+  margin-top: 20rpx;
   padding: 0 12rpx;
   font-size: 22rpx;
   line-height: 30rpx;
   font-weight: 400;
   color: #999999;
+  background-color: #f8f8fa;
+  border-radius: 4rpx;
 }
 // 居中
 .global_content_center {
@@ -234,6 +237,7 @@ button {
     font-size: 28rpx;
     background-color: #f8f8fa;
     flex-shrink: 0;
+    margin-right: 15rpx;
   }
   .tabs-active {
     background-color: #e5efff;
@@ -268,7 +272,7 @@ button {
       transform: translateX(-50%);
       width: 32rpx;
       height: 6rpx;
-      background-color: #376CBB;
+      background-color: #376cbb;
       border-radius: 10rpx;
     }
   }

uni.scss

@@ -12,7 +12,7 @@
  * 如果你的项目同样使用了scss预处理，你也可以直接在你的 scss 代码中使用如下变量，同时无需 import 这个文件
  */
 /* uni.scss */
-@import 'uview-ui/theme.scss';
+@import "uview-ui/theme.scss";
 /* 颜色变量 */
 
 /* 行为相关颜色 */
@@ -20,37 +20,35 @@ $uni-color-primary: #007aff;
 $uni-color-success: #4cd964;
 $uni-color-warning: #f0ad4e;
 $uni-color-error: #dd524d;
-$uni-color-new:#376CBB;
-
+$uni-color-new: #376cbb;
 
 /* 文字基本颜色 */
-$uni-text-color:#333;//基本色
-$uni-text-color-inverse:#fff;//反色
-$uni-text-color-grey:#999;//辅助灰色，如加载更多的提示信息
+$uni-text-color: #333; //基本色
+$uni-text-color-inverse: #fff; //反色
+$uni-text-color-grey: #999; //辅助灰色，如加载更多的提示信息
 $uni-text-color-placeholder: #808080;
-$uni-text-color-disable:#c0c0c0;
+$uni-text-color-disable: #c0c0c0;
 
 /* 背景颜色 */
-$uni-bg-color:#ffffff;
-$uni-bg-color-grey:#f8f8f8;
-$uni-bg-color-hover:#f1f1f1;//点击状态颜色
-$uni-bg-color-mask:rgba(0, 0, 0, 0.4);//遮罩颜色
-
+$uni-bg-color: #f3f5f9;
+$uni-bg-color-grey: #f8f8f8;
+$uni-bg-color-hover: #f1f1f1; //点击状态颜色
+$uni-bg-color-mask: rgba(0, 0, 0, 0.4); //遮罩颜色
 
 /* 边框颜色 */
-$uni-border-color:#c8c7cc;
+$uni-border-color: #c8c7cc;
 
 /* 尺寸变量 */
 
 /* 文字尺寸 */
-$uni-font-size-sm:24rpx;
-$uni-font-size-base:28rpx;
-$uni-font-size-lg:32rpx;
+$uni-font-size-sm: 24rpx;
+$uni-font-size-base: 28rpx;
+$uni-font-size-lg: 32rpx;
 
 /* 图片尺寸 */
-$uni-img-size-sm:40rpx;
-$uni-img-size-base:52rpx;
-$uni-img-size-lg:80rpx;
+$uni-img-size-sm: 40rpx;
+$uni-img-size-base: 52rpx;
+$uni-img-size-lg: 80rpx;
 
 /* Border Radius */
 $uni-border-radius-sm: 4rpx;
@@ -72,9 +70,9 @@ $uni-spacing-col-lg: 24rpx;
 $uni-opacity-disabled: 0.3; // 组件禁用态的透明度
 
 /* 文章场景相关 */
-$uni-color-title: #2C405A; // 文章标题颜色
-$uni-font-size-title:40rpx;
+$uni-color-title: #2c405a; // 文章标题颜色
+$uni-font-size-title: 40rpx;
 $uni-color-subtitle: #555555; // 二级标题颜色
-$uni-font-size-subtitle:36rpx;
-$uni-color-paragraph: #3F536E; // 文章段落颜色
-$uni-font-size-paragraph:30rpx;
+$uni-font-size-subtitle: 36rpx;
+$uni-color-paragraph: #3f536e; // 文章段落颜色
+$uni-font-size-paragraph: 30rpx;