From fc0f92a7de2f7df8bb4d7c0b08013db6646117bf Mon Sep 17 00:00:00 2001 From: yanran200730 Date: Fri, 9 Jun 2023 13:44:23 +0800 Subject: [PATCH 1/9] bug --- .../AppSystemAccountOms.vue | 2 +- .../AppWechatConfig/components/Detail.vue | 123 ------------------ .../apps/AppWechatConfig/components/List.vue | 8 +- .../AppWechatStatistics.vue | 6 +- 4 files changed, 8 insertions(+), 131 deletions(-) delete mode 100644 project/oms/apps/AppWechatConfig/components/Detail.vue diff --git a/project/oms/apps/AppSystemAccountOms/AppSystemAccountOms.vue b/project/oms/apps/AppSystemAccountOms/AppSystemAccountOms.vue index a562cdf7..1542e535 100644 --- a/project/oms/apps/AppSystemAccountOms/AppSystemAccountOms.vue +++ b/project/oms/apps/AppSystemAccountOms/AppSystemAccountOms.vue @@ -168,7 +168,7 @@ export default { }, getWechatList () { - this.instance.post(`/wxmpconfig/list?size=1000`).then(res => { + this.instance.post(`/api/wxmpconfig/list?size=1000`).then(res => { if (res.code == 0) { this.wechatList = res.data.records.map(v => { return { diff --git a/project/oms/apps/AppWechatConfig/components/Detail.vue b/project/oms/apps/AppWechatConfig/components/Detail.vue deleted file mode 100644 index 4d84b654..00000000 --- a/project/oms/apps/AppWechatConfig/components/Detail.vue +++ /dev/null @@ -1,123 +0,0 @@ - - - - - diff --git a/project/oms/apps/AppWechatConfig/components/List.vue b/project/oms/apps/AppWechatConfig/components/List.vue index 96abbf34..72a26d31 100644 --- a/project/oms/apps/AppWechatConfig/components/List.vue +++ b/project/oms/apps/AppWechatConfig/components/List.vue @@ -126,7 +126,7 @@ methods: { getList () { - this.instance.post(`/wxmpconfig/list`, null, { + this.instance.post(`/api/wxmpconfig/list`, null, { params: { ...this.search } @@ -168,7 +168,7 @@ onAmountConfirm () { this.$refs.amountForm.validate((valid) => { if (valid) { - this.instance.post(`/wxmpconfig/updateSettledAmount`, null, { + this.instance.post(`/api/wxmpconfig/updateSettledAmount`, null, { params: { ...this.amountForm, id: this.id @@ -188,7 +188,7 @@ onConfirm () { this.$refs.form.validate((valid) => { if (valid) { - this.instance.post(`/wxmpconfig/addOrUpdate`, { + this.instance.post(`/api/wxmpconfig/addOrUpdate`, { ...this.form, id: this.id || '' }).then(res => { @@ -205,7 +205,7 @@ remove (id) { this.$confirm('删除后不可恢复，确定删除该数据？').then(() => { - this.instance.post(`/wxmpconfig/delete?ids=${id}`).then(res => { + this.instance.post(`/api/wxmpconfig/delete?ids=${id}`).then(res => { if (res.code == 0) { this.$message.success('删除成功！') this.getList() diff --git a/project/oms/apps/AppWechatStatistics/AppWechatStatistics.vue b/project/oms/apps/AppWechatStatistics/AppWechatStatistics.vue index bb4f2140..7595ce80 100644 --- a/project/oms/apps/AppWechatStatistics/AppWechatStatistics.vue +++ b/project/oms/apps/AppWechatStatistics/AppWechatStatistics.vue @@ -120,7 +120,7 @@ }, getInfo () { - this.instance.post(`wxmppublisheradposgeneral/statistics`, null, { + this.instance.post(`/api/wxmppublisheradposgeneral/statistics`, null, { params: { ...this.search, startTime: this.search.type === '3' ? this.date[0] : '', @@ -136,7 +136,7 @@ }, getList () { - this.instance.post(`/wxmppublisheradposgeneral/list`, null, { + this.instance.post(`/api/wxmppublisheradposgeneral/list`, null, { params: { ...this.search, startTime: this.search.type === '3' ? this.date[0] : '', @@ -151,7 +151,7 @@ }, getWechatList () { - this.instance.post(`/wxmpconfig/list?size=1000`).then(res => { + this.instance.post(`/api/wxmpconfig/list?size=1000`).then(res => { if (res.code == 0) { this.wechatList = res.data.records.map(v => { return { From 96647bfa90eb8c52bd2fb9500ff3e59161dfad81 Mon Sep 17 00:00:00 2001 From: yanran200730 Date: Fri, 9 Jun 2023 14:01:18 +0800 Subject: [PATCH 2/9] bug --- project/oms/apps/AppSystemAccountOms/AppSystemAccountOms.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/project/oms/apps/AppSystemAccountOms/AppSystemAccountOms.vue b/project/oms/apps/AppSystemAccountOms/AppSystemAccountOms.vue index 1542e535..09785592 100644 --- a/project/oms/apps/AppSystemAccountOms/AppSystemAccountOms.vue +++ b/project/oms/apps/AppSystemAccountOms/AppSystemAccountOms.vue @@ -158,7 +158,7 @@ export default { chooseWechat (id) { this.form.userId = id - this.instance.post(`/sysuserwxmp/list?size=1000&userId=${id}`).then(res => { + this.instance.post(`/api/sysuserwxmp/list?size=1000&userId=${id}`).then(res => { if (res.code == 0) { this.form.appids = res.data.records.map(v => v.appId) } @@ -182,7 +182,7 @@ export default { onConfirm () { this.$refs.form.validate((valid) => { if (valid) { - this.instance.post(`/sysuserwxmp/addOrUpdate`, { + this.instance.post(`/api/sysuserwxmp/addOrUpdate`, { ...this.form }).then(res => { if (res.code == 0) { From f2a7cafc76b01557a1c0e0233e45eec5b8b4a037 Mon Sep 17 00:00:00 2001 From: yanran200730 Date: Fri, 9 Jun 2023 14:13:05 +0800 Subject: [PATCH 3/9] bug --- project/oms/apps/AppWechatStatistics/AppWechatStatistics.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/project/oms/apps/AppWechatStatistics/AppWechatStatistics.vue b/project/oms/apps/AppWechatStatistics/AppWechatStatistics.vue index 7595ce80..57b3c197 100644 --- a/project/oms/apps/AppWechatStatistics/AppWechatStatistics.vue +++ b/project/oms/apps/AppWechatStatistics/AppWechatStatistics.vue @@ -151,9 +151,9 @@ }, getWechatList () { - this.instance.post(`/api/wxmpconfig/list?size=1000`).then(res => { + this.instance.post(`/api/wxmpconfig/queryMyAppids`).then(res => { if (res.code == 0) { - this.wechatList = res.data.records.map(v => { + this.wechatList = res.data.map(v => { return { dictValue: v.appId, dictName: v.mpName From 4eb960b16bdd71f61ab6da90511dcb1d67196b6a Mon Sep 17 00:00:00 2001 From: yanran200730 Date: Fri, 9 Jun 2023 14:13:27 +0800 Subject: [PATCH 4/9] bug --- vue.config.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vue.config.js b/vue.config.js index 0380fc7e..3385f5de 100644 --- a/vue.config.js +++ b/vue.config.js @@ -62,7 +62,7 @@ module.exports = { } }, '/omsapi': { - target: 'http://192.168.1.87:19898', + target: 'http://192.168.1.87:19897', changeOrigin: true, pathRewrite: { //地址重写 From f4c3ad72c4205a4f208e6e05d928daa9fc9a0aeb Mon Sep 17 00:00:00 2001 From: yanran200730 Date: Fri, 9 Jun 2023 14:19:22 +0800 Subject: [PATCH 5/9] bug --- .../AppWechatStatistics.vue | 23 +++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/project/oms/apps/AppWechatStatistics/AppWechatStatistics.vue b/project/oms/apps/AppWechatStatistics/AppWechatStatistics.vue index 57b3c197..07f7f865 100644 --- a/project/oms/apps/AppWechatStatistics/AppWechatStatistics.vue +++ b/project/oms/apps/AppWechatStatistics/AppWechatStatistics.vue @@ -53,6 +53,15 @@ + (v * 100).toFixed(2) + '%' }, { prop: 'clickCount', label: '点击量', align: 'center' }, { prop: 'clickRate', label: '点击率', align: 'center', format: v => (v * 100).toFixed(2) + '%' }, - { prop: 'ecpm', label: 'eCPM（元）', align: 'center', format: v => v.toFixed(2) }, - { prop: 'income', label: '收入（元）', align: 'center', format: v => v.toFixed(2) } + { prop: 'ecpm', label: 'eCPM（元）', align: 'center', format: v => (v / 100).toFixed(2) }, + { prop: 'income', label: '收入（元）', align: 'center', format: v => (v / 100).toFixed(2) } ] } }, + computed: { + params () { + return { + ...this.search, + startTime: this.search.type === '3' ? this.date[0] : '', + endTime: this.search.type === '3' ? this.date[1] : '' + } + } + }, + created () { this.getInfo() this.getWechatList() From 5b90115b80a23cab17128739828ea95cd8c0b66f Mon Sep 17 00:00:00 2001 From: yanran200730 Date: Fri, 9 Jun 2023 14:20:18 +0800 Subject: [PATCH 6/9] =?UTF-8?q?=E6=AF=8F=E6=97=A5=E6=94=B6=E7=9B=8A?= =?UTF-8?q?=E6=98=8E=E7=BB=86=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- project/oms/apps/AppWechatStatistics/AppWechatStatistics.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/oms/apps/AppWechatStatistics/AppWechatStatistics.vue b/project/oms/apps/AppWechatStatistics/AppWechatStatistics.vue index 07f7f865..2618f1ba 100644 --- a/project/oms/apps/AppWechatStatistics/AppWechatStatistics.vue +++ b/project/oms/apps/AppWechatStatistics/AppWechatStatistics.vue @@ -57,7 +57,7 @@ 导出 From 6e1b0a06843124417175ce3b2e687cc96ecffa10 Mon Sep 17 00:00:00 2001 From: yanran200730 Date: Fri, 9 Jun 2023 14:29:30 +0800 Subject: [PATCH 7/9] bug --- .../oms/apps/AppSystemAccountOms/AppSystemAccountOms.vue | 1 + .../oms/apps/AppWechatStatistics/AppWechatStatistics.vue | 7 +++++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/project/oms/apps/AppSystemAccountOms/AppSystemAccountOms.vue b/project/oms/apps/AppSystemAccountOms/AppSystemAccountOms.vue index 09785592..e8fce718 100644 --- a/project/oms/apps/AppSystemAccountOms/AppSystemAccountOms.vue +++ b/project/oms/apps/AppSystemAccountOms/AppSystemAccountOms.vue @@ -110,6 +110,7 @@ export default { {label: "姓名", slot: "name"}, {label: "手机号", prop: "phone", align: 'center'}, {label: "所属单位", prop: "unitName", align: 'center'}, + {label: "公众号", prop: "wxMpNames", align: 'center'}, {label: "角色", prop: "roleName", align: 'center'}, {slot: "options"} ] diff --git a/project/oms/apps/AppWechatStatistics/AppWechatStatistics.vue b/project/oms/apps/AppWechatStatistics/AppWechatStatistics.vue index 2618f1ba..ecf7a965 100644 --- a/project/oms/apps/AppWechatStatistics/AppWechatStatistics.vue +++ b/project/oms/apps/AppWechatStatistics/AppWechatStatistics.vue @@ -49,7 +49,7 @@
已结算金额（元） -

{{ info['已结算金额'] ? (info['已结算金额'] / 100).toFixed(2) : 0 }}

+

{{ info['已结算金额'] || 0 }}

@@ -101,6 +101,7 @@ wechatList: [], colConfigs: [ { prop: 'ymd', label: '日期' }, + { prop: 'adSlot', label: '广告位类型', align: 'center', format: v => this.dict.getLabel('ad_slot', v) }, { prop: 'reqSuccCount', label: '拉取量', align: 'center' }, { prop: 'exposureCount', label: '曝光量', align: 'center' }, { prop: 'exposureRate', label: '曝光率', align: 'center', format: v => (v * 100).toFixed(2) + '%' }, @@ -124,7 +125,9 @@ created () { this.getInfo() - this.getWechatList() + this.dict.load('ad_slot').then(() => { + this.getWechatList() + }) }, methods: { From c18511ac01d349c70f9f081b6cf345c5919cb615 Mon Sep 17 00:00:00 2001 From: yanran200730 Date: Fri, 9 Jun 2023 14:30:22 +0800 Subject: [PATCH 8/9] bug --- project/oms/apps/AppWechatConfig/components/List.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/oms/apps/AppWechatConfig/components/List.vue b/project/oms/apps/AppWechatConfig/components/List.vue index 72a26d31..892dc591 100644 --- a/project/oms/apps/AppWechatConfig/components/List.vue +++ b/project/oms/apps/AppWechatConfig/components/List.vue @@ -58,7 +58,7 @@ - + From b89581c900773dcf96ed065fa57399927f12d096 Mon Sep 17 00:00:00 2001 From: yanran200730 Date: Fri, 9 Jun 2023 14:40:47 +0800 Subject: [PATCH 9/9] bug --- project/oms/apps/AppWechatStatistics/AppWechatStatistics.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/oms/apps/AppWechatStatistics/AppWechatStatistics.vue b/project/oms/apps/AppWechatStatistics/AppWechatStatistics.vue index ecf7a965..13163fc7 100644 --- a/project/oms/apps/AppWechatStatistics/AppWechatStatistics.vue +++ b/project/oms/apps/AppWechatStatistics/AppWechatStatistics.vue @@ -150,7 +150,7 @@ } }).then(res => { if (res.code === 0) { - this.info = res.data + this.info = res.data || {} this.getList() }