Merge remote-tracking branch 'origin/master'

src/components/station/index.vue

@@ -82,7 +82,7 @@ const handleNavStation = (station: any) => {
   border-radius: 10rpx;
   margin-top: 20rpx;
   padding: 15rpx;
-  background: white;
+  background: #fafafa;
   position: relative;
 
   &-title {

src/components/tab-bar/index.vue

@@ -107,7 +107,9 @@ view {
   display: flex;
   align-items: center;
   padding: 25rpx 0;
-  color: #999999;
+  //color: #999999;
+
+  box-shadow:  0 -2px 5px #efefef;
 }
 .tabbar-container .tabbar-item {
   width: 33.3%;
@@ -143,6 +145,8 @@ view {
   justify-content: center;
   align-items: center;
   align-content: center;
+
+  box-shadow: 0 0 10px #efefef; /* 阴影效果 */
 }
 .tabbar-container .center-item .item-top image{
   //width: 110rpx !important;

src/pages-user/wallet/index.vue

@@ -30,7 +30,7 @@
       <uv-tabs :list="tabs" :current="tab" @click="handleTabClick"></uv-tabs>
       <uv-list>
         <uv-list-item
-            clickable show-arrow v-for="(item,index) in dataList" :key="index" @click="handleClickDetail(item)">
+            clickable :show-arrow="tab==3" v-for="(item,index) in dataList" :key="index" @click="handleClickDetail(item)">
           <template #default>
             <view class="wallet-item">
               <view class="wallet-item_header">

src/pages-user/wallet/recharge.vue

@@ -73,7 +73,7 @@ const confirm = () => {
       success:function (res: any) {
         console.log(res)
         uni.redirectTo({
-          url:'/pages-user/wallet/index'
+          url:'/pages-user/user/index'
         })
       },
       fail: function (e)  {

src/pages-wash/device/index.vue

@@ -5,17 +5,34 @@
         <text>洗车机编号：{{ state.device.shortId }}</text>
       </view>
       <view class="device-header_fun">
-        <uv-tags plain size="mini" type="primary" :text="fmtDictName('WashDevice.status',state.device.state)"></uv-tags>
+        <view class="device-header_func-tag" v-for="f in state.device.functionList" :key="f" style="margin-right: 10px;">
+          <uv-tags :text="f"  size="mini"   plain plainFill bgColor="#19A497" color="white"> </uv-tags>
+        </view>
       </view>
       <view class="device-header_fun">
-        <uv-tags plain size="mini" type="info" :text="f" v-for="(f,i) in state.device.functions.split('\\|')" :key="i"></uv-tags>
+        <uv-tags plain size="mini" type="primary" :text="fmtDictName('WashDevice.status',state.device.state)"></uv-tags>
       </view>
+
     </view>
     <view class="device-body">
       <view class="device-body_ops" @click="debounceStartStopDevice">
         <text v-if="state.device.state==='idle'">启动设备</text>
         <text v-else>停止设备</text>
       </view>
+
+      <view class=device-body_guide>
+        <view>●点击上方【启动】按钮启动设备；
+        </view>
+        <view>●设备启动后，请在设备功能面板按下功能按键以选择服务项目；
+        </view>
+        <view>●洗车过程中再次按下功能按键可以暂停次功能，暂停过程中将停止计费，如需恢复请再次按下功能按键；
+        </view>
+        <view>●洗车结束后，请按下结算按键或小程序【结束】按钮，设备停止运行之后将结束计费；
+        </view>
+        <view>●请在洗车完成后尽快将车辆驶离工位以方便后续用户，谢谢配合。
+        </view>
+
+      </view>
 <!--      <view class="device-body_ops-time">{{ state.time }}</view>-->
     </view>
   </view>
@@ -63,6 +80,7 @@ onLoad((options:any) => {
 
 const loadDeviceDetail = (id: number) => {
   get(`/wash-device/queryDevice/${id}`).then((res: any) => {
+    res.functionList = res.funcs.split("|")||[]
     state.device = res;
   }).catch(e => {
     console.error(e)
@@ -142,6 +160,11 @@ const countTime = () => {
     font-size: 13px;
     color: #7a7a7a;
     margin: 10rpx 0;
+    display: inline-flex;
+
+    &-tag{
+      margin-right: 10px;
+    }
   }
 
 }
@@ -168,5 +191,11 @@ const countTime = () => {
     font-size: 28px;
     font-weight: 500;
   }
+
+  &_guide{
+    width: 80%;
+    margin-top: 40px;
+    font-size: 14px;
+  }
 }
 </style>

src/pages-wash/station/index.vue

@@ -15,7 +15,9 @@
           <text class="device-item_header-status">{{ fmtDictName('WashDevice.state', device.state) }}</text>
         </view>
         <view class="device-item_func">
-          <text class="device-item_func-label">{{ device.functions }}</text>
+          <view class="device-item_func-tag" v-for="f in device.functionList" :key="f">
+          <uv-tags :text="f"  size="mini"   plain plainFill bgColor="#19A497" color="white"> </uv-tags>
+          </view>
         </view>
       </view>
 
@@ -79,7 +81,12 @@ const loadStationDeviceList = () => {
     return;
   }
   get(`/wash-device/listWashDevice`, {stationId: state.station.stationId}).then((deviceList: any) => {
+    deviceList.forEach((item: any)=>{
+      item.functionList = item.functions.split("|")
+    })
     state.deviceList = deviceList;
+
+    console.log(state.deviceList)
   })
 }
 
@@ -148,11 +155,16 @@ const handleClickDevice = (device: any) => {
   }
 
   &_func {
+    display: inline-flex;
 
     &-label {
       font-size: 24rpx;
       color: #aaa;
     }
+
+    &-tag{
+      margin-right: 10px;
+    }
   }
 }
 

src/pages/index/index.vue

@@ -342,7 +342,7 @@ page{
 }
 
 .content_station {
-  background: #fafafa;
+
   height: calc(100vh - 750rpx);
   overflow: scroll;
 }

src/utils/https.ts

@@ -134,7 +134,7 @@ const request = (options: any) => {
                     }, 300)
 
                 } else {
-                    let errMsg = response.msg || '网络异常，请稍后重试';
+                    let errMsg = response.message || '网络异常，请稍后重试';
                     uni.showToast({
                         title: errMsg,
                         icon: 'none'