From 24f67d971f27dae3f1fc30ff90b1636054e6e974 Mon Sep 17 00:00:00 2001 From: xingyy <373639591@qq.com> Date: Tue, 26 Sep 2023 10:13:55 +0800 Subject: [PATCH 1/8] submit --- App.vue | 3 ++ pages/confirm-order/index.vue | 3 +- pages/consignment-painting/index.vue | 62 +++++++++++++++++---------- pages/order-goods/index.vue | 9 ++++ pages/order-goods/order-details.vue | 4 +- pages/paySuccess/paySuccess.vue | 14 +++++- static/zu142@3x.png | Bin 0 -> 399 bytes 7 files changed, 68 insertions(+), 27 deletions(-) create mode 100644 static/zu142@3x.png diff --git a/App.vue b/App.vue index adde646..9d80563 100644 --- a/App.vue +++ b/App.vue @@ -26,6 +26,9 @@ export default { justify-content: center; align-items: center; } +.tm-poup-wk{ + height: initial!important; +} .u-upload__button{ width: 404rpx!important; height: 306rpx!important; diff --git a/pages/confirm-order/index.vue b/pages/confirm-order/index.vue index 655c1cc..9e45015 100644 --- a/pages/confirm-order/index.vue +++ b/pages/confirm-order/index.vue @@ -153,8 +153,9 @@ export default { console.log(this.orderingInfo,'orderingInfo') if (this.$mp.query.ID) { this.ID=this.$mp.query.ID + this.getData() } - this.getData() + uni.createSelectorQuery().select('.title-block').boundingClientRect(data => { let res = uni.getSystemInfoSync(); const distance = res.windowHeight - data.bottom; diff --git a/pages/consignment-painting/index.vue b/pages/consignment-painting/index.vue index 079f2a1..29d9003 100644 --- a/pages/consignment-painting/index.vue +++ b/pages/consignment-painting/index.vue @@ -17,16 +17,22 @@ name="6" multiple :maxCount="1" - width="250" - height="150" + width="404rpx" + height="306rpx" > - +
+
+ +
+
上传画作图片
+
+ - -
+ +
更换您的寄存地址
@@ -149,25 +155,25 @@
-
+
寄存地址
-
-
+
-
+
寄存时限
- +
-
+
@@ -231,11 +237,6 @@ export default { url: ''//二维码扫码的结果用户发起请求的body体 } }, - onLoad(e) { - if (e) { - this.url = e.url - } - }, watch:{ cycleId(newValue){ this.obtainAmount() @@ -244,7 +245,8 @@ export default { }, mounted() { this.getCycle() - if (this.url){ + if (this.$mp.query.url){ + this.url=this.$mp.query.url this.getDetailUrl() } this.getAddress() @@ -268,9 +270,8 @@ export default { }); }) }, - // 删除图片 - deletePic(event) { - this[`fileList${event.name}`].splice(event.index, 1) + deletePic() { + this.fileList1=[] }, // 新增图片 async afterRead(event) { @@ -297,7 +298,22 @@ export default { } }, async signContract(){ - + const checks = [{ + value: this.warehouseID, + message: '请选择寄存地址' + }, { + value: this.cycleId, + message: '请选择寄存时限' + }] + for (const check of checks) { + if (!check.value) { + uni.showToast({ + title: check.message, + icon: 'none' + }) + return + } + } const data={ cycleId:this.cycleId, warehouseID:this.warehouseID, @@ -492,6 +508,7 @@ picker-view { padding-top: 28rpx; padding-left: 30rpx; padding-right: 30rpx; + margin-bottom: 72rpx; & > .content6 { margin-top: 26rpx; @@ -593,6 +610,7 @@ picker-view { } .poup { + margin-bottom: 72rpx; padding-top: 28rpx; padding-left: 30rpx; padding-right: 30rpx; diff --git a/pages/order-goods/index.vue b/pages/order-goods/index.vue index 700ecb4..65249e6 100644 --- a/pages/order-goods/index.vue +++ b/pages/order-goods/index.vue @@ -219,13 +219,22 @@ export default { } }, touchMove(e, index) { + if (this.mainList[index].artworkStatus!==5){ + return + } this.mainList[index].distanceX = e.touches[0].clientX - this.startX; }, touchStart(e, index) { + if (this.mainList[index].artworkStatus!==5){ + return + } this.mainList[index].isRight = true this.startX = e.touches[0].clientX; }, touchEnd(index) { + if (this.mainList[index].artworkStatus!==5){ + return + } if (this.mainList[index].distanceX < -((144 / 750) * this.windowWidth)) { this.mainList[index].distanceX = -((144 / 750) * this.windowWidth); } else { diff --git a/pages/order-goods/order-details.vue b/pages/order-goods/order-details.vue index 79ea4a2..6828276 100644 --- a/pages/order-goods/order-details.vue +++ b/pages/order-goods/order-details.vue @@ -1,6 +1,6 @@