@@ -40,7 +40,7 @@ export default {
this.page = this.$route.meta.page
},
computed: {
- ...mapState('setting', ['layout']),
+ ...mapState('setting', ['layout', 'multiPage']),
pageTitle() {
let pageTitle = this.page && this.page.title
return this.title || this.$t(pageTitle) || this.routeName
@@ -79,7 +79,7 @@ export default {
diff --git a/src/pages/components/TaskCard.vue b/src/pages/components/TaskCard.vue
deleted file mode 100644
index bcd655c..0000000
--- a/src/pages/components/TaskCard.vue
+++ /dev/null
@@ -1,50 +0,0 @@
-
-
-
-
-
- {{$t('all')}}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/pages/dashboard/workplace/i18n.js b/src/pages/dashboard/workplace/i18n.js
deleted file mode 100644
index b3115d4..0000000
--- a/src/pages/dashboard/workplace/i18n.js
+++ /dev/null
@@ -1,40 +0,0 @@
-module.exports = {
- messages: {
- CN: {
- project: '项目数',
- ranking: '团队排名',
- visit: '项目访问',
- progress: '进行中的项目',
- all: '全部项目',
- access: '快速开始/便捷导航',
- dynamic: '动态',
- degree: '指数',
- team: '团队',
- add: '添加'
- },
- HK: {
- project: '項目數',
- ranking: '團隊排名',
- visit: '項目訪問',
- progress: '進行中的項目',
- all: '全部項目',
- access: '快速開始/便捷導航',
- dynamic: '動態',
- degree: '指數',
- team: '團隊',
- add: '添加'
- },
- US: {
- project: 'Project',
- ranking: 'Ranking',
- visit: 'Visit',
- progress: 'Projects in progress',
- all: 'All projects',
- access: 'Quick start / Easy navigation',
- dynamic: 'Dynamic',
- degree: 'degree',
- team: 'Team',
- add: 'Add'
- },
- }
-}
diff --git a/src/pages/dashboard/workplace/index.less b/src/pages/dashboard/workplace/index.less
deleted file mode 100644
index c684c26..0000000
--- a/src/pages/dashboard/workplace/index.less
+++ /dev/null
@@ -1,59 +0,0 @@
-.project-list {
- .card-title {
- span{
- vertical-align: middle;
- &:last-child{
- margin-left: 12px;
- }
- }
- }
- .project-item {
- display: flex;
- justify-content: space-between;
- margin-top: 8px;
- overflow: hidden;
- font-size: 12px;
- color: inherit;
- .group{
- color: @text-color;
- flex: 1 1 0;
- &:hover {
- color: @primary-color;
- }
- }
- .datetime {
- color: @text-color-second;
- flex: 0 0 auto;
- }
- }
- .ant-card-meta-description {
- height: 44px;
- line-height: 22px;
- overflow: hidden;
- }
-}
-.item-group{
- padding: 20px 0 8px 24px;
- font-size: 0;
- a{
- color: inherit;
- display: inline-block;
- font-size: 14px;
- margin-bottom: 13px;
- width: 25%;
- }
-}
-.members {
- a {
- display: block;
- margin: 12px 0;
- color: @text-color;
- &:hover {
- color: @primary-color;
- }
- .member {
- vertical-align: middle;
- margin-left: 12px;
- }
- }
-}
diff --git a/src/pages/demo/Demo.vue b/src/pages/demo/Demo.vue
new file mode 100644
index 0000000..ba2aa2b
--- /dev/null
+++ b/src/pages/demo/Demo.vue
@@ -0,0 +1,26 @@
+
+
-
- 曲丽丽
- XX服务
- 2018-08-07
- 12421
- 2018-08-07 ~ 2018-12-11
- 请于两个工作日内确认
-
-
-
- 操作
- 操作
-
- 主操作
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 付晓晓
- 32943898021309809423
- 3321944288191034921
- 18112345678
- 浙江省杭州市西湖区黄姑山路工专路交叉路口
-
-
- 725
- 2018-08-08
-
- 725
- 2018-08-08
-
-
-
-
- 林东东
- 1234567
- XX公司-YY部
- 2018-08-08
- 这段描述很长很长很长很长很长很长很长很长很长很长很长很长很长很长...
-
-
- 林东东
- 1234567
- XX公司-YY部
- 2018-08-08
- 这段描述很长很长很长很长很长很长很长很长很长很长很长很长很长很长...
-
-
- 林东东
- 1234567
- XX公司-YY部
- 2018-08-08
- 这段描述很长很长很长很长很长很长很长很长很长很长很长很长很长很长...
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/pages/detail/BasicDetail.vue b/src/pages/detail/BasicDetail.vue
deleted file mode 100644
index 67ca385..0000000
--- a/src/pages/detail/BasicDetail.vue
+++ /dev/null
@@ -1,208 +0,0 @@
-
-
-
-
- 1000000000
- 已取货
- 987654321
- 1234567890
-
-
- 付小小
- 18100000001
- 菜鸟仓储
- 浙江省杭州市西湖区万塘路19号
- 无
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/pages/exception/403.vue b/src/pages/exception/403.vue
index 11de88c..ca8fae0 100644
--- a/src/pages/exception/403.vue
+++ b/src/pages/exception/403.vue
@@ -1,5 +1,5 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
- 王同学
- 李同学
- 黄同学
-
-
-
-
-
-
-
-
- 王晓丽
- 李军
-
-
-
-
-
-
-
-
-
-
- 公开
- 私密
-
-
-
-
-
- Submit
-
-
-
-
-
-
-
diff --git a/src/pages/form/advance/TaskForm.vue b/src/pages/form/advance/TaskForm.vue
deleted file mode 100644
index 3200c73..0000000
--- a/src/pages/form/advance/TaskForm.vue
+++ /dev/null
@@ -1,110 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 黄丽丽
- 李大刀
-
-
-
-
-
-
-
-
- 王伟
- 李红军
-
-
-
-
-
-
-
-
-
-
- 定时执行
- 周期执行
-
-
-
-
-
- Submit
-
-
-
-
-
-
-
diff --git a/src/pages/form/advance/UserForm.vue b/src/pages/form/advance/UserForm.vue
deleted file mode 100644
index 50daa63..0000000
--- a/src/pages/form/advance/UserForm.vue
+++ /dev/null
@@ -1,167 +0,0 @@
-
-
-
-
-
-
-
diff --git a/src/pages/form/advance/i18n-repository.js b/src/pages/form/advance/i18n-repository.js
deleted file mode 100644
index cc01ee3..0000000
--- a/src/pages/form/advance/i18n-repository.js
+++ /dev/null
@@ -1,34 +0,0 @@
-module.exports = {
- messages: {
- CN: {
- input: '请输入',
- select: '请选择',
- name: '仓库名',
- domain: '仓库域名',
- manager: '仓库管理员',
- approval: '审批人员',
- date: '生效日期',
- type: '仓库类型'
- },
- HK: {
- input: '請輸入',
- select: '請選擇',
- name: '倉庫名',
- domain: '倉庫域名',
- manager: '倉庫管理員',
- approval: '審批人員',
- date: '生效日期',
- type: '倉庫類型',
- },
- US: {
- input: 'Please enter',
- select: 'Please select',
- name: 'Repository Name',
- domain: 'Repository Domain',
- manager: 'Repository Manager',
- approval: 'Approval Person',
- date: 'Effective Date',
- type: 'Repository Type',
- }
- }
-}
diff --git a/src/pages/form/advance/i18n-task.js b/src/pages/form/advance/i18n-task.js
deleted file mode 100644
index 56ea836..0000000
--- a/src/pages/form/advance/i18n-task.js
+++ /dev/null
@@ -1,34 +0,0 @@
-module.exports = {
- messages: {
- CN: {
- input: '请输入',
- select: '请选择',
- name: '任务名',
- describe: '任务描述',
- executor: '执行人',
- duty: '责任人',
- time: '提醒时间',
- type: '任务类型',
- },
- HK: {
- input: '請輸入',
- select: '請選擇',
- name: '任務名',
- describe: '任務描述',
- executor: '執行人',
- duty: '責任人',
- time: '提醒時間',
- type: '任務類型',
- },
- US: {
- input: 'Please enter',
- select: 'Please select',
- name: 'Task Name',
- describe: 'Task Describe',
- executor: 'Executor',
- duty: 'Duty Person',
- time: 'Reminder Time',
- type: 'Task Type',
- }
- }
-}
diff --git a/src/pages/form/advance/i18n-user.js b/src/pages/form/advance/i18n-user.js
deleted file mode 100644
index eec8d10..0000000
--- a/src/pages/form/advance/i18n-user.js
+++ /dev/null
@@ -1,49 +0,0 @@
-module.exports = {
- messages: {
- CN: {
- add: '添加',
- delete: '删除',
- save: '保存',
- cancel: '取消',
- edit: '编辑',
- deleteConfirm: '是否要删除此行？',
- newMember: '新增成员',
- table: {
- name: '成员姓名',
- number: '工号',
- department: '所属部门',
- operation: '操作',
- }
- },
- HK: {
- add: '添加',
- delete: '刪除',
- save: '保存',
- cancel: '取消',
- edit: '編輯',
- deleteConfirm: '是否要刪除此行？',
- newMember: '新增成員',
- table: {
- name: '成員姓名',
- number: '工號',
- department: '所屬部門',
- operation: '操作',
- }
- },
- US: {
- add: 'add',
- delete: 'delete',
- save: 'save',
- cancel: 'cancel',
- edit: 'edit',
- deleteConfirm: 'Confirm to delete this row?',
- newMember: 'new member',
- table: {
- name: 'Member Name',
- number: 'Job Number',
- department: 'Department',
- operation: 'Operation',
- }
- }
- }
-}
diff --git a/src/pages/form/advance/i18n.js b/src/pages/form/advance/i18n.js
deleted file mode 100644
index 87ba584..0000000
--- a/src/pages/form/advance/i18n.js
+++ /dev/null
@@ -1,25 +0,0 @@
-module.exports = {
- messages: {
- CN: {
- desc: '高级表单常见于一次性输入和提交大批量数据的场景。',
- repository: '仓库管理',
- task: '任务管理',
- user: '用户管理',
- submit: '提交'
- },
- HK: {
- desc: '高級表單常見於一次性輸入和提交大批量數據的場景。',
- repository: '倉庫管理',
- task: '任務管理',
- user: '用戶管理',
- submit: '提交'
- },
- US: {
- desc: 'Advanced forms are common in scenarios where large quantities of data are entered and submitted at one time.',
- repository: 'Repository Manage',
- task: 'Task Manage',
- user: 'User Manage',
- submit: 'submit'
- }
- }
-}
diff --git a/src/pages/form/basic/BasicForm.vue b/src/pages/form/basic/BasicForm.vue
deleted file mode 100644
index 299dbe9..0000000
--- a/src/pages/form/basic/BasicForm.vue
+++ /dev/null
@@ -1,102 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{$t('public')}}
- {{$t('partially')}}
- {{$t('private')}}
-
-
- {{$t('colleague1')}}
- {{$t('colleague2')}}
- {{$t('colleague3')}}
-
-
-
- {{$t('submit')}}
- {{$t('save')}}
-
-
-
-
-
-
-
-
diff --git a/src/pages/form/basic/i18n.js b/src/pages/form/basic/i18n.js
deleted file mode 100644
index e01fcda..0000000
--- a/src/pages/form/basic/i18n.js
+++ /dev/null
@@ -1,79 +0,0 @@
-module.exports = {
- messages: {
- CN: {
- pageDesc: '表单页用于向用户收集或验证信息，基础表单常见于数据项较少的表单场景。',
- title: '标题',
- titleInput: '给目标起个名字',
- date: '起止日期',
- describe: '目标描述',
- describeInput: '请输入你阶段性工作目标',
- metrics: '衡量标准',
- metricsInput: '请输入衡量标准',
- customer: '客户',
- customerInput: '请描述你服务的客户，内部客户直接 @姓名／工号',
- critics: '邀评人',
- criticsInput: '请直接 @姓名／工号，最多可邀请 5 人',
- weight: '权重',
- disclosure: '目标公开',
- disclosureDesc: '客户、邀评人默认被分享',
- public: '公开',
- partially: '部分公开',
- private: '不公开',
- submit: '提交',
- save: '保存',
- colleague1: '同事甲',
- colleague2: '同事乙',
- colleague3: '同事丙'
- },
- HK: {
- pageDesc: '表單頁用於向用戶收集或驗證信息，基礎表單常見於數據項較少的表單場景。',
- title: '標題',
- titleInput: '給目標起個名字',
- date: '起止日期',
- describe: '目標描述',
- describeInput: '請輸入你階段性的工作目標',
- metrics: '衡量標準',
- metricsInput: '請輸入衡量標準',
- customer: '客戶',
- customerInput: '請描述你服務的客戶，內部客戶直接 @姓名／工號',
- critics: '邀評人',
- criticsInput: '請直接 @姓名／工號，最多可邀請 5 人',
- weight: '圈中人',
- disclosure: '目標公開',
- disclosureDesc: '客戶、邀評人默認被分享',
- public: '公開',
- partially: '部分公開',
- private: '不公開',
- submit: '提交',
- save: '保存',
- colleague1: '同事甲',
- colleague2: '同事乙',
- colleague3: '同事丙'
- },
- US: {
- pageDesc: 'Form pages are used to collect or verify information to users, and basic forms are common in scenarios where there are fewer data items.',
- title: 'Title',
- titleInput: 'Give the target a name',
- date: 'Start and end date',
- describe: 'Goal description',
- describeInput: 'Please enter your work goals',
- metrics: 'Metrics',
- metricsInput: 'Please enter a metric',
- customer: 'Customer',
- customerInput: 'Please describe your customer service, internal customers directly @ Name / job number',
- critics: 'Inviting critics',
- criticsInput: 'Please direct @ Name / job number, you can invite up to 5 people',
- weight: 'Weight',
- disclosure: 'Target disclosure',
- disclosureDesc: 'Customers and invitees are shared by default',
- public: 'Public',
- partially: 'Partially public',
- private: 'Private',
- submit: 'Submit',
- save: 'Save',
- colleague1: 'Colleague A',
- colleague2: 'Colleague B',
- colleague3: 'Colleague C'
- }
- }
-}
diff --git a/src/pages/form/step/Step1.vue b/src/pages/form/step/Step1.vue
deleted file mode 100644
index ca6822a..0000000
--- a/src/pages/form/step/Step1.vue
+++ /dev/null
@@ -1,61 +0,0 @@
-
-
-
-
-
-
-
-
-
-
diff --git a/src/pages/form/step/i18n.js b/src/pages/form/step/i18n.js
deleted file mode 100644
index 2fd854b..0000000
--- a/src/pages/form/step/i18n.js
+++ /dev/null
@@ -1,61 +0,0 @@
-module.exports = {
- messages: {
- CN: {
- pageDesc: '将一个冗长或用户不熟悉的表单任务分成多个步骤，指导用户完成。',
- input: '请填写转账信息',
- confirm: '确认转账信息',
- complete: '完成',
- payment: '付款账户',
- collection: '收款账户',
- alipay: '支付宝',
- wechat: '微信',
- collectionName: '收款人姓名',
- transferAmount: '转账金额',
- nextStep: '下一步',
- preStep: '上一步',
- submit: '提交',
- note: '确认转账后，资金将直接打入对方账户，无法退回。',
- success: '支付完成',
- doAgain: '再转一笔',
- bill: '查看账单'
- },
- HK: {
- pageDesc: '將一個冗長或用戶不熟悉的表單任務分成多個步驟，指導用戶完成。',
- input: '請填寫轉賬信息',
- confirm: '確認轉賬信息',
- complete: '完成',
- payment: '付款賬戶',
- collection: '收款賬戶',
- alipay: '支付寶',
- wechat: '微信',
- collectionName: '收款人姓名',
- transferAmount: '裝張金額',
- nextStep: '下一步',
- preStep: '上一步',
- submit: '提交',
- note: '確認轉賬後，現金將直接打入對方賬戶，無法退回。',
- success: '支付完成',
- doAgain: '再轉一筆',
- bill: '查看賬單'
- },
- US: {
- pageDesc: 'Divide a long or unfamiliar form task into several steps to guide the user to complete it.',
- input: 'Fill transfer information',
- confirm: 'Confirm transfer information',
- complete: 'Complete',
- payment: 'Payment account',
- collection: 'Collection account',
- alipay: 'Alipay',
- wechat: 'Wechat',
- collectionName: 'Name of payee',
- transferAmount: 'Transfer amount',
- nextStep: 'Next',
- preStep: 'Back',
- submit: 'Submit',
- note: 'After confirming the transfer, the funds will be directly transferred into the other party\'s account and cannot be returned.',
- success: 'Payment successful',
- doAgain: 'Do Again',
- bill: 'Check the bill'
- }
- }
-}
\ No newline at end of file
diff --git a/src/pages/list/CardList.vue b/src/pages/list/CardList.vue
deleted file mode 100644
index d1f3096..0000000
--- a/src/pages/list/CardList.vue
+++ /dev/null
@@ -1,80 +0,0 @@
-
-
-
-
-
-
-
diff --git a/src/pages/list/QueryList.vue b/src/pages/list/QueryList.vue
deleted file mode 100644
index 20f48b1..0000000
--- a/src/pages/list/QueryList.vue
+++ /dev/null
@@ -1,217 +0,0 @@
-
-
-
-
-
-
-
-
diff --git a/src/pages/list/StandardList.vue b/src/pages/list/StandardList.vue
deleted file mode 100644
index fe00ff1..0000000
--- a/src/pages/list/StandardList.vue
+++ /dev/null
@@ -1,86 +0,0 @@
-
-
-
-
-
-
- 类目一
- 类目二
- 类目三
- 类目四
- 类目五
- 类目六
- 类目七
- 类目八
- 类目九
- 类目十
- 类目十一
- 类目十二
- 类目十三
- 类目十四
- 类目十五
- 类目十六
-
-
-
-
-
-
- 我自己
- 吴家豪
- 周星星
- 李宁
-
-
- 只看自己的
-
-
-
-
-
-
- 周星星
-
-
-
-
-
-
- 优秀
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/pages/list/search/SearchLayout.vue b/src/pages/list/search/SearchLayout.vue
deleted file mode 100644
index 82cd728..0000000
--- a/src/pages/list/search/SearchLayout.vue
+++ /dev/null
@@ -1,69 +0,0 @@
-
-
-
-
- 返回修改
-
-
-
-
-
-
-
-
-
diff --git a/src/pages/result/Success.vue b/src/pages/result/Success.vue
deleted file mode 100644
index 4075e0a..0000000
--- a/src/pages/result/Success.vue
+++ /dev/null
@@ -1,76 +0,0 @@
-
-
-
-
- 返回列表
- 查看项目
- 打印
-
-
-
-
-
-
-
-
diff --git a/src/router/config.js b/src/router/config.js
new file mode 100644
index 0000000..d01eb62
--- /dev/null
+++ b/src/router/config.js
@@ -0,0 +1,106 @@
+import Login from '@/pages/login/Login'
+import TabsView from '@/layouts/tabs/TabsView'
+import BlankView from '@/layouts/BlankView'
+import PageView from '@/layouts/PageView'
+
+const options = {
+ routes: [
+ {
+ path: '/login',
+ name: '登录页',
+ component: Login
+ },
+ {
+ path: '*',
+ name: '404',
+ component: () => import('@/pages/exception/404'),
+ },
+ {
+ path: '/',
+ name: '首页',
+ component: TabsView,
+ redirect: '/login',
+ children: [
+ {
+ path: 'demo',
+ name: '演示页0',
+ meta: {
+ icon: 'file-ppt'
+ },
+ component: () => import('@/pages/demo')
+ },
+ {
+ path: 'parent1',
+ name: '父级路由1',
+ meta: {
+ icon: 'dashboard'
+ },
+ component: BlankView,
+ children: [
+ {
+ path: 'demo1',
+ name: '演示页面1',
+ component: () => import('@/pages/demo'),
+ }
+ ]
+ },
+ {
+ path: 'parent2',
+ name: '父级路由2',
+ meta: {
+ icon: 'form'
+ },
+ component: PageView,
+ children: [
+ {
+ path: 'demo2',
+ name: '演示页面2',
+ component: () => import('@/pages/demo'),
+ }
+ ]
+ },
+ {
+ path: 'exception',
+ name: '异常页',
+ meta: {
+ icon: 'warning',
+ },
+ component: BlankView,
+ children: [
+ {
+ path: '404',
+ name: '404',
+ component: () => import('@/pages/exception/404')
+ },
+ {
+ path: '403',
+ name: '403',
+ component: () => import('@/pages/exception/403')
+ },
+ {
+ path: '500',
+ name: '500',
+ component: () => import('@/pages/exception/500')
+ }
+ ]
+ },
+ ]
+ }
+ ]
+}
+
+// 不需要登录拦截的路由配置
+const loginIgnore = {
+ names: ['404'], //根据路由名称匹配
+ paths: ['/login'], //根据路由fullPath匹配
+ /**
+ * 判断路由是否包含在该配置中
+ * @param route vue-router 的 route 对象
+ * @returns {boolean}
+ */
+ includes(route) {
+ return this.names.includes(route.name) || this.paths.includes(route.path)
+ }
+}
+
+export {options, loginIgnore}
\ No newline at end of file
diff --git a/src/router/index.js b/src/router/index.js
index 8938b5c..fa07945 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -1,211 +1,15 @@
import Vue from 'vue'
-import {checkAuthorization} from '@/utils/request'
import Router from 'vue-router'
-import PageView from '@/layouts/PageView'
-import BlankView from '@/layouts/BlankView'
-import TabsView from '@/layouts/tabs/TabsView'
-import Login from '@/pages/login/Login'
+import {checkAuthorization} from '@/utils/request'
+import {options, loginIgnore} from './config'
Vue.use(Router)
-const router = new Router({
- routes: [
- {
- path: '/login',
- name: '登录页',
- component: Login
- },
- {
- path: '/',
- name: '首页',
- component: TabsView,
- redirect: '/login',
- children: [
- {
- path: 'dashboard',
- name: 'Dashboard',
- meta: {
- icon: 'dashboard'
- },
- component: BlankView,
- children: [
- {
- path: 'workplace',
- name: '工作台',
- component: () => import('@/pages/dashboard/workplace/WorkPlace'),
- },
- {
- path: 'analysis',
- name: '分析页',
- component: () => import('@/pages/dashboard/analysis/Analysis'),
- }
- ]
- },
- {
- path: 'form',
- name: '表单页',
- meta: {
- icon: 'form',
- },
- component: PageView,
- children: [
- {
- path: 'basic',
- name: '基础表单',
- component: () => import('@/pages/form/basic/BasicForm'),
- },
- {
- path: 'step',
- name: '分步表单',
- component: () => import('@/pages/form/step/StepForm'),
- },
- {
- path: 'advance',
- name: '高级表单',
- component: () => import('@/pages/form/advance/AdvancedForm'),
- }
- ]
- },
- {
- path: 'list',
- name: '列表页',
- meta: {
- icon: 'table'
- },
- component: PageView,
- children: [
- {
- path: 'query',
- name: '查询表格',
- component: () => import('@/pages/list/QueryList'),
- },
- {
- path: 'primary',
- name: '标准列表',
- component: () => import('@/pages/list/StandardList'),
- },
- {
- path: 'card',
- name: '卡片列表',
- component: () => import('@/pages/list/CardList'),
- },
- {
- path: 'search',
- name: '搜索列表',
- component: () => import('@/pages/list/search/SearchLayout'),
- children: [
- {
- path: 'article',
- name: '文章',
- component: () => import('@/pages/list/search/ArticleList'),
- },
- {
- path: 'application',
- name: '应用',
- component: () => import('@/pages/list/search/ApplicationList'),
- },
- {
- path: 'project',
- name: '项目',
- component: () => import('@/pages/list/search/ProjectList'),
- }
- ]
- }
- ]
- },
- {
- path: 'details',
- name: '详情页',
- meta: {
- icon: 'profile'
- },
- component: BlankView,
- children: [
- {
- path: 'basic',
- name: '基础详情页',
- component: () => import('@/pages/detail/BasicDetail')
- },
- {
- path: 'advance',
- name: '高级详情页',
- component: () => import('@/pages/detail/AdvancedDetail')
- }
- ]
- },
- {
- path: 'result',
- name: '结果页',
- meta: {
- icon: 'check-circle-o',
- },
- component: PageView,
- children: [
- {
- path: 'success',
- name: '成功',
- component: () => import('@/pages/result/Success')
- },
- {
- path: 'error',
- name: '失败',
- component: () => import('@/pages/result/Error')
- }
- ]
- },
- {
- path: 'exception',
- name: '异常页',
- meta: {
- icon: 'warning',
- },
- component: BlankView,
- children: [
- {
- path: '404',
- name: '404',
- component: () => import('@/pages/exception/404')
- },
- {
- path: '403',
- name: '403',
- component: () => import('@/pages/exception/403')
- },
- {
- path: '500',
- name: '500',
- component: () => import('@/pages/exception/500')
- }
- ]
- },
- {
- path: 'components',
- name: '小组件',
- meta: {
- icon: 'appstore-o'
- },
- component: PageView,
- children: [
- {
- path: 'taskCard',
- name: '任务卡片',
- component: () => import('@/pages/components/TaskCard')
- },
- {
- path: 'palette',
- name: '颜色复选框',
- component: () => import('@/pages/components/Palette')
- }
- ]
- }
- ]
- }
- ]
-})
+const router = new Router(options)
// 登录拦截
router.beforeEach((to, from, next) => {
- if (to.path !== '/login' && !checkAuthorization()) {
+ if (!loginIgnore.includes(to) && !checkAuthorization()) {
next({path: '/login'})
} else {
next()
diff --git a/src/store/index.js b/src/store/index.js
index 5d7521e..5c89750 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -1,19 +1,13 @@
import Vue from 'vue'
import Vuex from 'vuex'
-import account from './modules/account'
-import setting from './modules/setting'
+import modules from './modules'
import PouchDB from 'pouchdb'
const db = new PouchDB('adminDb')
Vue.use(Vuex)
-const store = new Vuex.Store({
- modules: {
- account,
- setting
- }
-})
+const store = new Vuex.Store({modules})
// 读取用户信息
db.get('currUser')
.then(doc => store.commit('account/setUser', doc.user))
diff --git a/src/store/modules/index.js b/src/store/modules/index.js
new file mode 100644
index 0000000..abaef76
--- /dev/null
+++ b/src/store/modules/index.js
@@ -0,0 +1,4 @@
+import account from './account'
+import setting from './setting'
+
+export default {account, setting}
\ No newline at end of file
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/pages/dashboard/analysis/Analysis.vue b/src/pages/dashboard/analysis/Analysis.vue
deleted file mode 100644
index 18a125d..0000000
--- a/src/pages/dashboard/analysis/Analysis.vue
+++ /dev/null
@@ -1,163 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{$t('all')}}
- {{$t('online')}}
- {{$t('stores')}}
-
-
-
-
-
-
-
-
-
-
diff --git a/src/pages/dashboard/analysis/HotSearch.vue b/src/pages/dashboard/analysis/HotSearch.vue
deleted file mode 100644
index 1a212c9..0000000
--- a/src/pages/dashboard/analysis/HotSearch.vue
+++ /dev/null
@@ -1,142 +0,0 @@
-
-
-
- {{$ta('daily|sales', 'p')}} ￥234.56
-
-
- {{$ta('daily|visits', 'p')}} 123,4
-
-
- {{$t('conversion')}} 60%
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{text}}
- {{text}} %
-
-
-
-
-
-
diff --git a/src/pages/dashboard/analysis/SalesData.vue b/src/pages/dashboard/analysis/SalesData.vue
deleted file mode 100644
index df8f0f0..0000000
--- a/src/pages/dashboard/analysis/SalesData.vue
+++ /dev/null
@@ -1,61 +0,0 @@
-
-
-
- {{$t('search')}}
-
-
-
-
-
- 12321
- 71.2
-
-
- {{$t('capita')}}
-
-
-
-
-
- 2.7
- 71.2
-
-
-
-
-
-
-
-
-
diff --git a/src/pages/dashboard/analysis/i18n-search.js b/src/pages/dashboard/analysis/i18n-search.js
deleted file mode 100644
index 1ee09a4..0000000
--- a/src/pages/dashboard/analysis/i18n-search.js
+++ /dev/null
@@ -1,31 +0,0 @@
-module.exports = {
- messages: {
- CN: {
- search: '搜索用户数',
- capita: '人均搜索次数',
- rank: '排名',
- keyword: '搜索关键词',
- count: '用户数',
- range: '周涨幅',
- introduce: '指标说明'
- },
- HK: {
- search: '搜索用戶數',
- capita: '人均搜索次數',
- rank: '排名',
- keyword: '搜索關鍵詞',
- count: '用戶數',
- range: '周漲幅',
- introduce: '指標說明'
- },
- US: {
- search: 'Search Users',
- capita: 'Per Capita Search',
- rank: 'Rank',
- keyword: 'Keyword',
- users: 'Users',
- range: 'Weekly Range',
- introduce: 'Introduce'
- },
- }
-}
diff --git a/src/pages/dashboard/analysis/i18n.js b/src/pages/dashboard/analysis/i18n.js
deleted file mode 100644
index 7be1437..0000000
--- a/src/pages/dashboard/analysis/i18n.js
+++ /dev/null
@@ -1,73 +0,0 @@
-module.exports = {
- messages: {
- CN: {
- introduce: '指标说明',
- totalSales: '总销售额',
- visits: '访问量',
- payments: '支付笔数',
- operating: '运营活动效果',
- wow: '同周比',
- dod: '日环比',
- sales: '销售额',
- daily: '日均',
- day: '今日',
- week: '本周',
- month: '本月',
- year: '本年',
- search: '热门搜索',
- proportion: '销售额占比',
- conversion: '转化率',
- trend: '趋势',
- ranking: '排行榜',
- all: '全渠道',
- online: '线上',
- stores: '门店',
- },
- HK: {
- introduce: '指標說明',
- totalSales: '總銷售額',
- visits: '訪問量',
- payments: '支付筆數',
- operating: '運營活動效果',
- wow: '通周比',
- dod: '日環比',
- sales: '銷售額',
- daily: '日均',
- day: '今日',
- week: '本週',
- month: '本月',
- year: '本年',
- search: '熱門搜索',
- proportion: '銷售額佔比',
- conversion: '轉化率',
- trend: '趨勢',
- ranking: '排行榜',
- all: '全渠道',
- online: '線上',
- stores: '門店',
- },
- US: {
- introduce: 'Introduce',
- totalSales: 'Total Sales',
- visits: 'Visits',
- payments: 'Payments',
- operating: 'Operational Effect',
- wow: 'WoW Change',
- dod: 'DoD Change',
- sales: 'Sales',
- daily: 'Daily',
- day: 'All Day',
- week: 'All Week',
- month: 'All Month',
- year: 'All Year',
- search: 'Hot Search',
- proportion: 'The Proportion Of Sales',
- conversion: 'Conversion Rate',
- trend: 'Trend',
- ranking: 'Ranking',
- all: 'All',
- online: 'Online',
- stores: 'Stores',
- }
- }
-}
diff --git a/src/pages/dashboard/workplace/WorkPlace.vue b/src/pages/dashboard/workplace/WorkPlace.vue
deleted file mode 100644
index 79d6346..0000000
--- a/src/pages/dashboard/workplace/WorkPlace.vue
+++ /dev/null
@@ -1,122 +0,0 @@
-
-
-
-
- {{welcome.timeFix[lang]}}，{{currUser.name}}，{{welcome.message[lang]}}
- {{currUser.position[lang]}}
-
-
-
-
-
-
-
-
-
-
-
- 科学搬砖组
- 9小时前
-
- 9小时前
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/pages/demo/i18n.js b/src/pages/demo/i18n.js
new file mode 100644
index 0000000..971c88f
--- /dev/null
+++ b/src/pages/demo/i18n.js
@@ -0,0 +1,16 @@
+module.exports = {
+ messages: {
+ CN: {
+ content: '演示页面',
+ description: '这是一个演示页面'
+ },
+ HK: {
+ content: '演示頁面',
+ description: '這是一個演示頁面'
+ },
+ US: {
+ content: 'Demo Page',
+ description: 'This is a demo page'
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/pages/demo/index.js b/src/pages/demo/index.js
new file mode 100644
index 0000000..c09014e
--- /dev/null
+++ b/src/pages/demo/index.js
@@ -0,0 +1,2 @@
+import Demo from './Demo.vue'
+export default Demo
\ No newline at end of file
diff --git a/src/pages/demo/index.less b/src/pages/demo/index.less
new file mode 100644
index 0000000..3436c92
--- /dev/null
+++ b/src/pages/demo/index.less
@@ -0,0 +1,10 @@
+.new-page{
+ height: 100%;
+ background-color: @base-bg-color;
+ text-align: center;
+ padding: 200px 0 0 0;
+ //margin-top: -24px;
+ h1{
+ font-size: 48px;
+ }
+}
\ No newline at end of file
diff --git a/src/pages/detail/AdvancedDetail.vue b/src/pages/detail/AdvancedDetail.vue
deleted file mode 100644
index eadc9c6..0000000
--- a/src/pages/detail/AdvancedDetail.vue
+++ /dev/null
@@ -1,169 +0,0 @@
-
- {{$t('content')}}
+退货商品
- 退货进度
-
-
-
-
- ant-design@alipay.com
-
-
-
-
-
- {{$t('alipay')}}
- {{$t('wechat')}}
-
-
-
-
-
-
-
-
- {{$t('nextStep')}}
-
-
-
-
-
-
-
-
diff --git a/src/pages/form/step/Step2.vue b/src/pages/form/step/Step2.vue
deleted file mode 100644
index a0b8415..0000000
--- a/src/pages/form/step/Step2.vue
+++ /dev/null
@@ -1,83 +0,0 @@
-
-
-
-
- ant-design@alipay.com
-
-
- test@example.com
-
-
- Alex
-
-
- ￥ 5,000.00
-
-
- {{$t('submit')}}
- {{$t('preStep')}}
-
-
-
-
-
-
-
-
diff --git a/src/pages/form/step/Step3.vue b/src/pages/form/step/Step3.vue
deleted file mode 100644
index d2d9002..0000000
--- a/src/pages/form/step/Step3.vue
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
- {{$t('doAgain')}}
- {{$t('bill')}}
-
-
-
-
-
-
diff --git a/src/pages/form/step/StepForm.vue b/src/pages/form/step/StepForm.vue
deleted file mode 100644
index 2118c71..0000000
--- a/src/pages/form/step/StepForm.vue
+++ /dev/null
@@ -1,58 +0,0 @@
-
-
-
-
-
- 查询
- 重置
-
- {{advanced ? '收起' : '展开'}}
-
-
-
-
-
-
-
-
-
-
-
- 关闭
- 运行中
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 关闭
- 运行中
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 新建
- 批量操作
-
-
- 删除
- 审批
-
-
- 更多操作
-
-
-
- {{text}}
-
-
-
-
-
-
-
- 添加
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/pages/list/search/ApplicationList.vue b/src/pages/list/search/ApplicationList.vue
deleted file mode 100644
index 081e517..0000000
--- a/src/pages/list/search/ApplicationList.vue
+++ /dev/null
@@ -1,91 +0,0 @@
-
-
-
-
-
- 全部
- 进行中
- 等待中
-
-
-
- 编辑
-
-
-
-
-
- Owner
-
- 付晓晓
-
- 开始时间
-
- 2018-07-26 22:44
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 1 item
- 2 item
- 3 item
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/pages/list/search/ArticleList.vue b/src/pages/list/search/ArticleList.vue
deleted file mode 100644
index 019d65e..0000000
--- a/src/pages/list/search/ArticleList.vue
+++ /dev/null
@@ -1,72 +0,0 @@
-
-
-
-
-
- 活跃用户
-18万
-
-
- 新增用户
-1,338
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/pages/list/search/ProjectList.vue b/src/pages/list/search/ProjectList.vue
deleted file mode 100644
index 03e9f06..0000000
--- a/src/pages/list/search/ProjectList.vue
+++ /dev/null
@@ -1,58 +0,0 @@
-
-
- Ant Design
- 设计语言
- 蚂蚁金服
-
-
-
-
- 段落示意：蚂蚁金服设计平台 ant.design，用最小的工作量，无缝接入蚂蚁金服生态，提供跨越设计与开发的体验解决方案。蚂蚁金服设计平台
- ant.design，用最小的工作量，无缝接入蚂蚁金服生态，提供跨越设计与开发的体验解决方案。
-
-
-
-
-
-
- 
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/pages/list/search/SearchForm.vue b/src/pages/list/search/SearchForm.vue
deleted file mode 100644
index 5cd06d1..0000000
--- a/src/pages/list/search/SearchForm.vue
+++ /dev/null
@@ -1,94 +0,0 @@
-
-
-
- 城镇中有那么多的酒馆，她却偏偏走进了我的酒馆
-
-
- 4小时前
-
-
-
-
-
-
-
-
-
-
diff --git a/src/pages/login/Login.vue b/src/pages/login/Login.vue
index f9f42e5..797f0b6 100644
--- a/src/pages/login/Login.vue
+++ b/src/pages/login/Login.vue
@@ -111,7 +111,7 @@ export default {
if (result.code >= 0) {
const user = result.data.user
setAuthorization({token: result.data.token, expireAt: new Date(result.data.expireAt)})
- this.$router.push('/dashboard/workplace')
+ this.$router.push('/parent1/demo1')
this.$store.commit('account/setUser', user)
this.$message.success(result.message, 3)
} else {
diff --git a/src/pages/result/Error.vue b/src/pages/result/Error.vue
deleted file mode 100644
index 1abfc69..0000000
--- a/src/pages/result/Error.vue
+++ /dev/null
@@ -1,47 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
- 20180724089
- 曲丽丽
- 016-12-12 ~ 2017-12-12
-
-
-
-
-
-
-
-
-
-
-
-
- 项目名称
-