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 bf885b3..e18e78a 100644 --- a/pages/feedback/feedback.vue +++ b/pages/feedback/feedback.vue @@ -105,7 +105,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 3a32926..8515662 100644 --- a/pages/project/projectList.vue +++ b/pages/project/projectList.vue @@ -1,66 +1,70 @@ @@ -193,11 +197,11 @@ } }, onLoad() { - this.getData() - + // this.getData() + }, methods: { - + getData() { this.$requst.post('/universal/api.project/project_list', { list_rows: this.dataList.list_rows, @@ -227,7 +231,7 @@ // this.$toolAll.tools.showToast(res.msg); if (res.code == 0) { console.log(res.data.data) - this.dataList = res.data.data + // this.dataList = res.data.data } else { } @@ -259,6 +263,7 @@ } +