diff --git a/App.vue b/App.vue index 5edf38c..8a60ffe 100644 --- a/App.vue +++ b/App.vue @@ -2,22 +2,7 @@ export default { onLaunch: function() { console.log('App Launch'); - // 调用uni.login方法获取code - uni.login({ - provider:'weixin', - success: function(loginRes) { - // 打印获取到的code - console.log('获取的用户code是：' + loginRes.code); - uni.request({ - url:'', - method:'POST' - }) - }, - fail: function(error) { - // 登录失败的回调 - console.error('登录失败：', error); - } - }); + }, onShow: function() { console.log('App Show') diff --git a/pages.json b/pages.json index 85bbc1c..da9bf63 100644 --- a/pages.json +++ b/pages.json @@ -62,14 +62,14 @@ { "path": "pages/tabBar/sdPage/sfReport", "style": { - "navigationBarTitleText": "水费上报", + "navigationBarTitleText": "水量上报", "disableScroll": true } }, { "path": "pages/tabBar/sdPage/dfReport", "style": { - "navigationBarTitleText": "电费上报", + "navigationBarTitleText": "电量上报", "disableScroll": true } } diff --git a/pages/login/login.vue b/pages/login/login.vue index 4d4301b..ec7496e 100644 --- a/pages/login/login.vue +++ b/pages/login/login.vue @@ -1,266 +1,282 @@ + .captcha-img { + width: 160rpx; + height: 60rpx; + margin-left: 16rpx; + border: 1rpx solid #e0e0e0; + border-radius: 8rpx; + background: #fff; + box-sizing: border-box; + } + \ No newline at end of file diff --git a/pages/tabBar/work/index.vue b/pages/tabBar/work/index.vue index fb90fae..74d9ba1 100644 --- a/pages/tabBar/work/index.vue +++ b/pages/tabBar/work/index.vue @@ -71,8 +71,8 @@ export default { { image: '/static/img/记录.png', text: '巡检记录' }, ], sdList: [ - { image: '/static/img/水费.png', text: '水费上报' }, - { image: '/static/img/电费.png', text: '电费上报' }, + { image: '/static/img/水费.png', text: '水量上报' }, + { image: '/static/img/电费.png', text: '电量上报' }, ], bxList: [ { image: '/static/img/上报.png', text: '上报' }, @@ -130,11 +130,11 @@ export default { } }, handelSdClick (item) { - if(item.text === '水费上报'){ + if(item.text === '水量上报'){ uni.navigateTo({ url: '/pages/tabBar/sdPage/sfReport' }) - } else if(item.text === '电费上报'){ + } else if(item.text === '电量上报'){ uni.navigateTo({ url: '/pages/tabBar/sdPage/dfReport' }) diff --git a/pages/tabBar/xjPage/xj.vue b/pages/tabBar/xjPage/xj.vue index 497dc71..41b3382 100644 --- a/pages/tabBar/xjPage/xj.vue +++ b/pages/tabBar/xjPage/xj.vue @@ -38,6 +38,8 @@ accept="all" @afterRead="afterRead" @delete="onDelete" + :maxSize="10 * 1024 * 1024" + @oversize="oversize" > @@ -158,6 +160,11 @@ export default { }); }); this.form.imageList = arry + }, + //图片超过大小时取消上传 + oversize(e) { + this.$u.toast("请传10MB以内大小的图片/视频！"); + return false; }, getDictType(){ getDicts('inspection_question_type').then((res) => { diff --git a/pagesA/checkout/detail/detail.vue b/pagesA/checkout/detail/detail.vue index 4407031..0e1815f 100644 --- a/pagesA/checkout/detail/detail.vue +++ b/pagesA/checkout/detail/detail.vue @@ -100,6 +100,8 @@ import { detail } from '@/api/mz/contract'; :maxCount="10" uploadIconColor="#12c3c3" :previewImage="true" + :maxSize="10 * 1024 * 1024" + @oversize="oversize" > @@ -197,6 +199,11 @@ export default { beforeRead(event) { console.log("event", event); }, + //图片超过大小时取消上传 + oversize(e) { + this.$u.toast("请传10MB以内大小的图片/视频！"); + return false; + }, // 选择文件后上传 async afterRead(event) { @@ -210,19 +217,33 @@ export default { }); }); for (let i = 0; i < lists.length; i++) { - const result = await uploadImage(lists[i].url); - let item = this[`fileList${event.name}`][fileListLen]; - - this[`fileList${event.name}`].splice( - fileListLen, - 1, - Object.assign(item, { - status: "success", - message: "", - url: result.url, - }) - ); - fileListLen++; + try { + const result = await uploadImage(lists[i].url); + let item = this[`fileList${event.name}`][fileListLen]; + this[`fileList${event.name}`].splice( + fileListLen, + 1, + Object.assign(item, { + status: "success", + message: "", + url: result.url, + }) + ); + fileListLen++; + } catch (err) { + // 处理接口异常 + let msg = (err && err.msg) || (err && err.message) || "上传失败"; + console.log('344',err); + + uni.showToast({ + title: msg, + icon: "none", + duration: 3000 + }); + // 失败时移除上传中的文件 + this[`fileList${event.name}`].splice(fileListLen, 1); + return; // 终止后续上传 + } } var arry = []; this.fileList.filter((v, i) => { diff --git a/pagesA/checkout/list/list.vue b/pagesA/checkout/list/list.vue index c1a3b77..f4da07c 100644 --- a/pagesA/checkout/list/list.vue +++ b/pagesA/checkout/list/list.vue @@ -32,7 +32,7 @@ 加载中... 暂无数据~ - 没有更多了~ + diff --git a/pagesA/force/index/index.vue b/pagesA/force/index/index.vue index fad27fc..14de2bb 100644 --- a/pagesA/force/index/index.vue +++ b/pagesA/force/index/index.vue @@ -9,9 +9,10 @@ placeholder="请输入身份证号" v-model="form.idCard" shape="round" - :showAction="false" + :showAction="false" @search="handleQuery" - @clear="handleClear" + @clear="handleClear" + @clickIcon="handleQuery" > @@ -53,13 +54,13 @@ /> --> - - {{ baseInfo.checkOutTime }} + {{ baseInfo.checkOutTime }} --> - + - + @@ -78,7 +82,9 @@ uploadIconColor="#12c3c3" uploadText="点击上传" :previewImage="true" - accept="media" + accept="all" + :maxSize="10 * 1024 * 1024" + @oversize="oversize" > @@ -92,6 +98,8 @@ uploadIconColor="#12c3c3" :previewImage="true" accept="image/*,video/*" + :maxSize="10 * 1024 * 1024" + @oversize="oversize" > @@ -186,6 +194,11 @@ export default { }); this.fileList = arry; }, + //图片超过大小时取消上传 + oversize(e) { + this.$u.toast("请传10MB以内大小的图片/视频！"); + return false; + }, // 选择文件后上传 async afterRead(event) { let lists = [].concat(event.file); @@ -284,14 +297,17 @@ export default { } // 检查设备检查是否都已完成 - if (!this.roomDetail.facilitiesCheckResults || this.roomDetail.facilitiesCheckResults.length === 0) { + if ( + !this.roomDetail.facilitiesCheckResults || + this.roomDetail.facilitiesCheckResults.length === 0 + ) { uni.showToast({ title: "请完成设备检查", icon: "none" }); return; } // 检查所有设备是否都是完好状态 - const unfinishedDevices = this.roomDetail.facilitiesCheckResults.filter(item => - item.checkResult === undefined || item.checkResult === null + const unfinishedDevices = this.roomDetail.facilitiesCheckResults.filter( + (item) => item.checkResult === undefined || item.checkResult === null ); if (unfinishedDevices.length > 0) { uni.showToast({ title: "请完成所有设备检查", icon: "none" }); @@ -299,11 +315,14 @@ export default { } // 检查是否所有设备都是完好状态（值为0） - const nonIntactDevices = this.roomDetail.facilitiesCheckResults.filter(item => - item.checkResult !== 0 + const nonIntactDevices = this.roomDetail.facilitiesCheckResults.filter( + (item) => item.checkResult !== 0 ); if (nonIntactDevices.length > 0) { - uni.showToast({ title: "所有设备必须都是完好状态才能提交", icon: "none" }); + uni.showToast({ + title: "所有设备必须都是完好状态才能提交", + icon: "none", + }); return; } @@ -313,7 +332,7 @@ export default { cleaned: this.cleaned, facilitiesCheckDesc: this.value, facilitiesCheckImages: this.fileList, - imageList:this.fileList + imageList: this.fileList, }; const res = await releaseRoom(parm); diff --git a/pagesA/release/list/list.vue b/pagesA/release/list/list.vue index 2726713..7795d3d 100644 --- a/pagesA/release/list/list.vue +++ b/pagesA/release/list/list.vue @@ -9,7 +9,7 @@ @scrolltolower="loadMore" style="height: 100vh;" > - + @@ -23,7 +23,7 @@ 加载中... 暂无数据~ - 没有更多了~ + @@ -102,6 +102,8 @@ export default { } }, goDetail(item) { + console.log(item,'item'); + uni.navigateTo({ url: `/pagesA/release/detail/detail?roomId=${item.roomId}&userInfo=${JSON.stringify(item)}` });