Merge branch 'master' of http://121.40.98.15:3001/evolve/car-wash-front

# Conflicts:
#	src/components/station/index.vue
#	src/pages-user/login/index.vue
#	src/pages.json
#	src/pages/index/index.vue

src/components/login-bar/index.vue

@@ -2,11 +2,11 @@
   <view class="login-bar flex flex-inline" v-if="!state.isLogin">
     <text class="login-bar_title" >   请先登录以享受更多洗车功能</text>
 <!--    <uv-button class="login-bar_btn" size="mini" shape="circle" type="primary" open-type="getPhoneNumber"
-               color="#19A497"
+               color="#C6171E"
                @getphonenumber="handleGetPhone">去登录
     </uv-button>-->
     <uv-button class="login-bar_btn" size="mini" shape="circle" type="primary"
-               color="#19A497"
+               color="#C6171E"
                @click="handleGotoLoginPage">去登录
     </uv-button>
   </view>

src/components/station/index.vue

@@ -1,9 +1,8 @@
-<template xmlns="http://www.w3.org/1999/html">
+<template>
   <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>
+      <text class="font16 ">{{ item.stationName }}</text>
     </view>
 
     <view class="station_item-status">
@@ -14,7 +13,8 @@
       <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) }} {{item.businessHours}}</text>
+            <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>
           </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>-->
@@ -29,7 +29,7 @@
                     style="width: 20px; height: 20px;color: #eeeeee;"
                     src="/static/nav.png"
                 />-->
-        <uv-icon name="map" color="#19A497"></uv-icon>
+<!--        <uv-icon name="map" color="#C6171E"></uv-icon>-->
         <text class="font12" @click.stop="handleNavMap(item)">{{ item.distance }}km</text>
         <!--            <uv-tags text="1222km" type="warning" plain size="mini"></uv-tags>-->
       </view>
