Merge remote-tracking branch 'origin/main' into main

src/components/order-coupon-detail/order-coupon-detail.vue

@@ -35,7 +35,7 @@
                         @click.stop="to(`/pages-common/activity/activity?id=${item.activityId}`)">
                     <view class="fs-26 color-999">到期时间：{{ item.endTime }}</view>
                     <view class="flex-align-center" v-if="mode === 0">
-                      <view class="fs-24 color-999">享受{{ (item.discount / 10).toFixed(1) }}折服务费权益，本次充电优惠：{{ ((item.discountAmount || 0) / 100).toFixed(2) }}元
+                      <view class="fs-24 color-999">享受{{ (item.discount / 10).toFixed(1) }}折服务费权益，本次充电优惠：{{ ((item.orderDiscountAmount || 0) / 100).toFixed(2) }}元
                                                 <text class="color-primary">详细规则</text>
                                                 <text class="fs-24 ml-4 color-primary">>></text>
                       </view>
@@ -88,7 +88,7 @@
                         @click.stop="to(`/pages-common/activity/activity?id=${item.activityId}`)">
                     <view class="fs-26 color-999">到期时间：{{ item.endTime }}</view>
                     <view class="flex-align-center">
-                      <view class="fs-26 color-999">服务费门槛：{{ ((item.minServiceMoney || 0) / 100).toFixed(2) }}元
+                      <view class="fs-26 color-999">本次充电优惠：{{ ((item.orderDiscountAmount || 0) / 100).toFixed(2) }}元
                         <text class="color-primary">详细规则</text>
                         <text class="fs-24 ml-4 color-primary">>></text>
                       </view>

src/pages-charge/machines/machines.vue

@@ -59,7 +59,7 @@
             class="foot mt-30 flex-align-center flex-shrink"
             @click="openDesc"
         >
-          <view class="fs-28 color-666">可用充电桩：</view>
+          <view class="fs-28 color-666">空闲充电桩：</view>
           <view class="fs-36 fw-500 color-primary">{{ canUseCount }}</view>
           <view class="fs-28 color-primary ml-6">个</view>
           <view class="fs-28 color-666 ml-auto">{{ canUseTime }}</view>

src/pages-charge/order/order.vue

@@ -58,6 +58,10 @@ onLoad((options: any) => {
             )}分钟`
           : `${parseInt(`${diff / 60}`)}分钟`;
       const _list = [
+        {
+          label: "充电站点",
+          value: `${res.stationName}`,
+        },
         {
           label: "累计充电量",
           value: `${res.totalPower}度`,

src/pages-common/faq/faq.vue

@@ -50,7 +50,7 @@
       <image
         class="width-96"
         mode="widthFix"
-        src="/static/images/contact-servicer.png"
+        src="/static/images/contact-customer.png"
       />
       <view class="mt-16 color-666 fs-28">电话客服</view>
     </view>