v1.1

1、提货点
2、客服(腾讯云智服)
3、接口权限控制
4、复制第三方商品可配置
4、优化附件上传配置
5、手机端核销订单
6、手机端订单统计、订单管理
7、短信优化
8、订阅消息全自动化

admin/src/router/index.js

@@ -18,7 +18,7 @@ import contentRouter from './modules/content'
 import operationRouter from './modules/operation'
 import appSettingRouter from './modules/appSetting'
 import maintainRouter from './modules/maintain'
-
+import mobileRouter from './modules/mobile'
 
 
 /**
@@ -68,6 +68,8 @@ export const constantRoutes = [
   appSettingRouter,
   // 维护
   maintainRouter,
+  //移动端管理
+  mobileRouter,
   // 数据
   {
     path: '/datas',
@@ -192,6 +194,11 @@ export const constantRoutes = [
       }
     ]
   },
+  {
+    path: '/auth-send',
+    component: () => import('@/views/mobile/auth-send'),
+    hidden: true
+  },
   {
     path: '/login',
     component: () => import('@/views/login/index'),

admin/src/router/modules/appSetting.js

@@ -84,9 +84,22 @@ const appSettingRouter = {
       children: [
         {
           path: 'routineTemplate',
-          component: () => import('@/views/appSetting/wxAccount/wxTemplate'),
+          component: () => import('@/views/appSetting/routine/myTemplate'),
           name: 'RoutineTemplate',
-          meta: { title: '小程序订阅消息', icon: '' }
+          meta: { title: '我的模板', icon: '' }
+        },
+        {
+          path: 'publicRoutineTemplate',
+          component: () => import('@/views/appSetting/routine/publicTemplate/index.vue'),
+          name: 'PublicRoutineTemplate',
+          meta: { title: '公共模板', icon: '' }
+        },
+        {
+          path: 'creatPublicTemplate/:tid/:id/:myId?',
+          component: () => import('@/views/appSetting/routine/publicTemplate/creatPublicTemplate.vue'),
+          name: 'CreatPublicTemplate',
+          meta: { title: '添加公共模板', icon: '', activeMenu: `/appSetting/publicRoutine/publicRoutineTemplate` },
+          hidden: true
         }
       ]
     }

admin/src/router/modules/mobile.js

@@ -0,0 +1,53 @@
+import Layout from '@/layout'
+
+const mobileRouter = {
+  path: '/javaMobile',
+  component: Layout,
+  redirect: '/javaMobile/index',
+  name: 'Mobile',
+  alwaysShow: true,
+  meta: {
+    title: '移动端',
+    icon: 'clipboard'
+  },
+  children: [
+    {
+      path: 'orderCancellation',
+      component: () => import('@/views/mobile/orderCancellation/index.vue'),
+      name: 'OrderCancellation',
+      meta: { title: '订单核销', icon: '' }
+    },
+    {
+      path: 'orderStatistics',
+      component: () => import('@/views/mobile/orderStatistics/index.vue'),
+      name: 'OrderStatistics',
+      meta: { title: '订单统计' }
+    },
+    {
+      path: 'orderList/:types?',
+      component: () => import('@/views/mobile/orderStatistics/orderList.vue'),
+      name: 'OrderList',
+      meta: { title: '订单列表' }
+    },
+    {
+      path: 'orderDelivery/:oid/:id?',
+      component: () => import('@/views/mobile/orderStatistics/orderDelivery.vue'),
+      name: 'OrderDelivery',
+      meta: { title: '订单发货' }
+    },
+    {
+      path: 'orderDetail/:id?/:goname?',
+      component: () => import('@/views/mobile/orderStatistics/orderDetail.vue'),
+      name: 'OrderDetail',
+      meta: { title: '订单详情' }
+    },
+    {
+      path: 'orderStatisticsDetail/:type/:time?',
+      component: () => import('@/views/mobile/orderStatistics/Statistics.vue'),
+      name: 'OrderStatistics',
+      meta: { title: '订单数据统计' }
+    }
+  ]
+}
+
+export default mobileRouter

admin/src/router/modules/operation.js

@@ -156,6 +156,30 @@ const operationRouter = {
         }
       ]
     },
+    {
+      path: 'storeService',
+      component: () => import('@/views/systemSetting/storeService'),
+      name: 'StoreService',
+      meta: {
+        title: '客服管理',
+        icon: 'clipboard',
+        roles: ['admin']
+      },
+      children: [
+        {
+          path: 'list',
+          component: () => import('@/views/systemSetting/storeService/chatRoom'),
+          name: 'StoreServiceList',
+          meta: { title: '客服列表', noCache: true }
+        },
+        {
+          path: 'chatRoom',
+          component: () => import('@/views/systemSetting/storeService/list'),
+          name: 'ChatRoom',
+          meta: { title: '聊天室', noCache: true }
+        }
+      ]
+    },
   ]
 }
 

admin/src/router/modules/order.js

@@ -16,6 +16,36 @@ const orderRouter = {
       component: () => import('@/views/order/index'),
       name: 'OrderIndex',
       meta: { title: '订单管理' }
+    },
+    {
+      path: 'statistics',
+      component: () => import('@/views/mobile/orderStatistics/index.vue'),
+      name: 'OrderStatistics',
+      meta: { title: '订单统计' }
+    },
+    {
+      path: 'orderList/:types?',
+      component: () => import('@/views/mobile/orderStatistics/orderList.vue'),
+      name: 'OrderList',
+      meta: { title: '订单列表' }
+    },
+    {
+      path: 'orderDelivery/:oid/:id?',
+      component: () => import('@/views/mobile/orderStatistics/orderDelivery.vue'),
+      name: 'OrderDelivery',
+      meta: { title: '订单发货' }
+    },
+    {
+      path: 'orderDetail/:id?/:goname?',
+      component: () => import('@/views/mobile/orderStatistics/orderDetail.vue'),
+      name: 'OrderDetail',
+      meta: { title: '订单详情' }
+    },
+    {
+      path: 'orderStatistics/:type/:time?',
+      component: () => import('@/views/mobile/orderStatistics/Statistics.vue'),
+      name: 'OrderStatistics',
+      meta: { title: '订单数据统计' }
     }
   ]
 }