后台优化

lb-module/src/main/java/com/ydd/module/dto/RechargeDto.java

@@ -18,6 +18,7 @@ public class RechargeDto {
     private String merchantName;
     private String agentName;
     private String payType;
+    private String rechargeSn;
     private String memberType;
     private String status;
     private Date createTime;
@@ -86,6 +87,14 @@ public class RechargeDto {
         this.payType = payType;
     }
 
+    public String getRechargeSn() {
+      return rechargeSn;
+    }
+
+    public void setRechargeSn(String rechargeSn) {
+      this.rechargeSn = rechargeSn;
+    }
+
     public String getMemberType() {
         return memberType;
     }

lb-module/src/main/resources/mapper/module/rechargeMapper.xml

@@ -26,6 +26,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         mb.amount,
         mb.create_time,
         mb.payment_type as payType,
+        mb.recharge_sn,
         m.nickname,
         m.member_type,
         m.mobile,

web-ui/src/views/module/agent/info.vue

@@ -216,22 +216,6 @@
         <el-form-item label="联系手机" prop="mobile">
           <el-input v-model="form.mobile" placeholder="请输入联系手机" />
         </el-form-item>
-
-<!--        <el-form-item label="所在地区">-->
-<!--          <span style="color: #f56c6c;float: left;position: absolute;left: -77px;">*</span>-->
-<!--          <Area :areaProp="areaProp" @changeArea="changeArea" ref="area"/>-->
-<!--        </el-form-item>-->
-        <!-- <el-form-item label="代理商等级" prop="agentLevel" v-if="form.isPid == 0 || form.id == undefined">
-          <el-select v-model="form.agentLevel" placeholder="请选择代理商等级" clearable >
-            <el-option
-                v-for="item in agentLevelList"
-                :key="item.level"
-                :label="item.name"
-                :value="item.level"
-                :disabled="item.isNone == 1"
-              ></el-option>
-          </el-select>
-        </el-form-item> -->
         <el-form-item label="代理商等级" prop="agentLevel" v-if="form.isPid == 0 || this.title == '添加代理商'">
           <el-select v-model="form.agentLevel" placeholder="请选择代理商等级" clearable >
             <el-option
@@ -259,7 +243,8 @@
         </el-form-item> -->
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
+        {{this.subLoading}}
+        <el-button type="primary" @click="submitForm" :loading="subLoading">确 定</el-button>
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
@@ -280,6 +265,7 @@ export default {
   },
   data() {
     return {
+      subLoading: false,
       // 登录用户
       user: {},
       maxRate: '',
@@ -588,17 +574,26 @@ export default {
           this.form.provinceName = this.startArea.provinceName
           this.form.cityName = this.startArea.cityName
           this.form.districtName = this.startArea.districtName
+          
+          // 不允许重复提交
+          this.subLoading = true
           if (this.form.id != null) {
             updateAgent(this.form).then(response => {
               this.msgSuccess("修改成功");
+              this.subLoading = false
               this.open = false;
               this.getList();
+            }).catch((error) => {
+              this.subLoading = true
             });
           } else {
             addAgent(this.form).then(response => {
               this.msgSuccess("新增成功");
+              this.subLoading = false
               this.open = false;
               this.getList();
+            }).catch((error) => {
+              this.subLoading = true
             });
           }
         }

web-ui/src/views/module/memberBalanceLog/recharge.vue

@@ -71,6 +71,7 @@
           <el-tag type="primary" v-if="scope.row.payType == 3">现金</el-tag>
         </template>
       </el-table-column>
+      <el-table-column label="订单流水号" align="center" prop="rechargeSn" v-if="this.userType == 1"></el-table-column>
       <el-table-column label="状态" align="center" prop="status">
         <template slot-scope="scope">
           <el-tag v-if="scope.row.status == -1">已取消</el-tag>
@@ -134,6 +135,8 @@ export default {
   },
   data() {
     return {
+      // 登录用户类型
+      userType: undefined,
       memberTypeOption: [{
         value: 1,
         name: '个人'
@@ -194,6 +197,7 @@ export default {
     };
   },
   created() {
+    this.userType = localStorage.getItem("SYS_USER_TYPE")
     this.queryParams.memberId = this.$route.query.id
     // this.getList();
   },

web-ui/src/views/module/shop/waimai.vue

@@ -25,6 +25,12 @@
       </el-table-column>
       <el-table-column prop="thirdShopId" header-align="center" align="center" label="编号"></el-table-column>
       <el-table-column prop="thirdShopName" header-align="center" align="center" label="店铺名称"></el-table-column>
+      <el-table-column prop="businessId" header-align="center" align="center" label="绑定类型">
+          <template slot-scope="scope">
+              <span v-if="scope.row.businessId == 2"> 冲突模式 </span>
+              <span v-if="scope.row.businessId == 16"> 非冲突模式 </span>
+          </template>
+      </el-table-column>
       <el-table-column prop="bindStatus" header-align="center" align="center" label="绑定状态">
           <template slot-scope="scope">
               <el-tag type="success" v-if="scope.row.bindStatus == 1 && scope.row.deleted == 0"> 绑定 </el-tag>