From 1aee1ff64e3088021796a684ddb39e5e62339c05 Mon Sep 17 00:00:00 2001 From: "DESKTOP-GMUNQ1B\\k" <1154079537@qq.com> Date: Wed, 20 Mar 2024 10:47:12 +0800 Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/order_details/index.vue | 39 ++++++++++++++++++++------------ pages/payment/get_payment.vue | 3 ++- pages/payment/settlement.vue | 10 +++++--- pages/store/home/index.vue | 4 +++- pages/users/order_list/index.vue | 8 +++++-- 5 files changed, 42 insertions(+), 22 deletions(-) diff --git a/pages/order_details/index.vue b/pages/order_details/index.vue index f127d2a..caf3312 100644 --- a/pages/order_details/index.vue +++ b/pages/order_details/index.vue @@ -249,32 +249,27 @@ - - - - + + + + 公司名称: - {{item.company_name}} + {{orderInfo.order_extend.bank_info.company_name}} 对公账号: - {{item.corporate_account}} + {{orderInfo.order_extend.bank_info.corporate_account}} 开户行: - {{item.corporate_bank}} + {{orderInfo.order_extend.bank_info.corporate_bank}} 开户行地址: - {{item.corporate_bank_address}} + {{orderInfo.order_extend.bank_info.corporate_bank_address}} - - - @@ -298,6 +293,14 @@ 实付款: ¥{{orderInfo.pay_price}} + + 付款凭证: + + + + @@ -551,9 +554,15 @@ methods: { // 图片预览 getPhotoClickIdx(list, idx) { + const ls = []; + if (!Array.isArray(list)) { + ls.push(list) + } else { + ls.concat(...list) + } uni.previewImage({ - current: list[idx], // 传 Number H5端出现不兼容 - urls: list + current: 0, // 传 Number H5端出现不兼容 + urls: ls }); }, // 判断是否到支付尾款时间 diff --git a/pages/payment/get_payment.vue b/pages/payment/get_payment.vue index 4e24b0c..5af02bf 100644 --- a/pages/payment/get_payment.vue +++ b/pages/payment/get_payment.vue @@ -250,7 +250,8 @@ checkForm: that.checkForm, money: that.cartForm.total_amount, merName: that.mer_name, - money: that.cartForm.total_amount + money: that.cartForm.total_amount, + key: res1.data.key }) }, fail(err) { diff --git a/pages/payment/settlement.vue b/pages/payment/settlement.vue index 97f6681..4cf16db 100644 --- a/pages/payment/settlement.vue +++ b/pages/payment/settlement.vue @@ -245,7 +245,9 @@ pay_type: '', money: '', merName: '', - return_url: '' + return_url: '', + key: '', + source: 999, }, checkForm: { address_id: '', @@ -255,7 +257,8 @@ source: 999, takes: [], use_coupon: {}, - use_integral: false + use_integral: false, + key: '' }, productData: [] }; @@ -297,8 +300,9 @@ this.payForm.cart_id = this.checkForm.cart_id; this.payForm.money = data.money; this.payForm.merName = data.merName; + this.payForm.key = data.key; this.total_coupon = data.money; - + this.checkForm.key = data.key; // #ifdef H5 this.from = this.$wechat.isWeixin() ? 'weixin' : 'h5' diff --git a/pages/store/home/index.vue b/pages/store/home/index.vue index 1aa1de7..303faba 100644 --- a/pages/store/home/index.vue +++ b/pages/store/home/index.vue @@ -40,7 +40,9 @@ - 营业时间 : 90:00-21:00 + 营业时间 : + {{store.mer_info.mer_take_time[0]}}-{{store.mer_info.mer_take_time[1]}} + {{store.mer_address}} diff --git a/pages/users/order_list/index.vue b/pages/users/order_list/index.vue index e3e750f..4ee5e2c 100644 --- a/pages/users/order_list/index.vue +++ b/pages/users/order_list/index.vue @@ -104,7 +104,11 @@ - {{item.group_order_sn}} + + + {{item.orderList[0].merchant.mer_name}} + + {{ item.orderList[0].activity_type === 2 && item.orderList[0].orderProduct[0].cart_info.productPresell.presell_type ==2 ? "待付定金" : "待付款" }} @@ -191,7 +195,7 @@ 立即付款 - + 上传凭证