From 731b3a23a6369aaef5c4fdc0ff4524eb6a7f3642 Mon Sep 17 00:00:00 2001
From: xuxueyang <xuxy@fengyuntec.com>
Date: 星期五, 13 九月 2024 19:07:12 +0800
Subject: [PATCH] update 合伙人、花店端
---
pages/order/order.vue | 129 ++++++++++++++++++++++++++++++++++++-------
1 files changed, 108 insertions(+), 21 deletions(-)
diff --git a/pages/order/order.vue b/pages/order/order.vue
index ee974fb..7152f84 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,15 @@
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
+ })
+ },
+ toOrderItemDetail(item, op, opstr) {
+ uni.navigateTo({
+ url: `/sub_pages/supplier/order-manage/order-manage-settlement-op-detail?opStr=${opStr}&op=${op}&orderItemId=${item.id || item.orderItemId}`
})
},
async buttonClick(item, buttontype) {
@@ -127,18 +133,64 @@
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()
+ //刷新积分
+ tmp.$store.dispatch('getCurrentInfo')
+ }
+ },
+ 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()
}
}
@@ -239,6 +291,7 @@
if (code === 0) {
// this.$store.dispatch('sign_add', 'order')
this.refreshList()
+
}
}
break
@@ -326,8 +379,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>
@@ -339,8 +392,20 @@
</image>
<view class="flex1">
<view class=" flex">
- <view class="title"><span class="level">{{ item.flowerCategory }}</span><span
- class="level">{{ item.flowerLevelStr }}</span>{{ item.flowerName }}
+ <view class="title flex flex1">
+ <!-- <span class="level">{{ item.flowerCategory }}</span> -->
+ <span class="m-r-10">{{ item.flowerName }}</span>
+ <span class="level">{{ item.flowerLevelStr }}</span>
+ <view class="m-l-a m-r-10 flex">
+ <view class="m-r-10 button-icon" @click="toOrderItemDetail(item,'lack','缺货')"
+ v-if="item.lackNum">
+ 缺货<uni-icons type="right" size="14" color="#ffffff"></uni-icons>
+ </view>
+ <view class="m-r-10 button-icon" @click="toOrderItemDetail(item,'reduce','降级')"
+ v-if="item.reduceNum">
+ 降级<uni-icons type="right" size="14" color="#ffffff"></uni-icons>
+ </view>
+ </view>
</view>
</view>
<view class="each-list">
@@ -372,6 +437,18 @@
</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 +469,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>
@@ -506,6 +583,7 @@
font-size: 28rpx;
color: #000000;
line-height: 40rpx;
+ flex: 1;
.level {
font-weight: 400;
@@ -514,6 +592,13 @@
line-height: 40rpx;
margin-right: 20rpx;
}
+
+ .button-icon {
+ color: #fff;
+ padding-left: 10rpx;
+ padding-right: 10rpx;
+ background-color: darkred;
+ }
}
.flower-img {
@@ -521,6 +606,8 @@
height: 118rpx;
min-width: 128rpx;
min-height: 118rpx;
+
+
}
.each-list {
--
Gitblit v1.9.3