diff --git a/pages.json b/pages.json index 1b8c3f3..2caa9ba 100644 --- a/pages.json +++ b/pages.json @@ -46,7 +46,7 @@ { "path": "pages/tabBar/xjPage/xj", "style": { - "navigationBarTitleText": "巡检", + "navigationBarTitleText": "巡检上报", "disableScroll": true } }, diff --git a/pages/tabBar/sdPage/dfReport.vue b/pages/tabBar/sdPage/dfReport.vue index 1b25348..1276452 100644 --- a/pages/tabBar/sdPage/dfReport.vue +++ b/pages/tabBar/sdPage/dfReport.vue @@ -39,7 +39,6 @@ 水表号 - @@ -66,7 +65,9 @@ @delete="onDelete" > - + + + 点击上传 @@ -104,10 +105,6 @@ export default { } else if(type == '房屋'){ this.form.pickerValue2 = this.items[e.detail.value] } - - }, - onDeviceChange(idx, val) { - this.deviceList[idx].status = val }, afterRead(event) { let files = Array.isArray(event) ? event : [event] @@ -264,6 +261,19 @@ display: flex; justify-content: center; margin: 20rpx 16rpx 0 0; } +.icon-box{ + width: 60rpx; + height: 60rpx; + background: #ceeced; + border-radius: 50%; + display: flex; + align-items: center; + justify-content: center; +} +.camera-icon{ + width: 36rpx; + height: 36rpx; +} .upload-tips { color: #bbb; font-size: 24rpx; @@ -293,13 +303,13 @@ display: flex; font-size: 36rpx; border-radius: 48rpx !important; border: none; - width: 80vw; + width: 80%; height: 88rpx; } diff --git a/pages/tabBar/sdPage/sfReport.vue b/pages/tabBar/sdPage/sfReport.vue index aab6866..781cd39 100644 --- a/pages/tabBar/sdPage/sfReport.vue +++ b/pages/tabBar/sdPage/sfReport.vue @@ -66,7 +66,9 @@ @delete="onDelete" > - + + + 点击上传 @@ -74,8 +76,9 @@ - - 提交 + 提交 + + @@ -104,10 +107,6 @@ export default { } else if(type == '房屋'){ this.form.pickerValue2 = this.items[e.detail.value] } - - }, - onDeviceChange(idx, val) { - this.deviceList[idx].status = val }, afterRead(event) { let files = Array.isArray(event) ? event : [event] @@ -264,6 +263,19 @@ display: flex; justify-content: center; margin: 20rpx 16rpx 0 0; } +.icon-box{ + width: 60rpx; + height: 60rpx; + background: #ceeced; + border-radius: 50%; + display: flex; + align-items: center; + justify-content: center; +} +.camera-icon{ + width: 36rpx; + height: 36rpx; +} .upload-tips { color: #bbb; font-size: 24rpx; @@ -290,17 +302,23 @@ display: flex; } .u-button--primary { + display: flex; + align-items: center; + justify-content: center; background: linear-gradient(90deg, #0DC6C6 0%, #13C2C2 100%) !important; font-size: 36rpx; border-radius: 48rpx !important; border: none; - width: 80vw; + margin: auto; + margin-top: 40rpx; + width: 80%; height: 88rpx; + color: rgba(255, 255, 255, 1); } diff --git a/pages/tabBar/work/index.vue b/pages/tabBar/work/index.vue index 48cb72e..fb90fae 100644 --- a/pages/tabBar/work/index.vue +++ b/pages/tabBar/work/index.vue @@ -67,8 +67,8 @@ export default { { image: '/static/img/强制清退.png', text: '强制清退' }, ], xjList: [ - { image: '/static/img/巡查.png', text: '巡检' }, - { image: '/static/img/记录.png', text: '记录' }, + { image: '/static/img/巡查.png', text: '巡检上报' }, + { image: '/static/img/记录.png', text: '巡检记录' }, ], sdList: [ { image: '/static/img/水费.png', text: '水费上报' }, @@ -118,7 +118,7 @@ export default { } }, handelXjClick (item) { - if (item.text === '巡检') { + if (item.text === '巡检上报') { // 列表 uni.navigateTo({ url: '/pages/tabBar/xjPage/xj' diff --git a/pages/tabBar/xjPage/xj.vue b/pages/tabBar/xjPage/xj.vue index a9334f9..15cf4e7 100644 --- a/pages/tabBar/xjPage/xj.vue +++ b/pages/tabBar/xjPage/xj.vue @@ -5,9 +5,9 @@ 填写信息 请您填写相关问题 - + - @@ -26,9 +26,31 @@ + + + + + + + + 点击上传 + + + - + @@ -72,16 +94,34 @@ export default { name: '', phone: '', }, + rules:{ + sex:[ + { required: true, message: '请输入', trigger: 'blur' } + ] + }, radio: '', switchVal: false, + fileList: [], } }, onLoad () { }, methods: { + afterRead(event) { + let files = Array.isArray(event) ? event : [event] + this.fileList = this.fileList.concat(files) + }, + onDelete(event) { + this.fileList.splice(event.index, 1) + }, handleBtn () { - + this.$refs['uForm'].validate((valid) => { + if (valid) { + console.log(this.userInfo); + + } + }) }, sexSelect (e) { this.model1.userInfo.sex = e.name @@ -148,4 +188,47 @@ export default { margin: auto; margin-top: 40rpx; } + +.custom-upload-btn { + width: 160rpx; + height: 160rpx; + background: #fafafa; + border: 2rpx solid #f0f0f0; + border-radius: 16rpx; + display: flex; + flex-direction: column; + align-items: center; + justify-content: center; + margin: 20rpx 16rpx 0 0; +} +.icon-box{ + width: 60rpx; + height: 60rpx; + background: #ceeced; + border-radius: 50%; + display: flex; + align-items: center; + justify-content: center; +} +.camera-icon{ + width: 36rpx; + height: 36rpx; +} +.upload-tips { + color: #bbb; + font-size: 24rpx; + margin-top: 8rpx; +} +.u-upload__wrap { + display: flex; + flex-wrap: wrap; + align-items: center; + margin-top: 20rpx; +} +.u-upload__preview { + border-radius: 16rpx; + overflow: hidden; + margin-right: 16rpx; + margin-bottom: 16rpx; +} diff --git a/static/img/camera-icon.png b/static/img/camera-icon.png new file mode 100644 index 0000000..ef68fd3 Binary files /dev/null and b/static/img/camera-icon.png differ