skyline 1 年之前
父节点
当前提交
7339f22c67
共有 4 个文件被更改,包括 7 次插入7 次删除
  1. 3 3
      src/components/station/index.vue
  2. 2 2
      src/pages-user/login/index.vue
  3. 1 1
      src/pages.json
  4. 1 1
      src/pages/index/index.vue

+ 3 - 3
src/components/station/index.vue

@@ -1,8 +1,9 @@
-<template>
+<template xmlns="http://www.w3.org/1999/html">
   <view class="station_item"
         @click="handleNavStation(item)">
     <view class="station_item-title">
       <text class="font13">{{ item.stationName }}</text>
+      <text class="station_item-content-left-label-left_count">空闲:{{ item.idleParkingNum }}/{{ item.parkingNum }}</text>
     </view>
 
     <view class="station_item-status">
@@ -13,8 +14,7 @@
       <view class="station_item-content-left">
         <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.idleParkingNum }}/{{ item.parkingNum }}</text>
+            <text class="station_item-content-left-label-left_idle">{{ fmtDictName('WashStation.status', item.stationStatus) }} {{item.businessHours}}</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>-->

+ 2 - 2
src/pages-user/login/index.vue

@@ -3,7 +3,7 @@
     <!-- Logo区域 -->
     <div class="logo-box">
       <img src="@/static/logo.png" alt="logo" class="logo">
-      <div class="app-name">iWash洗车</div>
+      <div class="app-name">Yeswash</div>
     </div>
 
     <!-- 登录按钮 -->
@@ -214,4 +214,4 @@ const handleGetPhone = (e:any) => {
 .link {
   color:$uni-color-primary
 }
-</style>
+</style>

+ 1 - 1
src/pages.json

@@ -10,7 +10,7 @@
     {
       "path": "pages/index/index",
       "style": {
-        "navigationBarTitleText": "iWash洗车",
+        "navigationBarTitleText": "Yeswash",
         "enablePullDownRefresh": true,
         "disableScroll": true
       }

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

@@ -1,5 +1,5 @@
 <template>
-  <uv-navbar placeholder leftIcon="" title="iWash洗车"
+  <uv-navbar placeholder leftIcon="" title="Yeswash"
              :border="false"></uv-navbar>
   <view class="content" :style="containerStyle">
     <!--    <image class="logo" src="/static/logo.png"/>