diff --git a/common/http.api.js b/common/http.api.js index 3abcef4..7f8a468 100644 --- a/common/http.api.js +++ b/common/http.api.js @@ -100,7 +100,7 @@ const install = (Vue, vm) => { // 个人信息修改 user: { saveUserInfo: (params = {}) => vm.$u.post(config.adminPath+'/mobile/user/saveUserInfo', params), - infoSavePwd: (params = {}) => vm.$u.put(config.adminPath+'/system/user/profile/updatePwd', params), + infoSavePwd: (params = {}) => vm.$u.put(config.adminPath+'/property/xcx/person/editPW', params), infoSavePqa: (params = {}) => vm.$u.post(config.adminPath+'/sys/user/infoSavePqa', params), }, @@ -119,6 +119,7 @@ const install = (Vue, vm) => { queryEmployeeById:(params = {}) => vm.$u.get(config.adminPath+'/property/xcx/person/'+ params.id), queryEmployee:(params = {}) => vm.$u.get(config.adminPath+'/property/xcx/person/list', params), updateEmployee:(params = {}) => vm.$u.put(config.adminPath+'/property/xcx/person', params), + queryUnitById:(params = {}) => vm.$u.get(config.adminPath+'/property/xcx/unit/'+ params.unitId), }, // 单位管理 repair:{ @@ -127,6 +128,7 @@ const install = (Vue, vm) => { getMyOrderList:(params = {})=>vm.$u.get(config.adminPath+'/property/xcx/workOrders/list',params), updateOrder:(params = {})=>vm.$u.put(config.adminPath+'/property/xcx/workOrders',params), }, + //访客管理 visitor:{ //我的访客列表 getMyVisitor:(params = {})=>vm.$u.get(config.adminPath+'/property/xcx/visitorManagement/list/'+params.type), diff --git a/manifest.json b/manifest.json index 8bff8f2..fd27333 100644 --- a/manifest.json +++ b/manifest.json @@ -1,6 +1,6 @@ { "name" : "数字南川", - "appid" : "__UNI__7AF1078", + "appid" : "__UNI__AAACEF3", "description" : "", "versionName" : "1.8.4", "versionCode" : "100", diff --git a/pages.json b/pages.json index d113baf..1946383 100644 --- a/pages.json +++ b/pages.json @@ -8,7 +8,6 @@ "style": { "navigationBarTitleText": "登录", "navigationStyle": "custom" - // 隐藏系统导航栏 } }, { @@ -32,7 +31,7 @@ { "path": "pages/sys/user/changeInfo/changeInfo", "style": { - "navigationStyle": "custom" + "navigationBarTitleText": "个人信息" } }, { @@ -41,6 +40,12 @@ "navigationStyle": "custom" } }, + { + "path": "pages/sys/user/pwd", + "style": { + "navigationBarTitleText": "修改密码" + } + }, { "path": "pages/sys/user/serviceCenter/serviceCenter", "style": { diff --git a/pages/sys/home/home.vue b/pages/sys/home/home.vue index dbd7845..6e850a3 100644 --- a/pages/sys/home/home.vue +++ b/pages/sys/home/home.vue @@ -37,13 +37,14 @@ - - 头条 - - {{ item }} - - › - + + 公告 + + + {{ item }}› + + + @@ -83,22 +84,22 @@ ], current: 0, gridList: [ - { - icon: '/static/aaaa_gd.png', - text: '工单', - url:'/pages/sys/workbench/order/order' - }, - { - icon: '/static/aaaa_yjcl.png', - text: '预警处理', - url:'/pages/sys/workbench/earlyWarning/earlyWarning' - - }, - { - icon: '/static/aaaa_jk.png', - text: '监控', - url:'/pages/sys/workbench/monitor/monitors' - }, + // { + // icon: '/static/aaaa_gd.png', + // text: '工单', + // url:'/pages/sys/workbench/order/order' + // }, + // { + // icon: '/static/aaaa_yjcl.png', + // text: '预警处理', + // url:'/pages/sys/workbench/earlyWarning/earlyWarning' + // + // }, + // { + // icon: '/static/aaaa_jk.png', + // text: '监控', + // url:'/pages/sys/workbench/monitor/monitors' + // }, { icon: '/static/aaaa_bsbx.png', text: '报事报修', @@ -486,4 +487,41 @@ border-radius: 8rpx; padding: 4rpx 12rpx; } + .news-bar { + display: flex; + align-items: center; + padding: 10rpx 0; + border-top: 1rpx solid #f5f5f5; + margin-top: 10rpx; + height: 60rpx; /* 固定高度 */ + overflow: hidden; + } + + .news-label { + color: #FF6A00; + font-size: 28rpx; + font-weight: bold; + margin-right: 16rpx; + border: 1rpx solid #FF6A00; + border-radius: 4rpx; + padding: 2rpx 6rpx; + } + + .news-swiper { + flex: 1; + height: 100%; + } + + .news-item { + display: block; + color: #666; + font-size: 24rpx; + line-height: 40rpx; /* 与容器高度一致 */ + } + + .news-arrow { + color: #999; + font-size: 32rpx; + margin-left: 10rpx; + } \ No newline at end of file diff --git a/pages/sys/user/changeInfo/changeInfo.vue b/pages/sys/user/changeInfo/changeInfo.vue index d633537..dd36753 100644 --- a/pages/sys/user/changeInfo/changeInfo.vue +++ b/pages/sys/user/changeInfo/changeInfo.vue @@ -1,237 +1,284 @@ \ No newline at end of file +.form-input:disabled { + background-color: #f5f5f5; + color: #666; +} + diff --git a/pages/sys/user/mine.vue b/pages/sys/user/mine.vue index feba15d..ad2e400 100644 --- a/pages/sys/user/mine.vue +++ b/pages/sys/user/mine.vue @@ -44,10 +44,6 @@ icon: '/static/ic_mine_info.png', text: '我的信息' }, - { - icon: '/static/ic_mine_pay.png', - text: '我的缴费' - }, { icon: '/static/ic_mine_repair.png', text: '我的报修' @@ -56,10 +52,6 @@ icon: '/static/ic_mine_visitor.png', text: '我的访客' }, - { - icon: '/static/ic_mine_check.png', - text: '我的考勤' - }, { icon: '/static/ic_mine_pwd.png', text: '修改密码' @@ -96,21 +88,17 @@ }); } else if (idx === 1) { uni.navigateTo({ - url: '/pages/sys/user/myPayment/myPayment' + url: '/pages/sys/user/myRepair/myRepair' }); } else if (idx === 2) { - uni.navigateTo({ - url: '/pages/sys/user/myRepair/myRepair' - }); - } else if (idx === 3) { uni.navigateTo({ url: '/pages/sys/user/myVisitor/myVisitor' }); - } else if (idx === 4) { - uni.navigateTo({ - url: '/pages/sys/user/myRecord/myRecord' - }); - } + }else if (idx === 3) { + uni.navigateTo({ + url: '/pages/sys/user/pwd' + }); + } }, logout() { // 清除用户信息并返回登录页 diff --git a/pages/sys/user/pwd.vue b/pages/sys/user/pwd.vue index 732d9c1..cf19c98 100644 --- a/pages/sys/user/pwd.vue +++ b/pages/sys/user/pwd.vue @@ -1,126 +1,123 @@ diff --git a/pages/sys/workbench/unitManagement/employeeAdd.vue b/pages/sys/workbench/unitManagement/employeeAdd.vue index 0fa7d19..af690d7 100644 --- a/pages/sys/workbench/unitManagement/employeeAdd.vue +++ b/pages/sys/workbench/unitManagement/employeeAdd.vue @@ -162,7 +162,8 @@ export default { // 删除图片 deleteImage() { this.employeeInfo.img = ''; - }, // 提交表单 + }, + // 提交表单 submitForm() { //密码对比 if (!this.validatePassword()) { diff --git a/pages/sys/workbench/unitManagement/unitManagement.vue b/pages/sys/workbench/unitManagement/unitManagement.vue index 88f12c2..f5e6d60 100644 --- a/pages/sys/workbench/unitManagement/unitManagement.vue +++ b/pages/sys/workbench/unitManagement/unitManagement.vue @@ -136,7 +136,7 @@ export default { .unit-management { display: flex; flex-direction: column; - height: 95vh; + height: 100vh; background-color: #f5f5f5; padding: 20rpx; } diff --git a/pages/sys/workbench/workbench.vue b/pages/sys/workbench/workbench.vue index 580256e..d9fbac8 100644 --- a/pages/sys/workbench/workbench.vue +++ b/pages/sys/workbench/workbench.vue @@ -64,31 +64,36 @@ text: '工单', url:'/pages/sys/workbench/order/order' }, - { - icon: '/static/aaaa_yjcl.png', - text: '预警处理', - url:'/pages/sys/workbench/earlyWarning/earlyWarning' - - }, + // { + // icon: '/static/aaaa_yjcl.png', + // text: '预警处理', + // url:'/pages/sys/workbench/earlyWarning/earlyWarning' + // + // }, // { // icon: 'https://picsum.photos/80/80?random=3', // text: '保洁' // }, - { - icon: '/static/aaaa_jk.png', - text: '监控', - url:'/pages/sys/workbench/monitor/monitors' - }, - { - icon: '/static/aaaa_bsbx.png', - text: '报事报修', - url:'/pages/sys/user/myRepair/myRepair' - }, + // { + // icon: '/static/aaaa_jk.png', + // text: '监控', + // url:'/pages/sys/workbench/monitor/monitors' + // }, + // { + // icon: '/static/aaaa_bsbx.png', + // text: '报事报修', + // url:'/pages/sys/user/myRepair/myRepair' + // }, { icon: '/static/ic_unit.png', text: '单位管理', url:'/pages/sys/workbench/unitManagement/unitManagement' }, + { + icon: '/static/aaa_yq.png', + text: '访客管理', + url:'/pages/sys/user/myVisitor/myVisitor' + }, // { // icon: 'https://picsum.photos/80/80?random=3', // text: '添加常用' diff --git a/static/aaa_yq.png b/static/aaa_yq.png new file mode 100644 index 0000000..4ba9c0c Binary files /dev/null and b/static/aaa_yq.png differ