Merge branch 'master' of http://101.37.21.97:3000/wash/wash_server_v2

# Conflicts:
#	admin-ui/src/views/index.vue
#	admin-ui/src/views/index_store.vue

admin-ui/src/permission.js

@@ -11,6 +11,7 @@ NProgress.configure({ showSpinner: false })
 const whiteList = ['/login', '/auth-redirect', '/bind', '/register']
 
 router.beforeEach((to, from, next) => {
+  console.log("路由 ==========》", to.meta.componentPath, to.meta.title)
   NProgress.start()
   if (getToken()) {
     to.meta.title && store.dispatch('settings/setTitle', to.meta.title)
@@ -29,7 +30,6 @@ router.beforeEach((to, from, next) => {
       if (store.getters.roles.length === 0) {
         isRelogin.show = true
         // 判断当前用户是否已拉取完user_info信息
-        console.log("SSSSSSS")
         store.dispatch('GetInfo').then(() => {
           isRelogin.show = false
           store.dispatch('GenerateRoutes').then(accessRoutes => {

admin-ui/src/store/modules/permission.js

@@ -37,7 +37,6 @@ const permission = {
         // 向后端请求路由数据
         getRouters().then(res => {
           let userInfo = getUserInfo()
-          console.log('a1',constantRoutes)
           constantRoutes.forEach(item => {
             if (userInfo.userType === '00' && item.redirect === 'index') {
               item.hidden = false
@@ -49,7 +48,6 @@ const permission = {
               item.hidden = false
             }
           })
-          console.log('a2',constantRoutes)
           const sdata = JSON.parse(JSON.stringify(res.data))
           const rdata = JSON.parse(JSON.stringify(res.data))
           const sidebarRoutes = filterAsyncRouter(sdata)
@@ -57,6 +55,7 @@ const permission = {
           const asyncRoutes = filterDynamicRoutes(dynamicRoutes);
           rewriteRoutes.push({ path: '*', redirect: '/404', hidden: true })
           router.addRoutes(asyncRoutes);
+          console.log('C4',rewriteRoutes)
           commit('SET_ROUTES', rewriteRoutes)
           commit('SET_SIDEBAR_ROUTERS', constantRoutes.concat(sidebarRoutes))
           commit('SET_DEFAULT_ROUTES', sidebarRoutes)
@@ -75,6 +74,7 @@ function filterAsyncRouter(asyncRouterMap, lastRouter = false, type = false) {
       route.children = filterChildren(route.children)
     }
     if (route.component) {
+      route.meta.componentPath = route.component
       // Layout ParentView 组件特殊处理
       if (route.component === 'Layout') {
         route.component = Layout

admin-ui/src/views/index.vue

@@ -14,7 +14,7 @@
         <div class="stat-card stat-card-green">
           <div class="stat-card-title">洗衣订单金额</div>
           <div class="stat-card-value">
-            <count-to :start-val="0" :end-val="statistics.clothReceiveAmount" :duration="2600" prefix="￥" />
+            <count-to :start-val="0" :end-val="statistics.clothReceiveAmount" :duration="2600" prefix="￥" decimals="2"/>
           </div>
         </div>
       </el-col>
@@ -30,7 +30,7 @@
         <div class="stat-card stat-card-orange">
           <div class="stat-card-title">商品订单金额</div>
           <div class="stat-card-value">
-            <count-to :start-val="0" :end-val="statistics.goodsReceiveAmount" :duration="2600" prefix="￥" />
+            <count-to :start-val="0" :end-val="statistics.goodsReceiveAmount" :duration="2600" prefix="￥" decimals="2"/>
           </div>
         </div>
       </el-col>
@@ -46,7 +46,7 @@
         <div class="stat-card stat-card-cyan">
           <div class="stat-card-title">充值金额</div>
           <div class="stat-card-value">
-            <count-to :start-val="0" :end-val="statistics.chargeAmount" :duration="2600" prefix="￥" />
+            <count-to :start-val="0" :end-val="statistics.chargeAmount" :duration="2600" prefix="￥" decimals="2"/>
           </div>
         </div>
       </el-col>
@@ -87,7 +87,7 @@
                   </div>
                   <div class="card-panel-description">
                     <div class="card-panel-text">洗衣订单金额</div>
-                    <count-to :start-val="0" :end-val="dayStatistics.clothReceiveAmount" :duration="2600" class="card-panel-num" prefix="￥" />
+                    <count-to :start-val="0" :end-val="dayStatistics.clothReceiveAmount" :duration="2600" class="card-panel-num" prefix="￥" decimals="2"/>
                   </div>
                 </div>
               </el-col>
@@ -109,7 +109,7 @@
                   </div>
                   <div class="card-panel-description">
                     <div class="card-panel-text">商品订单金额</div>
-                    <count-to :start-val="0" :end-val="dayStatistics.goodsReceiveAmount" :duration="2600" class="card-panel-num" prefix="￥" />
+                    <count-to :start-val="0" :end-val="dayStatistics.goodsReceiveAmount" :duration="2600" class="card-panel-num" prefix="￥" decimals="2"/>
                   </div>
                 </div>
               </el-col>
@@ -131,7 +131,7 @@
                   </div>
                   <div class="card-panel-description">
                     <div class="card-panel-text">充值金额</div>
-                    <count-to :start-val="0" :end-val="dayStatistics.chargeAmount" :duration="2600" class="card-panel-num" prefix="￥" />
+                    <count-to :start-val="0" :end-val="dayStatistics.chargeAmount" :duration="2600" class="card-panel-num" prefix="￥" decimals="2"/>
                   </div>
                 </div>
               </el-col>

admin-ui/src/views/index_store.vue

@@ -19,7 +19,7 @@
               <div class="stat-card stat-card-green">
                 <div class="stat-card-title">洗衣订单金额</div>
                 <div class="stat-card-value">
-                  <count-to :start-val="0" :end-val="orderStats.clothOrderAmount || 0" :duration="2600" prefix="￥" />
+                  <count-to :start-val="0" :end-val="orderStats.clothOrderAmount || 0" :duration="2600" prefix="￥" :decimals="2"/>
                 </div>
               </div>
             </el-col>
@@ -35,7 +35,7 @@
               <div class="stat-card stat-card-orange">
                 <div class="stat-card-title">商品订单金额</div>
                 <div class="stat-card-value">
-                  <count-to :start-val="0" :end-val="orderStats.goodsOrderAmount || 0" :duration="2600" prefix="￥" />
+                  <count-to :start-val="0" :end-val="orderStats.goodsOrderAmount || 0" :duration="2600" prefix="￥" :decimals="2"/>
                 </div>
               </div>
             </el-col>
@@ -52,7 +52,7 @@
               <div class="stat-card stat-card-purple">
                 <div class="stat-card-title">付款金额</div>
                 <div class="stat-card-value">
-                  <count-to :start-val="0" :end-val="chargeStats.rechargePayAmount || 0" :duration="2600" prefix="￥" />
+                  <count-to ref="rechargePayAmount" :start-val="0" :end-val="chargeStats.rechargePayAmount || 0" :duration="2600" prefix="￥" :decimals="2"/>
                 </div>
               </div>
             </el-col>
@@ -68,7 +68,7 @@
               <div class="stat-card stat-card-teal">
                 <div class="stat-card-title">退款金额</div>
                 <div class="stat-card-value">
-                  <count-to :start-val="0" :end-val="chargeStats.chargeRefundAmount || 0" :duration="2600" prefix="￥" />
+                  <count-to :start-val="0" :end-val="chargeStats.chargeRefundAmount || 0" :duration="2600" prefix="￥" :decimals="2"/>
                 </div>
               </div>
             </el-col>
@@ -76,7 +76,7 @@
               <div class="stat-card stat-card-indigo">
                 <div class="stat-card-title">退款笔数</div>
                 <div class="stat-card-value">
-                  <count-to :start-val="0" :end-val="chargeStats.refundCount || 0" :duration="2600" prefix="￥" />
+                  <count-to :start-val="0" :end-val="chargeStats.refundCount || 0" :duration="2600"/>
                 </div>
               </div>
             </el-col>
@@ -90,7 +90,7 @@
       <el-col :span="24">
         <div class="chart-wrapper">
           <div class="chart-header">
-            <div class="chart-title">今日概览</div>
+            <div class="chart-title">营收概览</div>
             <div class="chart-actions">
               <el-radio-group v-model="dailyTimeRange" size="small" @change="handleDailyTimeRangeChange">
                 <el-radio-button label="today">今日</el-radio-button>
@@ -118,7 +118,7 @@
                   </div>
                   <div class="card-panel-description">
                     <div class="card-panel-text">洗衣订单金额</div>
-                    <count-to :start-val="0" :end-val="dailyOrderStats.clothOrderAmount || 0" :duration="2600" class="card-panel-num" prefix="￥" />
+                    <count-to :start-val="0" :end-val="dailyOrderStats.clothOrderAmount || 0" :duration="2600" class="card-panel-num" prefix="￥" :decimals="2"/>
                   </div>
                 </div>
               </el-col>
@@ -129,7 +129,7 @@
                   </div>
                   <div class="card-panel-description">
                     <div class="card-panel-text">充值金额</div>
-                    <count-to :start-val="0" :end-val="dailyChargeStats.rechargePayAmount || 0" :duration="2600" class="card-panel-num" prefix="￥" />
+                    <count-to :start-val="0" :end-val="dailyChargeStats.rechargePayAmount || 0" :duration="2600" class="card-panel-num" prefix="￥" :decimals="2"/>
                   </div>
                 </div>
               </el-col>
@@ -330,7 +330,7 @@ export default {
     .stat-card {
       height: 120px;
       border-radius: 8px;
-      padding: 20px;
+      padding: 20px 10px;
       color: #fff;
       display: flex;
       flex-direction: column;
@@ -350,7 +350,7 @@ export default {
       }
 
       .stat-card-value {
-        font-size: 28px;
+        font-size: 20px;
         font-weight: bold;
       }
     }

admin-ui/src/views/order/cloth/component/cashCloth.vue

@@ -6,6 +6,7 @@
                 :model="orderForm"
                 :rules="rules"
                 label-width="100px"
+                @submit.native.prevent.capture
             >
                 <div class="cash-container">
                     <!-- 左侧核对信息区域 -->

admin-ui/src/views/order/cloth/orderList.vue

@@ -19,6 +19,7 @@
                         <!-- <el-option key="9" label="待送衣" value="9" />
                         <el-option key="10" label="送衣中" value="10" /> -->
                         <el-option key="12" label="已完成" value="12" />
+                        <el-option key="15" label="已退款" value="15" />
                         <el-option key="-1" label="已取消" value="-1" />
                     </el-select>
                 </el-form-item>
@@ -85,10 +86,14 @@
         </el-table-column>
         <el-table-column label="支付方式" align="center" width="100">
           <template slot-scope="scope">
-            <span v-if=" scope.row.payType === '0'">微信</span>
-            <span v-if=" scope.row.payType === '1'">支付宝</span>
-            <span v-if=" scope.row.payType === '2'">现金</span>
-            <span v-if=" scope.row.payType === '3'">会员余额</span>
+            <span v-if=" scope.row.payTimeType === '1' && scope.row.payStatus == 0">--</span>
+            <div v-else>
+                <span v-if=" scope.row.payType === '0'">微信</span>
+                <span v-if=" scope.row.payType === '1'">支付宝</span>
+                <span v-if=" scope.row.payType === '2'">现金</span>
+                <span v-if=" scope.row.payType === '3'">会员余额</span>
+            </div>
+            
           </template>
         </el-table-column>
         <el-table-column label="订单金额" align="center" width="100">
@@ -115,13 +120,13 @@
             </div>
           </template>
         </el-table-column>
-        <el-table-column label="退款状态" align="center" width="100">
+        <!-- <el-table-column label="退款状态" align="center" width="100">
           <template slot-scope="scope">
             <div class="status-group">
               <dict-tag :options="dict.type.goods_order_refund_status" :value="scope.row.refundStatus" />
             </div>
           </template>
-        </el-table-column>
+        </el-table-column> -->
         <el-table-column label="下单时间" align="center" width="180">
           <template slot-scope="scope">
             <div class="time-info">
@@ -150,10 +155,13 @@
                         </el-descriptions-item>
                         <el-descriptions-item>
                             <template slot="label"> 支付方式 </template>
-                            <template v-if="orderDetail.payType == '0'">微信</template>
-                            <template v-if="orderDetail.payType == '1'">支付宝</template>
-                            <template v-if="orderDetail.payType == '2'">现金</template>
-                            <template v-if="orderDetail.payType == '3'">余额</template>
+                            <span v-if="orderDetail.payTimeType === '1' && orderDetail.payStatus == 0">取衣付款</span>
+                            <span v-else>
+                                <template v-if="orderDetail.payType == '0'">微信</template>
+                                <template v-if="orderDetail.payType == '1'">支付宝</template>
+                                <template v-if="orderDetail.payType == '2'">现金</template>
+                                <template v-if="orderDetail.payType == '3'">余额</template>
+                            </span>
                             （{{ orderDetail.payAmount }}元）
                         </el-descriptions-item>
                         <el-descriptions-item>
@@ -222,6 +230,11 @@
                                 <dict-tag :options="dict.type.order_cloth_flow_status" :value="scope.row.flowStatus" />
                             </template>
                         </el-table-column>
+                        <el-table-column label="重洗" align="center" prop="repeatCount" width="100">
+                            <template slot-scope="scope">
+                                <span>{{ scope.row.repeatCount || 0 }}次</span>
+                            </template>
+                        </el-table-column>
                         <el-table-column label="附件" align="center" width="150">
                             <template slot-scope="scope">
                                 <el-tag size="small" v-for="item in scope.row.orderClothAdjuncts" style="margin-right: 10px; margin-bottom: 2.5px; margin-top: 2.5px">