From 89f727050def33a2e5eb3cc276d1759e7a7f8408 Mon Sep 17 00:00:00 2001 From: douzhuo <17611323298@163.com> Date: Wed, 19 Oct 2022 17:54:33 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A41017=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- env/cl.js | 2 +- pages/center/consumer/edit.vue | 28 +++++++++++++++++++++++-- pages/login/index.vue | 2 +- pages/mine/calibration.vue | 27 +++++++++++++++++++++++- pages/mine/selectBuilding.vue | 38 ++++++++++++++++++++++++---------- 5 files changed, 81 insertions(+), 16 deletions(-) diff --git a/env/cl.js b/env/cl.js index a394b7c..5335457 100644 --- a/env/cl.js +++ b/env/cl.js @@ -1,5 +1,5 @@ const ENV_PATH = { - baseUrl: 'http://192.168.31.231:8080/autoSR/api', // 长龙 + baseUrl: 'http://192.168.31.244:8080/autoSR/api', // 长龙 } module.exports = ENV_PATH \ No newline at end of file diff --git a/pages/center/consumer/edit.vue b/pages/center/consumer/edit.vue index a4fe208..c35d372 100644 --- a/pages/center/consumer/edit.vue +++ b/pages/center/consumer/edit.vue @@ -96,7 +96,7 @@ - + {{item.name}} @@ -344,8 +344,13 @@ if (this.form.showPhones != this.form.showPhone) { this.form.phone = this.form.showPhone } - + let isPass = false // 默认通过 + let indexs = 0; // + let checkArr = {} this.allList.map(item => { + checkArr = this.allList.find(item => item.mustSelected == 0) + isPass = checkArr.children.findIndex(item => item.selected == 0) == -1 + if (isPass) return; item.children.map(item1 => { if (item1.selected == 0) { console.log(item, item1) @@ -353,6 +358,15 @@ } }) }) + + if (isPass) { + uni.showToast({ + title: `${checkArr.name}为必选项~`, + icon: 'none', + duration: 2000 + }) + return + } str = str.join(',') param = this.form param.keywordIds = str @@ -402,6 +416,7 @@ padding: 0 30rpx; .conmsg-msg-lab { + position: relative; height: 102rpx; display: flex; font-size: 30rpx; @@ -410,6 +425,15 @@ border-bottom: 1px solid #E0E0E0; line-height: 102rpx; + &.mustSe::before { + content: '*'; + color: red; + position: absolute; + left: -10rpx; + right: -10rpx; + z-index: 10; + } + .conmsg-msg-lab-1 { display: flex; min-width: 136rpx; diff --git a/pages/login/index.vue b/pages/login/index.vue index 2d15bed..c904276 100644 --- a/pages/login/index.vue +++ b/pages/login/index.vue @@ -103,7 +103,7 @@ uni.setStorageSync(WXB_SESSION_LOGIN_DATA, data); //写入缓存 that.getMenu() that.getUser(); - util.showSuccess('登录成功'); + // util.showSuccess('登录成功'); } else { util.showNone("账号名或密码错误，请重试"); return false; diff --git a/pages/mine/calibration.vue b/pages/mine/calibration.vue index ce5d8e9..3a97ebd 100644 --- a/pages/mine/calibration.vue +++ b/pages/mine/calibration.vue @@ -5,7 +5,7 @@ - + {{item.name}} @@ -82,7 +82,13 @@ projectId: uni.getStorageSync('buildingID').id, } let str = [] + let isPass = false // 默认通过 + let indexs = 0; // + let checkArr = {} this.allList.map(item => { + checkArr = this.allList.find(item => item.mustSelected == 0) + isPass = checkArr.children.findIndex(item => item.selected == 0) == -1 + if (isPass) return; item.children.map(item1 => { if (item1.selected == 0) { str.push(item1.keywordsId) @@ -90,6 +96,15 @@ }) }) + if (isPass) { + uni.showToast({ + title: `${checkArr.name}为必选项~`, + icon: 'none', + duration: 2000 + }) + return + } + str = str.join(',') param.keywordIds = str this.$u.post("matchKeywords/updateManualCalibration", param).then(res => { @@ -144,6 +159,7 @@ padding: 0 30rpx; .conmsg-msg-lab { + position: relative; height: 102rpx; display: flex; font-size: 30rpx; @@ -151,6 +167,15 @@ color: #333333; border-bottom: 1px solid #E0E0E0; line-height: 102rpx; + + &.mustSe::before { + content: '*'; + color: red; + position: absolute; + left: -10rpx; + right: -10rpx; + z-index: 10; + } .conmsg-msg-lab-1 { display: flex; diff --git a/pages/mine/selectBuilding.vue b/pages/mine/selectBuilding.vue index 128f233..f36161a 100644 --- a/pages/mine/selectBuilding.vue +++ b/pages/mine/selectBuilding.vue @@ -4,8 +4,11 @@ - - {{item.propertyName}} + + + {{item.propertyName}} + + （{{ item.daysRemaining < 0 ? '已过期' : '' }} {{ item.lockFlag == 1 ? '已禁用' : ''}}） @@ -22,22 +25,32 @@ list: [], }; }, - methods:{ - s(e){ + methods: { + s(e) { this.init(e) }, - okSelect(id,name){ + okSelect(data) { + if (data.lockFlag == 1) { + uni.showToast({ + title: `${data.propertyName}项目已禁用，不能操作`, + icon: 'none', + duration: 2000 + }) + return + } let lopan = { - id, - name + id: data.id, + name: data.propertyName } uni.setStorageSync("buildingID", lopan); uni.navigateBack({ - delta:-1 + delta: -1 }) }, - init(e){ - let data = {houseName:decodeURI(e)||''} + init(e) { + let data = { + houseName: decodeURI(e) || '' + } uni.request({ url: config.service.getUser, method: "GET", @@ -67,10 +80,13 @@ .searchResultStyle { padding: 0 30rpx; - .searchList{ + + .searchList { border-bottom: 1rpx solid #E0E0E0; padding: 30rpx 0; font-size: 30rpx; + display: flex; + justify-content: space-between; } } }