diff --git a/components/ar-circle-progress/index.vue b/components/ar-circle-progress/index.vue index b76def0..35a4e4d 100644 --- a/components/ar-circle-progress/index.vue +++ b/components/ar-circle-progress/index.vue @@ -8,7 +8,7 @@ }" > - - + + + + + 取消 + 确认 + + + + + {{pItem}} + + + + {{cItem}} + + + + {{tItem}} + + + + + + + + + + + diff --git a/components/lw-notice/lw-notice.vue b/components/lw-notice/lw-notice.vue index 5194005..3e15a24 100644 --- a/components/lw-notice/lw-notice.vue +++ b/components/lw-notice/lw-notice.vue @@ -356,14 +356,14 @@ moreColor:显示更多的颜色 } .loopItemBaseShow { + position: absolute; top: 0; left: 0; width: 100%; - height: 100%; + // height: 100%; overflow: hidden; font-size: 28rpx; text-align: left; - position: absolute; white-space: nowrap; align-items: center; text-overflow: ellipsis; diff --git a/jsFile/tools.js b/jsFile/tools.js index 118ef71..531362d 100644 --- a/jsFile/tools.js +++ b/jsFile/tools.js @@ -69,6 +69,16 @@ const tools = { // return false return !reg_tel.test(phone); }, + // 电子邮箱验证 + isEmail(email){ + let reg_email = /^\w+([-+.]\w+)*@\w+([-.]\w+)*\.\w+([-.]\w+)*$/; + return !reg_email.test(email); + }, + // 身份证验证 + isIdentity(identity) { + let reg_identity = /(^\d{15}$)|(^\d{18}$)|(^\d{17}(\d|X|x)$)/; + return !reg_identity.test(identity); + }, // 手机号中间四位用"****"带替 hideMPhone(phone){ return `${phone.substr(0, 3)}****${phone.substr(7)}` diff --git a/pages/feedback/feedback.vue b/pages/feedback/feedback.vue index 23b129a..a0f7cd6 100644 --- a/pages/feedback/feedback.vue +++ b/pages/feedback/feedback.vue @@ -104,7 +104,16 @@ ] } }, + onLoad() { + this.checkFeedback(); + }, methods: { + // 查询意见反馈类型 + checkFeedback(){ + this.$requst.get('/universal/api.feedback/feedback_type',{page:1,list_rows:20}).then(res=>{ + + }) + }, opinionType(index) { for (var i = 0; i < this.typeData.length; i++) { this.typeData[i].state = false diff --git a/pages/project/projectList.vue b/pages/project/projectList.vue index 770f85e..b498a54 100644 --- a/pages/project/projectList.vue +++ b/pages/project/projectList.vue @@ -1,14 +1,11 @@ - + - - - + + - - - + @@ -79,7 +76,6 @@ format: true }) return { - statusBarHeight:uni.getSystemInfoSync().statusBarHeight+40, date: currentDate, array: ['类型', '类型', '类型', '类型'], index: 0, @@ -128,8 +124,6 @@ height: 114rpx; position: relative; padding: 20rpx 16rpx; - position: fixed; - z-index: 2; box-sizing: border-box; background-color: #FFFFFF } diff --git a/pages/tabbar/my/my.vue b/pages/tabbar/my/my.vue index 14b972e..3d7a2fd 100644 --- a/pages/tabbar/my/my.vue +++ b/pages/tabbar/my/my.vue @@ -4,7 +4,15 @@ 个人中心 - + + + + + + + + + @@ -38,7 +46,7 @@ {{item.num}}% diff --git a/pages/tabbar/pagehome/pagehome.vue b/pages/tabbar/pagehome/pagehome.vue index bd47815..6bf97b1 100644 --- a/pages/tabbar/pagehome/pagehome.vue +++ b/pages/tabbar/pagehome/pagehome.vue @@ -1,5 +1,5 @@ - + @@ -10,201 +10,214 @@ + 拨打电话 + + + + + 拨打电话 + + + + + - - - - - - - 项目总数 - 126 - - - - 实时故障 - 116 - - - - - - - - - - - - - - - 故障报修 - - - - {{item.title}} - - - - - - 数据查询 - - - - - {{item.num}} + + + + + + + + + 项目总数 + 126 - {{item.title}} - - - - - - 增值服务 - - - - {{item.title}} - - - - - - - - - 项目维修 - - - - - {{item.num}} + + + 实时故障 + 116 + + + + + + - {{item.title}} - - - - - 待办工单 - - - - - {{item.num}} + + + + + 故障报修 + + + + {{item.title}} + + + + + + 数据查询 + + + + + {{item.num}} + + {{item.title}} + + + + + + 增值服务 + + + + {{item.title}} - {{item.title}} - - - 待办事件 - - - - - {{item.num}} + + + + + 项目维修 + + + + + {{item.num}} + + {{item.title}} + + + + + + 待办工单 + + + + + {{item.num}} + + {{item.title}} + + + + + + 待办事件 + + + + + {{item.num}} + + {{item.title}} + + + + + + + 工单数据 + + + + + {{item.num}} + + {{item.title}} + + + + + + 数据查询 + + + + + {{item.num}} + + {{item.title}} + + + + + + 结算情况 + + + + + {{item.num}} + + {{item.title}} + + + + + + + 其他 + + + {{item.title}} - - - 工单数据 - - - - - {{item.num}} + + + + + 畅想智能-场景化设计 + 解决方案Solution + + + + + + + + + {{item.title}} + - {{item.title}} - + - - - 数据查询 - - - - - {{item.num}} + + + 常见故障Common faults + + + + {{item.title}} + {{item.content}} - {{item.title}} - - - - - - 结算情况 - - - - - {{item.num}} - - {{item.title}} + {{item.views}}人看过 + - - - 其他 - - - - {{item.title}} - - - - - - - - - 畅想智能-场景化设计 - 解决方案Solution - - - - - - - - - {{item.title}} - - - - - - - - 常见故障Common faults - - - - {{item.title}} - {{item.content}} - - {{item.views}}人看过 - - - - - + @@ -217,12 +230,14 @@ // 公告 import lwNotice from '@/components/lw-notice/lw-notice.vue'; import footTabOne from '@/components/foot-tabs/foot-tab-one.vue'; + import containerSubgroupTwo from '@/components/containers/container-subgroup-two.vue'; export default { components:{ pitera, statusNavSlot, lwNotice, - 'foot-tab' :footTabOne + 'foot-tab' :footTabOne, + containerSubgroupTwo }, data() { return { diff --git a/pagesB/electronic-certificate/electronic-certificate.vue b/pagesB/electronic-certificate/electronic-certificate.vue index ec5bcb9..d4c519a 100644 --- a/pagesB/electronic-certificate/electronic-certificate.vue +++ b/pagesB/electronic-certificate/electronic-certificate.vue @@ -6,17 +6,17 @@ - - ID:CW-0000 + + ID:{{userId}} - 姓名 - 市场部门 | 技术支持 + {{userName}} + {{userContent}} - +86 123 4567 8910 - 12345678910qwer@890.com - WWW.12345678910.com + +86 {{userPhone}} + {{userEmail}} + {{website}} @@ -30,7 +30,13 @@ export default { data() { return { - + userImg:'/static/public/icon-electronic-logo.png', + userId:'CW-0000', + userName:'姓名', + userContent:'市场部门 | 技术支持', + userPhone:'123 4567 8910', + userEmail:'12345678910qwer@890.com', + website:'WWW.12345678910.com' } }, methods: { diff --git a/pagesB/personal-information/personal-information.vue b/pagesB/personal-information/personal-information.vue index 25b86e8..1f47065 100644 --- a/pagesB/personal-information/personal-information.vue +++ b/pagesB/personal-information/personal-information.vue @@ -76,7 +76,7 @@ - 提交保存 + 提交保存 @@ -98,9 +98,69 @@ e_mail:'', // 电子邮箱 id_card_no:'', // 身份证号码 imgList:[], + flag:true } }, methods: { + // 提交保存事件 + sumbmitData(){ + if(this.checkEmpty()){ + if(this.flag) { + this.flag = false; + let params = { + a:this.nickname, + b:this.full_name, + c:this.genderNum, + d:this.contact_number, + e:this.e_mail, + f:this.id_card_no, + g:this.imgList[0] || '', + h:this.imgList[1] || '', + i:this.imgList[2] || '', + k:this.imgList[3] || '' + } + console.log(params,119); + // this.$requst.post('',params).then(res=>{ + // if(res.code){ + uni.navigateBack({delta:1}) + // } + // }) + } else { + this.$toolAll.tools.showToast('请勿重复提交'); + } + } + }, + // 判断是否为空 + checkEmpty(){ + let result = false; + if(uni.getStorageSync('type_id')==4) { + // 如果是工程师 + if(!this.nickname) { + this.$toolAll.tools.showToast('请输入我的昵称'); + } else if(!this.full_name) { + this.$toolAll.tools.showToast('请输入姓名'); + } else if(this.$toolAll.tools.isPhone(this.contact_number)) { + this.$toolAll.tools.showToast('请正确输入联系电话'); + } else if(this.$toolAll.tools.isEmail(this.e_mail)) { + this.$toolAll.tools.showToast('请正确输入电子邮箱'); + } else if(this.$toolAll.tools.isIdentity(this.id_card_no)) { + this.$toolAll.tools.showToast('请正确输入身份证号码'); + } else if(!this.imgList[0]) { + this.$toolAll.tools.showToast('请上传身份证正反面'); + } else if(!this.imgList[1]) { + this.$toolAll.tools.showToast('请上传意外险材料'); + } else if(!this.imgList[2]) { + this.$toolAll.tools.showToast('请上传合作协议'); + } else if(!this.imgList[3]) { + this.$toolAll.tools.showToast('请上传技能证书'); + } else { + result = true; + } + } else { + result = true; + } + return result; + }, // 性别切换 chooseGender(index){ this.genderNum = index; @@ -119,12 +179,12 @@ from:tempImg[0] } console.log(params,104); - // uploadImg(params).then(res=>{ - // console.log(res); - // }) + uploadImg(params).then(res=>{ + console.log(res); + }) // this.$requst.upload('file/upload/image',{file:tempImg[i]}).then(res=>{ // if(this.imgArr.length!=9){ - // this.imgArr.push(this.$http + res.data.src); + // // this.imgArr.push(this.$http + res.data.src); // } // if(num==tempImg.length){ // this.$toolAll.tools.showToast('上传成功(*^▽^*)') diff --git a/pagesB/service-range/service-range.vue b/pagesB/service-range/service-range.vue index 7a17843..ce63115 100644 --- a/pagesB/service-range/service-range.vue +++ b/pagesB/service-range/service-range.vue @@ -17,15 +17,16 @@ 地 区* - - 湖南省株洲市芦淞区 + + + {{region}} 详细地址 * - + @@ -43,12 +44,18 @@ - 提交保存 + 提交保存 +