From b8178bdf2b7be88288a279a4b3edb58770b6987c Mon Sep 17 00:00:00 2001 From: THK3121 Date: Tue, 11 Jul 2023 18:01:46 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=88=97=E8=A1=A8,=E8=AE=A2?= =?UTF-8?q?=E5=8D=95=E8=AF=A6=E6=83=85=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/order_details/stay.vue | 2216 ++++++++++++---------- pages/product/list/index.vue | 31 +- pages/users/online_warehousing/index.vue | 2 +- pages/users/order_list/index.vue | 2214 ++++++++++----------- pages/users/payment/payment.vue | 8 +- 5 files changed, 2298 insertions(+), 2173 deletions(-) diff --git a/pages/order_details/stay.vue b/pages/order_details/stay.vue index ae1e42b..9f947ae 100644 --- a/pages/order_details/stay.vue +++ b/pages/order_details/stay.vue @@ -1,1089 +1,1195 @@ \ No newline at end of file diff --git a/pages/product/list/index.vue b/pages/product/list/index.vue index a1e50ed..20401ef 100644 --- a/pages/product/list/index.vue +++ b/pages/product/list/index.vue @@ -207,7 +207,7 @@ data: { product_id: '', unique: "", - number: '' + number: 1 }, on_line: '' } @@ -256,19 +256,27 @@ }, //导入 creat() { + if (this.on_line == 1) { - postImport(this.mer_id, this.data).then(res => { - console.log(res); - this.show = false + if(this.data.number <1){ + this.show=false this.$util.Tips({ - title: res.message + title: '入库数量不得小于一件' + }) + }else{ + postImport(this.mer_id, this.data).then(res => { + console.log(res); + this.show = false + this.$util.Tips({ + title: res.message + }) + }).catch(err=>{ + this.show=false + this.$util.Tips({ + title: err.message + }) }) - }).catch(err=>{ - this.show=false - this.$util.Tips({ - title: err.message - }) - }) + } } if (this.on_line == 0) { console.log('12'); @@ -722,6 +730,7 @@ width: 100%; margin: auto; padding: 10px; + z-index: 0; h4 { font-weight: 400; diff --git a/pages/users/online_warehousing/index.vue b/pages/users/online_warehousing/index.vue index 4e4d7ca..bc41dfa 100644 --- a/pages/users/online_warehousing/index.vue +++ b/pages/users/online_warehousing/index.vue @@ -3,7 +3,7 @@ - + 暂无商品订单~ diff --git a/pages/users/order_list/index.vue b/pages/users/order_list/index.vue index 2a3ea6a..1a02bb2 100644 --- a/pages/users/order_list/index.vue +++ b/pages/users/order_list/index.vue @@ -1,1179 +1,1187 @@ \ No newline at end of file diff --git a/pages/users/payment/payment.vue b/pages/users/payment/payment.vue index 01e5485..887f01a 100644 --- a/pages/users/payment/payment.vue +++ b/pages/users/payment/payment.vue @@ -65,7 +65,7 @@ ¥0.00 ¥{{couponData.orderList[0].pay_price}} - + 可结算周期到期后再付款¥{{totalPrice}} @@ -176,12 +176,14 @@ groupOrderDetail(this.order_id, this.product_type).then(res => { this.couponData = res.data this.$nextTick(()=>{ - this.moerTime(this.couponData.interest.start_time) + if(this.couponData.interest !== null){ + this.moerTime(this.couponData.interest.start_time) + } }) }) }, SubOrder() { - if (this.product_type == 98) { + if (this.couponData.pay_type == 8) { postsettle( this.mer_id, { id:this.order_id,