diff --git a/components/htz-image-upload/htz-image-upload.vue b/components/htz-image-upload/htz-image-upload.vue index 1ef83c9..df67830 100644 --- a/components/htz-image-upload/htz-image-upload.vue +++ b/components/htz-image-upload/htz-image-upload.vue @@ -32,7 +32,7 @@ - 请上传不超过5MB格式为png/jpg/jpeg的图片 + 请上传不超过5MB的图片 diff --git a/config.js b/config.js index ef310eb..d84a84d 100644 --- a/config.js +++ b/config.js @@ -1,8 +1,8 @@ // 应用全局配置 module.exports = { - baseUrl: 'https://sy.hbcjy.com/prod-api', + // baseUrl: 'https://sy.hbcjy.com/prod-api', h5Url:'https://sy.hbcjy.com', - // baseUrl: 'http://127.0.0.1:48080', + baseUrl: 'http://127.0.0.1:48080', // baseUrl: 'http://192.168.130.193:48080', baseApi: '/admin-api', // 应用信息 diff --git a/static/images/default-data.svg b/static/images/default-data.svg new file mode 100644 index 0000000..0c27508 --- /dev/null +++ b/static/images/default-data.svg @@ -0,0 +1 @@ +图标 \ No newline at end of file diff --git a/sunPages/addBlock/addBlock.vue b/sunPages/addBlock/addBlock.vue index df669fa..4223354 100644 --- a/sunPages/addBlock/addBlock.vue +++ b/sunPages/addBlock/addBlock.vue @@ -1,34 +1,50 @@ - - - - + @@ -52,387 +65,398 @@ diff --git a/sunPages/addNoteJobForm/addNoteJobForm.vue b/sunPages/addNoteJobForm/addNoteJobForm.vue index 1820eff..6df2cc9 100644 --- a/sunPages/addNoteJobForm/addNoteJobForm.vue +++ b/sunPages/addNoteJobForm/addNoteJobForm.vue @@ -85,10 +85,10 @@ @@ -309,7 +321,7 @@ export default { color: #666; padding-left: 15rpx; position: relative; - &:before{ + &:before { content: ' '; width: 4rpx; height: 60%; @@ -354,4 +366,10 @@ export default { box-shadow: 0 0 9px 0px gainsboro; border-radius: 15rpx; } +.no-data{ + display: flex; + flex-direction: column; + align-items: center; + color: #666; +} diff --git a/sunPages/commonSearch/nzSearch.vue b/sunPages/commonSearch/nzSearch.vue index d15f5b6..3d1c146 100644 --- a/sunPages/commonSearch/nzSearch.vue +++ b/sunPages/commonSearch/nzSearch.vue @@ -24,6 +24,10 @@ + + + 暂无数据 + @@ -344,4 +348,10 @@ export default { bottom: 55rpx; z-index: 97; } +.no-data{ + display: flex; + flex-direction: column; + align-items: center; + color: #666; +} diff --git a/sunPages/editBlock/editBlock.vue b/sunPages/editBlock/editBlock.vue index 4cb47aa..e3b8b70 100644 --- a/sunPages/editBlock/editBlock.vue +++ b/sunPages/editBlock/editBlock.vue @@ -1,8 +1,15 @@ - - - @@ -58,410 +69,397 @@ - diff --git a/sunPages/noteJobList/noteJobList.vue b/sunPages/noteJobList/noteJobList.vue index daded33..b356492 100644 --- a/sunPages/noteJobList/noteJobList.vue +++ b/sunPages/noteJobList/noteJobList.vue @@ -6,17 +6,27 @@ 记农事 - + - {{ parseTime(item.jobTime, '{y}-{m}-{d}') }} + + {{ parseTime(item.operatingTime, '{y}-{m}-{d} {h}:{i}') }} + {{ item.husbandryName && item.husbandryName != '' && item.husbandryName != null ? item.husbandryName : '-' }} - 操作人: + 农事负责人: {{ item.nickname && item.nickname != '' && item.nickname != null ? item.nickname : '-' }} + + 操作人: + {{ item.operator && item.operator != '' && item.operator != null ? item.operator : '-' }} + + + 农事时间: + {{ parseTime(item.jobTime, '{y}-{m}-{d}') }} + 种植方式: @@ -61,6 +71,10 @@ + + + 暂无数据 + @@ -88,9 +102,9 @@ export default { onLoad(options) { if (options.params) { this.resviceData = JSON.parse(options.params); - this.resviceData.choose = false + this.resviceData.choose = false; this.getBathList(this.resviceData.batch); - this.defaultBitch = this.resviceData.batch + this.defaultBitch = this.resviceData.batch; this.getCropperNote(this.defaultBitch); } }, @@ -112,17 +126,17 @@ export default { //批次切换 bathChange(e) { this.defaultBitch = e; - this.resviceData.batch = e - console.log(e,this.resviceData); + this.resviceData.batch = e; + console.log(e, this.resviceData); this.getCropperNote(e); }, //几农事 - goNoteJob(){ - const data = encodeURIComponent(JSON.stringify(this.resviceData)) - console.log(data) + goNoteJob() { + const data = encodeURIComponent(JSON.stringify(this.resviceData)); + console.log(data); uni.navigateTo({ - url:'/sunPages/addNoteJob/addNoteJob?params='+data - }) + url: '/sunPages/addNoteJob/addNoteJob?params=' + data + }); }, //批次详情 getCropperNote(val) { @@ -211,7 +225,7 @@ export default { font-size: 32rpx; color: #1b1b1b; line-height: 60rpx; - width: 50%; + width: 100%; position: relative; padding-left: 50rpx; display: flex; @@ -237,7 +251,7 @@ export default { opacity: 1; } .item-data { - background-color: rgba(0, 0, 0, 0.03); + background-color: rgba(0, 0, 0, 0.03); border-radius: 20rpx; padding: 20rpx; margin-left: 35rpx; @@ -266,7 +280,7 @@ export default { } .nz-list { - background-color: rgba(0, 0, 0, 0.05); + background-color: rgba(0, 0, 0, 0.05); border-radius: 12rpx; padding: 15rpx; margin-bottom: 30rpx; @@ -276,7 +290,7 @@ export default { .nz-top { max-width: 70%; - .nz-name{ + .nz-name { color: #333; } .nz-name, @@ -300,4 +314,13 @@ export default { } } } +.no-data { + display: flex; + flex-direction: column; + align-items: center; + color: #666; + height: 100vh; + background: #fff; + padding-top: 100rpx; +} diff --git a/uni_modules/uv-pick-color/components/uv-pick-color/props.js b/uni_modules/uv-pick-color/components/uv-pick-color/props.js index a57f063..c614b2d 100644 --- a/uni_modules/uv-pick-color/components/uv-pick-color/props.js +++ b/uni_modules/uv-pick-color/components/uv-pick-color/props.js @@ -40,7 +40,7 @@ export default { // 确认按钮的颜色 confirmColor: { type: String, - default: '#3c9cff' + default: '#14c171' }, ...uni.$uv?.props?.pickColor }