From 041d7ab614bcc5cf61a9d8c71b6bd2fac7e8f228 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=BD=87?= Date: Mon, 10 Mar 2025 02:12:33 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96+bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app.js | 2 +- components/img-uploader/index.js | 2 +- components/modalView/index.js | 29 +++++++++++++++++++----- components/modalView/index.wxml | 13 ++++++++--- components/modalView/index.wxss | 38 ++++++++++++++++++++++++++++++++ pages/index/index.wxml | 2 +- pages/index/mark-up/index.js | 19 ++++++++-------- pages/index/mark-up/index.wxml | 4 ++-- 8 files changed, 85 insertions(+), 24 deletions(-) diff --git a/app.js b/app.js index b92956f..5ecbfa1 100644 --- a/app.js +++ b/app.js @@ -65,7 +65,7 @@ App({ } //非空 if(item.required){ - if(value==''){ + if(!value){ valid = false; } }else if(item.length){ diff --git a/components/img-uploader/index.js b/components/img-uploader/index.js index c148fd6..dab420e 100644 --- a/components/img-uploader/index.js +++ b/components/img-uploader/index.js @@ -115,7 +115,7 @@ Component({ }, setUploadedImgs(imgs){ this.setData({ - tempImgs:imgs.concat(this.data.tempImgs) + tempImgs:imgs }) } }, diff --git a/components/modalView/index.js b/components/modalView/index.js index e7d69ff..f4ebe32 100644 --- a/components/modalView/index.js +++ b/components/modalView/index.js @@ -52,6 +52,14 @@ Component({ show:{ type:Boolean, value:false + }, + overlayClose:{ + type:Boolean, + value:true + }, + showCloseButton:{ + type:Boolean, + value:false } }, /** @@ -59,16 +67,20 @@ Component({ */ data: { dynamicsStyle:'', - textareaHeight:124 + textareaHeight:124, + _show:false }, /** * 组件的方法列表 */ methods: { + abc(event){ + console.log(event); + }, cancelButtonTap(){ this.setData({ - show:false + _show:false }); this.triggerEvent('cancel'); }, @@ -88,21 +100,23 @@ Component({ show:false }); this.triggerEvent('ok',this.properties.content); + }, + afterLeave(event){ + this.setData({ + show:false + }) } }, lifetimes:{ attached(){ - + console.log('init model view'); } }, observers:{ "show"(show){ if(show){ const windowInfo = wx.getWindowInfo(); - // this.setData({ - // textareaHeight:this.properties.row*25+24, - // }) this.createSelectorQuery().select('#modalViewMain').boundingClientRect((res)=>{ const viewHeight = res.height; this.setData({ @@ -110,6 +124,9 @@ Component({ }) }).exec(); } + this.setData({ + _show:show + }) } } }) \ No newline at end of file diff --git a/components/modalView/index.wxml b/components/modalView/index.wxml index e7ecf7d..e5091fb 100644 --- a/components/modalView/index.wxml +++ b/components/modalView/index.wxml @@ -1,9 +1,16 @@ - + - {{titleText}} - + + {{titleText}} + + + + {{content}} diff --git a/components/modalView/index.wxss b/components/modalView/index.wxss index fa65a03..40d9564 100644 --- a/components/modalView/index.wxss +++ b/components/modalView/index.wxss @@ -1,18 +1,56 @@ .custom-modal-view{ border-radius: 20px; } +.custom-modal-view-overlay{ + position: fixed; + top:0;left:0;right:0; + height:100vh; + opacity: 0; +} .custom-modal-view .title{ font-size: 34rpx; font-weight: 500; line-height: 50rpx; + position: relative; } .custom-modal-view .title.center{ text-align: center; } +.close-btn-area{ + position: absolute; + right:-32rpx;top:-32rpx; + width:100rpx;height:82rpx; + display: flex; + align-items: flex-end; + justify-content: center; +} +.custom-modal-view .title .close-btn{ + position: relative; + width:50rpx;height:50rpx; +} +.custom-modal-view .title .close-btn::before,.custom-modal-view .title .close-btn::after{ + content: ''; + position: absolute; + width:80%; + height:4rpx; + left:10%;top:50%; + margin-top:-2rpx; + background-color: #999999; + transform: rotate(45deg); +} +.custom-modal-view .title .close-btn::after{ + width:4rpx; + height:80%; + left:50%;top:10%; + margin-top:0; + margin-left: -2rpx; +} .modal-view-main{ border-radius: 24rpx; background-color: #fff; padding:32rpx; + position: relative; + z-index: 111; } .custom-modal-view .textarea{ border: 1.2px solid rgba(85, 85, 85, 0.3); diff --git a/pages/index/index.wxml b/pages/index/index.wxml index 640cc69..a14fffb 100644 --- a/pages/index/index.wxml +++ b/pages/index/index.wxml @@ -206,7 +206,7 @@ - + diff --git a/pages/index/mark-up/index.js b/pages/index/mark-up/index.js index 2f9dd2b..3bd5709 100644 --- a/pages/index/mark-up/index.js +++ b/pages/index/mark-up/index.js @@ -33,8 +33,7 @@ Component({ */ methods: { async apply(){ - const imgUploader = this.selectComponent('#imgUploader'); - const urls = await imgUploader.getUploadedUrl(); + const urls = await this.imgUploader.getUploadedUrl(); const valid = app.validateForm({ reason:{required:true,autoFocus:true,shake:true}, money:{min:1,shake:true} @@ -52,10 +51,9 @@ Component({ this.setData({ reason:'', money:0, - }); - this.setData({ isShowMarkup:false - }) + }); + this.imgUploader.setUploadedImgs([]); wx.showToast({ title: '保存成功', }) @@ -70,10 +68,9 @@ Component({ this.setData({ reason:'', money:0, - }); - this.setData({ isShowMarkup:false - }) + }); + this.imgUploader.setUploadedImgs([]); wx.showToast({ title: '保存成功', }) @@ -98,19 +95,21 @@ Component({ money:data.additional_fee_amount, requestId:data.id }) - this.selectComponent('#imgUploader').setUploadedImgs(imgs); + this.imgUploader.setUploadedImgs(imgs); }).catch((error)=>{ this.setData({ reason:'', + requestId:'', money:0, }); + this.imgUploader.setUploadedImgs([]); }) } }, lifetimes:{ attached(){ - + this.imgUploader = this.selectComponent('#imgUploader') } } }) \ No newline at end of file diff --git a/pages/index/mark-up/index.wxml b/pages/index/mark-up/index.wxml index 7cac176..a2c567f 100644 --- a/pages/index/mark-up/index.wxml +++ b/pages/index/mark-up/index.wxml @@ -1,7 +1,7 @@ + okButtonText="提交申请" model:show="{{isShowMarkup}}" show-close-button + class="mark-up-view" titleTextCenter="{{false}}" overlay-close="{{false}}">