From 4b68b41822b8da02c9a9ceba3bc6e30d4445d324 Mon Sep 17 00:00:00 2001
From: xuxueyang <xuxy@fengyuntec.com>
Date: 星期四, 26 九月 2024 08:54:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'remote-v2/master-2.0' into master-2.0
---
pages/order/order.vue | 75 ++++++++++++++++++++++---------------
1 files changed, 44 insertions(+), 31 deletions(-)
diff --git a/pages/order/order.vue b/pages/order/order.vue
index 7e8fabb..1a11356 100644
--- a/pages/order/order.vue
+++ b/pages/order/order.vue
@@ -93,8 +93,8 @@
uni.stopPullDownRefresh()
},
methods: {
-
-
+
+
openbrand(item) {
console.log(item)
//也要判断一下是否重复进入
@@ -118,7 +118,7 @@
return
}
}
-
+
if (pages.length >= 10) {
//直接强制购物车
uni.reLaunch({
@@ -129,7 +129,7 @@
url: '/sub_pages/customer/shop/shop?id=' + (item.supplierId || '')
})
}
-
+
},
toFlowerDetail(item) {
uni.navigateTo({
@@ -166,8 +166,8 @@
url: '/pages/order/order-detail?id=' + item.id
})
},
-
- async copyOrder(item){
+
+ async copyOrder(item) {
console.log(item)
await this.$message.confirm('是否确定再来一单')
// 发送请求
@@ -184,13 +184,13 @@
this.$message.hideLoading()
if (code === 0) {
//微信接口
- if(msg&&msg!=""){
+ if (msg && msg != "") {
this.$message.showToast(msg)
}
-
+
}
},
-
+
toDetailSaleInfo(dto, flower) {
console.log('flower', dto, flower)
uni.navigateTo({
@@ -234,34 +234,47 @@
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()
- const {
- code
- } = await tmp.$http.request('get',
- '/api/customer/order/receive/confirm', {
- params: {
- id: item.id,
- }
- })
- tmp.$message.hideLoading()
- if (code === 0) {
- tmp.refreshList()
- //刷新积分
- tmp.$store.dispatch('getCurrentInfo')
+ if (info.extraData && info.extraData.status === 'fail') {
+ tmp.$message.showToast('支付和确认收货需要是同一微信号，请联系实际支付人登录确认')
+ } else if (info.extraData && info.extraData.status === 'cancel') {
+
+ } else {
+
+
+ // 发送请求
+ tmp.$message.showLoading()
+ const {
+ code
+ } = await tmp.$http.request('get',
+ '/api/customer/order/receive/confirm', {
+ params: {
+ id: item.id,
+ }
+ })
+ tmp.$message.hideLoading()
+ if (code === 0) {
+ 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)
}
});
}
@@ -473,17 +486,17 @@
<view class="flower-info m-b-5 m-t-8 br-4" v-for="(item,j) of dto.items" :key="j">
<!-- <view class="line-gray"></view> -->
- <view class="supplier-name " @click.stop="openbrand(item)" >
+ <view class="supplier-name " @click.stop="openbrand(item)">
<image class="icon-dp br-4" src="/static/common/icon-dp.png"></image>
{{ item.supplierName }}
</view>
- <view class="flex m-t-12 flex-wrap-normal" >
+ <view class="flex m-t-12 flex-wrap-normal">
<image class="flower-img img100 m-r-6" :src="item.flowerCover"
@click="previewImg(item.flowerCover)">
</image>
<!-- <view class="flex1" @click.stop="toFlowerDetail(item)"> -->
<view class="flex1" @click.stop="toDetail(dto)">
-
+
<view class=" flex">
<view class="title flex flex1">
<!-- <span class="level">{{ item.flowerCategory }}</span> -->
--
Gitblit v1.9.3