Merge remote-tracking branch 'origin/master'

# Conflicts:
#	admin-ui/.env.development

admin-ui/src/components/payStatusPopup/index.vue

@@ -48,8 +48,8 @@
         </div>
         <el-descriptions border direction="vertical" :column="3" :labelStyle="{ width: '140px' }" v-if="payType == '3'" style="margin: 0 30px">
           <el-descriptions-item label="用户" v-if="appUserInfo">{{ appUserInfo.realName }}</el-descriptions-item>
-          <el-descriptions-item label="当前余额（元）" v-if="appUserInfo">{{ appUserInfo.rechargeBalance + appUserInfo.giveBalance }}</el-descriptions-item>
-          <el-descriptions-item label="支付后余额（元）" v-if="appUserInfo">{{ appUserInfo.rechargeBalance + appUserInfo.giveBalance - orderInfo.payAmount }}</el-descriptions-item>
+          <el-descriptions-item label="当前余额（元）" v-if="appUserInfo">{{ handelAmount(appUserInfo.rechargeBalance + appUserInfo.giveBalance) }}</el-descriptions-item>
+          <el-descriptions-item label="支付后余额（元）" v-if="appUserInfo">{{ handelAmount(appUserInfo.rechargeBalance + appUserInfo.giveBalance - orderInfo.payAmount) }}</el-descriptions-item>
         </el-descriptions>
         <div class="cell" v-if="payType == 0">
           <div class="label">付款码</div>
