From 32526e5bddb7b14328b2467cd18783f480b33f3b Mon Sep 17 00:00:00 2001
From: xuxueyang <xuxy@fengyuntec.com>
Date: 星期六, 31 八月 2024 01:51:53 +0800
Subject: [PATCH] update合伙人
---
pages/order/order.vue | 36 ++++++++++++++++++++----------------
1 files changed, 20 insertions(+), 16 deletions(-)
diff --git a/pages/order/order.vue b/pages/order/order.vue
index e62584c..0859686 100644
--- a/pages/order/order.vue
+++ b/pages/order/order.vue
@@ -100,7 +100,8 @@
url: '/pages/order/order-detail?id=' + item.id
})
},
- toDetailSale(dto, flower) {
+ toDetailSaleInfo(dto, flower) {
+ console.log('flower', dto, flower)
uni.navigateTo({
url: '/pages/order/order-detail?showsales=1&id=' + dto.id + '&flowerId=' + flower.id
})
@@ -130,26 +131,27 @@
var tryCallWx = false
// #ifdef MP
let tmp = this
- if (wx.openBusinessView&&false) {
+ if (wx.openBusinessView && item.paymentTrId) {
tryCallWx = true
wx.openBusinessView({
businessType: 'weappOrderConfirm',
extraData: {
- merchant_id: '1230000109',
- merchant_trade_no: '1234323JKHDFE1243252',
- transaction_id: '420123123123123123123'
+ // merchant_id: '1230000109',
+ // merchant_trade_no: '1234323JKHDFE1243252',
+ transaction_id: item.paymentTrId
},
- success() {
+ async success() {
//dosomething
// 发送请求
tmp.$message.showLoading()
const {
code
- } = await tmp.$http.request('get', '/api/customer/order/receive/confirm', {
- params: {
- id: item.id,
- }
- })
+ } = await tmp.$http.request('get',
+ '/api/customer/order/receive/confirm', {
+ params: {
+ id: item.id,
+ }
+ })
tmp.$message.hideLoading()
if (code === 0) {
tmp.refreshList()
@@ -369,8 +371,8 @@
</view>
<view class="value">{{ dto.paymentTime || '-' }}</view>
</view>
- <view class="flower-info m-b-5 m-t-8 br-4" v-for="(item,index) of dto.items" :key="index">
- <view class="line-gray"></view>
+ <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 ">
<image class="icon-dp br-4" src="/static/common/icon-dp.png"></image>
@@ -415,9 +417,11 @@
</view>
</view>
</view>
- <view class="line-gray"></view>
- <view class="flex buttons">
- <view class="button button-1 m-l-a m-r-15" @click="toDetailSale(dto,item)"
+ <view class="line-gray" v-if="dto.statusBackend!=='COMPLETED'&&dto.statusBackend!=='SEND'&&dto.statusBackend=='RECEIVE'"></view>
+ <!-- dtoId:{{dto.id}} -->
+ <!-- flowerId:{{item.id}} -->
+ <view class="flex buttons" v-if="dto.statusBackend!=='COMPLETED'&&dto.statusBackend!=='SEND'&&dto.statusBackend=='RECEIVE'">
+ <view class="button button-1 m-l-a m-r-0" @click="toDetailSaleInfo(dto,item)"
v-if="dto.statusBackend === 'RECEIVE'"> 申请售后
</view>
</view>
--
Gitblit v1.9.3