diff --git a/src/views/common/home.vue b/src/views/common/home.vue index 1eb348b..743996c 100644 --- a/src/views/common/home.vue +++ b/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: { diff --git a/src/views/modules/bank-card/popup/add-or-update.vue b/src/views/modules/bank-card/popup/add-or-update.vue index 3e80f4a..6b0cdca 100644 --- a/src/views/modules/bank-card/popup/add-or-update.vue +++ b/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 { diff --git a/src/views/modules/brand/config/popup/add-or-update.vue b/src/views/modules/brand/config/popup/add-or-update.vue index 93bbd73..cb56f78 100644 --- a/src/views/modules/brand/config/popup/add-or-update.vue +++ b/src/views/modules/brand/config/popup/add-or-update.vue @@ -2,7 +2,7 @@
{ - 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); diff --git a/src/views/modules/logistics-fare/logistics-template/popup/add-template.vue b/src/views/modules/logistics-fare/logistics-template/popup/add-template.vue index 675f5ac..8881d88 100644 --- a/src/views/modules/logistics-fare/logistics-template/popup/add-template.vue +++ b/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() { - let res = await this.$api.mer_admin.getSaleUnit({ - shopId: JSON.parse(sessionStorage.getItem("userInfo")).shopId, - }); - console.log(res); + // async getSaleUnit() { + // let res = await this.$api.mer_admin.getSaleUnit({ + // shopId: JSON.parse(sessionStorage.getItem("userInfo")).shopId, + // }); + // console.log(res); - return res.data.data; - }, + // return res.data.data; + // }, }, }; diff --git a/src/views/modules/wallet/index.vue b/src/views/modules/wallet/index.vue index 3596f10..d2b0165 100644 --- a/src/views/modules/wallet/index.vue +++ b/src/views/modules/wallet/index.vue @@ -227,8 +227,15 @@
钱包账单
-
+
订单状态:{{ getBillStatus(item.billStatus) }}
-
{{ item.billTypeName }}:{{item.billAmount}}
+
{{ item.billTypeName }}:{{ item.billAmount }}
余额:{{ item.amountAfterChange }}
@@ -268,7 +275,11 @@ - +
diff --git a/src/views/modules/wallet/popup/withdrawal.vue b/src/views/modules/wallet/popup/withdrawal.vue index caf5948..d099798 100644 --- a/src/views/modules/wallet/popup/withdrawal.vue +++ b/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(); }); }