diff --git a/pages/confirm-order/index.vue b/pages/confirm-order/index.vue index 717f6d9..9465e32 100644 --- a/pages/confirm-order/index.vue +++ b/pages/confirm-order/index.vue @@ -645,7 +645,11 @@ export default { this.data = [e.detail.value[0] + 1990, e.detail.value[1] + 1, e.detail.value[2] + 1] }, back() { - uni.navigateBack({delta: 2}) + if (this.type==='detail'){ + uni.redirectTo({url: '/pages/home/index'}) + }else { + uni.navigateBack({delta: 2}) + } } } } diff --git a/pages/consignment-painting/index.vue b/pages/consignment-painting/index.vue index 1880c97..b28df00 100644 --- a/pages/consignment-painting/index.vue +++ b/pages/consignment-painting/index.vue @@ -92,7 +92,7 @@
画作平尺数
- +
@@ -127,7 +127,7 @@
-
+
@@ -136,8 +136,6 @@
- -
@@ -594,7 +592,15 @@ export default { }] for (const [index,item] of this.listPaintings.entries()) { for (const check of checks) { + if (check.value==='fileList1'&&item.fileList1.length<1){ + uni.showToast({ + title: `请完善第${index+1}条数据的${check.message}`, + icon: 'none' + }) + return + } if (!item[check.value]) { + uni.showToast({ title: `请完善第${index+1}条数据的${check.message}`, icon: 'none' @@ -640,7 +646,7 @@ export default { } const res = await postDataByParams('/api/v2/warehouse/calculate',data) if (res.code===200){ - this.listPaintings[this.currentIndex].expectedPayment=res.data.orders?.[0]?.money + this.listPaintings[this.currentIndex].expectedPayment=Number(res.data.orders?.[0]?.money) } }, confirmCycle() {