Browse Source

整体色调修改

skyline 1 năm trước cách đây
mục cha
commit
79370fa516

+ 8 - 7
src/pages-charge/card/card.vue

@@ -19,10 +19,11 @@
               <view class="flex-align-end">
                 <view class="item-header__left">
                   <image class="width-84" src="/pages-charge/static/discount-rights-card.png" mode="widthFix"></image>
-                  <view class="fs-48 lh-58 color-000 fw-500 ml-16">{{ item.discountAmount }}折
+                  <view class="fs-48 lh-58 color-000 fw-500 ml-16">
+                    {{ (item.discount / 10).toFixed(1) }}折
                   </view>
                   <view class="fs-26 color-999 ml-16" v-if="mode === 0"
-                  >用于充电服务费抵扣
+                  >抵扣充电服务费
                   </view>
                 </view>
 
@@ -35,9 +36,9 @@
               <block>
                 <view class="fs-26 color-999 mt-8"
                       @click.stop="to(`/pages-common/activity/activity?id=${item.activityId}`)">
-                  <view class="fs-26 color-999 mt-24">到期时间:{{ item.endTime }}</view>
+                  <view class="fs-26 color-999">到期时间:{{ item.endTime }}</view>
                   <view class="flex-align-center" v-if="mode === 0">
-                    <view class="fs-26 color-999 mt-24">权益余额:{{ ((item.rightsBalance || 0) / 100).toFixed(2) }}元
+                    <view class="fs-26 color-999">权益余额:{{ ((item.rightsBalance || 0) / 100).toFixed(2) }}元
                       <text class="color-primary">详细规则</text>
                       <text class="fs-24 ml-4 color-primary">>></text>
                     </view>
@@ -106,7 +107,7 @@
                   </view>
 
                   <view class="fs-26 color-999 ml-16">
-                    {{ item.couponType == 'FullDiscount' ? '满减券' : '折扣券' }}:抵扣充电服务费
+                    充电服务费:{{ item.couponType == 'FullDiscount' ? '满减券' : '折扣券' }}
                   </view>
                 </view>
 
@@ -124,9 +125,9 @@
               <block v-if="mode === 1">
                 <view class="fs-26 color-999 mt-8"
                       @click.stop="to(`/pages-common/activity/activity?id=${item.activityId}`)">
-                  <view class="fs-26 color-999 mt-24">到期时间:{{ item.endTime }}</view>
+                  <view class="fs-26 color-999">到期时间:{{ item.endTime }}</view>
                   <view class="flex-align-center">
-                    <view class="fs-26 color-999 mt-24">服务费门槛:{{ ((item.minServiceMoney || 0) / 100).toFixed(2) }}元
+                    <view class="fs-26 color-999">服务费门槛:{{ ((item.minServiceMoney || 0) / 100).toFixed(2) }}元
                       <text class="color-primary">详细规则</text>
                       <text class="fs-24 ml-4 color-primary">>></text>
                     </view>

+ 8 - 8
src/pages-charge/machines/charge-machine/charge-machine.vue

@@ -127,12 +127,12 @@ export default {
       background-color: #b1b1b1;
     }
     &-1 {
-      background: #21dc82;
+      background: #2d9e95;
     }
     &-2,
     &-3,
     &-4 {
-      background: rgba(255, 153, 0, 1);
+      background: rgb(154, 168, 168);
     }
   }
   .tag {
@@ -146,18 +146,18 @@ export default {
     background: rgba(244, 54, 54, 0.1);
   }
   .tag-0 {
-    color: #b1b1b1;
-    background-color: rgba(177, 177, 177, 0.1);
+    color: #abadb0;
+    background-color: rgb(255, 255, 255);
   }
   .tag-1 {
-    color: #21dc82;
-    background: rgba(33, 220, 130, 0.1);
+    color: #2d9e95;
+    background: rgb(255, 255, 255);
   }
   .tag-2,
   .tag-3,
   .tag-4 {
-    color: rgba(255, 153, 0, 1);
-    background: rgba(255, 153, 0, 0.1);
+    color: rgba(171, 173, 176);
+    background: rgb(255, 255, 255);
   }
 }
 </style>

BIN
src/pages-charge/static/charge-ordering-border.png


BIN
src/pages-charge/static/charge-ordering-finish.png


BIN
src/pages-charge/static/charge-ordering-icon.png


BIN
src/pages-charge/static/discount-coupon.png


BIN
src/pages-charge/static/discount-rights-card.png


BIN
src/pages-charge/static/discount-折.png


BIN
src/pages-charge/static/icon-alarm.png


+ 1 - 1
src/pages/map/map.vue

@@ -954,7 +954,7 @@ page {
   width: 186rpx;
   height: 88rpx;
   border-radius: 88rpx 0px 0px 88rpx;
-  background: linear-gradient(106deg, #34b6ff 15.97%, #2d9e95 72.38%);
+  background: #2d9e95;
   margin-bottom: constant(safe-area-inset-bottom);
   margin-bottom: env(safe-area-inset-bottom);
 }

BIN
src/static/images/map-charging.png