From 056997b07e61fc99d5c311d0c5489b9de48fd9bc Mon Sep 17 00:00:00 2001
From: xuxueyang <xuxy@fengyuntec.com>
Date: 星期二, 24 九月 2024 17:25:16 +0800
Subject: [PATCH] update 细节和订单确认收货（写死了商户号）
---
manifest.json | 2 +-
sub_pages/partner/delivery/delivery-detail.vue | 2 +-
sub_pages/partner/delivery/delivery-supplier-detail-list.vue | 2 +-
pages/order/order.vue | 13 +++++++++----
pages/order/order-detail.vue | 5 ++++-
5 files changed, 16 insertions(+), 8 deletions(-)
diff --git a/manifest.json b/manifest.json
index f2448bf..2848179 100644
--- a/manifest.json
+++ b/manifest.json
@@ -49,7 +49,7 @@
"quickapp" : {},
/* 快应用特有相关 */
"mp-weixin" : {
- "appid" : "wx3203fd935a6ffe09",
+ "appid" : "wx1441324401626290",
"setting" : {
"urlCheck" : false,
"es6" : true,
diff --git a/pages/order/order-detail.vue b/pages/order/order-detail.vue
index 2ee8c07..8a444b5 100644
--- a/pages/order/order-detail.vue
+++ b/pages/order/order-detail.vue
@@ -210,9 +210,12 @@
extraData: {
// merchant_id: '',
// merchant_trade_no: '',
+ merchant_id: '1661512517',
+ merchant_trade_no: tmp.id || '',
transaction_id: tmp.dto && tmp.dto.paymentTrId || ''
},
- async success() {
+ async success(info) {
+ console.log('info', info)
//dosomething
// 发送请求
tmp.$message.showLoading()
diff --git a/pages/order/order.vue b/pages/order/order.vue
index d5b59ea..fb97ae7 100644
--- a/pages/order/order.vue
+++ b/pages/order/order.vue
@@ -166,9 +166,12 @@
extraData: {
// merchant_id: '1230000109',
// merchant_trade_no: '1234323JKHDFE1243252',
+ merchant_id: '1661512517',
+ merchant_trade_no: item.orderId || item.id || '',
transaction_id: item.paymentTrId
},
- async success() {
+ async success(info) {
+ console.log('确认收货 info success', info)
//dosomething
// 发送请求
tmp.$message.showLoading()
@@ -185,15 +188,17 @@
tmp.refreshList()
//刷新积分
tmp.$store.dispatch('getCurrentInfo')
+ tmp.$message.showToast('收货成功')
}
},
fail(e) {
- //dosomething
- console.log('error fail', e)
+ console.log('确认收货 info error', e)
+ // console.log('error fail', e)
tmp.$message.showToast('收货失败')
},
- complete() {
+ complete(info) {
//dosomething
+ console.log('确认收货 info complete', info)
}
});
}
diff --git a/sub_pages/partner/delivery/delivery-detail.vue b/sub_pages/partner/delivery/delivery-detail.vue
index fda4359..565f2ec 100644
--- a/sub_pages/partner/delivery/delivery-detail.vue
+++ b/sub_pages/partner/delivery/delivery-detail.vue
@@ -415,7 +415,7 @@
</view>
<view class="form-item" v-if="form.status==='reduce'">
<view class="form-item-label require">
- 扣款金额/每扎
+ 每扎扣款
</view>
<view class="form-item-value">
<input v-model="form.deductAmount" placeholder="请输入扣款金额" type="digit"
diff --git a/sub_pages/partner/delivery/delivery-supplier-detail-list.vue b/sub_pages/partner/delivery/delivery-supplier-detail-list.vue
index e96bcde..6f62210 100644
--- a/sub_pages/partner/delivery/delivery-supplier-detail-list.vue
+++ b/sub_pages/partner/delivery/delivery-supplier-detail-list.vue
@@ -573,7 +573,7 @@
</view>
<view class="form-item" v-if="form.status==='reduce'">
<view class="form-item-label require">
- 扣款金额/每扎
+ 每扎扣款
</view>
<view class="form-item-value">
<input v-model="form.deductAmount" placeholder="请输入扣款金额" type="digit"
--
Gitblit v1.9.3