diff --git a/template/admin/src/components/linkaddress/index.vue b/template/admin/src/components/linkaddress/index.vue index 0e65260ec..e2d7d58f2 100644 --- a/template/admin/src/components/linkaddress/index.vue +++ b/template/admin/src/components/linkaddress/index.vue @@ -206,6 +206,28 @@ : '' " > + + + -->
- + 普通链接 @@ -344,6 +366,7 @@ export default { label: 'name', children: 'children', }, + templateRadio: 0, columns: [ { title: 'ID', @@ -462,40 +485,12 @@ export default { created() { this.getSort(); this.goodsCategory(); - let radio = { - width: 60, - align: 'center', - render: (h, params) => { - let id = params.row.id; - let flag = false; - if (this.presentId === id) { - flag = true; - } else { - flag = false; - } - let self = this; - return h('div', [ - h('el-radio', { - props: { - value: flag, - }, - on: { - 'on-change': () => { - self.presentId = id; - this.currenUrl = params.row.url; - }, - }, - }), - ]); - }, - }; - this.columns.unshift(radio); - this.columns7.unshift(radio); - this.columns8.unshift(radio); - this.bargain.unshift(radio); - this.news.unshift(radio); }, methods: { + getTemplateRow(row) { + this.presentId = row.id; + this.currenUrl = row.url; + }, // 删除 delLink(row, tit, num) { let delfromData = { diff --git a/template/admin/src/components/mobileConfigRightDiy/c_set_up.vue b/template/admin/src/components/mobileConfigRightDiy/c_set_up.vue index c22a6fb38..12af9a861 100644 --- a/template/admin/src/components/mobileConfigRightDiy/c_set_up.vue +++ b/template/admin/src/components/mobileConfigRightDiy/c_set_up.vue @@ -2,8 +2,8 @@
diff --git a/template/admin/src/components/uploadPictures/index.vue b/template/admin/src/components/uploadPictures/index.vue index 954f2508e..baa82f824 100644 --- a/template/admin/src/components/uploadPictures/index.vue +++ b/template/admin/src/components/uploadPictures/index.vue @@ -194,7 +194,13 @@
- +
diff --git a/template/admin/src/pages/account/login/index.vue b/template/admin/src/pages/account/login/index.vue index 29ce6a1b3..9be160fc8 100644 --- a/template/admin/src/pages/account/login/index.vue +++ b/template/admin/src/pages/account/login/index.vue @@ -187,10 +187,7 @@ export default { closeModel(params) { this.isShow = false; // noinspection JSVoidFunctionReturnValueUsed - let msg = this.$message.loading({ - content: '登录中...', - duration: 0, - }); + this.loading = true; AccountLogin({ account: this.formInline.username, @@ -200,7 +197,6 @@ export default { captchaVerification: params ? params.captchaVerification : '', }) .then(async (res) => { - msg(); let data = res.data; let expires = this.getExpiresTime(data.expires_time); // 记录用户登陆信息 @@ -257,7 +253,6 @@ export default { }); }) .catch((res) => { - msg(); let data = res === undefined ? {} : res; this.$message.error(data.msg || '登录失败'); this.login_captcha = res.data.login_captcha; diff --git a/template/admin/src/pages/app/wechat/menus/index.vue b/template/admin/src/pages/app/wechat/menus/index.vue index 28a7092d2..7a643ea5d 100644 --- a/template/admin/src/pages/app/wechat/menus/index.vue +++ b/template/admin/src/pages/app/wechat/menus/index.vue @@ -8,7 +8,7 @@ - + @@ -101,7 +101,7 @@ 删除 - + 保存并发布 diff --git a/template/admin/src/pages/app/wechat/reply/follow.vue b/template/admin/src/pages/app/wechat/reply/follow.vue index 2603f6cde..dcb6c6318 100644 --- a/template/admin/src/pages/app/wechat/reply/follow.vue +++ b/template/admin/src/pages/app/wechat/reply/follow.vue @@ -8,7 +8,7 @@ - + @@ -137,7 +137,7 @@ - +
保存并发布
diff --git a/template/admin/src/pages/kefu/index.vue b/template/admin/src/pages/kefu/index.vue index 1f4c0443b..2dc457b0d 100644 --- a/template/admin/src/pages/kefu/index.vue +++ b/template/admin/src/pages/kefu/index.vue @@ -165,17 +165,12 @@ export default { }, // 关闭模态框 closeModel() { - let msg = this.$message.loading({ - content: '登录中...', - duration: 0, - }); AccountLogin({ account: this.formInline.username, password: this.formInline.password, imgcode: this.formInline.code, }) .then(async (res) => { - msg(); let expires = this.getExpiresTime(res.data.exp_time); // 记录用户登陆信息 setCookies('kefu_uuid', res.data.kefuInfo.uid, expires); @@ -195,7 +190,6 @@ export default { } }) .catch((res) => { - msg(); let data = res === undefined ? {} : res; this.errorNum++; this.captchas(); diff --git a/template/admin/src/pages/kefu/pc/components/msgWindow.vue b/template/admin/src/pages/kefu/pc/components/msgWindow.vue index 539546879..17ff710f6 100644 --- a/template/admin/src/pages/kefu/pc/components/msgWindow.vue +++ b/template/admin/src/pages/kefu/pc/components/msgWindow.vue @@ -46,7 +46,7 @@
- +
- +
diff --git a/template/admin/src/pages/kefu/pc/components/rightMenu.vue b/template/admin/src/pages/kefu/pc/components/rightMenu.vue index 53440ea82..d1e6be697 100644 --- a/template/admin/src/pages/kefu/pc/components/rightMenu.vue +++ b/template/admin/src/pages/kefu/pc/components/rightMenu.vue @@ -103,7 +103,7 @@ />
- +
@@ -180,7 +180,7 @@
- +
@@ -211,8 +211,8 @@ />
- -
+
+
@@ -228,7 +228,7 @@
- +
diff --git a/template/admin/src/pages/marketing/storeBargain/create.vue b/template/admin/src/pages/marketing/storeBargain/create.vue index df7edefac..637760fdd 100644 --- a/template/admin/src/pages/marketing/storeBargain/create.vue +++ b/template/admin/src/pages/marketing/storeBargain/create.vue @@ -16,12 +16,12 @@ - - - - - - + + + + + + { let data = res.data.info; - let radio = { - title: '选择', - key: 'chose', - width: 60, - align: 'center', - render: (h, params) => { - let uid = params.index; - let flag = false; - if (this.currentid === uid) { - flag = true; - } else { - flag = false; - } - let self = this; - return h('div', [ - h('el-radio', { - props: { - value: flag, - }, - on: { - 'on-change': () => { - self.currentid = uid; - let attrs = []; - attrs.push(params.row); - self.formValidate.attrs = attrs; - }, - }, - }), - ]); - }, - }; that.columns = data.header; // that.columns.unshift(radio); that.specsData = data.attrs; - that.inputChange(data); that.formValidate.items = data.items; }) .catch((res) => { @@ -684,50 +652,6 @@ export default { this.push(row); this.formValidate.attrs = attrs; }, - inputChange(data) { - let that = this; - let $index = []; - data.header.forEach(function (item, index) { - if (item.type === 1) { - $index.push({ index: index, key: item.key, title: item.title }); - } - }); - $index.forEach(function (item, index) { - let title = item.title; - let key = item.key; - let row = { - title: title, - key: key, - align: 'center', - minWidth: 100, - render: (h, params) => { - return h('div', [ - h('InputNumber', { - props: { - min: 1, - precision: 0, - value: params.row.quota, - }, - on: { - 'on-change': (e) => { - params.row.quota = e; - that.specsData[params.index] = params.row; - if (!!that.formValidate.attrs && that.formValidate.attrs.length) { - that.formValidate.attrs.forEach((v, index) => { - if (v.id === params.row.id) { - that.formValidate.attrs.splice(index, 1, params.row); - } - }); - } - }, - }, - }), - ]); - }, - }; - that.columns.splice(item.index, 1, row); - }); - }, // 获取运费模板； productGetTemplate() { productGetTemplateApi().then((res) => { @@ -818,40 +742,7 @@ export default { this.formValidate.rule = info.rule === null ? '' : info.rule; this.$set(this.formValidate, 'items', info.attrs.items); this.description = this.formValidate.description; - this.columns = info.attrs.header; - let radio = { - title: '选择', - key: 'chose', - width: 60, - align: 'center', - render: (h, params) => { - let uid = params.index; - let flag = false; - if (this.currentid === uid) { - flag = true; - } else { - flag = false; - } - let self = this; - return h('div', [ - h('el-radio', { - props: { - value: flag, - }, - on: { - 'on-change': () => { - self.currentid = uid; - let attrs = []; - attrs.push(params.row); - self.formValidate.attrs = attrs; - }, - }, - }), - ]); - }, - }; - that.columns.unshift(radio); this.specsData = info.attrs.value; let defaultAttrs = []; info.attrs.value.forEach(function (item, index) { diff --git a/template/admin/src/pages/marketing/storeCombination/create.vue b/template/admin/src/pages/marketing/storeCombination/create.vue index 4187fb287..d21d2545b 100644 --- a/template/admin/src/pages/marketing/storeCombination/create.vue +++ b/template/admin/src/pages/marketing/storeCombination/create.vue @@ -16,11 +16,11 @@ - - - - - + + + + + - + { that.$Message.error(res.msg); }); }, - inputChange(data) { - let that = this; - let $index = []; - data.header.forEach(function (item, index) { - if (item.type === 1) { - $index.push({ index: index, key: item.key, title: item.title }); - } - }); - $index.forEach(function (item, index) { - let title = item.title; - let key = item.key; - let row = { - title: title, - key: key, - align: 'center', - minWidth: 100, - render: (h, params) => { - return h('div', [ - h('InputNumber', { - props: { - min: 1, - precision: 0, - value: params.row.quota, - }, - on: { - 'on-change': (e) => { - params.row.quota = e; - that.specsData[params.index] = params.row; - if (!!that.formValidate.attrs && that.formValidate.attrs.length) { - that.formValidate.attrs.forEach((v, index) => { - if (v.id === params.row.id) { - that.formValidate.attrs.splice(index, 1, params.row); - } - }); - } - }, - }, - }), - ]); - }, - }; - that.columns.splice(item.index, 1, row); - }); - }, // 多选 changeCheckbox(selection) { this.formValidate.attrs = selection; @@ -842,7 +797,6 @@ export default { } } that.formValidate.attrs = attr; - that.inputChange(data); this.spinShow = false; }) .catch((res) => { diff --git a/template/admin/src/pages/marketing/storeIntegral/create.vue b/template/admin/src/pages/marketing/storeIntegral/create.vue index 941f842f4..a505b97e0 100644 --- a/template/admin/src/pages/marketing/storeIntegral/create.vue +++ b/template/admin/src/pages/marketing/storeIntegral/create.vue @@ -16,11 +16,11 @@ - - - - - + + + + + { that.$Message.error(res.msg); }); }, - inputChange(data) { - let that = this; - let $index = []; - data.header.forEach(function (item, index) { - if (item.type === 1) { - $index.push({ index: index, key: item.key, title: item.title }); - } - }); - $index.forEach(function (item, index) { - let title = item.title; - let key = item.key; - let row = { - title: title, - key: key, - align: 'center', - minWidth: 120, - render: (h, params) => { - return h('div', [ - h('InputNumber', { - props: { - min: 0, - precision: 0, - value: key === 'price' ? params.row.price : params.row.quota, - }, - on: { - 'on-change': (e) => { - key === 'price' ? (params.row.price = e) : (params.row.quota = e); - that.specsData[params.index] = params.row; - if (!!that.formValidate.attrs && that.formValidate.attrs.length) { - that.formValidate.attrs.forEach((v, index) => { - if (v.id === params.row.id) { - that.formValidate.attrs.splice(index, 1, params.row); - } - }); - } - }, - }, - }), - ]); - }, - }; - that.columns.splice(item.index, 1, row); - }); - }, // 多选 changeCheckbox(selection) { this.formValidate.attrs = selection; @@ -589,7 +544,6 @@ export default { } } that.formValidate.attrs = attr; - that.inputChange(data); this.spinShow = false; }) .catch((res) => { diff --git a/template/admin/src/pages/marketing/storePresell/create.vue b/template/admin/src/pages/marketing/storePresell/create.vue index 79a6dae2e..b2c6ca88a 100644 --- a/template/admin/src/pages/marketing/storePresell/create.vue +++ b/template/admin/src/pages/marketing/storePresell/create.vue @@ -14,11 +14,11 @@ - - - - - + + + + + { let data = res.data.info; - let selection = { - type: 'selection', - width: 60, - align: 'center', - }; that.specsData = data.attrs; that.specsData.forEach(function (item, index) { that.$set(that.specsData[index], 'id', index); }); that.formValidate.items = data.items; that.columns = data.header; - that.columns.unshift(selection); - that.inputChange(data); }) .catch((res) => { that.$Message.error(res.msg); }); }, - inputChange(data) { - let that = this; - let $index = []; - data.header.forEach(function (item, index) { - if (item.type === 1) { - $index.push({ index: index, key: item.key, title: item.title }); - } - }); - $index.forEach(function (item, index) { - let title = item.title; - let key = item.key; - let row = { - title: title, - key: key, - align: 'center', - minWidth: 100, - render: (h, params) => { - return h('div', [ - h('InputNumber', { - props: { - min: 1, - max: key === 'price' ? 10000000 : params.row.stock, - value: key === 'price' ? params.row.price : params.row.quota, - }, - on: { - 'on-change': (e) => { - key === 'price' - ? (params.row.price = e) - : (params.row.quota = e < params.row.stock ? e : params.row.stock); - that.specsData[params.index] = params.row; - if (!!that.formValidate.attrs && that.formValidate.attrs.length) { - that.formValidate.attrs.forEach((v, index) => { - if (v.id === params.row.id) { - that.formValidate.attrs.splice(index, 1, params.row); - } - }); - } - }, - }, - }), - ]); - }, - }; - that.columns.splice(item.index, 1, row); - }); - }, + // 多选 changeCheckbox(selection) { this.formValidate.attrs = selection; @@ -684,7 +632,6 @@ export default { } } that.formValidate.attrs = attr; - that.inputChange(data); this.spinShow = false; }) .catch((res) => { diff --git a/template/admin/src/pages/marketing/storeSeckill/create.vue b/template/admin/src/pages/marketing/storeSeckill/create.vue index f132e7ac3..b16394b5b 100644 --- a/template/admin/src/pages/marketing/storeSeckill/create.vue +++ b/template/admin/src/pages/marketing/storeSeckill/create.vue @@ -12,11 +12,11 @@ - - - - - + + + + + { that.$Message.error(res.msg); }); }, - inputChange(data) { - let that = this; - let $index = []; - data.header.forEach(function (item, index) { - if (item.type === 1) { - $index.push({ index: index, key: item.key, title: item.title }); - } - }); - $index.forEach(function (item, index) { - let title = item.title; - let key = item.key; - let row = { - title: title, - key: key, - align: 'center', - minWidth: 120, - render: (h, params) => { - return h('div', [ - h('InputNumber', { - props: { - min: 0, - value: key === 'price' ? params.row.price : params.row.quota, - formatter: (value) => - key === 'price' ? `${value}`.match(/^\d+(?:\.\d{0,2})?/) : `${value}`.match(/^\d+(?:\.\d{0,-1})?/), - }, - on: { - 'on-change': (e) => { - key === 'price' ? (params.row.price = e) : (params.row.quota = e); - that.specsData[params.index] = params.row; - if (!!that.formValidate.attrs && that.formValidate.attrs.length) { - that.formValidate.attrs.forEach((v, index) => { - if (v.id === params.row.id) { - that.formValidate.attrs.splice(index, 1, params.row); - } - }); - } - }, - }, - }), - ]); - }, - }; - that.columns.splice(item.index, 1, row); - }); - }, + // 多选 changeCheckbox(selection) { this.formValidate.attrs = selection; @@ -761,7 +715,6 @@ export default { } } that.formValidate.attrs = attr; - this.inputChange(data); this.spinShow = false; }) .catch((res) => { diff --git a/template/admin/src/pages/notify/smsConfig/components/forgetPassword.vue b/template/admin/src/pages/notify/smsConfig/components/forgetPassword.vue index c4e202e0f..4d99ce545 100644 --- a/template/admin/src/pages/notify/smsConfig/components/forgetPassword.vue +++ b/template/admin/src/pages/notify/smsConfig/components/forgetPassword.vue @@ -1,11 +1,11 @@