diff --git a/App.vue b/App.vue index cc1058b..532de4e 100644 --- a/App.vue +++ b/App.vue @@ -4,6 +4,7 @@ }, onShow: function() { // this.$store.commit('initConfig') + this.$store.commit('templateStatusInfo') }, onHide: function() { } diff --git a/api/api.js b/api/api.js index 4805a19..4e56563 100644 --- a/api/api.js +++ b/api/api.js @@ -5,83 +5,64 @@ import utils from '../utils/utils.js' let limit = {} let debounce = {} -const models = [] +const models = ['login', 'user', 'config'] const config = { - // 示例 - // wxLogin : {url : '/api/wxLogin', method : 'POST', - // auth : false, showLoading : true, loadingTitle : '加载中...', - // limit : 1000 - // }, - - getConfig: { - url: '/api/getConfig', - method: 'GET', - limit: 500 - }, - //轮播图-轮播图列表 queryBannerList: { url: '/workorder/banner/queryBannerList', method: 'GET', + auth : true, }, - //工单信息-查询工单列表 queryTemplateList: { url: '/workorder/template/queryTemplateList', method: 'GET', + auth : true, }, //公告信息-查询公告列表 queryNewsList: { url: '/workorder/news/queryNewsList', method: 'GET', + auth : true, }, // 公告信息-根据id查询公告信息 queryNewsById: { url: '/workorder/news/queryNewsById', method: 'GET', - }, - // 配置信息-帮助中心 - helpInfo: { - url: '/workorder/config/helpInfo', - method: 'GET', - }, - // 配置信息-隐私协议 - privacyInfo: { - url: '/workorder/config/privacyInfo', - method: 'GET', - }, - //用户列表 - queryUserList: { - url: '/workorder/user/queryUserList', - method: 'GET', + auth : true, }, //工单信息-工序卡1(选配)详情 queryStepOne: { url: '/workorder/template/queryStepOne', method: 'GET', + auth : true, }, //工单信息-工序卡2详情 queryStepTwo: { url: '/workorder/template/queryStepTwo', method: 'GET', + auth : true, }, //收藏信息-我的收藏 queryCollectionList: { url: '/workorder/collection/queryCollectionList', method: 'GET', + auth : true, }, //工单信息-根据id查询工单详情 queryTemplateById: { url: '/workorder/template/queryTemplateById', method: 'GET', + auth : true, }, //工单信息-工序卡3详情 queryStepThree: { url: '/workorder/template/queryStepThree', method: 'GET', + auth : true, }, } diff --git a/api/model/config.js b/api/model/config.js new file mode 100644 index 0000000..3a2ab28 --- /dev/null +++ b/api/model/config.js @@ -0,0 +1,30 @@ + + +// 配置相关接口 + +const api = { + // 示例 + + getConfig: { + url: '/api/getConfig', + method: 'GET', + limit: 500, + }, + //配置信息-查询工单状态配置 + templateStatusInfo: { + url: '/workorder/config/templateStatusInfo', + method: 'GET', + }, + // 配置信息-帮助中心 + helpInfo: { + url: '/workorder/config/helpInfo', + method: 'GET', + }, + // 配置信息-隐私协议 + privacyInfo: { + url: '/workorder/config/privacyInfo', + method: 'GET', + }, +} + +export default api \ No newline at end of file diff --git a/api/model/user.js b/api/model/user.js new file mode 100644 index 0000000..6eedaa5 --- /dev/null +++ b/api/model/user.js @@ -0,0 +1,39 @@ + + +// 用户相关接口 + +const api = { + //用户信息-根据id查询用户信息 + queryUserById: { + url: '/workorder/user/queryUserById', + method: 'GET', + auth : true, + }, + //用户信息-资料修改 + updateUser: { + url: '/workorder/user/updateUser', + method: 'POST', + auth : true, + showLoading : true, + }, + //用户列表 + queryUserList: { + url: '/workorder/user/queryUserList', + method: 'GET', + auth : true, + }, + //账号密码登录 + login: { + url: '/workorder/user/login', + method: 'POST', + showLoading : true, + }, + //注册 + register: { + url: '/workorder/user/register', + method: 'POST', + showLoading : true, + }, +} + +export default api \ No newline at end of file diff --git a/config.js b/config.js index b8c3722..ce904f0 100644 --- a/config.js +++ b/config.js @@ -7,13 +7,13 @@ import uvUI from '@/uni_modules/uv-ui-tools' Vue.use(uvUI); // 当前环境 -const type = 'prod' +const type = 'dev' // 环境配置 const config = { dev : { - baseUrl : 'http://www.gcosc.fun:82', + baseUrl : 'http://augcl.natapp1.cc/workorder-admin', }, prod : { baseUrl : 'https://workorderadmin.augcl.com/workorder-admin', diff --git a/main.js b/main.js index 84751ca..ff736f6 100644 --- a/main.js +++ b/main.js @@ -13,6 +13,7 @@ import store from '@/store/store' import './config' import './utils/index.js' +import mixinPermission from '@/mixins/permission.js' //组件注册 import configPopup from '@/components/config/configPopup.vue' @@ -21,6 +22,8 @@ import navbar from '@/components/base/navbar.vue' Vue.component('configPopup',configPopup) Vue.component('navbar',navbar) +Vue.mixin(mixinPermission) + const app = new Vue({ ...App, store, diff --git a/mixins/permission.js b/mixins/permission.js new file mode 100644 index 0000000..c12b5b9 --- /dev/null +++ b/mixins/permission.js @@ -0,0 +1,17 @@ + + +import { mapState } from 'vuex' +export default { + data() { + return { + } + }, + computed: { + ...mapState(['permissions']), + }, + methods: { + isPermission(permission){ + return this.permissions.includes(permission) + }, + } +} \ No newline at end of file diff --git a/pages/index/center.vue b/pages/index/center.vue index b913270..11d225f 100644 --- a/pages/index/center.vue +++ b/pages/index/center.vue @@ -3,15 +3,15 @@ - + - 李晓春 + {{ userInfo.name }} - + - @@ -25,13 +25,12 @@ -
- + 修改密码 @@ -39,14 +38,12 @@ -
- + - + 收藏列表 @@ -54,7 +51,6 @@ -
@@ -68,7 +64,6 @@ -
@@ -82,55 +77,47 @@ -
+ + + + + + + 退出登录 + + + + + + - + \ No newline at end of file diff --git a/pages_order/order/ProcessCardOne.vue b/pages_order/order/ProcessCardOne.vue index 2734c6e..7b15659 100644 --- a/pages_order/order/ProcessCardOne.vue +++ b/pages_order/order/ProcessCardOne.vue @@ -1,11 +1,115 @@ - \ No newline at end of file diff --git a/pages_order/order/WorkOrderList.vue b/pages_order/order/WorkOrderList.vue index 99618ae..39e7534 100644 --- a/pages_order/order/WorkOrderList.vue +++ b/pages_order/order/WorkOrderList.vue @@ -12,7 +12,7 @@ - @@ -20,7 +20,7 @@ + @click="$utils.navigateTo('/pages_order/order/WorkOrders?id=' + item.id)"/> @@ -31,6 +31,7 @@ \ No newline at end of file diff --git a/pages_order/order/memberList.vue b/pages_order/order/memberList.vue index 19fbc02..8eeb0f4 100644 --- a/pages_order/order/memberList.vue +++ b/pages_order/order/memberList.vue @@ -2,31 +2,34 @@ - - - + {{item.name}} - + 修改 - - 创建时间：{{item.createTime}} @@ -35,18 +38,11 @@ - - - -