skyline hai 1 ano
pai
achega
cb0504b84d

+ 5 - 5
src/components/charge-station/charge-station.vue

@@ -12,13 +12,13 @@
       <view>
         <view class="flex flex-align-center">
           <view class="fs-32 fw-bold" @click.stop="detail">{{ title }}</view>
+          <image class="ml-10" src="/static/images/coupon-center.png" mode="widthFix" style="width:32rpx"/>
           <view class="coupon-box ml-5" @click.stop="toCouponCenter"
                 v-if="activityList&&activityList.length>0"
                 @touchstart="touchstart"
                 @touchend.stop="touchend"
           >
-            <!--            <image src="/static/images/coupon-center.png" mode="widthFix" style="width:42rpx"/>-->
-            <text>领券</text>
+            <text>活动中</text>
           </view>
         </view>
 
@@ -307,9 +307,9 @@ export default {
   justify-content: space-between;
   align-items: center;
   color: #fff;
-  background-color: #dd524d;
-  font-size: 18rpx;
-  border-radius: 4rpx;
+  background-color: #2d9e95;
+  font-size: 14rpx;
+  border-radius: 8rpx;
   padding: 0rpx 6rpx;
   text {
     font-size: 24rpx;

+ 4 - 4
src/pages-charge/appointment/appointment.vue

@@ -19,12 +19,12 @@
           <view class="fs-26 color-666">{{ data.station.address }}</view>
         </view>
       </view>
-      <view class="mt-40 color-999 fs-32 fw-500">费用说明</view>
+<!--      <view class="mt-40 ml-30 color-999 fs-32 fw-500">费用说明</view>-->
       <view
         class="mt-20 block height-96 flex-align-center pl-30 pr-30"
         @click="openPriceDesc"
       >
-        <view class="fs-26 color-666">充电费用</view>
+        <view class="fs-28 color-000">充电费用</view>
         <view class="ml-64 fs-26 color-333"
           >{{ priceInfo.minPrice }}~{{ priceInfo.maxPrice }}元/度</view
         >
@@ -63,7 +63,7 @@
         </view>
       </template>
       <template v-else>
-        <view class="mt-40 color-999 fs-32 fw-500">选择充电方式</view>
+<!--        <view class="mt-40 ml-30 color-999 fs-32 fw-500">选择充电方式</view>-->
         <view class="mt-20 block pl-30 pr-30">
           <view
             v-for="(type, index) in chargeTypes"
@@ -149,7 +149,7 @@
           <view class="fs-28 lh-28 color-000 fw-500">优惠</view>
           <block v-if="discountList.length > 0">
             <view class="fs-28 lh-28 ml-auto" style="color: #f43636"
-              >{{ discountList[discountIndex].discountFormat }}折</view
+              >{{ discountList[discountIndex].discountFormat.toFixed(1) }}折</view
             >
             <uni-icons type="right" size="16" color="#CACACA"></uni-icons>
           </block>

+ 10 - 9
src/pages-charge/machines/machines.vue

@@ -30,12 +30,12 @@
       <view class="station flex-column" v-if="canUseCount >= 0">
         <view style="display: inline-flex;align-items: center;">
           <view class="fs-40 fw-600 color-000">{{ title }}</view>
+          <image class="ml-10" src="/static/images/coupon-center.png" mode="widthFix" style="width:32rpx"/>
           <view class="coupon-box ml-5"
                 v-if="location.activityList&&location.activityList.length>0"
                 @tap.stop="toCouponCenter"
           >
-<!--            <image src="/static/images/coupon-center.png" mode="widthFix" style="width:42rpx"/>-->
-            <text @tap.stop="showStationCoupon">领券</text>
+            <text @tap.stop="showStationCoupon">活动中</text>
           </view>
         </view>
         <view class="flex-align-center mt-10 height-48 relative flex-shrink">
@@ -63,7 +63,7 @@
           <view class="fs-28 color-666 ml-auto">{{ canUseTime }}</view>
         </view>
       </view>
-      <view class="pt-40 pb-20 fs-32 fw-500 color-999">详细说明</view>
+<!--      <view class="pt-40 pb-20 fs-32 fw-500 color-999">详细说明</view>-->
       <view class="desc" v-if="station">
         <view class="flex-align-center" @click="openDesc">
           <view class="width-168 fs-26 color-666">充电费用</view>
@@ -104,15 +104,16 @@
         </view>
       </view>
       <view class="pt-40 flex-align-center">
-        <view class="fs-32 fw-500 color-999">充电桩</view>
-        <view class="fs-26 color-999" v-if="station"
-          >(共{{ totalCount }}个)</view
+<!--        <view class="fs-32 fw-500 color-999">充电桩</view>-->
+        <view class="fs-26 ml-30 color-999" v-if="station"
+          >设备数量(共{{ totalCount }}台)</view
         >
         <view class="ml-auto flex-align-center" @click="openStatus">
           <view class="fs-28 color-333 mr-16">{{
             statusList[status].title
           }}</view>
           <view
+            class="mr-20"
             style="
               width: 0;
               height: 0;
@@ -460,9 +461,9 @@ page {
   justify-content: space-between;
   align-items: center;
   color: #fff;
-  background-color: #dd524d;
-  font-size: 18rpx;
-  border-radius: 4rpx;
+  background-color: #2d9e95;
+  font-size: 14rpx;
+  border-radius: 8rpx;
   padding: 0rpx 6rpx;
   text {
     font-size: 24rpx;

BIN=BIN
src/static/images/coupon-center.png


BIN=BIN
src/static/images/map-point-current.png


BIN=BIN
src/static/images/map-point.png