Browse Source

放开门店编辑

lhch2015 1 month ago
parent
commit
4db69ff394

+ 4 - 4
admin-ui/.env.development

@@ -5,12 +5,12 @@ VUE_APP_TITLE = 一七管理系统
 ENV = 'development'
 
 
-VUE_APP_BASE_API_HOST = 'http://127.0.0.1:9801'
-VUE_APP_BASE_API = 'http://127.0.0.1:9801'
+# VUE_APP_BASE_API_HOST = 'http://127.0.0.1:9801'
+# VUE_APP_BASE_API = 'http://127.0.0.1:9801'
 #VUE_APP_BASE_API_HOST = 'http://139.224.65.227:8091/prod-api'
 #VUE_APP_BASE_API = 'http://139.224.65.227:8091/prod-api'
-# VUE_APP_BASE_API_HOST = 'http://192.168.5.247:9801/'
-# VUE_APP_BASE_API = 'http://192.168.5.247:9801/'
+VUE_APP_BASE_API_HOST = 'http://192.168.5.176:9801/'
+VUE_APP_BASE_API = 'http://192.168.5.176:9801/'
 
 
 # 路由懒加载

+ 2 - 2
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>

+ 15 - 11
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 = '修改用户'
             })

+ 12 - 5
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,8 +212,9 @@
                             type="danger"
                             class="checkout-btn"
                             icon="el-icon-shopping-cart-2"
+                            :loading="confirmLoading"
                             @click="handleConfirmPay">
-                            收银
+                            收银{{ confirmLoading }}
                         </el-button>
                     </div>
                 </div>
@@ -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
@@ -1551,6 +1554,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 +1563,7 @@ export default {
                     // res.data.forEach(item => {
                     //     item.isUnique = 'N'
                     // })
+                    _.confirmLoading = false
                     this.deductCouponVOS = res.data
 
                     this.selectCoupons = []
@@ -1571,7 +1576,9 @@ export default {
                     delete this.orderForm.discountCouponId
                     delete this.orderForm.discountCoupon
                     this.confirmPayOpen = true
-                })
+                }).catch((res) => {
+                    _.confirmLoading = false;
+                });
             })
         },
         onCouponTabChange(tab, event) {