diff --git a/template/admin/src/components/couponList/index.vue b/template/admin/src/components/couponList/index.vue index 04621bd35..558f85290 100644 --- a/template/admin/src/components/couponList/index.vue +++ b/template/admin/src/components/couponList/index.vue @@ -1,6 +1,6 @@ @@ -211,6 +215,7 @@ export default { } else { this.$emit('nameId', this.selectedIds, this.selectedNames); } + this.isTemplate = false; }, pageChange(index) { this.tableFrom.page = index; diff --git a/template/admin/src/components/customerInfo/index.vue b/template/admin/src/components/customerInfo/index.vue index ca660c90d..fc6642179 100644 --- a/template/admin/src/components/customerInfo/index.vue +++ b/template/admin/src/components/customerInfo/index.vue @@ -14,16 +14,18 @@ item.text }} - + > @@ -161,7 +163,7 @@ export default { // 具体日期 onchangeTime(e) { this.timeVal = e; - this.formValidate.data = this.timeVal.join('-'); + this.formValidate.data = this.timeVal ? this.timeVal.join('-') : ''; this.getListService(); }, // 选择时间 @@ -185,7 +187,7 @@ export default { }) .catch((res) => { this.loading2 = false; - this.$Message.error(res.msg); + this.$message.error(res.msg); }); }, // 搜索 @@ -212,7 +214,7 @@ export default { }); } } else { - this.$Message.warning('请先选择商品'); + this.$message.warning('请先选择商品'); } }, }, diff --git a/template/admin/src/components/diyComponents/c_bg_color.vue b/template/admin/src/components/diyComponents/c_bg_color.vue index 3125ff2a1..2c0296899 100644 --- a/template/admin/src/components/diyComponents/c_bg_color.vue +++ b/template/admin/src/components/diyComponents/c_bg_color.vue @@ -4,7 +4,7 @@ {{ configData[this.configNum][name].title }}
- 重置
diff --git a/template/admin/src/components/diyComponents/c_goods.vue b/template/admin/src/components/diyComponents/c_goods.vue index 3bc7cbc22..d8619926c 100644 --- a/template/admin/src/components/diyComponents/c_goods.vue +++ b/template/admin/src/components/diyComponents/c_goods.vue @@ -15,16 +15,12 @@ - - + + 取 消 + 确 定 + + @@ -127,7 +127,7 @@ export default { }, ok() { if (!this.tempGoods.length) { - return this.$Message.warning('请先选择商品'); + return this.$message.warning('请先选择商品'); } let list = this.defaults.goodsList.list; list.push.apply(list, this.tempGoods); @@ -135,6 +135,7 @@ export default { let picList = this.unique(list); this.defaults.goodsList.list = picList; // this.defaults.goodsList.list.push(this.tempGoods); + this.modals = false; }, bindDelete(index) { this.defaults.goodsList.list.splice(index, 1); diff --git a/template/admin/src/components/diyComponents/c_hot_word.vue b/template/admin/src/components/diyComponents/c_hot_word.vue index 480288012..365220012 100644 --- a/template/admin/src/components/diyComponents/c_hot_word.vue +++ b/template/admin/src/components/diyComponents/c_hot_word.vue @@ -66,7 +66,7 @@ export default { if (this.datas[this.name].list.length < 20) { this.datas[this.name].list.push(obj); } else { - this.$Message.warning('最多添加20个热词'); + this.$message.warning('最多添加20个热词'); } }, close(index) { diff --git a/template/admin/src/components/diyComponents/c_input_list.vue b/template/admin/src/components/diyComponents/c_input_list.vue index 70de24d7c..fea073631 100644 --- a/template/admin/src/components/diyComponents/c_input_list.vue +++ b/template/admin/src/components/diyComponents/c_input_list.vue @@ -5,7 +5,7 @@ {{ item.title }} - +
@@ -15,7 +15,7 @@ {{ item.title }} - + diff --git a/template/admin/src/components/diyComponents/c_input_number.vue b/template/admin/src/components/diyComponents/c_input_number.vue index 9401a407e..f8a2335fa 100644 --- a/template/admin/src/components/diyComponents/c_input_number.vue +++ b/template/admin/src/components/diyComponents/c_input_number.vue @@ -5,7 +5,7 @@ {{ datas[name].title }} 数量 - +
是否显示 - +
diff --git a/template/admin/src/components/diyComponents/c_select.vue b/template/admin/src/components/diyComponents/c_select.vue index 45baa30b3..428334b71 100644 --- a/template/admin/src/components/diyComponents/c_select.vue +++ b/template/admin/src/components/diyComponents/c_select.vue @@ -4,7 +4,7 @@ {{ datas[name].title }} - +
名称 - +
链接 - +
@@ -45,12 +45,12 @@
- - +
diff --git a/template/admin/src/components/diyComponents/c_txt_list.vue b/template/admin/src/components/diyComponents/c_txt_list.vue index 1a5877e98..335745eff 100644 --- a/template/admin/src/components/diyComponents/c_txt_list.vue +++ b/template/admin/src/components/diyComponents/c_txt_list.vue @@ -29,7 +29,7 @@ {{ list.title }} - + diff --git a/template/admin/src/components/diyComponents/c_upload_img.vue b/template/admin/src/components/diyComponents/c_upload_img.vue index 5a98403d6..676d0198e 100644 --- a/template/admin/src/components/diyComponents/c_upload_img.vue +++ b/template/admin/src/components/diyComponents/c_upload_img.vue @@ -8,12 +8,9 @@
- - +
diff --git a/template/admin/src/components/diyComponents/c_upload_list.vue b/template/admin/src/components/diyComponents/c_upload_list.vue index b4dc5d6d7..5e67dfc26 100644 --- a/template/admin/src/components/diyComponents/c_upload_list.vue +++ b/template/admin/src/components/diyComponents/c_upload_list.vue @@ -35,7 +35,12 @@
{{ infos.title }}
- +
@@ -43,24 +48,21 @@
- - - +
diff --git a/template/admin/src/components/mobileConfigRightDiy/c_hot_imgs.vue b/template/admin/src/components/mobileConfigRightDiy/c_hot_imgs.vue index 668e1a71a..3601df82e 100644 --- a/template/admin/src/components/mobileConfigRightDiy/c_hot_imgs.vue +++ b/template/admin/src/components/mobileConfigRightDiy/c_hot_imgs.vue @@ -11,14 +11,10 @@
- - +
diff --git a/template/admin/src/components/mobileConfigRightDiy/c_input_item.vue b/template/admin/src/components/mobileConfigRightDiy/c_input_item.vue index 5e3658b15..524a9b54d 100644 --- a/template/admin/src/components/mobileConfigRightDiy/c_input_item.vue +++ b/template/admin/src/components/mobileConfigRightDiy/c_input_item.vue @@ -4,7 +4,7 @@ {{ configData.title }} - +
{{ configData.title || '商品数量' }} - +
- - +
diff --git a/template/admin/src/components/modelSure/modelSure.vue b/template/admin/src/components/modelSure/modelSure.vue index 0777e6140..3822cbb40 100644 --- a/template/admin/src/components/modelSure/modelSure.vue +++ b/template/admin/src/components/modelSure/modelSure.vue @@ -1,5 +1,5 @@ - - diff --git a/template/admin/src/pages/cms/addArticle/index.vue b/template/admin/src/pages/cms/addArticle/index.vue index 3cd86a4ad..39479a35a 100644 --- a/template/admin/src/pages/cms/addArticle/index.vue +++ b/template/admin/src/pages/cms/addArticle/index.vue @@ -22,7 +22,7 @@
文章信息
- + @@ -76,7 +76,7 @@
其他设置
- + @@ -101,16 +101,7 @@ 提交 - + - +
@@ -262,7 +253,7 @@ export default { this.treeData = res.data; }) .catch((res) => { - this.$Message.error(res.msg); + this.$message.error(res.msg); }); }, // 提交数据 @@ -272,13 +263,13 @@ export default { if (valid) { cmsAddApi(this.formValidate) .then(async (res) => { - this.$Message.success(res.msg); + this.$message.success(res.msg); setTimeout(() => { this.$router.push({ path: this.$routeProStr + '/cms/article/index' }); }, 500); }) .catch((res) => { - this.$Message.error(res.msg); + this.$message.error(res.msg); }); } else { return false; @@ -307,7 +298,7 @@ export default { }) .catch((res) => { this.loading = false; - this.$Message.error(res.msg); + this.$message.error(res.msg); }); }, }, diff --git a/template/admin/src/pages/cms/article/index.vue b/template/admin/src/pages/cms/article/index.vue index 3f27bbd2f..87a01772a 100644 --- a/template/admin/src/pages/cms/article/index.vue +++ b/template/admin/src/pages/cms/article/index.vue @@ -11,12 +11,16 @@ - - - {{ item.title }} - - - + + @@ -106,17 +110,9 @@ - + - + @@ -159,6 +155,11 @@ export default { rows: {}, modal_loading: false, modals: false, + props: { + value: 'id', + label: 'title', + emitPath: false, + }, }; }, components: { @@ -196,7 +197,7 @@ export default { }; relationApi(data, this.rows.id) .then(async (res) => { - this.$Message.success(res.msg); + this.$message.success(res.msg); row.id = 0; this.modal_loading = false; this.modals = false; @@ -207,7 +208,7 @@ export default { .catch((res) => { this.modal_loading = false; this.loading = false; - this.$Message.error(res.msg); + this.$message.error(res.msg); }); }, cancel() { @@ -225,7 +226,7 @@ export default { }) .catch((res) => { this.loading = false; - this.$Message.error(res.msg); + this.$message.error(res.msg); }); }, // 分类 @@ -241,26 +242,13 @@ export default { this.treeData.unshift(obj); }) .catch((res) => { - this.$Message.error(res.msg); + this.$message.error(res.msg); }); }, // 下拉树 handleCheckChange(data) { - let value = ''; - let title = ''; - this.list = []; - this.artFrom.pid = 0; - data.forEach((item, index) => { - value += `${item.id},`; - title += `${item.title},`; - }); - value = value.substring(0, value.length - 1); - title = title.substring(0, title.length - 1); - this.list.push({ - value, - title, - }); - this.artFrom.pid = value; + console.log(data); + this.artFrom.pid = data ? data : 0; this.artFrom.page = 1; this.getList(); }, @@ -283,11 +271,11 @@ export default { }; this.$modalSure(delfromData) .then((res) => { - this.$Message.success(res.msg); + this.$message.success(res.msg); this.getList(); }) .catch((res) => { - this.$Message.error(res.msg); + this.$message.error(res.msg); }); } }, @@ -302,11 +290,11 @@ export default { }; this.$modalSure(delfromData) .then((res) => { - this.$Message.success(res.msg); + this.$message.success(res.msg); this.cmsList.splice(num, 1); }) .catch((res) => { - this.$Message.error(res.msg); + this.$message.error(res.msg); }); }, // 表格搜索 diff --git a/template/admin/src/pages/cms/article/relation.vue b/template/admin/src/pages/cms/article/relation.vue index d104d6331..24a185fd0 100644 --- a/template/admin/src/pages/cms/article/relation.vue +++ b/template/admin/src/pages/cms/article/relation.vue @@ -1,13 +1,10 @@ @@ -601,4 +614,44 @@ export default { min-width: 121px; } } +.tree { + min-height: 374px; + /deep/ .file-name { + display: flex; + align-items: center; + .icon { + width: 12px; + height: 12px; + margin-right: 8px; + } + } + /deep/ .el-tree-node { + // margin-right: 16px; + } + /deep/ .el-tree-node__children .el-tree-node { + margin-right: 0; + } + /deep/ .el-tree-node__content { + width: 100%; + height: 36px; + } + /deep/ .custom-tree-node { + flex: 1; + display: flex; + align-items: center; + justify-content: space-between; + padding-right: 17px; + font-size: 13px; + font-weight: 400; + color: rgba(0, 0, 0, 0.6); + line-height: 13px; + } + /deep/ .is-current { + background: #f1f9ff !important; + color: #1890ff !important; + } + /deep/ .is-current .custom-tree-node { + color: #1890ff !important; + } + } diff --git a/template/admin/src/pages/marketing/channelCode/codeStatistic.vue b/template/admin/src/pages/marketing/channelCode/codeStatistic.vue index f24ba72f9..f7e7c094e 100644 --- a/template/admin/src/pages/marketing/channelCode/codeStatistic.vue +++ b/template/admin/src/pages/marketing/channelCode/codeStatistic.vue @@ -1,5 +1,5 @@ @@ -97,32 +96,6 @@ export default { optionData: {}, spinShow: false, options: this.$timeOptions, - columns: [ - { - title: '序号', - type: 'index', - width: 60, - align: 'center', - }, - { - title: '来源', - key: 'name', - minWidth: 80, - align: 'center', - }, - { - title: '金额', - width: 180, - key: 'value', - align: 'center', - }, - { - title: '占比率', - slot: 'percent', - minWidth: 100, - align: 'center', - }, - ], }; }, created() { @@ -169,7 +142,7 @@ export default { // 具体日期 onchangeTime(e) { this.timeVal = e; - this.formValidate.time = this.timeVal.join('-'); + this.formValidate.time = this.timeVal ? this.timeVal.join('-') : ''; this.name = this.formValidate.time; this.wechatQrcodeStatistic(); }, diff --git a/template/admin/src/pages/marketing/channelCode/createCode.vue b/template/admin/src/pages/marketing/channelCode/createCode.vue index 40990b6ff..664a16e18 100644 --- a/template/admin/src/pages/marketing/channelCode/createCode.vue +++ b/template/admin/src/pages/marketing/channelCode/createCode.vue @@ -44,9 +44,9 @@
- {{ + {{ item.label_name - }} + }}
选择用户关联标签
@@ -72,7 +72,8 @@ 有效期 - 临时码过期后不能再扫码,永久二维码最大创建数量为10万个
- - - - 文字内容 - - - 声音消息 - 图片消息 - 图文消息 - - - - - - - - 选择图文消息 -
- - {{ formData.content.list.title }} -
- - -
- - - 上传 - -
- 文件最大2Mb，支持bmp/png/jpeg/jpg/gif格式 - 文件最大2Mb，支持mp3格式,播放长度不超过60s - - - + + 文字内容 + 声音消息 + 图片消息 + 图文消息 + + + + + + + + 选择图文消息 +
+ + {{ formData.content.list.title }} +
+ + +
+ + + 上传 + +
+ 文件最大2Mb，支持bmp/png/jpeg/jpg/gif格式 + 文件最大2Mb，支持mp3格式,播放长度不超过60s + + + - 立即提交 + 立即提交 - + - + - + - - + - + @@ -308,7 +303,7 @@ export default { this.labelSelect = res.data.list; }) .catch((res) => { - this.$Message.error(res.msg); + this.$message.error(res.msg); }); }, imageObject(e) { @@ -324,20 +319,20 @@ export default { handleSuccess(res, file) { if (res.status === 200) { this.formData.content.src = res.data.src; - this.$Message.success(res.msg); + this.$message.success(res.msg); } else { - this.$Message.error(res.msg); + this.$message.error(res.msg); } }, handleFormatError(file) { if (this.formData.type === 'image') { - this.$Message.warning('请上传bmp/png/jpeg/jpg/gif格式的图片'); + this.$message.warning('请上传bmp/png/jpeg/jpg/gif格式的图片'); } else { - this.$Message.warning('请上传mp3/wma/wav/amr格式的语音'); + this.$message.warning('请上传mp3/wma/wav/amr格式的语音'); } }, handleMaxSize(file) { - this.$Message.warning('请上传文件2M以内的文件'); + this.$message.warning('请上传文件2M以内的文件'); }, // 上传头部token getToken() { @@ -356,13 +351,13 @@ export default { // 创建 save() { if (!this.formData.name) { - return this.$Message.error('请输入二维码名称'); + return this.$message.error('请输入二维码名称'); } if (!this.formData.cate_id) { - return this.$Message.error('请选择分组'); + return this.$message.error('请选择分组'); } if (!this.dataLabel.length) { - return this.$Message.error('请选择用户标签'); + return this.$message.error('请选择用户标签'); } else { let ids = []; this.dataLabel.map((i) => { @@ -371,28 +366,28 @@ export default { this.formData.label_id = ids; } if (!this.formData.uid) { - return this.$Message.error('请选择推广员'); + return this.$message.error('请选择推广员'); } if (this.isReceiveTime) { if (this.formData.time < 1) { - return this.$Message.error('使用有效期限不能小于1天'); + return this.$message.error('使用有效期限不能小于1天'); } } else { this.formData.time = 0; } if (this.formData.type === 'text' || this.formData.type === 'url') { if (!this.formData.content.content.trim()) { - return this.$Message.error('请输入内容'); + return this.$message.error('请输入内容'); } } if (this.formData.type === 'voice' || this.formData.type === 'image') { if (!this.formData.content.src.trim()) { - return this.$Message.error('请先上传消息'); + return this.$message.error('请先上传消息'); } } if (this.formData.type === 'news') { if (!this.formData.content.list.title.trim()) { - return this.$Message.error('请选择图文消息'); + return this.$message.error('请选择图文消息'); } } this.disabled = false; @@ -400,7 +395,7 @@ export default { wechatQrcodeSaveApi(this.id, this.formData) .then((res) => { this.disabled = true; - this.$Message.success(res.msg); + this.$message.success(res.msg); setTimeout(() => { this.$router.push({ path: this.$routeProStr + '/marketing/channel_code/channelCodeIndex', @@ -409,7 +404,7 @@ export default { }) .catch((err) => { this.disabled = true; - this.$Message.error(err.msg); + this.$message.error(err.msg); }); }, }, diff --git a/template/admin/src/pages/marketing/live/add_goods.vue b/template/admin/src/pages/marketing/live/add_goods.vue index 11652bafb..5b6c2ee80 100644 --- a/template/admin/src/pages/marketing/live/add_goods.vue +++ b/template/admin/src/pages/marketing/live/add_goods.vue @@ -83,7 +83,7 @@ - + - + @@ -147,7 +147,7 @@ export default { this.isShowBox = true; }) .catch((error) => { - this.$Message.error(error.msg); + this.$message.error(error.msg); }); }, getProductId(data) { @@ -182,7 +182,7 @@ export default { goods_info: this.tabList, }) .then((res) => { - this.$Message.success('添加成功'); + this.$message.success('添加成功'); this.disabled = false; setTimeout(() => { this.$router.push({ path: this.$routeProStr + '/marketing/live/live_goods' }); @@ -190,7 +190,7 @@ export default { }) .catch((error) => { this.disabled = false; - this.$Message.error(error.msg); + this.$message.error(error.msg); }); }, }, diff --git a/template/admin/src/pages/marketing/live/anchor.vue b/template/admin/src/pages/marketing/live/anchor.vue index f192a914d..cadf9e738 100644 --- a/template/admin/src/pages/marketing/live/anchor.vue +++ b/template/admin/src/pages/marketing/live/anchor.vue @@ -113,7 +113,7 @@ export default { }; this.$modalSure(delfromData) .then((res) => { - this.$Message.success(res.msg); + this.$message.success(res.msg); this.labelLists.splice(num, 1); if (!this.labelLists.length && this.labelFrom.page != 1) { this.labelFrom.page -= 1; @@ -123,7 +123,7 @@ export default { } }) .catch((res) => { - this.$Message.error(res.msg); + this.$message.error(res.msg); }); }, // 分组列表 @@ -138,7 +138,7 @@ export default { }) .catch((res) => { this.loading = false; - this.$Message.error(res.msg); + this.$message.error(res.msg); }); }, }, diff --git a/template/admin/src/pages/marketing/live/components/add_goods.vue b/template/admin/src/pages/marketing/live/components/add_goods.vue index f29bc7c63..6c531d284 100644 --- a/template/admin/src/pages/marketing/live/components/add_goods.vue +++ b/template/admin/src/pages/marketing/live/components/add_goods.vue @@ -16,7 +16,7 @@
提交 - + - + diff --git a/template/admin/src/pages/marketing/live/components/goods_detail.vue b/template/admin/src/pages/marketing/live/components/goods_detail.vue index 00c5b3810..3241a912c 100644 --- a/template/admin/src/pages/marketing/live/components/goods_detail.vue +++ b/template/admin/src/pages/marketing/live/components/goods_detail.vue @@ -49,7 +49,7 @@ export default { this.loading = false; }) .catch((error) => { - this.$Message.error(error.msg); + this.$message.error(error.msg); this.loading = false; }); }, diff --git a/template/admin/src/pages/marketing/live/components/live_detail.vue b/template/admin/src/pages/marketing/live/components/live_detail.vue index 8c44c64ec..3ab731887 100644 --- a/template/admin/src/pages/marketing/live/components/live_detail.vue +++ b/template/admin/src/pages/marketing/live/components/live_detail.vue @@ -97,7 +97,7 @@ export default { this.loading = false; }) .catch((error) => { - this.$Message.error(error.msg); + this.$message.error(error.msg); this.loading = false; }); }, diff --git a/template/admin/src/pages/marketing/live/creat_live.vue b/template/admin/src/pages/marketing/live/creat_live.vue index 216d7913f..3db4f4d1d 100644 --- a/template/admin/src/pages/marketing/live/creat_live.vue +++ b/template/admin/src/pages/marketing/live/creat_live.vue @@ -19,32 +19,34 @@ :rules="ruleValidate" @submit.native.prevent > - - 必须前往微信小程序官方后台开通直播权限，关注【小程序直播】须知直播状态 - - - - - - - - - + + + + 必须前往微信小程序官方后台开通直播权限，关注【小程序直播】须知直播状态 + + + + + + + + + - + value-format="yyyy-MM-dd HH:mm" + range-separator="至" + start-placeholder="开始日期" + end-placeholder="结束日期" + > @@ -168,7 +174,7 @@ - + 提交 @@ -185,16 +191,7 @@
- + - +
- +
- - + @@ -342,6 +338,7 @@ export default { this.modal3 = false; }, codeImg() { + console.log('111'); this.modal3 = true; }, anchorName(e) { @@ -363,7 +360,7 @@ export default { this.liveList = res.data.list; }) .catch((error) => { - this.$Message.error(error.msg); + this.$message.error(error.msg); }); }, // 点击图文封面 @@ -391,7 +388,7 @@ export default { this.loading = true; liveAdd(this.formValidate) .then((res) => { - this.$Message.success('添加成功'); + this.$message.success('添加成功'); setTimeout(() => { this.loading = false; this.$router.push({ path: this.$routeProStr + '/marketing/live/live_room' }); @@ -401,7 +398,7 @@ export default { setTimeout(() => { this.loading = false; }, 1000); - this.$Message.error(error.msg); + this.$message.error(error.msg); }); }, }, diff --git a/template/admin/src/pages/marketing/live/index.vue b/template/admin/src/pages/marketing/live/index.vue index b4688775e..6f3015795 100644 --- a/template/admin/src/pages/marketing/live/index.vue +++ b/template/admin/src/pages/marketing/live/index.vue @@ -144,11 +144,11 @@ - + - + - + - + @@ -269,10 +269,10 @@ export default { onchangeIsShow({ id, is_show }) { liveShow(id, is_show) .then((res) => { - this.$Message.success(res.msg); + this.$message.success(res.msg); }) .catch((error) => { - this.$Message.error(error.msg); + this.$message.error(error.msg); }); }, // 详情 @@ -292,12 +292,12 @@ export default { goods_ids: data, }) .then((res) => { - this.$Message.success(res.msg); + this.$message.success(res.msg); this.isShowBox = false; this.$refs.liveAdd.goodsList = []; }) .catch((error) => { - this.$Message.error(error.msg); + this.$message.error(error.msg); this.isShowBox = false; this.$refs.liveAdd.goodsList = []; }); @@ -306,11 +306,11 @@ export default { syncRoom() { liveSyncRoom() .then((res) => { - this.$Message.success(res.msg); + this.$message.success(res.msg); this.getList(); }) .catch((error) => { - this.$Message.error(res.msg); + this.$message.error(res.msg); }); }, // 删除 @@ -324,13 +324,13 @@ export default { }; this.$modalSure(delfromData) .then((res) => { - this.$Message.success(res.msg); + this.$message.success(res.msg); this.tabList.splice(num, 1); this.getList(); }) .catch((res) => { - this.$Message.error(res.msg); + this.$message.error(res.msg); }); }, getProductId(data) { diff --git a/template/admin/src/pages/marketing/live/live_goods.vue b/template/admin/src/pages/marketing/live/live_goods.vue index 341a83e29..bd4c7e0b9 100644 --- a/template/admin/src/pages/marketing/live/live_goods.vue +++ b/template/admin/src/pages/marketing/live/live_goods.vue @@ -133,9 +133,9 @@ - + - + @@ -217,10 +217,10 @@ export default { onchangeIsShow({ id, is_show }) { liveGoodsShow(id, is_show) .then((res) => { - this.$Message.success(res.msg); + this.$message.success(res.msg); }) .catch((error) => { - this.$Message.error(error.msg); + this.$message.error(error.msg); }); }, // 列表数据 @@ -233,7 +233,7 @@ export default { this.loading = false; }) .catch((error) => { - this.$Message.error(error.msg); + this.$message.error(error.msg); this.loading = false; }); }, @@ -252,11 +252,11 @@ export default { syncGoods() { liveSyncGoods() .then((res) => { - this.$Message.success(res.msg); + this.$message.success(res.msg); this.getList(); }) .catch((error) => { - this.$Message.error(res.msg); + this.$message.error(res.msg); }); }, edit(row) { @@ -274,13 +274,13 @@ export default { }; this.$modalSure(delfromData) .then((res) => { - this.$Message.success(res.msg); + this.$message.success(res.msg); this.tabList.splice(num, 1); this.getList(); }) .catch((res) => { - this.$Message.error(res.msg); + this.$message.error(res.msg); }); }, }, diff --git a/template/admin/src/pages/marketing/lottery/addGoods.vue b/template/admin/src/pages/marketing/lottery/addGoods.vue index 04d92a686..27fb7f533 100644 --- a/template/admin/src/pages/marketing/lottery/addGoods.vue +++ b/template/admin/src/pages/marketing/lottery/addGoods.vue @@ -13,9 +13,9 @@
- {{ + {{ item.title - }} + }}
添加优惠券 @@ -24,7 +24,8 @@ prop="num" v-if="[2, 3, 4].includes(formValidate.type)" > - - + @@ -819,7 +803,7 @@ export default { if (this.formValidate.id && !this.copy) { lotteryEditApi(this.formValidate.id, this.formValidate) .then(async (res) => { - this.$Message.success(res.msg); + this.$message.success(res.msg); this.submitOpen = false; // setTimeout(() => { // this.submitOpen = false; @@ -830,13 +814,13 @@ export default { }) .catch((res) => { this.submitOpen = false; - this.$Message.error(res.msg); + this.$message.error(res.msg); }); } else { lotteryCreateApi(this.formValidate) .then(async (res) => { this.submitOpen = false; - this.$Message.success(res.msg); + this.$message.success(res.msg); // setTimeout(() => { // this.submitOpen = false; // this.$router.push({ @@ -846,7 +830,7 @@ export default { }) .catch((res) => { this.submitOpen = false; - this.$Message.error(res.msg); + this.$message.error(res.msg); }); } } else { @@ -882,7 +866,7 @@ export default { // 表单验证 validate(prop, status, error) { if (status === false) { - this.$Message.error(error); + this.$message.error(error); return false; } else { return true; @@ -918,7 +902,7 @@ export default { ? this.$set(this.specsData, [this.editIndex], data) : this.specsData.length < 8 ? this.specsData.push(data) - : this.$Message.warning('最多添加8个奖品'); + : this.$message.warning('最多添加8个奖品'); this.getProbability(); this.addGoodsModel = false; this.editIndex = null; diff --git a/template/admin/src/pages/marketing/lottery/index.vue b/template/admin/src/pages/marketing/lottery/index.vue index e86f69fae..3282d8697 100644 --- a/template/admin/src/pages/marketing/lottery/index.vue +++ b/template/admin/src/pages/marketing/lottery/index.vue @@ -247,11 +247,11 @@ export default { }; this.$modalSure(delfromData) .then((res) => { - this.$Message.success(res.msg); + this.$message.success(res.msg); this.tableList.splice(num, 1); }) .catch((res) => { - this.$Message.error(res.msg); + this.$message.error(res.msg); }); }, //查看抽奖记录 @@ -277,7 +277,7 @@ export default { }) .catch((res) => { this.loading = false; - this.$Message.error(res.msg); + this.$message.error(res.msg); }); }, // 表格搜索 @@ -293,11 +293,11 @@ export default { }; lotteryStatusApi(data) .then(async (res) => { - this.$Message.success(res.msg); + this.$message.success(res.msg); this.getList(); }) .catch((res) => { - this.$Message.error(res.msg); + this.$message.error(res.msg); this.getList(); }); }, diff --git a/template/admin/src/pages/marketing/lottery/recordingList.vue b/template/admin/src/pages/marketing/lottery/recordingList.vue index 43a6719e1..686f3b8ae 100644 --- a/template/admin/src/pages/marketing/lottery/recordingList.vue +++ b/template/admin/src/pages/marketing/lottery/recordingList.vue @@ -25,16 +25,18 @@ item.text }} - + value-format="yyyy/MM/dd" + range-separator="至" + start-placeholder="开始日期" + end-placeholder="结束日期" + + > @@ -86,7 +88,6 @@ - 关闭 - + @@ -305,7 +302,7 @@ export default { this.$refs[name].validate((valid) => { lotteryRecordDeliver(this.modelType == 1 ? this.shipForm : this.markForm) .then((res) => { - this.$Message.success('操作成功'); + this.$message.success('操作成功'); this.shipModel = false; this.getList(); this.shipForm = { @@ -320,7 +317,7 @@ export default { }; }) .catch((err) => { - this.$Message.error(err.msg); + this.$message.error(err.msg); }); }); }, @@ -336,13 +333,13 @@ export default { this.locationList = res.data; }) .catch((res) => { - this.$Message.error(res.msg); + this.$message.error(res.msg); }); }, // 具体日期 onchangeTime(e) { - this.timeVal = e; - this.tableFrom.data = this.timeVal[0] ? this.timeVal.join('-') : ''; + this.timeVal = e || []; + this.tableFrom.data = this.timeVal[0] ? (this.timeVal ? this.timeVal.join('-') : '') : ''; this.tableFrom.page = 1; this.getList(); }, @@ -375,7 +372,7 @@ export default { }) .catch((res) => { this.loading = false; - this.$Message.error(res.msg); + this.$message.error(res.msg); }); }, // 表格搜索 diff --git a/template/admin/src/pages/marketing/point_record/index.vue b/template/admin/src/pages/marketing/point_record/index.vue index 5e9117b30..b69dd2a40 100644 --- a/template/admin/src/pages/marketing/point_record/index.vue +++ b/template/admin/src/pages/marketing/point_record/index.vue @@ -12,19 +12,19 @@ - + > @@ -99,12 +99,12 @@ - +
确定
- + - - diff --git a/template/admin/src/pages/user/cancel/handle/task.vue b/template/admin/src/pages/user/cancel/handle/task.vue index 0a9def85b..0be36ccbe 100644 --- a/template/admin/src/pages/user/cancel/handle/task.vue +++ b/template/admin/src/pages/user/cancel/handle/task.vue @@ -1,15 +1,5 @@