From 34b6e0548fb7f3d88842914db89d7cd603a5e531 Mon Sep 17 00:00:00 2001
From: xuxy <1059738716@qq.com>
Date: 星期四, 01 八月 2024 23:11:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/main'
---
pages/order/order-detail.vue | 43 +++++++++++++++++++++++++++----------------
1 files changed, 27 insertions(+), 16 deletions(-)
diff --git a/pages/order/order-detail.vue b/pages/order/order-detail.vue
index 0445373..3ce3511 100644
--- a/pages/order/order-detail.vue
+++ b/pages/order/order-detail.vue
@@ -86,10 +86,9 @@
this.$message.showLoading()
const {
code
- } = await this.$http.request('post', '/api/customer/order/refund', {
- data: {
+ } = await this.$http.request('get', '/api/customer/order/refund', {
+ params: {
id: this.id,
- evaluate: res.content
}
})
this.$message.hideLoading()
@@ -301,10 +300,10 @@
dto.status === 'SEND' && '商家已发货，正在通知取货'
|| dto.status === 'PENDING' && '订单还未支付，立即去支付'
|| dto.status === 'RECEIVE' && '待签收'
- || ('订单' + dto.statusStr)
+ || ('订单状态: ' + dto.statusStr)
}}
</view>
- <view class="desc-gray">支付时间:{{dto.paymentTime}}</view>
+ <view class="desc-gray">支付时间:{{dto.paymentTime || '-'}}</view>
</view>
</view>
<view class="address-container bg-white br-4 m-t-12" v-if="!showSales">
@@ -314,29 +313,37 @@
<view class="info">
<view class="title">
{{ dto.customer }}
- <view class="tel">{{ dto.customerTel }}</view>
+ <view class="tel">{{ dto.customerTel || ''}}</view>
</view>
- <view class="content">{{ dto.customerAddress }}</view>
+ <view class="content">{{ dto.customerAddress || ''}}</view>
</view>
</view>
</view>
<view class="flower-info m-b-20 m-t-12 br-4" v-for="(item,index) of list" :key="index">
<view class="supplier-name ">
<image class="icon-dp" src="/static/common/icon-dp.png"></image>
- {{ item.supplierName }}
+ {{ item.supplierName || ''}}
</view>
<view class="flex m-t-12">
- <radio :checked="submitForm.orderItems.indexOf(item.id)>=0" @click="changeSalesOrderItem(item)"></radio>
+ <radio v-if="showSales" :checked="submitForm.orderItems.indexOf(item.id)>=0"
+ @click="changeSalesOrderItem(item)"></radio>
- <image class="flower-img img100 m-r-6" :src="item.flowerCover" @click="previewImg(item.flowerCover)">
+ <image class="flower-img img100 br-4 m-r-6" :src="item.flowerCover"
+ @click="previewImg(item.flowerCover)">
</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"><span class="level">{{ item.flowerCategory || ''}}</span><span
+ class="level">{{ item.flowerLevelStr || ''}}</span>{{ item.flowerName || ''}}
</view>
</view>
<view class="each-list">
+ <view class="each-item">
+ <view class="label">货位号</view>
+ <view class="value">{{ item.warehouseLocationCode || dto.warehouseLocationCode || '-' }}
+ </view>
+ </view>
+
<view class="each-item">
<view class="label">颜色</view>
<view class="value">{{ item.flowerColor || '-' }}</view>
@@ -447,13 +454,17 @@
<view class="flex m-t-12">
<view class="flex1 w-fit m-auto icon-view" @click.stop="callTel">
<image src="/static/common/icon-call.png" class="icon icon-call m-r-10 img100"></image>
- 15974805814
+ 拨打15974805814
</view>
- <view class="flex1 w-fit m-auto icon-view" open-type="contact">
- <image src="/static/common/icon-wx.png" class="icon icon-call m-r-10 img100"></image>
- 在线客服
+ <view class="flex1 w-fit m-auto icon-view flex flex-wrap-normal" open-type="contact">
+ <image src="/static/common/icon-wx.png" class="icon icon-call m-t-2 m-r-10 img100"></image>
+
+ <button open-type="contact" class="component-button-contact" @handleContact="handleContact">
+ 联系在线客服
+ </button>
</view>
+
</view>
</view>
--
Gitblit v1.9.3