skyline 1 rok pred
rodič
commit
240a30413d

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

@@ -6,15 +6,16 @@
     </view>
 
     <view class="station_item-status">
-      <text class="station_item-status-text">{{ item.stationStatus == 'Normal' ? '营业中' : '暂停营业' }}</text>
+<!--      <text class="station_item-status-text">{{ item.stationStatus == 'Normal' ? '营业中' : '暂停营业' }}</text>-->
+      <text class="station_item-status-text">{{ fmtDictName('WashStation.status', item.stationStatus) }}</text>
     </view>
 
     <view class="station_item-content">
       <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">{{item.businessHours}} | 空闲:{{ item.idleParkingNum }}</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>-->

+ 2 - 2
src/uni_modules/uv-ui-tools/theme.scss

@@ -10,7 +10,7 @@ $uv-border-color: #dadbde;
 $uv-bg-color: #f3f4f6;
 $uv-disabled-color: #c8c9cc;
 
-$uv-primary: #3c9cff;
+$uv-primary: #C6171E;
 $uv-primary-dark: #398ade;
 $uv-primary-disabled: #9acafc;
 $uv-primary-light: #ecf5ff;
@@ -40,4 +40,4 @@ $uv-info-light: #f4f4f5;
 	display: flex;
 	/* #endif */
 	flex-direction: $direction;
-}
+}