@@ -183,6 +183,9 @@ export default {
   },
 
   methods: {
+    handelAmount(e) {
+      return e.toFixed(2)
+    },
     openSelected(info) {
       console.log()
       this.orderInfo = info

admin-ui/src/views/activity/couponInfo/index.vue

@@ -630,7 +630,7 @@ export default {
     }
 
     .radio-group-block {
-        display: flex;
+        // display: flex;
         width: 100%;
 
         .el-radio-button {

admin-ui/src/views/activity/couponItem/index.vue

@@ -345,7 +345,7 @@ export default {
                 .catch(() => {})
         },
         handleClose(done) {
-            if (this.isFormChanged()) {
+            // if (this.isFormChanged()) {
                 this.$confirm('确认关闭？未保存的数据将会丢失', '提示', {
                     confirmButtonText: '确定',
                     cancelButtonText: '取消',
@@ -354,11 +354,14 @@ export default {
                     this.reset()
                     done()
                 }).catch(() => {})
-            } else {
-                this.reset()
-                done()
-            }
+            // } else {
+            //     this.reset()
+            //     done()
+            // }
         },
+        // isFormChanged() {
+        //     return this.sendCouponForm.appUserPhoneNumber || this.sendCouponForm.sendNum
+        // },
         handleStockClose(done) {
             if (this.stockForm.stockNum) {
                 this.$confirm('确认关闭？未保存的数据将会丢失', '提示', {

admin-ui/src/views/activity/discountInfo/index.vue

@@ -476,7 +476,7 @@ export default {
     }
 
     .radio-group-block {
-        display: flex;
+        // display: flex;
         width: 100%;
 
         .el-radio-button {

admin-ui/src/views/activity/rechargeInfo/index.vue

@@ -394,7 +394,7 @@ export default {
     }
 
     .radio-group-block {
-        display: flex;
+        // display: flex;
         width: 100%;
 
         .el-radio-button {

admin-ui/src/views/app/user/component/editUser.vue

@@ -35,9 +35,9 @@
           <el-form-item label="头像地址" prop="avatarUrl" >
             <image-upload v-model="dataSource.avatarUrl" :limit="1" :disabled="isDisabled"/>
           </el-form-item>
-          <!-- <el-form-item label="客户等级" prop="level">
+          <el-form-item label="客户等级" prop="level">
             <el-input-number v-model="dataSource.level"  :min="1" :max="50" label="请输入客户等级" :disabled="isDisabled"></el-input-number>
-          </el-form-item> -->
+          </el-form-item>
           <el-form-item label="备注" prop="remark">
             <el-input v-model="dataSource.remark" placeholder="请输入备注" maxlength="50" show-word-limit />
           </el-form-item>

admin-ui/src/views/app/user/index.vue

@@ -124,20 +124,23 @@
                                 <el-tag type="warning">Level {{ userInfo.level }}</el-tag>
                             </div>
                         </div> -->
-                        <el-descriptions :column="3" border>
-                            <el-descriptions-item label="姓名">
+                        <el-descriptions :column="4" border>
+                            <el-descriptions-item label="姓名" contentStyle="width: 110px">
                                 <span class="primary-text">{{ userInfo.realName }}</span>
                             </el-descriptions-item>
-                            <el-descriptions-item label="手机号">
+                            <el-descriptions-item label="手机号" contentStyle="width: 110px"> 
                                 {{ userInfo.phoneNumber }}
                             </el-descriptions-item>
-                            <el-descriptions-item label="性别">
+                            <el-descriptions-item label="性别" contentStyle="width: 110px">
                                 <dict-tag :options="dict.type.sys_user_sex" :value="userInfo.sex" />
                             </el-descriptions-item>
-                            <el-descriptions-item label="生日">
+                            <el-descriptions-item label="等级" contentStyle="width: 110px">
+                                {{ userInfo.level }}
+                            </el-descriptions-item>
+                            <el-descriptions-item label="生日" contentStyle="width: 110px">
                                 {{ parseTime(userInfo.birthday, '{y}-{m}-{d}') }}
                             </el-descriptions-item>
-                            <el-descriptions-item label="地址" :span="2">
+                            <el-descriptions-item label="地址" :span="3">
                                 {{ getAddress(userInfo) ? getAddress(userInfo) : '暂无地址' }}
                             </el-descriptions-item>
                         </el-descriptions>
@@ -496,11 +499,12 @@ export default {
                 console.log("AAAA")
                 this.form = response.data
                 this.open = true
-                if (this.userInfoVO.userType == '00') {
-                    this.isDisabled = false
-                } else {
-                    this.isDisabled = true
-                }
+                this.isDisabled = false
+                // if (this.userInfoVO.userType == '00') {
+                //     this.isDisabled = false
+                // } else {
+                //     this.isDisabled = true
+                // }
                
                 this.title = '修改用户'
             })

admin-ui/src/views/coupon/type/index.vue

@@ -354,6 +354,9 @@ export default {
         this.getList()
     },
     methods: {
+        formatAmount(amount) {
+            return parseFloat(amount).toFixed(2)
+        },
         getThirdPartyList() {
             listThirdParty({ pageSize: 99999, pageNum: 1, status: '0' }).then((response) => {
                 this.thirdPartyList = response.rows

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

@@ -33,9 +33,9 @@
                     <el-descriptions-item label="手机号">
                         {{ appUserInfo.phoneNumber }}
                     </el-descriptions-item>
-                    <!-- <el-descriptions-item label="等级">
+                    <el-descriptions-item label="等级">
                         {{ appUserInfo.level }}
-                    </el-descriptions-item> -->
+                    </el-descriptions-item>
                     <el-descriptions-item label="现金余额">
                         <span class="amount">{{ (appUserInfo.rechargeBalance * 100) / 100 }}</span>
                     </el-descriptions-item>
@@ -212,6 +212,7 @@
                             type="danger"
                             class="checkout-btn"
                             icon="el-icon-shopping-cart-2"
+                            :loading="confirmLoading"
                             @click="handleConfirmPay">
                             收银
                         </el-button>
@@ -487,7 +488,7 @@
             </span>
         </el-dialog>
 
-        <el-dialog title="收银" :visible.sync="confirmPayOpen" size="90%" :before-close="handleClose" destroy-on-close append-to-body>
+        <el-dialog title="收银" :visible.sync="confirmPayOpen" width="90%" :before-close="handleClose" destroy-on-close append-to-body>
             <CashCloth ref="cashCloth" :orderForm="orderForm" :orderClothItemDTOS="orderClothItemDTOS" :appUserInfo="appUserInfo" :clothSpeeds="clothSpeeds" :deductCouponVOS="deductCouponVOS" :discountCouponVOS="discountCouponVOS" @onPaySuccess="onPaySuccess" @initOrderList="initOrderList" @confirm="handelPaySuccess"/>
         </el-dialog>
 
@@ -686,7 +687,8 @@ export default {
 
             collectClothDetail: null,
             showAdvanceOrder: false,
-            advanceOrderList: []
+            advanceOrderList: [],
+            confirmLoading: false
         }
     },
     mounted() {
@@ -1513,6 +1515,7 @@ export default {
             //     id: 18
             // }, this.appUserInfo);
             // return
+            const _ = this;
             if (this.orderClothItemDTOS.length == 0) {
                 this.$message.error('请先添加衣服')
                 return
@@ -1526,10 +1529,10 @@ export default {
 
                 return
             }
-            // if (!this.orderForm.sendClothWay) {
-            //     this.$message.error('请先选取衣方式')
-            //     return
-            // }
+            if (!this.orderForm.sendClothWay) {
+                this.$message.error('请先选取衣方式')
+                return
+            }
 
             if (this.orderForm.isAppointment == 'Y') {
                 var res = await getInfoByOrderNo({ orderNo: this.orderForm.orderNo, appUserId: this.appUserInfo.id })
@@ -1537,6 +1540,10 @@ export default {
                     this.$message.error('未查询到预约订单')
                     return
                 }
+                if (!this.orderForm.sendClothWay) {
+                    this.$message.error('请先选取衣方式')
+                    return
+                }
                 // this.orderForm.sendClothWay = res.data.sendClothWay
             }
 
@@ -1551,6 +1558,7 @@ export default {
             this.orderForm.authCode = ''
             this.orderForm.payType = ''
             // this.orderForm.sendClothWay = '0'
+            _.confirmLoading = true
             getDiscountByStoreId({ appUserId: this.appUserInfo.id }).then((res) => {
                 this.discountCouponVOS = res.data
                 params.discountWay = '0'
@@ -1559,6 +1567,7 @@ export default {
                     // res.data.forEach(item => {
                     //     item.isUnique = 'N'
                     // })
+                    _.confirmLoading = false
                     this.deductCouponVOS = res.data
 
                     this.selectCoupons = []
@@ -1571,7 +1580,9 @@ export default {
                     delete this.orderForm.discountCouponId
                     delete this.orderForm.discountCoupon
                     this.confirmPayOpen = true
-                })
+                }).catch((res) => {
+                    _.confirmLoading = false;
+                });
             })
         },
         onCouponTabChange(tab, event) {

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

@@ -14,7 +14,7 @@
                         <el-card class="info-card">
                             <div class="card-header">
                                 <span class="title">订单信息</span>
-                                <el-tag v-if="orderForm.isAppointment === 'Y'" type="success">预约订单</el-tag>
+                                <el-tag v-if="orderForm.isAppointment === 'Y'" type="success" style="margin-left: 10px;">预约订单</el-tag>
                             </div>
 
                             <!-- 订单基本信息 -->
@@ -50,7 +50,7 @@
                                 </div>
                                 <div class="info-item">
                                     <span class="label">可用余额:</span>
-                                    <span class="value balance">¥{{ appUserInfo.rechargeBalance + appUserInfo.giveBalance + appUserInfo.welfareBalance  }}</span>
+                                    <span class="value balance">¥{{ Math.round((appUserInfo.rechargeBalance + appUserInfo.giveBalance + appUserInfo.welfareBalance) * 100) / 100  }}</span>
                                 </div>
                             </div>
                         </el-card>

admin-ui/src/views/order/statistics/charge.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
     <!-- 搜索区域 -->
-    <el-form :model="queryParams" ref="queryForm" @submit.native.prevent :inline="true" v-show="showSearch" label-width="68px">
+    <el-form :model="queryParams" ref="queryForm" @submit.native.prevent :inline="true" v-show="showSearch" label-width="80px">
       <el-form-item label="日期范围" prop="dateRange">
         <el-date-picker
           v-model="dateRange"
@@ -14,8 +14,8 @@
         ></el-date-picker>
       </el-form-item>
       <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+        <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>