diff --git a/template/admin/src/components/from/from.vue b/template/admin/src/components/from/from.vue
index eb7e1a2e4..cd04d74be 100644
--- a/template/admin/src/components/from/from.vue
+++ b/template/admin/src/components/from/from.vue
@@ -58,6 +58,7 @@ export default {
return {
modals: false,
type: 0,
+ loading: false,
config: {
global: {
upload: {
@@ -83,6 +84,8 @@ export default {
onSubmit(formData) {
let datas = {};
datas = formData;
+ if (this.loading) return;
+ this.loading = true;
request({
url: this.FromData.action,
method: this.FromData.method,
@@ -95,8 +98,10 @@ export default {
setTimeout(() => {
this.$emit('submitFail');
}, 1000);
+ this.loading = false;
})
.catch((res) => {
+ this.loading = false;
this.$Message.error(res.msg);
});
},
diff --git a/template/admin/src/components/main/components/tags-nav/tags-nav.less b/template/admin/src/components/main/components/tags-nav/tags-nav.less
index 3ddb61f57..6cb1479d4 100644
--- a/template/admin/src/components/main/components/tags-nav/tags-nav.less
+++ b/template/admin/src/components/main/components/tags-nav/tags-nav.less
@@ -69,7 +69,7 @@
.scroll-body {
height: ~'calc(100% - 1px)';
display: inline-block;
- padding: 3px 20px 0 20px;
+ padding: 3px 40px 0 20px;
position: absolute;
overflow: visible;
white-space: nowrap;
diff --git a/template/admin/src/pages/marketing/channelCode/createCode.vue b/template/admin/src/pages/marketing/channelCode/createCode.vue
index 8fbd1345d..d77ccd61a 100644
--- a/template/admin/src/pages/marketing/channelCode/createCode.vue
+++ b/template/admin/src/pages/marketing/channelCode/createCode.vue
@@ -502,10 +502,11 @@ export default {
}
textarea {
- padding: 5px;
+ padding: 0 5px;
border-radius: 3px;
border-color: #c5c8ce;
outline-color: #2d8cf0;
+ font-size: 14px;
}
.picBox {
diff --git a/template/admin/src/pages/marketing/live/anchor.vue b/template/admin/src/pages/marketing/live/anchor.vue
index 61e164a3c..9d5bf11d9 100644
--- a/template/admin/src/pages/marketing/live/anchor.vue
+++ b/template/admin/src/pages/marketing/live/anchor.vue
@@ -122,8 +122,12 @@ export default {
.then((res) => {
this.$Message.success(res.msg);
this.labelLists.splice(num, 1);
-
- this.getList();
+ if (!this.labelLists.length && this.labelFrom.page != 1) {
+ this.labelFrom.page -= 1;
+ this.getList();
+ } else {
+ this.getList();
+ }
})
.catch((res) => {
this.$Message.error(res.msg);
diff --git a/template/admin/src/pages/order/invoice/index.vue b/template/admin/src/pages/order/invoice/index.vue
index 85e490bee..33f6afe70 100644
--- a/template/admin/src/pages/order/invoice/index.vue
+++ b/template/admin/src/pages/order/invoice/index.vue
@@ -94,7 +94,7 @@
已开票
- 未开票
+ --
未发货
diff --git a/template/admin/src/utils/modalForm.js b/template/admin/src/utils/modalForm.js
index 125387eec..313f45e40 100644
--- a/template/admin/src/utils/modalForm.js
+++ b/template/admin/src/utils/modalForm.js
@@ -90,6 +90,7 @@ export default function (formRequestPromise, { width = '700' } = { width: '700'
};
let btnStop = false;
data.config.onSubmit = (formData, $f) => {
+ console.log('add')
$f.btn.loading(true);
$f.btn.disabled(true);
if (btnStop) return;