From f8867b8df117d1ac0f1311970994e15059c3da03 Mon Sep 17 00:00:00 2001
From: xuxueyang <xuxy@fengyuntec.com>
Date: 星期四, 05 九月 2024 15:57:36 +0800
Subject: [PATCH] add 兼容扫码问题
---
pages/order/order.vue | 92 ++++++++++++++++++++++++++++++++++++---------
1 files changed, 73 insertions(+), 19 deletions(-)
diff --git a/pages/order/order.vue b/pages/order/order.vue
index ee974fb..0859686 100644
--- a/pages/order/order.vue
+++ b/pages/order/order.vue
@@ -61,10 +61,10 @@
item.statusBackend = '已取消'
item.status = 'CANCEL'
item.statusStr = '已取消'
-
+
item.bctime = ''
change = true
-
+
} else {
//相差
var alltime = parseInt(diff / 1000)
@@ -100,9 +100,10 @@
url: '/pages/order/order-detail?id=' + item.id
})
},
- toDetailSale(item) {
+ toDetailSaleInfo(dto, flower) {
+ console.log('flower', dto, flower)
uni.navigateTo({
- url: '/pages/order/order-detail?showsales=1&id=' + item.id
+ url: '/pages/order/order-detail?showsales=1&id=' + dto.id + '&flowerId=' + flower.id
})
},
async buttonClick(item, buttontype) {
@@ -127,18 +128,62 @@
break
case 'confirm': {
await this.$message.confirm('是否确定收货')
- // 发送请求
- this.$message.showLoading()
- const {
- code
- } = await this.$http.request('get', '/api/customer/order/receive/confirm', {
- params: {
- id: item.id,
+ var tryCallWx = false
+ // #ifdef MP
+ let tmp = this
+ if (wx.openBusinessView && item.paymentTrId) {
+ tryCallWx = true
+ wx.openBusinessView({
+ businessType: 'weappOrderConfirm',
+ extraData: {
+ // merchant_id: '1230000109',
+ // merchant_trade_no: '1234323JKHDFE1243252',
+ transaction_id: item.paymentTrId
+ },
+ async success() {
+ //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()
+ }
+ },
+ fail(e) {
+ //dosomething
+ console.log('error fail', e)
+ tmp.$message.showToast('收货失败')
+ },
+ complete() {
+ //dosomething
+ }
+ });
+ }
+
+ // #endif
+
+ if (!tryCallWx) {
+ // 发送请求
+ this.$message.showLoading()
+ const {
+ code
+ } = await this.$http.request('get', '/api/customer/order/receive/confirm', {
+ params: {
+ id: item.id,
+ }
+ })
+ this.$message.hideLoading()
+ if (code === 0) {
+ this.refreshList()
}
- })
- this.$message.hideLoading()
- if (code === 0) {
- this.refreshList()
}
}
@@ -326,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>
@@ -372,6 +417,15 @@
</view>
</view>
</view>
+ <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>
+
</view>
<view class="line-gray"></view>
@@ -392,9 +446,9 @@
v-if="dto.statusBackend ==='RECEIVE'"> 确认收货
</view>
<!-- ||item.statusBackend=='COMPLETED' -->
- <view class="button button-1 m-l-a m-r-15" @click="toDetailSale(dto)"
+ <!-- <view class="button button-1 m-l-a m-r-15" @click="toDetailSale(dto)"
v-if="dto.statusBackend === 'RECEIVE'"> 申请售后
- </view>
+ </view> -->
<view class="button button-0 m-l-a m-r-15" @click="buttonClick(dto,'evaluate')"
v-if="dto.statusBackend === 'EVALUATE'"> 评价
</view>
--
Gitblit v1.9.3