bding 1 tahun lalu
induk
melakukan
307a31f129

+ 1 - 1
activityPages/themeActivity/themeActivity.vue

@@ -50,7 +50,7 @@
       <!-- 活动列表 -->
       <view>
         <view class="collect-ul" v-if="haveData">
-          <view class="collect-ltem" v-for="(item, index) in collectList" :key="index">
+          <view class="collect-ltem global_card_content" v-for="(item, index) in collectList" :key="index">
             <view class="title-date" @click="goDetail(item)">
               <text :class="item.ActivityType == 1 ? '' : 'xianxia'">{{ item.ActivityType == 1 ? "线上" : "线下" }}</text>
               {{ item.SourceType == 2 ? "" : item.ActivityTimeText }}

+ 5 - 9
components/activity/indexActivity.scss

@@ -20,23 +20,19 @@
     border-bottom: 1px solid #e5e5e5;
 
     text {
-      // background: linear-gradient(264deg, #01baff 0%, #0044ff 100%);
       background-color: #DFE8FF;
-      color: #3385FF;
+      color: $uni-color-new;
       width: 110rpx;
-      height: 40rpx;
+      height: 42rpx;
       text-align: center;
       margin-right: 20rpx;
       font-size: 24rpx;
-      line-height: 40rpx;
-      // color: #fff;
+      line-height: 42rpx;
       border-radius: 4rpx;
+      font-weight: 500;
     }
-
     .xianxia {
-      // background: linear-gradient(264deg, #ff8801 0%, #ffb950 100%);
-      background-color: #FFFAF2;
-      color: #FF8A00;
+      background-color: #F2E8CC;
     }
   }
 

+ 6 - 7
pages/activity/activity.vue

@@ -5,8 +5,8 @@
         <template slot="content-left">
           <view class="content">
             <view class="activity-back" @click="activityPlayBack" v-if="isUserBindingPhoneNumber">
-              <image src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/at_back.png"></image>
-              活动回放
+              <image src="https://hzchart.oss-cn-shanghai.aliyuncs.com/new_cygx/at_back.png"></image>
+              回放
             </view>
           </view>
         </template>
@@ -328,12 +328,11 @@ export default {
           display: flex;
           flex-shrink: 0;
           align-items: center;
-          color: #3385ff;
+          color: $uni-color-new;
           font-size: 30rpx;
           image {
-            width: 28rpx;
-            height: 28rpx;
-            margin-right: 10rpx;
+            width: 40rpx;
+            height: 40rpx;
           }
         }
       }
@@ -421,7 +420,7 @@ export default {
     display: flex;
     justify-content: center;
     margin-top: 60rpx;
-    color: #3385ff;
+    color: $uni-color-new;
   }
   /deep/.not-have-login {
     padding-top: 200rpx !important;

+ 1 - 2
pages/reportForm/index.scss

@@ -129,10 +129,9 @@
       width: 100%;
       z-index: 99;
       background-color: #fff;
-      padding: 0 30rpx;
       display: flex;
       flex-wrap: wrap;
-      padding: 30rpx 20rpx;
+      padding: 15rpx 20rpx 0;
 
       .scroll-tab-item {
         position: relative;

+ 2 - 45
pages/reportForm/reportForm.vue

@@ -11,10 +11,10 @@
           </view>
         </template>
       </search-bar>
-      <view class="second-tabs">
+      <view class="global_one_tabs">
         <view :class="['item', item.ChartPermissionId == tabAct_id && 'tabs-active']" v-for="(item, index) in tabBars" :key="item.ChartPermissionId" @click="toggleTab(item, index)">
           {{ item.PermissionName }}
-          <view class="active" v-if="item.ChartPermissionId == tabAct_id"></view>
+          <!-- <view class="active" v-if="item.ChartPermissionId == tabAct_id"></view> -->
         </view>
       </view>
     </view>
@@ -689,49 +689,6 @@ export default {
         }
       }
     }
-    .second-tabs {
-      width: 100%;
-      padding-left: 30rpx;
-      display: flex;
-      overflow-x: auto;
-      background-color: #fff;
-      font-size: 34rpx;
-      color: #999999;
-      &::-webkit-scrollbar {
-        width: 0;
-        height: 0;
-        display: none;
-      }
-      .item {
-        position: relative;
-        padding-bottom: 16rpx;
-        margin-right: 50rpx;
-        flex-shrink: 0;
-        .limit-img {
-          position: absolute;
-          top: -15rpx;
-          right: -50rpx;
-          z-index: 99;
-        }
-        .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;
-      }
-      .tabs-img {
-        width: 46rpx;
-        height: 26rpx;
-      }
-    }
   }
   .label-content {
     display: flex;

+ 14 - 2
style/common.scss

@@ -244,20 +244,32 @@ button {
   display: flex;
   width: 100%;
   height: 96rpx;
-  padding-left: 30rpx;
   overflow-x: auto;
   background-color: #fff;
   .item {
     width: 120rpx;
     display: flex;
     align-items: center;
+    justify-content: center;
     color: #333;
     font-size: 28rpx;
     line-height: 44rpx;
     flex-shrink: 0;
   }
   .tabs-active {
-    background-color: #e5efff;
+    position: relative;
     color: #376cbb;
+    font-weight: 600;
+    &::before {
+      content: "";
+      position: absolute;
+      bottom: 15rpx;
+      left: 50%;
+      transform: translateX(-50%);
+      width: 32rpx;
+      height: 6rpx;
+      background-color: #376CBB;
+      border-radius: 10rpx;
+    }
   }
 }