From 4b516bbb5c6f2006ca7e2538e82200f80a0c4531 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=B4=E6=98=8A=E5=A4=A9?= <442384644@qq.com> Date: Mon, 29 Aug 2022 18:13:00 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E6=A8=A1=E7=89=88=E7=9B=AE=E5=BD=95?= =?UTF-8?q?=E3=80=91=E6=9B=B4=E6=96=B0=E5=89=8D=E7=AB=AF=E6=A8=A1=E7=89=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- template/admin/.gitignore | 29 - .../admin/src/pages/order/refund/index.vue | 19 +- template/uni-app/api/user.js | 7 + template/uni-app/mixins/color.js | 1 - .../pages/goods/order_confirm/index.vue | 3441 +++++++++-------- .../pages/users/message_center/index.vue | 66 +- 6 files changed, 1806 insertions(+), 1757 deletions(-) delete mode 100644 template/admin/.gitignore diff --git a/template/admin/.gitignore b/template/admin/.gitignore deleted file mode 100644 index 75021760f..000000000 --- a/template/admin/.gitignore +++ /dev/null @@ -1,29 +0,0 @@ -.DS_Store -node_modules -/dist -.history -package-lock.json - -/tests/e2e/videos/ -/tests/e2e/screenshots/ - -# local env files -.env.local -.env.*.local - -# Log files -npm-debug.log* -yarn-debug.log* -yarn-error.log* - -# Editor directories and files -.idea -.vscode -*.suo -*.ntvs* -*.njsproj -*.sln -*.sw* - -build/env.js -.env diff --git a/template/admin/src/pages/order/refund/index.vue b/template/admin/src/pages/order/refund/index.vue index cc108b982..5b00a9222 100644 --- a/template/admin/src/pages/order/refund/index.vue +++ b/template/admin/src/pages/order/refund/index.vue @@ -217,6 +217,9 @@ 不退款 + 删除订单 @@ -481,20 +484,12 @@ export default { break; case '8': this.delfromData = { - title: '修改确认收货', - url: `/order/take/${row.id}`, - method: 'put', + title: '删除订单', + url: `/order/del/${row.store_order_id}`, + method: 'DELETE', ids: '', }; - this.$modalSure(this.delfromData) - .then((res) => { - this.$Message.success(res.msg); - this.getOrderList(); - }) - .catch((res) => { - this.$Message.error(res.msg); - }); - // this.modalTitleSs = '修改确认收货'; + this.delOrder(row, this.delfromData); break; case '10': this.delfromData = { diff --git a/template/uni-app/api/user.js b/template/uni-app/api/user.js index 8c00ae1ff..4fb752a27 100644 --- a/template/uni-app/api/user.js +++ b/template/uni-app/api/user.js @@ -585,6 +585,13 @@ export function getMsgDetails(id) { return request.get('user/message_system/detail/' + id); } +/** + * 消息中心-消息已读/删除 + */ +export function msgLookDel(data) { + return request.get('user/message_system/edit_message', data); +} + /** * 苹果账号登录 * @param {Object} data diff --git a/template/uni-app/mixins/color.js b/template/uni-app/mixins/color.js index 0d05935a1..94a2b4ee2 100644 --- a/template/uni-app/mixins/color.js +++ b/template/uni-app/mixins/color.js @@ -18,7 +18,6 @@ export default { created() { this.colorStyle = uni.getStorageSync('viewColor') uni.$on('ok', (data, status) => { - console.log(status) this.colorStyle = data this.colorStatus = status }) diff --git a/template/uni-app/pages/goods/order_confirm/index.vue b/template/uni-app/pages/goods/order_confirm/index.vue index 4ff4424dd..241fa6ae5 100644 --- a/template/uni-app/pages/goods/order_confirm/index.vue +++ b/template/uni-app/pages/goods/order_confirm/index.vue @@ -1,1705 +1,1738 @@ - - - - diff --git a/template/uni-app/pages/users/message_center/index.vue b/template/uni-app/pages/users/message_center/index.vue index d8afa74f4..bd4936106 100644 --- a/template/uni-app/pages/users/message_center/index.vue +++ b/template/uni-app/pages/users/message_center/index.vue @@ -7,7 +7,7 @@ {{$t(item.name)}} - + 全部已读 @@ -75,7 +75,8 @@