样式修改

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

@@ -634,7 +634,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

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

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

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

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

@@ -214,7 +214,7 @@
                             icon="el-icon-shopping-cart-2"
                             :loading="confirmLoading"
                             @click="handleConfirmPay">
-                            收银{{ confirmLoading }}
+                            收银
                         </el-button>
                     </div>
                 </div>
@@ -488,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>
 
@@ -1529,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 })
@@ -1540,6 +1540,10 @@ export default {
                     this.$message.error('未查询到预约订单')
                     return
                 }
+                if (!this.orderForm.sendClothWay) {
+                    this.$message.error('请先选取衣方式')
+                    return
+                }
                 // this.orderForm.sendClothWay = res.data.sendClothWay
             }
 

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>