@@ -94,6 +94,7 @@ const handleNavStation = (station: any) => {
   &-title {
     display: inline-flex;
     padding-left: 5px;
+    font-weight: 600;
   }
 
   &-status {

src/components/tab-bar/index.vue

@@ -41,8 +41,8 @@
       {
         id: 1,
         path: '/pages-wash/scan/index',
-        icon: '/static/tabbar/2.png',
-        selectIcon: '/static/tabbar/2-1.png',
+        icon: '/static/iconfont/scan.svg',
+        selectIcon: '/static/iconfont/scan.svg',
         text: '扫码',
         centerItem: true
       },

src/pages-user/feedback/add.vue

@@ -200,7 +200,7 @@ defineExpose({
 
   .text-right_btn {
     /* margin-right: 10px; */
-    background-color: #19A497;
+    background-color: #C6171E;
     color: white;
     font-size: 15px;
     padding: 5px 12px;

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">Yeswash</div>
+      <div class="app-name">Yeswash洗车</div>
     </div>
 
     <!-- 登录按钮 -->
@@ -13,7 +13,7 @@
         微信一键登录
       </div>-->
       <uv-button :disabled="!isAgreePrivacy||isAgreePrivacy.length===0"
-                 class="phone-login-btn" type="primary"        color="#19A497"
+                 class="phone-login-btn" type="primary"        color="#C6171E"
                  @getphonenumber="handleGetPhone"  open-type="getPhoneNumber">
         手机号一键登录
       </uv-button>
@@ -28,6 +28,7 @@
             shape="circle">
           <uv-checkbox
               :name="'aa'"
+              activeColor="#C6171E"
           ></uv-checkbox>
         </uv-checkbox-group>
         <view class="text">
@@ -153,7 +154,7 @@ const handleGetPhone = (e:any) => {
 
 .wechat-login-btn,
 .phone-login-btn {
-  color:#19A497 !important;
+  color:#C6171E !important;
   width: 100%;
   height: 44px;
   border-radius: 2px;
@@ -214,4 +215,4 @@ const handleGetPhone = (e:any) => {
 .link {
   color:$uni-color-primary
 }
-</style>
+</style>

src/pages-user/wallet/index.vue

@@ -38,7 +38,7 @@
                 <view class="wallet-item_header">
                   <view class="flex-inline">
                     <text class="wallet-item_header-type">{{ fmtDictName('WalletDetail.type', item.type) }}</text>
-                    <uv-tags class="ml10" style="margin-left: 10px;" size="mini" plain
+                    <uv-tags class="ml10 wallet-item_header-status" style="margin-left: 10px;" size="mini" plain
                              :type="item.status==0?'primary':(item.status==1?'success':'error')"
                              :text="fmtDictName('WalletDetail.status', item.status)"></uv-tags>
                   </view>
@@ -62,7 +62,7 @@
     <view class="wallet-bottom">
       <uv-button
           type="primary"
-          color="#19A497"
+          color="#C6171E"
           @click="to(`/pages-user/wallet/recharge`)">充值
       </uv-button>
     </view>
@@ -192,11 +192,11 @@ const handleClickDetail = (walletDetail: any) => {
       }
 
       &-refund {
-        color: #127779;
+        color: $uni-color-primary;
         padding: 6rpx 28rpx;
         font-size: 26rpx;
         border-radius: 14px;
-        background-color: #65C0B7;
+        background-color: #fff;
         display: flex;
         align-items: center;
         justify-content: center;
@@ -258,6 +258,7 @@ const handleClickDetail = (walletDetail: any) => {
             margin-left: 6px;
             border: 1px solid $uni-color-primary;
             border-radius: 2rpx;
+            transform: scale(0.8);
           }
 
           &-amt {
@@ -291,8 +292,12 @@ const handleClickDetail = (walletDetail: any) => {
   }
 
   .wallet-bottom {
-    width: 100%;
-    height: 36px;
+    /*width: 100%;
+    height: 46px;*/
+    width: calc(100vw - 40rpx);
+    position: fixed;
+    bottom: 10rpx;
+    left: 20rpx;
   }
 
 }

src/pages-user/wallet/recharge.vue

@@ -6,13 +6,13 @@
             class="recharge-item" :class="idx===state.chosenIdx?'active':''">
         <view class="recharge-item_amt">{{ (recharge.rechargeAmount/100).toFixed(2) }}</view>
         <view class="recharge-item_grant" v-if="recharge.grantsAmount>0">
-          <uv-icon name="gift" :color="idx===state.chosenIdx?'#19A497':'#2b2b2b'" size="14px"></uv-icon>
+          <uv-icon name="gift" :color="idx===state.chosenIdx?'#C6171E':'#2b2b2b'" size="14px"></uv-icon>
           {{ (recharge.grantsAmount/100).toFixed(2) }}元
         </view>
       </view>
     </view>
     <view class="recharge-pay">
-      <uv-button type="primary" iconColor="white" color="#19A497" text="充值" @click="debounceConfirm"></uv-button>
+      <uv-button type="primary" iconColor="white" color="#C6171E" text="充值" @click="debounceConfirm"></uv-button>
     </view>
   </view>
 

src/pages-wash/device/index.vue

@@ -6,7 +6,7 @@
       </view>
       <view class="device-header_fun">
         <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>
+          <uv-tags :text="f" size="mini" plain plainFill bgColor="#C6171E" color="white" type="error"></uv-tags>
         </view>
       </view>
       <view class="device-header_fun">
@@ -39,7 +39,7 @@
         <uv-button
             v-if="state.isLogin"
             type="default"
-            color="#19A497"
+            color="#C6171E"
             @click="handleGotoRechage">余额￥ {{ fmtMoney(state.balance)  }},去充值
         </uv-button>
       </view>

src/pages-wash/station/index.vue

@@ -16,7 +16,7 @@
         </view>
         <view class="device-item_func">
           <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>
+            <uv-tags :text="f" size="mini" plain plainFill bgColor="#C6171E" color="white"  type="error"></uv-tags>
           </view>
         </view>
       </view>
@@ -24,7 +24,7 @@
     </view>
 
     <view class="scan-btn">
-      <uv-button type="primary" icon="scan" iconColor="white" color="#19A497" text="扫码洗车" @click="handleClickScan"></uv-button>
+      <uv-button type="primary" icon="scan" iconColor="white" color="#C6171E" text="扫码洗车" @click="handleClickScan"></uv-button>
     </view>
   </view>
 </template>

src/pages.json

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

src/pages/index/index.vue

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

src/pages/user/index.vue

@@ -1,6 +1,7 @@
 <template>
-  <uv-navbar leftIcon="" title="我的" bg-color="#19A497"></uv-navbar>
-  <image src="/static/user/user-bg.png" mode="widthFix" class="bg"/>
+  <uv-navbar leftIcon="" title="我的" bg-color="#C6171E"></uv-navbar>
+  <view class="w100 bg" style="background-color:#C6171E "></view>
+<!--  <image src="/static/user/user-bg.png" mode="widthFix" class="bg"/>-->
 
   <block>
     <view class="container" :style="containerStyle">
@@ -21,7 +22,7 @@
           <view class="money" @click="toPage({path: '/pages-user/wallet/index'})">
             <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>-->
+<!--              <uv-icon name="red-packet" size="24" color="#C6171E"></uv-icon>-->
               <view style="font-size: 16px;margin-left: 10rpx;">钱包 | 充值</view>
             </view>
 
@@ -252,7 +253,8 @@ page{
   width: 100%;
 
   .main {
-    height: 334rpx;
+    //height: 234rpx;
+    padding: 60rpx auto;
     background: rgba(254, 255, 255, 0.7);
     border-radius: 40rpx 40rpx 0 0;
     position: relative;
@@ -282,13 +284,13 @@ page{
       //left: 0;
       //bottom: 0;
       width: 600rpx;
-      height: 118rpx;
+      //height: 98rpx;
       background: #feffff;
       border-radius: 120rpx;
       margin: 0 auto;
-      margin-top: 30rpx;
+      margin-top: 60rpx;
       color: #000000;
-      padding: 0 24rpx 0 40rpx;
+      padding: 40rpx;
 
       display: flex;
       align-content: center;
@@ -319,6 +321,7 @@ page{
 .body {
   width: 100%;
   background-color: #fff;
+  //border-top: 1px solid $uni-color-primary;
   //padding: 0rpx 30rpx;
 
   .menu-item {

src/static/iconfont/chongzhi.svg

@@ -1 +1 @@
-<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg class="icon" width="48px" height="48.00px" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg"><path fill="#19A497" d="M74.839 320.6H949.16v-30.018c0-54.47-42.38-98.73-93.552-98.73H168.39c-51.172 0-93.552 44.26-93.552 98.73v30.017z m874.322 46.85H74.84v365.953c0 54.484 42.378 98.746 93.552 98.746h409.933c12.934 0 23.419 10.488 23.419 23.425 0 12.938-10.485 23.426-23.42 23.426H168.392C90.885 879 28 813.32 28 733.403V290.582C28 210.678 90.888 145 168.391 145H855.61C933.112 145 996 210.678 996 290.582v337.265c0 12.938-10.485 23.426-23.42 23.426-12.934 0-23.419-10.488-23.419-23.426V367.45z"  /><path fill="#19A497" d="M155.615 520h286.776c30.13 0 30.161-47 0-47H155.615c-30.13 0-30.177 47 0 47M597.61 520h96.78c30.123 0 30.17-47 0-47h-96.78c-30.123 0-30.17 47 0 47"  /><path fill="#19A497" d="M376.61 672.533c6.645 0 12.14-5.537 12.14-12.24v-5.586c0-6.703-5.495-12.24-12.14-12.24H183.405c-6.652 0-12.156 5.542-12.156 12.24v5.586c0 6.698 5.504 12.24 12.156 12.24H376.61z m0 31.467H183.405C159.496 704 140 684.37 140 660.293v-5.586C140 630.631 159.496 611 183.406 611H376.61C400.52 611 420 630.63 420 654.707v5.586C420 684.369 400.52 704 376.61 704z"  /><path fill="#19A497" d="M829.637 775.336v81.014h-46.774 46.774c0 30.231-46.774 30.169-46.774 0v-81.014h-74.271c-30.154 0-30.091-46.895 0-46.895h74.271v-70.785c0-30.231 46.774-30.185 46.774 0v70.785h68.777c30.138 0 30.091 46.895 0 46.895h-68.777z"  /></svg>
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg class="icon" width="48px" height="48.00px" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg"><path fill="#C6171E" d="M74.839 320.6H949.16v-30.018c0-54.47-42.38-98.73-93.552-98.73H168.39c-51.172 0-93.552 44.26-93.552 98.73v30.017z m874.322 46.85H74.84v365.953c0 54.484 42.378 98.746 93.552 98.746h409.933c12.934 0 23.419 10.488 23.419 23.425 0 12.938-10.485 23.426-23.42 23.426H168.392C90.885 879 28 813.32 28 733.403V290.582C28 210.678 90.888 145 168.391 145H855.61C933.112 145 996 210.678 996 290.582v337.265c0 12.938-10.485 23.426-23.42 23.426-12.934 0-23.419-10.488-23.419-23.426V367.45z"  /><path fill="#C6171E" d="M155.615 520h286.776c30.13 0 30.161-47 0-47H155.615c-30.13 0-30.177 47 0 47M597.61 520h96.78c30.123 0 30.17-47 0-47h-96.78c-30.123 0-30.17 47 0 47"  /><path fill="#C6171E" d="M376.61 672.533c6.645 0 12.14-5.537 12.14-12.24v-5.586c0-6.703-5.495-12.24-12.14-12.24H183.405c-6.652 0-12.156 5.542-12.156 12.24v5.586c0 6.698 5.504 12.24 12.156 12.24H376.61z m0 31.467H183.405C159.496 704 140 684.37 140 660.293v-5.586C140 630.631 159.496 611 183.406 611H376.61C400.52 611 420 630.63 420 654.707v5.586C420 684.369 400.52 704 376.61 704z"  /><path fill="#C6171E" d="M829.637 775.336v81.014h-46.774 46.774c0 30.231-46.774 30.169-46.774 0v-81.014h-74.271c-30.154 0-30.091-46.895 0-46.895h74.271v-70.785c0-30.231 46.774-30.185 46.774 0v70.785h68.777c30.138 0 30.091 46.895 0 46.895h-68.777z"  /></svg>

src/static/iconfont/chongzhi_1.svg

@@ -1 +1 @@
-<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg class="icon" width="48px" height="48.00px" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg"><path fill="#19A497" d="M512 750.51c-19.08 0-31.801-12.721-31.801-31.802V432.497c0-19.08 12.72-31.801 31.801-31.801s31.801 12.72 31.801 31.8v286.212c-6.36 19.08-19.08 31.801-31.801 31.801zM651.925 534.26h-286.21c-19.081 0-31.802-12.72-31.802-31.8 0-19.081 12.72-31.802 31.801-31.802h286.211c19.081 0 31.802 12.72 31.802 31.802 0 19.08-12.72 31.8-31.802 31.8zM651.925 648.745h-286.21c-19.081 0-31.802-12.72-31.802-31.8 0-19.082 12.72-31.802 31.801-31.802h286.211c19.081 0 31.802 12.72 31.802 31.801 0 19.08-12.72 31.801-31.802 31.801zM512 464.298c-6.36 0-19.08 0-25.441-6.36L352.994 324.373c-12.72-12.72-12.72-31.802 0-44.522 12.72-12.72 31.801-12.72 44.522 0L531.08 413.416c12.72 12.72 12.72 31.801 0 44.522-6.36 6.36-12.72 6.36-19.081 6.36zM512 464.298c-6.36 0-19.08 0-25.441-6.36-12.72-12.72-12.72-31.801 0-44.522l133.565-133.565c12.72-12.72 31.801-12.72 44.522 0 12.72 12.72 12.72 31.801 0 44.522L531.081 457.938c-6.36 6.36-12.72 6.36-19.081 6.36zM512 1017.64c-279.85 0-508.82-228.97-508.82-508.82S232.15 0 512 0s508.82 228.969 508.82 508.82c0 25.44 0 50.882-6.36 82.683 0 19.08-19.081 31.801-38.162 25.441-19.08 0-31.801-19.08-25.44-38.161 6.36-25.441 6.36-44.522 6.36-69.963C957.217 260.77 760.05 63.602 512 63.602S66.783 267.13 66.783 515.18 263.95 960.398 512 960.398c25.441 0 57.242 0 82.683-6.36 19.081-6.361 31.801 6.36 38.162 25.44 6.36 19.081-6.36 31.802-25.441 38.162H512zM989.019 864.994H671.006c-19.08 0-31.801-12.72-31.801-31.801s12.72-31.802 31.801-31.802H989.02c19.08 0 31.8 12.72 31.8 31.802s-19.08 31.8-31.8 31.8zM830.012 1024c-19.08 0-31.8-12.72-31.8-31.801V674.186c0-19.08 12.72-31.8 31.8-31.8s31.802 12.72 31.802 31.8V992.2c0 12.72-19.081 31.801-31.802 31.801z" /></svg>
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg class="icon" width="48px" height="48.00px" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg"><path fill="#C6171E" d="M512 750.51c-19.08 0-31.801-12.721-31.801-31.802V432.497c0-19.08 12.72-31.801 31.801-31.801s31.801 12.72 31.801 31.8v286.212c-6.36 19.08-19.08 31.801-31.801 31.801zM651.925 534.26h-286.21c-19.081 0-31.802-12.72-31.802-31.8 0-19.081 12.72-31.802 31.801-31.802h286.211c19.081 0 31.802 12.72 31.802 31.802 0 19.08-12.72 31.8-31.802 31.8zM651.925 648.745h-286.21c-19.081 0-31.802-12.72-31.802-31.8 0-19.082 12.72-31.802 31.801-31.802h286.211c19.081 0 31.802 12.72 31.802 31.801 0 19.08-12.72 31.801-31.802 31.801zM512 464.298c-6.36 0-19.08 0-25.441-6.36L352.994 324.373c-12.72-12.72-12.72-31.802 0-44.522 12.72-12.72 31.801-12.72 44.522 0L531.08 413.416c12.72 12.72 12.72 31.801 0 44.522-6.36 6.36-12.72 6.36-19.081 6.36zM512 464.298c-6.36 0-19.08 0-25.441-6.36-12.72-12.72-12.72-31.801 0-44.522l133.565-133.565c12.72-12.72 31.801-12.72 44.522 0 12.72 12.72 12.72 31.801 0 44.522L531.081 457.938c-6.36 6.36-12.72 6.36-19.081 6.36zM512 1017.64c-279.85 0-508.82-228.97-508.82-508.82S232.15 0 512 0s508.82 228.969 508.82 508.82c0 25.44 0 50.882-6.36 82.683 0 19.08-19.081 31.801-38.162 25.441-19.08 0-31.801-19.08-25.44-38.161 6.36-25.441 6.36-44.522 6.36-69.963C957.217 260.77 760.05 63.602 512 63.602S66.783 267.13 66.783 515.18 263.95 960.398 512 960.398c25.441 0 57.242 0 82.683-6.36 19.081-6.361 31.801 6.36 38.162 25.44 6.36 19.081-6.36 31.802-25.441 38.162H512zM989.019 864.994H671.006c-19.08 0-31.801-12.72-31.801-31.801s12.72-31.802 31.801-31.802H989.02c19.08 0 31.8 12.72 31.8 31.802s-19.08 31.8-31.8 31.8zM830.012 1024c-19.08 0-31.8-12.72-31.8-31.801V674.186c0-19.08 12.72-31.8 31.8-31.8s31.802 12.72 31.802 31.8V992.2c0 12.72-19.081 31.801-31.802 31.801z" /></svg>

src/static/iconfont/default/scan.svg

@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1742306327613" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="7333" width="72" height="72" xmlns:xlink="http://www.w3.org/1999/xlink"><path d="M510.171429 96.914286C283.428571 96.914286 98.742857 281.6 98.742857 508.342857s184.685714 411.428571 411.428572 411.428572 411.428571-184.685714 411.428571-411.428572S736.914286 96.914286 510.171429 96.914286zM288.914286 287.085714h155.428571v32.914286h-122.514286v122.514286h-32.914285V287.085714z m0 287.085715h32.914285v122.514285h122.514286v32.914286h-155.428571v-155.428571z m287.085714 122.514285h122.514286v-122.514285H731.428571v155.428571h-155.428571v-32.914286z m0-409.6H731.428571v155.428572h-32.914285v-122.514286h-122.514286V287.085714zM354.742857 490.057143h309.028572v36.571428H354.742857v-36.571428z" fill="#bfbfbf" p-id="7334"></path></svg>

src/static/iconfont/dingdan.svg

@@ -1 +1 @@
-<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg class="icon" width="48px" height="48.00px" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg"><path fill="#19A497" d="M496 704H368c-17.6 0-32 14.4-32 32s14.4 32 32 32h128c17.6 0 32-14.4 32-32s-14.4-32-32-32z m160-160H368c-17.6 0-32 14.4-32 32s14.4 32 32 32h288c17.6 0 32-14.4 32-32s-14.4-32-32-32z m0-160H368c-17.6 0-32 14.4-32 32s14.4 32 32 32h288c17.6 0 32-14.4 32-32s-14.4-32-32-32z"  /><path fill="#19A497" d="M720 144h-22.4c-12.8-36.8-48-64-89.6-64H416c-41.6 0-76.8 27.2-89.6 64H304c-88 0-160 72-160 160v480c0 88 72 160 160 160h416c88 0 160-72 160-160V304c0-88-72-160-160-160z m-304 0h192c17.6 0 32 14.4 32 32s-14.4 32-32 32H416c-17.6 0-32-14.4-32-32s14.4-32 32-32z m400 640c0 52.8-43.2 96-96 96H304c-52.8 0-96-43.2-96-96V304c0-52.8 43.2-96 96-96h22.4c12.8 36.8 48 64 89.6 64h192c41.6 0 76.8-27.2 89.6-64H720c52.8 0 96 43.2 96 96v480z"  /></svg>
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg class="icon" width="48px" height="48.00px" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg"><path fill="#C6171E" d="M496 704H368c-17.6 0-32 14.4-32 32s14.4 32 32 32h128c17.6 0 32-14.4 32-32s-14.4-32-32-32z m160-160H368c-17.6 0-32 14.4-32 32s14.4 32 32 32h288c17.6 0 32-14.4 32-32s-14.4-32-32-32z m0-160H368c-17.6 0-32 14.4-32 32s14.4 32 32 32h288c17.6 0 32-14.4 32-32s-14.4-32-32-32z"  /><path fill="#C6171E" d="M720 144h-22.4c-12.8-36.8-48-64-89.6-64H416c-41.6 0-76.8 27.2-89.6 64H304c-88 0-160 72-160 160v480c0 88 72 160 160 160h416c88 0 160-72 160-160V304c0-88-72-160-160-160z m-304 0h192c17.6 0 32 14.4 32 32s-14.4 32-32 32H416c-17.6 0-32-14.4-32-32s14.4-32 32-32z m400 640c0 52.8-43.2 96-96 96H304c-52.8 0-96-43.2-96-96V304c0-52.8 43.2-96 96-96h22.4c12.8 36.8 48 64 89.6 64h192c41.6 0 76.8-27.2 89.6-64H720c52.8 0 96 43.2 96 96v480z"  /></svg>

src/static/iconfont/fastwash.svg

@@ -1 +1 @@
-<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg class="icon" width="48px" height="48.00px" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg"><path fill="#19A497" d="M771.584 286.72c22.016 0 41.984 12.8 51.1744 32.7936l102.4 222.848 47.36-11.9296a14.08 14.08 0 0 1 17.5104 13.4656l0.5632 43.8272a14.08 14.08 0 0 1-7.68 12.7488l-56.4224 28.8256-28.4672 241.3056a56.32 56.32 0 0 1-55.936 49.7152l-6.2464-0.0256v56.3456a28.16 28.16 0 0 1-28.16 28.16h-56.32a28.16 28.16 0 0 1-28.16-28.16v-56.3456h-422.4v56.3456a28.16 28.16 0 0 1-28.16 28.16h-56.32a28.16 28.16 0 0 1-28.16-28.16v-56.3456l-6.2464 0.0256a56.32 56.32 0 0 1-55.936-49.7152L97.4848 629.248l-56.4224-28.8a14.08 14.08 0 0 1-7.5264-10.496l-0.128-2.2528 0.5632-43.8272a14.08 14.08 0 0 1 15.2832-13.824l2.2528 0.3584 47.3088 11.9296 102.4256-222.848a56.32 56.32 0 0 1 51.2-32.7936H771.584z m-238.464 366.08l-84.48 98.56h42.24v98.56l84.48-98.56h-42.24V652.8zM806.4 665.6a51.2 51.2 0 1 0 0 102.4 51.2 51.2 0 0 0 0-102.4z m-588.8 0a51.2 51.2 0 1 0 0 102.4 51.2 51.2 0 0 0 0-102.4z m506.112-308.48H300.288a42.24 42.24 0 0 0-37.0176 21.8624l-1.7152 3.456-79.616 182.016a12.8 12.8 0 0 0 9.4208 17.7408l2.304 0.2048h636.672a12.8 12.8 0 0 0 12.4672-15.744l-0.7168-2.176-79.6416-182.0416a42.24 42.24 0 0 0-38.7072-25.3184z m-28.672-281.6c37.5552 35.584 56.32 63.744 56.32 84.48a56.32 56.32 0 0 1-112.64 0c0-20.736 18.7648-48.896 56.32-84.48z m-366.08 0c37.5552 35.584 56.32 63.744 56.32 84.48a56.32 56.32 0 0 1-112.64 0c0-20.736 18.7648-48.896 56.32-84.48zM512 19.2c37.5552 35.584 56.32 63.744 56.32 84.48a56.32 56.32 0 0 1-112.64 0c0-20.736 18.7648-48.896 56.32-84.48z"  /></svg>
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg class="icon" width="48px" height="48.00px" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg"><path fill="#C6171E" d="M771.584 286.72c22.016 0 41.984 12.8 51.1744 32.7936l102.4 222.848 47.36-11.9296a14.08 14.08 0 0 1 17.5104 13.4656l0.5632 43.8272a14.08 14.08 0 0 1-7.68 12.7488l-56.4224 28.8256-28.4672 241.3056a56.32 56.32 0 0 1-55.936 49.7152l-6.2464-0.0256v56.3456a28.16 28.16 0 0 1-28.16 28.16h-56.32a28.16 28.16 0 0 1-28.16-28.16v-56.3456h-422.4v56.3456a28.16 28.16 0 0 1-28.16 28.16h-56.32a28.16 28.16 0 0 1-28.16-28.16v-56.3456l-6.2464 0.0256a56.32 56.32 0 0 1-55.936-49.7152L97.4848 629.248l-56.4224-28.8a14.08 14.08 0 0 1-7.5264-10.496l-0.128-2.2528 0.5632-43.8272a14.08 14.08 0 0 1 15.2832-13.824l2.2528 0.3584 47.3088 11.9296 102.4256-222.848a56.32 56.32 0 0 1 51.2-32.7936H771.584z m-238.464 366.08l-84.48 98.56h42.24v98.56l84.48-98.56h-42.24V652.8zM806.4 665.6a51.2 51.2 0 1 0 0 102.4 51.2 51.2 0 0 0 0-102.4z m-588.8 0a51.2 51.2 0 1 0 0 102.4 51.2 51.2 0 0 0 0-102.4z m506.112-308.48H300.288a42.24 42.24 0 0 0-37.0176 21.8624l-1.7152 3.456-79.616 182.016a12.8 12.8 0 0 0 9.4208 17.7408l2.304 0.2048h636.672a12.8 12.8 0 0 0 12.4672-15.744l-0.7168-2.176-79.6416-182.0416a42.24 42.24 0 0 0-38.7072-25.3184z m-28.672-281.6c37.5552 35.584 56.32 63.744 56.32 84.48a56.32 56.32 0 0 1-112.64 0c0-20.736 18.7648-48.896 56.32-84.48z m-366.08 0c37.5552 35.584 56.32 63.744 56.32 84.48a56.32 56.32 0 0 1-112.64 0c0-20.736 18.7648-48.896 56.32-84.48zM512 19.2c37.5552 35.584 56.32 63.744 56.32 84.48a56.32 56.32 0 0 1-112.64 0c0-20.736 18.7648-48.896 56.32-84.48z"  /></svg>

src/static/iconfont/me.svg

@@ -1 +1 @@
-<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1733648494440" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="33288" xmlns:xlink="http://www.w3.org/1999/xlink" width="48" height="48"><path d="M507.75 373.24m-188.74 0a188.74 188.74 0 1 0 377.48 0 188.74 188.74 0 1 0-377.48 0Z" fill="#19A497" p-id="33289"></path><path d="M679.43 696.78m-119.22 0a119.22 119.22 0 1 0 238.44 0 119.22 119.22 0 1 0-238.44 0Z" fill="#19A497" p-id="33290"></path><path d="M255.35 812.88a40 40 0 0 1-40-40 290.38 290.38 0 0 1 290.39-290.39 40 40 0 0 1 0 80c-116 0-210.39 94.38-210.39 210.39a40 40 0 0 1-40 40z" fill="#19A497" p-id="33291"></path><path d="M507.75 496.64a113.14 113.14 0 0 1-80.53-33.35 25 25 0 1 1 35.36-35.36 63.88 63.88 0 0 0 90.34 0 25 25 0 0 1 35.36 35.36 113.14 113.14 0 0 1-80.53 33.35z" fill="#19A497" p-id="33292"></path></svg>
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1733648494440" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="33288" xmlns:xlink="http://www.w3.org/1999/xlink" width="48" height="48"><path d="M507.75 373.24m-188.74 0a188.74 188.74 0 1 0 377.48 0 188.74 188.74 0 1 0-377.48 0Z" fill="#C6171E" p-id="33289"></path><path d="M679.43 696.78m-119.22 0a119.22 119.22 0 1 0 238.44 0 119.22 119.22 0 1 0-238.44 0Z" fill="#C6171E" p-id="33290"></path><path d="M255.35 812.88a40 40 0 0 1-40-40 290.38 290.38 0 0 1 290.39-290.39 40 40 0 0 1 0 80c-116 0-210.39 94.38-210.39 210.39a40 40 0 0 1-40 40z" fill="#C6171E" p-id="33291"></path><path d="M507.75 496.64a113.14 113.14 0 0 1-80.53-33.35 25 25 0 1 1 35.36-35.36 63.88 63.88 0 0 0 90.34 0 25 25 0 0 1 35.36 35.36 113.14 113.14 0 0 1-80.53 33.35z" fill="#C6171E" p-id="33292"></path></svg>

src/static/iconfont/scan.svg

@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1742306327613" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="7333" width="72" height="72" xmlns:xlink="http://www.w3.org/1999/xlink"><path d="M510.171429 96.914286C283.428571 96.914286 98.742857 281.6 98.742857 508.342857s184.685714 411.428571 411.428572 411.428572 411.428571-184.685714 411.428571-411.428572S736.914286 96.914286 510.171429 96.914286zM288.914286 287.085714h155.428571v32.914286h-122.514286v122.514286h-32.914285V287.085714z m0 287.085715h32.914285v122.514285h122.514286v32.914286h-155.428571v-155.428571z m287.085714 122.514285h122.514286v-122.514285H731.428571v155.428571h-155.428571v-32.914286z m0-409.6H731.428571v155.428572h-32.914285v-122.514286h-122.514286V287.085714zM354.742857 490.057143h309.028572v36.571428H354.742857v-36.571428z" fill="#C6171E" p-id="7334"></path></svg>

src/static/iconfont/tingchechang.svg

@@ -1 +1 @@
-<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg class="icon" width="48px" height="48.00px" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg"><path fill="#19A497" d="M512 106.666667a405.333333 405.333333 0 1 0 405.333333 405.333333A405.333333 405.333333 0 0 0 512 106.666667z m0 768a362.666667 362.666667 0 1 1 362.666667-362.666667 362.666667 362.666667 0 0 1-362.666667 362.666667z"  /><path fill="#19A497" d="M565.333333 277.333333h-104.106666A98.56 98.56 0 0 0 362.666667 375.893333V746.666667a21.333333 21.333333 0 0 0 42.666666 0V375.893333A55.893333 55.893333 0 0 1 461.226667 320h104.106666a117.333333 117.333333 0 0 1 0 234.666667H448a21.333333 21.333333 0 0 0 0 42.666666h117.333333a160 160 0 0 0 0-320z"  /></svg>
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg class="icon" width="48px" height="48.00px" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg"><path fill="#C6171E" d="M512 106.666667a405.333333 405.333333 0 1 0 405.333333 405.333333A405.333333 405.333333 0 0 0 512 106.666667z m0 768a362.666667 362.666667 0 1 1 362.666667-362.666667 362.666667 362.666667 0 0 1-362.666667 362.666667z"  /><path fill="#C6171E" d="M565.333333 277.333333h-104.106666A98.56 98.56 0 0 0 362.666667 375.893333V746.666667a21.333333 21.333333 0 0 0 42.666666 0V375.893333A55.893333 55.893333 0 0 1 461.226667 320h104.106666a117.333333 117.333333 0 0 1 0 234.666667H448a21.333333 21.333333 0 0 0 0 42.666666h117.333333a160 160 0 0 0 0-320z"  /></svg>

src/uni.scss

@@ -17,7 +17,7 @@
 @import '@climblee/uv-ui/theme.scss';
 
 /* 行为相关颜色 */
-$uni-color-primary: #19A497;
+$uni-color-primary: #C6171E;
 $uni-color-success: #4cd964;
 $uni-color-warning: #f0ad4e;
 $uni-color-error: #dd524d;