diff --git a/src/assets/css/index.css b/src/assets/css/index.css index 08b041d6018c6f8b79fe948eefa8ab2a7a96a2bb..8b14025a70d3cad7fcae3bb8af7b1345b3b7ed81 100644 --- a/src/assets/css/index.css +++ b/src/assets/css/index.css @@ -609,6 +609,17 @@ width: 620px!important; color: #dde4ff; margin: 0 20px; } +.apass_table .border-active td { + padding: 10px 0; + border-top: 2px solid #515fe7 !important; + border-bottom: 2px solid #515fe7 !important; +} +.apass_table .border-active td:first-child { + border-left: 2px solid #515fe7 !important; +} +.apass_table .border-active td:last-child { + border-right: 2px solid #515fe7 !important; +} .apass_checkbox .el-checkbox__input.is-checked .el-checkbox__inner, .apass_checkbox .el-checkbox__input.is-indeterminate .el-checkbox__inner { @@ -666,27 +677,27 @@ width: 620px!important; .apaas_detail_container .detail_action .el-button + .el-button { margin-left: 30px; } -.apaas_detail_container .detail_form { +.apaas_detail_form { max-width: 970px; } -.apaas_detail_container .detail_form .el-input__inner, -.apaas_detail_container .detail_form .el-textarea__inner { +.apaas_detail_form .el-input__inner, +.apaas_detail_form .el-textarea__inner { width: 100%; background-color: #f7f8f9; } -.apaas_detail_container .detail_form .el-select { +.apaas_detail_form .el-select { width: 100%; } -.apaas_detail_container .detail_form.el-form--label-top .el-form-item__label { +.apaas_detail_form.el-form--label-top .el-form-item__label { padding: 0 0 15px; font-size: 14px; line-height: 1; color: #58617a; } -.apaas_detail_container .detail_form .el-form-item { +.apaas_detail_form .el-form-item { margin-bottom: 30px; } -.apaas_detail_container .detail_form .textarea_count { +.apaas_detail_form .textarea_count { font-size: 14px; line-height: 1; color: #a9aec0; diff --git a/src/components/apass-table.vue b/src/components/apass-table.vue index 0ea06d12e70be858b06a42bd641f0900c5d76c7a..46802356fa45ef5026f82bb35bb11b69089af817 100644 --- a/src/components/apass-table.vue +++ b/src/components/apass-table.vue @@ -1,6 +1,11 @@ + + + + + + diff --git a/src/pages/message-management/banner/banner_add.vue b/src/pages/message-management/banner/banner-detail.vue similarity index 78% rename from src/pages/message-management/banner/banner_add.vue rename to src/pages/message-management/banner/banner-detail.vue index 19837df053d4c7bf99bd411f2cc225c3e1917de6..f420b9879461c3fdb389abe28f0de442e35f8957 100644 --- a/src/pages/message-management/banner/banner_add.vue +++ b/src/pages/message-management/banner/banner-detail.vue @@ -1,12 +1,12 @@ diff --git a/src/pages/message-management/banner/banner-list.vue b/src/pages/message-management/banner/banner-list.vue index 05c667d5e46dab96d33339b4b55e2884920b498f..8cf0e3ab17277f350595904b45484293282852a2 100644 --- a/src/pages/message-management/banner/banner-list.vue +++ b/src/pages/message-management/banner/banner-list.vue @@ -193,31 +193,31 @@ export default { { label: "编辑", callback: this.editAction, - disabledRule(item) { -              return item.state == 1; -            } + disabledRule(item) { + return item.state == 1; + }, }, { label: "上架", callback: this.upAction, - disabledRule(item) { -              return item.state == 1 || item.state == 3; -            } + disabledRule(item) { + return item.state == 1 || item.state == 3; + }, }, { label: "下架", callback: this.downAction, - disabledRule(item) { -              return item.state == 2 || item.state == 3; -            } + disabledRule(item) { + return item.state == 2 || item.state == 3; + }, }, { label: "删除", class: "warn", callback: this.deleteAction, - disabledRule(item) { -              return item.state == 1; -            } + disabledRule(item) { + return item.state == 1; + }, }, ], }, @@ -241,10 +241,10 @@ export default { page: filter.page, size: filter.size, state: filter.state, - up_time_s:fullFilter.up_time?fullFilter.up_time[0]:'', - up_time_e:fullFilter.up_time?fullFilter.up_time[1]:'', - down_time_s:fullFilter.down_time?fullFilter.down_time[0]:'', - down_time_e:fullFilter.down_time?fullFilter.down_time[1]:'' + up_time_s: fullFilter.up_time ? fullFilter.up_time[0] : "", + up_time_e: fullFilter.up_time ? fullFilter.up_time[1] : "", + down_time_s: fullFilter.down_time ? fullFilter.down_time[0] : "", + down_time_e: fullFilter.down_time ? fullFilter.down_time[1] : "", }, }) .then(({ data }) => { @@ -260,6 +260,11 @@ export default { }) .catch((error) => { console.log(error); + + this.$message({ + message: "获取列表失败", + type: "warning", + }); }); }, topFilterAction() { @@ -278,53 +283,72 @@ export default { showDialog() { this.$refs.dialog.show(); }, - detailAction(item){ - this.$router.push('/message/banner_detail?id='+item.serial_num) + detailAction(item) { + this.$router.push("/message/banner_detail?id=" + item.serial_num); }, addNew() { - console.log("新建模板"); - this.$router.push('/message/banner_add') + this.$router.push("/message/banner_add"); }, editAction(item) { - console.log(item); - this.$router.push('/message/banner_edit?id='+item.serial_num) + this.$router.push("/message/banner_edit?id=" + item.serial_num); }, upAction(item) { this.$http - .post("/apaas/service/v3/recommend/manage/banners/up",{ - serial_num:item.serial_num + .post("/apaas/service/v3/recommend/manage/banners/up", { + serial_num: item.serial_num, }) .then(({ data }) => { if (data.success == 1) { - this.$message.success('上架成功') - this.initList(this.tempFilter) + this.$message.success("上架成功"); + this.initList(this.tempFilter); + } else { + this.$message.warning("上架失败"); } }) + .catch((error) => { + console.log(error); + + this.$message.warning("上架失败"); + }); }, downAction(item) { this.$http - .post("/apaas/service/v3/recommend/manage/banners/down",{ - serial_num:item.serial_num + .post("/apaas/service/v3/recommend/manage/banners/down", { + serial_num: item.serial_num, }) .then(({ data }) => { if (data.success == 1) { - this.$message.success('下架成功') - this.initList(this.tempFilter) + this.$message.warning("下架成功"); + this.initList(this.tempFilter); + } else { + this.$message.warning("下架失败"); } }) + .catch((error) => { + console.log(error); + + this.$message.warning("下架失败"); + }); }, deleteAction(item) { // console.log(`删除${item.name}`); this.$http - .post("/apaas/service/v3/recommend/manage/banners/del",[item.serial_num]) + .post("/apaas/service/v3/recommend/manage/banners/del", [ + item.serial_num, + ]) .then(({ data }) => { if (data.success == 1) { - this.$message.success('删除成功') - this.initList(this.tempFilter) - }else{ - this.$message.error('删除失败') + this.$message.success("删除成功"); + this.initList(this.tempFilter); + } else { + this.$message.warning("删除失败"); } }) + .catch((error) => { + console.log(error); + + this.$message.warning("删除失败"); + }); }, }, }; diff --git a/src/pages/message-management/directed-push/directed-push-add.vue b/src/pages/message-management/directed-push/directed-push-add.vue index 844aac7c004e258f2193f29d29e04ec49afec95c..06d6d426daa22c3d045f6dd57ed22a74949277dc 100644 --- a/src/pages/message-management/directed-push/directed-push-add.vue +++ b/src/pages/message-management/directed-push/directed-push-add.vue @@ -131,13 +131,13 @@ export default { created() {}, methods: { selectService(values) { - this.serviceIds = values.map((item) => item.id).join(","); + this.serviceIds = values.map((item) => item.id).join(",") || ""; }, selectTemplate(value) { this.templateId = (value && value.id) || ""; }, selectTargetUser(values) { - this.targetUserIds = values.map((item) => item.user_id).join(",");; + this.targetUserIds = values.map((item) => item.id).join(",") || ""; }, backToList() { this.$router.push("/message/directed_push"); @@ -176,7 +176,34 @@ export default { return; } - this.done = true; + this.$http + .post("/apaas/service/v3/push/directmsg/create", { + service_id: this.serviceIds, + tpl_id: this.templateId, + receive_user: this.targetUserIds, + }) + .then(({ data }) => { + if (data.success == 1) { + this.$message({ + message: "创建成功", + type: "success", + }); + this.done = true; + } else { + this.$message({ + message: data.errMsg || "创建失败", + type: "warning", + }); + } + }) + .catch((error) => { + console.log(error); + + this.$message({ + message: "创建失败", + type: "warning", + }); + }); }, }, }; diff --git a/src/pages/message-management/message-template/message-template-detail.vue b/src/pages/message-management/message-template/message-template-detail.vue index cabca48f26a7c89424133d374623be9570abb0e0..6b65e416b75c64c83dea3b3ac03942999a0f28ee 100644 --- a/src/pages/message-management/message-template/message-template-detail.vue +++ b/src/pages/message-management/message-template/message-template-detail.vue @@ -17,7 +17,7 @@

diff --git a/src/router/index.js b/src/router/index.js index c2da89642f6f55bf156bef5ee8c7cd562695da69..c0599a55217b12f3ba2697041580eda5e974b3e7 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -422,17 +422,17 @@ export default new Router({ { path: "/message/banner_add", // benner新增 name: "banner_add", - component: () => import("@/pages/message-management/banner/banner_add"), + component: () => import("@/pages/message-management/banner/banner-detail"), }, { path: "/message/banner_edit", // benner编辑 name: "banner_edit", - component: () => import("@/pages/message-management/banner/banner_add"), + component: () => import("@/pages/message-management/banner/banner-detail"), }, { path: "/message/banner_detail", // benner详情 name: "banner_detail", - component: () => import("@/pages/message-management/banner/banner_add"), + component: () => import("@/pages/message-management/banner/banner-detail"), }, { path: "/message/message_template", // 消息模板列表