diff --git a/common/config.js b/common/config.js index 8a35c82..93e2ed3 100644 --- a/common/config.js +++ b/common/config.js @@ -24,6 +24,6 @@ const config = { } // 设置后台接口服务的基础地址 -config.baseUrl = 'http://192.168.0.104:8080'; +config.baseUrl = 'http://tc.cqsznc.com:7080/api'; export default config; \ No newline at end of file diff --git a/common/http.api.js b/common/http.api.js index 4aa590c..a8c9fce 100644 --- a/common/http.api.js +++ b/common/http.api.js @@ -12,11 +12,12 @@ const install = (Vue, vm) => { login: (params = {}) => vm.$u.post(config.adminPath+'/auth/login', params), + getUserInfo: (params = {}) => vm.$u.get(config.adminPath+'/system/user/profile', params), // 基础服务:登录登出、身份信息、菜单授权、切换系统、字典数据等 lang: (params = {}) => vm.$u.get('/lang/'+params.lang), index: (params = {}) => vm.$u.get(config.adminPath+'/mobile/index', params), - getUserInfo: (params = {}) => vm.$u.get(config.adminPath+'/mobile/user/getUserInfo', params), + // getUserInfo: (params = {}) => vm.$u.get(config.adminPath+'/mobile/user/getUserInfo', params), // login: (params = {}) => vm.$u.post(config.adminPath+'/mobile/login/loginByPassword', params), sendCode: (params = {}) => vm.$u.post(config.adminPath+'/mobile/login/sendCode', params), registerUser: (params = {}) => vm.$u.post(config.adminPath+'/mobile/user/registerUser', params), diff --git a/common/http.interceptor.js b/common/http.interceptor.js index 1b0f8e9..a072c2d 100644 --- a/common/http.interceptor.js +++ b/common/http.interceptor.js @@ -30,10 +30,10 @@ const install = (Vue, vm) => { if (!req.header[ajaxHeader]){ req.header[ajaxHeader] = 'json'; } - + console.log('t1', req.url); // 设定传递 Token 认证参数 aidex - if (!req.header[sessionIdHeader] && vm.vuex_token){ - req.header[sessionIdHeader] = vm.vuex_token; + if (req.url!="/auth/login"&&!req.header[sessionIdHeader] && vm.vuex_token){ + req.header[sessionIdHeader] = "Bearer "+vm.vuex_token; } // 为节省流量,记住我数据不是每次都发送的,当会话失效后,尝试重试登录 aidex diff --git a/pages.json b/pages.json index d0d8ed5..dde8d6e 100644 --- a/pages.json +++ b/pages.json @@ -2,207 +2,405 @@ "easycom": { "^u-(.*)": "@/uview-ui/components/u-$1/u-$1.vue" }, - "pages": [ - { - "path": "pages/sys/login/index", - "style": { - "navigationBarTitleText": "登录" - } - }, - { - "path": "pages/sys/login/forget", - "style": { - "navigationBarTitleText": "忘记密码" - } - }, - { - "path": "pages/sys/login/reg", - "style": { - "navigationBarTitleText": "注册账号" - } - }, - { - "path": "pages/sys/msg/index", - "style": { - "navigationBarTitleText": "消息" - } - }, - { - "path": "pages/sys/msg/form", - "style": { - "navigationBarTitleText": "查看详情" - } - }, - { - "path": "pages/sys/home/index", - "style": { - "navigationBarTitleText": "工作台", - "navigationStyle": "custom" // 隐藏系统导航栏 + //案列页面 + // "pages": [ + // { + // "path": "pages/sys/login/index", + // "style": { + // "navigationBarTitleText": "登录" + // } + // }, + // { + // "path": "pages/sys/login/forget", + // "style": { + // "navigationBarTitleText": "忘记密码" + // } + // }, + // { + // "path": "pages/sys/login/reg", + // "style": { + // "navigationBarTitleText": "注册账号" + // } + // }, + // { + // "path": "pages/sys/msg/index", + // "style": { + // "navigationBarTitleText": "消息" + // } + // }, + // { + // "path": "pages/sys/msg/form", + // "style": { + // "navigationBarTitleText": "查看详情" + // } + // }, + // { + // "path": "pages/sys/home/index", + // "style": { + // "navigationBarTitleText": "工作台", + // "navigationStyle": "custom" // 隐藏系统导航栏 - } - }, + // } + // }, + // { + // "path": "pages/sys/user/index", + // "style": { + // "navigationBarTitleText": "我的", + // "navigationBarBackgroundColor":"#5b95ff", + // "navigationBarTextStyle": "white" + // } + // }, + // { + // "path": "pages/sys/user/info", + // "style": { + // "navigationBarTitleText": "个人信息" + // } + // }, + // { + // "path": "uview-ui/components/u-avatar-cropper/u-avatar-cropper", + // "style": { + // "navigationBarTitleText": "头像裁剪", + // "navigationBarBackgroundColor": "#000000" + // } + // }, + // { + // "path": "pages/sys/user/help", + // "style": { + // "navigationBarTitleText": "帮助中心" + // } + // }, + // { + // "path": "pages/sys/user/pwd", + // "style": { + // "navigationBarTitleText": "修改密码" + // } + // }, + // { + // "path": "pages/sys/user/setting", + // "style": { + // "navigationBarTitleText": "系统设置" + // } + // }, + // { + // "path": "pages/sys/user/comment", + // "style": { + // "navigationBarTitleText": "意见反馈" + // } + // }, + // { + // "path": "pages/sys/user/about", + // "style": { + // "navigationBarTitleText": "关于我们" + // } + // }, + // { + // "path": "pages/testData/form", + // "style": { + // "navigationBarTitleText": "新增编辑" + // } + // }, + // { + // "path": "pages/testData/index", + // "style": { + // "navigationBarTitleText": "增删改查" + // } + // }, + // { + // "path": "pages/common/webview", + // "style": { + // "navigationBarTitleText": "浏览网页" + // } + // }, + // { + // "path": "pages/sys/login/code", + // "style": { + // "navigationBarTitleText": "验证码" + // } + // }, + // { + // "path": "pages/sys/login/registerCode", + // "style": { + // "navigationBarTitleText": "验证码" + // } + // }, + // { + // "path": "pages/sys/user/service", + // "style": { + // "navigationBarTitleText": "联系客服" + // } + // }, + // { + // "path": "pages/sys/user/problem", + // "style": { + // "navigationBarTitleText": "常见问题" + // } + // }, + // { + // "path": "pages/sys/user/currency", + // "style": { + // "navigationBarTitleText": "通用" + // } + // }, + // { + // "path": "pages/sys/user/clear-cache", + // "style": { + // "navigationBarTitleText": "清除缓存" + // } + // }, + // { + // "path": "pages/sys/workbench/index", + // "style": { + // "navigationBarTitleText": "工作台" + // } + // }, + // { + // "path": "pages/sys/book/index", + // "style": { + // "navigationBarTitleText": "通讯录" + // } + // }, + // { + // "path": "pages/sys/book/personal-details", + // "style": { + // "navigationBarTitleText": "详情" + // } + // }, + // { + // "path": "pages/sys/msg/list-item", + // "style": { + // "navigationBarTitleText": "列表" + // } + // }, + // { + // "path": "pages/sys/workbench/add-form", + // "style": { + // "navigationBarTitleText": "请假申请" + // } + // }, + // { + // "path": "pages/sys/msg/examine-item", + // "style": { + // "navigationBarTitleText": "网上报销" + // } + // }, + // { + // "path": "pages/sys/msg/details", + // "style": { + // "navigationBarTitleText": "详情" + // } + // }, + // { + // "path": "pages/sys/user/modify", + // "style": { + // "navigationBarTitleText": "修改" + // } + // }, + // { + // "path": "pages/sys/workbench/install", + // "style": { + // "navigationBarTitleText": "常用设置", + // "navigationStyle": "custom" // 隐藏系统导航栏 + // } + // } + + // ], + // "tabBar": { + // "color": "#333333", + // "selectedColor": "#4094ff", + // "backgroundColor": "#ffffff", + // "borderStyle": "white", + // "list": [ + // { + // "pagePath": "pages/sys/msg/index", + // "iconPath": "static/aidex/tabbar/msg_1.png", + // "selectedIconPath": "static/aidex/tabbar/msg_2.png", + // "text": "消息" + // }, + // // { + // // "pagePath": "pages/sys/home/index", + // // "iconPath": "static/aidex/tabbar/home_1.png", + // // "selectedIconPath": "static/aidex/tabbar/home_2.png", + // // "text": "首页" + // // }, + // { + // "pagePath": "pages/sys/workbench/index", + // "iconPath": "static/aidex/tabbar/apply_1.png", + // "selectedIconPath": "static/aidex/tabbar/apply_2.png", + // "text": "工作台" + // }, + // { + // "pagePath": "pages/sys/book/index", + // "iconPath": "static/aidex/tabbar/book_1.png", + // "selectedIconPath": "static/aidex/tabbar/book_2.png", + // "text": "通讯录" + // }, + // { + // "pagePath": "pages/sys/user/index", + // "iconPath": "static/aidex/tabbar/my_1.png", + // "selectedIconPath": "static/aidex/tabbar/my_2.png", + // "text": "我的" + // } + // ] + // }, + "pages":[ { - "path": "pages/sys/user/index", + "path": "pages/sys/login/login", "style": { - "navigationBarTitleText": "我的", - "navigationBarBackgroundColor":"#5b95ff", - "navigationBarTextStyle": "white" - } - }, - { - "path": "pages/sys/user/info", - "style": { - "navigationBarTitleText": "个人信息" - } - }, - { - "path": "uview-ui/components/u-avatar-cropper/u-avatar-cropper", - "style": { - "navigationBarTitleText": "头像裁剪", - "navigationBarBackgroundColor": "#000000" - } - }, - { - "path": "pages/sys/user/help", - "style": { - "navigationBarTitleText": "帮助中心" - } - }, - { - "path": "pages/sys/user/pwd", - "style": { - "navigationBarTitleText": "修改密码" - } - }, - { - "path": "pages/sys/user/setting", - "style": { - "navigationBarTitleText": "系统设置" - } - }, - { - "path": "pages/sys/user/comment", - "style": { - "navigationBarTitleText": "意见反馈" - } - }, - { - "path": "pages/sys/user/about", - "style": { - "navigationBarTitleText": "关于我们" - } - }, - { - "path": "pages/testData/form", - "style": { - "navigationBarTitleText": "新增编辑" - } - }, - { - "path": "pages/testData/index", - "style": { - "navigationBarTitleText": "增删改查" - } - }, - { - "path": "pages/common/webview", - "style": { - "navigationBarTitleText": "浏览网页" - } - }, - { - "path": "pages/sys/login/code", - "style": { - "navigationBarTitleText": "验证码" - } - }, - { - "path": "pages/sys/login/registerCode", - "style": { - "navigationBarTitleText": "验证码" - } - }, - { - "path": "pages/sys/user/service", - "style": { - "navigationBarTitleText": "联系客服" - } - }, - { - "path": "pages/sys/user/problem", - "style": { - "navigationBarTitleText": "常见问题" - } - }, - { - "path": "pages/sys/user/currency", - "style": { - "navigationBarTitleText": "通用" - } - }, - { - "path": "pages/sys/user/clear-cache", - "style": { - "navigationBarTitleText": "清除缓存" - } - }, - { - "path": "pages/sys/workbench/index", - "style": { - "navigationBarTitleText": "工作台" - } - }, - { - "path": "pages/sys/book/index", - "style": { - "navigationBarTitleText": "通讯录" - } - }, - { - "path": "pages/sys/book/personal-details", - "style": { - "navigationBarTitleText": "详情" - } - }, - { - "path": "pages/sys/msg/list-item", - "style": { - "navigationBarTitleText": "列表" - } - }, - { - "path": "pages/sys/workbench/add-form", - "style": { - "navigationBarTitleText": "请假申请" - } - }, - { - "path": "pages/sys/msg/examine-item", - "style": { - "navigationBarTitleText": "网上报销" - } - }, - { - "path": "pages/sys/msg/details", - "style": { - "navigationBarTitleText": "详情" - } - }, - { - "path": "pages/sys/user/modify", - "style": { - "navigationBarTitleText": "修改" - } - }, - { - "path": "pages/sys/workbench/install", - "style": { - "navigationBarTitleText": "常用设置", + "navigationBarTitleText": "登录", "navigationStyle": "custom" // 隐藏系统导航栏 } + }, + + { + "path": "pages/sys/home/home", + "style": { + "navigationStyle": "custom" + } + }, + { + "path": "pages/sys/workbench/workbench", + "style": { + "navigationStyle": "custom" + } + }, + { + "path": "pages/sys/user/mine", + "style": { + "navigationStyle": "custom" + } + }, + { + "path": "pages/sys/user/changeInfo/changeInfo", + "style": { + "navigationStyle": "custom" + } + }, + { + "path": "pages/sys/user/message/message", + "style": { + "navigationStyle": "custom" + } + }, + { + "path": "pages/sys/user/serviceCenter/serviceCenter", + "style": { + "navigationBarTitleText": "服务中心" + } + }, + { + "path": "pages/sys/user/serviceCenter/questionDetail", + "style": { + "navigationBarTitleText": "服务中心" + } + }, + { + "path": "pages/sys/user/myVisitor/myVisitor", + "style": { + "navigationBarTitleText": "我的访客" + } + }, + { + "path": "pages/sys/user/myVisitor/creatVisitor", + "style": { + "navigationBarTitleText": "发起邀约" + } + }, + { + "path": "pages/sys/user/myVisitor/visitorInfo", + "style": { + "navigationStyle": "custom" + } + }, + { + "path" : "pages/sys/user/myPayment/myPayment", + "style" : + { + "navigationBarTitleText": "停车缴费" + } + }, + { + "path" : "pages/sys/user/myPayment/paymentRecords", + "style" : + { + "navigationBarTitleText": "缴费记录" + } + }, + { + "path" : "pages/sys/user/myRepair/myRepair", + "style" : + { + "navigationBarTitleText": "报事报修" + } + }, + { + "path" : "pages/sys/user/myRepair/addRepair", + "style" : + { + "navigationBarTitleText": "新增" + } + }, + { + "path" : "pages/sys/user/myRepair/repaired", + "style" : + { + "navigationStyle" : "custom" + } + }, + { + "path" : "pages/sys/user/myRepair/repairEvaluate", + "style" : + { + "navigationBarTitleText": "服务评价" + } + }, + { + "path" : "pages/sys/user/myRecord/myRecord", + "style" : + { + "navigationStyle" : "custom" + } + }, + { + "path" : "pages/sys/workbench/oa/oa", + "style" : + { + "navigationStyle" : "custom" + } + }, + + { + "path" : "pages/sys/workbench/oa/oaDetail", + "style" : + { + "navigationStyle" : "custom" + } } - ], + "tabBar": { + "color": "#232323", + "selectedColor": "#0652FF", + "backgroundColor": "#fff", + "borderStyle": "black", + "list": [{ + "pagePath": "pages/sys/home/home", + "iconPath": "static/ic_main_home.png", + "selectedIconPath": "static/ic_main_home_selected.png", + "text": "首页" + }, + { + "pagePath": "pages/sys/workbench/workbench", + "iconPath": "static/ic_main_work.png", + "selectedIconPath": "static/ic_main_work_selected.png", + "text": "工作台" + }, + { + "pagePath": "pages/sys/user/mine", + "iconPath": "static/ic_main_mine.png", + "selectedIconPath": "/static/ic_main_mine_selected.png", + "text": "我的" + } + ] + }, "subPackages": [ ], @@ -213,43 +411,5 @@ "navigationBarTextStyle": "black", "navigationBarTitleText": "Aidex", "navigationBarBackgroundColor": "#ffffff" - }, - "tabBar": { - "color": "#333333", - "selectedColor": "#4094ff", - "backgroundColor": "#ffffff", - "borderStyle": "white", - "list": [ - { - "pagePath": "pages/sys/msg/index", - "iconPath": "static/aidex/tabbar/msg_1.png", - "selectedIconPath": "static/aidex/tabbar/msg_2.png", - "text": "消息" - }, - // { - // "pagePath": "pages/sys/home/index", - // "iconPath": "static/aidex/tabbar/home_1.png", - // "selectedIconPath": "static/aidex/tabbar/home_2.png", - // "text": "首页" - // }, - { - "pagePath": "pages/sys/workbench/index", - "iconPath": "static/aidex/tabbar/apply_1.png", - "selectedIconPath": "static/aidex/tabbar/apply_2.png", - "text": "工作台" - }, - { - "pagePath": "pages/sys/book/index", - "iconPath": "static/aidex/tabbar/book_1.png", - "selectedIconPath": "static/aidex/tabbar/book_2.png", - "text": "通讯录" - }, - { - "pagePath": "pages/sys/user/index", - "iconPath": "static/aidex/tabbar/my_1.png", - "selectedIconPath": "static/aidex/tabbar/my_2.png", - "text": "我的" - } - ] } } diff --git a/pages/sys/home/home.vue b/pages/sys/home/home.vue new file mode 100644 index 0000000..d924f6d --- /dev/null +++ b/pages/sys/home/home.vue @@ -0,0 +1,409 @@ + + + + + \ No newline at end of file diff --git a/pages/sys/login/login.vue b/pages/sys/login/login.vue new file mode 100644 index 0000000..b79aab1 --- /dev/null +++ b/pages/sys/login/login.vue @@ -0,0 +1,266 @@ + + + + + \ No newline at end of file diff --git a/pages/sys/msg/form.vue b/pages/sys/msg/form.vue index 31e5fd3..b9a1a3a 100644 --- a/pages/sys/msg/form.vue +++ b/pages/sys/msg/form.vue @@ -70,7 +70,7 @@ page { overflow: hidden; font-size: 30rpx; line-height: 50rpx; - /deep/ p { + ::v-deep p { margin-bottom: 20rpx; text-indent: 60rpx; } diff --git a/pages/sys/user/changeInfo/changeInfo.vue b/pages/sys/user/changeInfo/changeInfo.vue new file mode 100644 index 0000000..cb487a4 --- /dev/null +++ b/pages/sys/user/changeInfo/changeInfo.vue @@ -0,0 +1,236 @@ + + + + + \ No newline at end of file diff --git a/pages/sys/user/clear-cache.vue b/pages/sys/user/clear-cache.vue index 6460ce6..d9fcd25 100644 --- a/pages/sys/user/clear-cache.vue +++ b/pages/sys/user/clear-cache.vue @@ -39,7 +39,7 @@ page { background-color: #f8f8f8; } -/deep/ .u-cell-title { +::v-deep .u-cell-title { padding: 25rpx 30rpx; font-size: 30rpx; } diff --git a/pages/sys/user/currency.vue b/pages/sys/user/currency.vue index 371e192..d150f73 100644 --- a/pages/sys/user/currency.vue +++ b/pages/sys/user/currency.vue @@ -77,7 +77,7 @@ page { background-color: #f8f8f8; } -/deep/ .u-cell-title { +::v-deep .u-cell-title { padding: 25rpx 30rpx; font-size: 30rpx; } diff --git a/pages/sys/user/message/message.vue b/pages/sys/user/message/message.vue new file mode 100644 index 0000000..82a19d0 --- /dev/null +++ b/pages/sys/user/message/message.vue @@ -0,0 +1,164 @@ + + + + + diff --git a/pages/sys/user/mine.vue b/pages/sys/user/mine.vue new file mode 100644 index 0000000..a4d34b6 --- /dev/null +++ b/pages/sys/user/mine.vue @@ -0,0 +1,232 @@ + + + + + \ No newline at end of file diff --git a/pages/sys/user/myPayment/myPayment.vue b/pages/sys/user/myPayment/myPayment.vue new file mode 100644 index 0000000..536a1a2 --- /dev/null +++ b/pages/sys/user/myPayment/myPayment.vue @@ -0,0 +1,537 @@ + + + + + \ No newline at end of file diff --git a/pages/sys/user/myPayment/paymentRecords.vue b/pages/sys/user/myPayment/paymentRecords.vue new file mode 100644 index 0000000..ce64e4f --- /dev/null +++ b/pages/sys/user/myPayment/paymentRecords.vue @@ -0,0 +1,127 @@ + + + + + \ No newline at end of file diff --git a/pages/sys/user/myRecord/myRecord.vue b/pages/sys/user/myRecord/myRecord.vue new file mode 100644 index 0000000..ef8e8ca --- /dev/null +++ b/pages/sys/user/myRecord/myRecord.vue @@ -0,0 +1,507 @@ + + + + + diff --git a/pages/sys/user/myRecord/myRecord2.vue b/pages/sys/user/myRecord/myRecord2.vue new file mode 100644 index 0000000..d29fa68 --- /dev/null +++ b/pages/sys/user/myRecord/myRecord2.vue @@ -0,0 +1,405 @@ + + + + + diff --git a/pages/sys/user/myRepair/addRepair.vue b/pages/sys/user/myRepair/addRepair.vue new file mode 100644 index 0000000..e5f1cdd --- /dev/null +++ b/pages/sys/user/myRepair/addRepair.vue @@ -0,0 +1,299 @@ +