From a6ae5ee5fd461dceae887631bd29e9245a4600f1 Mon Sep 17 00:00:00 2001 From: "@fawn-nine" <1271023382@qq.com> Date: Thu, 18 May 2023 13:26:22 +0800 Subject: [PATCH] =?UTF-8?q?ios=E5=85=85=E5=80=BC=E5=BC=82=E5=B8=B8?= =?UTF-8?q?=E8=AE=A2=E5=8D=95=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/index.js | 2 +- src/router/index.js | 6 +- .../activity/activity-add-or-update.vue | 9 +- src/views/modules/order/buyorder.vue | 65 ++++--- src/views/modules/order/order-errorpay.vue | 166 ++++++++++++++++++ .../modules/order/orderdeliver-split.vue | 2 +- static/img/oder_chong.png | Bin 0 -> 8418 bytes static/img/oder_vip.png | Bin 0 -> 7370 bytes 8 files changed, 221 insertions(+), 29 deletions(-) create mode 100644 src/views/modules/order/order-errorpay.vue create mode 100644 static/img/oder_chong.png create mode 100644 static/img/oder_vip.png diff --git a/config/index.js b/config/index.js index de5e36b..2567183 100644 --- a/config/index.js +++ b/config/index.js @@ -23,7 +23,7 @@ module.exports = { }, // Various Dev Server settings - host: '192.168.110.157', // can be overwritten by process.env.HOST + host: '192.168.110.159', // can be overwritten by process.env.HOST port: 8001, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined autoOpenBrowser: true, errorOverlay: true, diff --git a/src/router/index.js b/src/router/index.js index cefb5f2..bcb9e87 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -45,8 +45,10 @@ const mainRoutes = { { path: '/buyorder-mergeorder', component: _import('modules/order/buyorder-mergeorder'), name: 'buyorder-mergeorder', meta: { title: '合并发货', isTab: true } }, { path: '/buyorder-print', component: _import('modules/order/buyorder-print'), name: 'buyorder-print', meta: { title: '打印面单', isTab: true } }, { path: '/activity-list', component: _import('modules/activity/activityList'), name: 'activity-list', meta: { title: '活动列表', isTab: true } }, - { path: '/user-point-memery', component: _import('modules/user/user-point-memery'), name: 'user-point-memery', meta: { title: '充/扣记录', isTab: true } }, - { path: '/xieyi_list', component: _import('modules/xieyi/xieyi'), name: 'xieyi_list', meta: { title: '协议管理', isTab: true } }, + { path: '/user-point-memery', component: _import('modules/user/user-point-memery'), name: 'user-point-memery', meta: { title: '充/扣记录', isTab: true } }, + { path: '/order-epay', component: _import('modules/order/order-errorpay'), name: 'order-epay', meta: { title: '充值异常列表', isTab: true } }, + { path: '/xieyi_list', component: _import('modules/xieyi/xieyi'), name: 'xieyi_list', meta: { title: '协议管理', isTab: true } }, + ], beforeEnter (to, from, next) { let token = Vue.cookie.get('token') diff --git a/src/views/modules/activity/activity-add-or-update.vue b/src/views/modules/activity/activity-add-or-update.vue index 7616d7c..20fa314 100644 --- a/src/views/modules/activity/activity-add-or-update.vue +++ b/src/views/modules/activity/activity-add-or-update.vue @@ -239,7 +239,7 @@