diff --git a/project/oms/apps/AppSystemAccountOms/AppSystemAccountOms.vue b/project/oms/apps/AppSystemAccountOms/AppSystemAccountOms.vue index a562cdf7..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"} ] @@ -158,7 +159,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) } @@ -168,7 +169,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 { @@ -182,7 +183,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) { 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 @@ - - - - - - - - - - {{info.content}} - {{info.createUserName}}发布于{{info.createTime}} 已有{{info.answerCount || 0}}个回答 - - - - - {{item.createUserName}} - {{item.createUserDeptName}} - - - - - 发布于 {{item.createTime}} - - 暂无回答 - - - - - - - - - diff --git a/project/oms/apps/AppWechatConfig/components/List.vue b/project/oms/apps/AppWechatConfig/components/List.vue index 96abbf34..892dc591 100644 --- a/project/oms/apps/AppWechatConfig/components/List.vue +++ b/project/oms/apps/AppWechatConfig/components/List.vue @@ -58,7 +58,7 @@ - + @@ -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..13163fc7 100644 --- a/project/oms/apps/AppWechatStatistics/AppWechatStatistics.vue +++ b/project/oms/apps/AppWechatStatistics/AppWechatStatistics.vue @@ -49,10 +49,19 @@ 已结算金额(元) - {{ info['已结算金额'] ? (info['已结算金额'] / 100).toFixed(2) : 0 }} + {{ info['已结算金额'] || 0 }} + + + 导出 + + 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) + '%' }, { 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() + this.dict.load('ad_slot').then(() => { + this.getWechatList() + }) }, methods: { @@ -120,7 +142,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] : '', @@ -128,7 +150,7 @@ } }).then(res => { if (res.code === 0) { - this.info = res.data + this.info = res.data || {} this.getList() } @@ -136,7 +158,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,9 +173,9 @@ }, getWechatList () { - this.instance.post(`/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 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: { //地址重写
{{info.content}}
{{item.createUserDeptName}}
发布于 {{item.createTime}}