Merge branch 'master' of http://60.204.229.151:20080/chenkangxu/merchant-web

src/views/common/home.vue

@@ -119,7 +119,7 @@ export default {
       JSON.parse(sessionStorage.getItem("password")) == "123456" &&
       JSON.parse(sessionStorage.getItem("role")) === "ROLE_BRAND_MANAGER"
     ) {
-      this.dialogVisible = true;
+      this.dialogVisible = false;
     }
   },
   methods: {

src/views/modules/bank-card/popup/add-or-update.vue

@@ -653,7 +653,7 @@ export default {
               } else if (!Number.isInteger(+value)) {
                 callback(new Error("银行卡号必须全为数字"));
               } else if (value.trim().length < 12 || value.trim().length > 19) {
-                callback(new Error("银行卡号长度必须在12到19之间"));
+                callback(new Error("银行卡号长度必须在12到20之间"));
               } else if (strBin.indexOf(value.substring(0, 2)) === -1) {
                 callback(new Error("银行卡号开头6位不符合规范"));
               } else {

src/views/modules/brand/config/popup/add-or-update.vue

@@ -2,7 +2,7 @@
   <div>
     <obj-modal
       ref="modal"
-      labelWidth="150px"
+      labelWidth="190px"
       :modalCols="modalCols"
       :modalConfig="modalConfig"
       :modalData="modalData"
@@ -50,7 +50,7 @@ export default {
           this.isAdd = true;
         },
         update: (row) => {
-          this.fileList = []
+          this.fileList = [];
           this.modalData = JSON.parse(JSON.stringify(row));
           console.log(row);
 
@@ -83,6 +83,7 @@ export default {
           prop: "logo",
           type: "Input",
           width: "300px",
+          rules: { required: true, message: "请输入品牌宣传语" },
           type: "jsx",
           render: () => {
             const handleChange = (file, fileList) => {
@@ -155,12 +156,14 @@ export default {
           prop: "tagline",
           type: "Input",
           width: "300px",
+          rules: { required: true, message: "请输入品牌宣传语" },
         },
         {
           label: "首页背景",
           prop: "background",
           type: "Input",
           width: "300px",
+          rules: { required: true, message: "请添加背景首页" },
           type: "jsx",
           render: () => {
             const handleChange = (file, fileList) => {
@@ -215,6 +218,7 @@ export default {
           type: "Input",
           width: "300px",
           type: "jsx",
+          rules: { required: true, message: "请添加视频" },
           render: () => {
             const handleChange = (file, fileList) => {
               // console.log(fileList);

src/views/modules/logistics-fare/logistics-template/popup/add-template.vue

@@ -962,14 +962,14 @@ export default {
     //   let res = await this.$api.mer_admin.getProductCategory();
     //   return res.data.data;
     // },
-    async getSaleUnit() {
+    // async getSaleUnit() {
-      let res = await this.$api.mer_admin.getSaleUnit({
+    //   let res = await this.$api.mer_admin.getSaleUnit({
-        shopId: JSON.parse(sessionStorage.getItem("userInfo")).shopId,
+    //     shopId: JSON.parse(sessionStorage.getItem("userInfo")).shopId,
-      });
+    //   });
-      console.log(res);
+    //   console.log(res);
 
-      return res.data.data;
+    //   return res.data.data;
-    },
+    // },
   },
 };
 </script>

src/views/modules/wallet/index.vue

@@ -227,8 +227,15 @@
             <div style="font-size: 16px; margin: 0 0 20px 0; font-weight: 600">
               钱包账单
             </div>
-            <div style="background: #fff; padding: 10px; height: 51vh;min-width: 400px;
+            <div
-            overflow-y:scroll;">
+              style="
+                background: #fff;
+                padding: 10px;
+                height: 51vh;
+                min-width: 400px;
+                overflow-y: scroll;
+              "
+            >
               <div
                 v-for="item in billList"
                 :key="item.id"
@@ -246,7 +253,7 @@
                   <div>订单状态：{{ getBillStatus(item.billStatus) }}</div>
                 </div>
                 <div class="wallet-item">
-                  <div>{{ item.billTypeName }}：{{item.billAmount}}</div>
+                  <div>{{ item.billTypeName }}：{{ item.billAmount }}</div>
                   <div>余额：{{ item.amountAfterChange }}</div>
                 </div>
               </div>
@@ -268,7 +275,11 @@
       </el-col>
     </el-row>
     <!-- 提现 -->
-    <withdrawal @init="init" ref="withdrawal"></withdrawal>
+    <withdrawal
+      @init="init"
+      @getWithdrawalRecord="getWithdrawalRecord"
+      ref="withdrawal"
+    ></withdrawal>
   </div>
 </template>
 

src/views/modules/wallet/popup/withdrawal.vue

@@ -127,6 +127,7 @@ export default {
                   console.log(valid);
                   this.$api.wallet.Withdrawal(this.ruleForm).then((res) => {
                     this.$emit("init");
+                    this.$emit("getWithdrawalRecord");
                     this.toggle();
                   });
                 }