Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/pages-wash/device/index.vue

src/components/station/index.vue

@@ -14,7 +14,7 @@
         <view class="station_item-content-left-label">
           <view class="font12 station_item-content-left-label-left">
             <text class="station_item-content-left-label-left_idle">{{ fmtDictName('WashStation.status',item.stationStatus) }}</text>
-            <text class="station_item-content-left-label-left_count">{{ item.parkingNum }}/{{ item.parkingNum }}</text>
+            <text class="station_item-content-left-label-left_count">{{ item.idleParkingNum }}/{{ item.parkingNum }}</text>
           </view>
           <!--              <uv-tags size="small" class="station_item-content-left-label_tag" text="洗车机" plain shape="circle"></uv-tags>-->
           <!--              <view class="station_item-content-left-label_func">{{ ['清洁', '泡沫', '吸尘', '消毒', '充电']?.join(" | ") }}</view>-->
@@ -181,4 +181,4 @@ const handleNavStation = (station: any) => {
   }
 }
 
-</style>
+</style>

src/pages-wash/device/index.vue

@@ -4,6 +4,8 @@
       <view class="device-header_name">
         <text>洗车机编号：{{ state.device.shortId }}</text>
       </view>
+      <uv-tags plain size="mini" type="primary" :text="fmtDictName('WashDevice.status',state.device.state)"></uv-tags>
+
       <view class="device-header_fun">
         <view class="device-header_func-tag" v-for="f in state.device.functionList" :key="f">
           <uv-tags :text="f"  size="mini"   plain plainFill bgColor="#19A497" color="white"> </uv-tags>
@@ -17,8 +19,8 @@
     </view>
     <view class="device-body">
       <view class="device-body_ops" @click="debounceStartStopDevice">
-        <text v-if="state.device.state==='idle'">启动</text>
-        <text v-else>停止</text>
+        <text v-if="state.device.state==='idle'">启动设备</text>
+        <text v-else>停止设备</text>
       </view>
 
       <view class=device-body_guide>
@@ -42,7 +44,7 @@
 <script setup lang="ts">
 import {onHide, onLoad, onShow} from "@dcloudio/uni-app";
 import {reactive, ref} from "vue";
-import {debounce} from "@/utils/common";
+import {debounce, fmtDictName} from "@/utils/common";
 import {get, post} from "@/utils/https";
 
 const initState = () => ({
@@ -106,7 +108,7 @@ const handleClickDevice = () => {
       post(`/wash-device/startDevice/${state.device.shortId}`).then((res:any)=>{
         uni.hideLoading();
         uni.showToast({
-          title:'启动成功，请到洗车机面板选择服务项目'
+          title:'设备启动成功'
         })
       })
     }else{
@@ -184,8 +186,8 @@ const countTime = () => {
     justify-content: center;
     align-items: center;
     align-content: center;
-    width: 240rpx;
-    height: 240rpx;
+    width: 300rpx;
+    height: 300rpx;
     border-radius: 50%;
     background-color: $uni-color-primary;
     color: white;

src/pages/user/index.vue

@@ -23,12 +23,11 @@
             <view class="money-left">
               <image src="/static/iconfont/chongzhi.svg"  mode="widthFit"  style="width: 40rpx;height: 40rpx"></image>
 <!--              <uv-icon name="red-packet" size="24" color="#19A497"></uv-icon>-->
-              <view style="font-size: 13px;margin-left: 10rpx;">钱包|充值</view>
+              <view style="font-size: 16px;margin-left: 10rpx;">钱包 | 充值</view>
             </view>
 
             <view class="money-right">
-              <view>¥</view>
-              <view class="money-right_balance">{{ ((user.balance || 0) / 100).toFixed(2) }}</view>
+              <view class="money-right_balance">¥ {{ ((user.balance || 0) / 100).toFixed(2) }}</view>
             </view>
 
           </view>
@@ -284,7 +283,7 @@ page{
       //position: absolute;
       //left: 0;
       //bottom: 0;
-      width: 690rpx;
+      width: 600rpx;
       height: 118rpx;
       background: #feffff;
       border-radius: 120rpx;
@@ -312,6 +311,7 @@ page{
         &_balance {
           font-weight: 600;
           font-size: 20px;
+          margin-right: 10px;
         }
       }
     }