From aa82f2ce6aabe78b47c927d7ae2d3ff08c59baaf Mon Sep 17 00:00:00 2001
From: xuxueyang <xuxy@fengyuntec.com>
Date: 星期三, 09 十月 2024 15:43:26 +0800
Subject: [PATCH] Merge branch 'master-2.0' of http://47.96.225.205:8888/r/hmy_farmer-main into master-2.0
---
pages/order/order-sale/order-sale.vue | 45 ++++++++++++++++++++++++++++-----------------
1 files changed, 28 insertions(+), 17 deletions(-)
diff --git a/pages/order/order-sale/order-sale.vue b/pages/order/order-sale/order-sale.vue
index c4dc2e8..b616b1c 100644
--- a/pages/order/order-sale/order-sale.vue
+++ b/pages/order/order-sale/order-sale.vue
@@ -63,12 +63,12 @@
<view class="sale-form">
<view class="form-item">
<view class="label" @click="copyTxt(item.orderNo)">订单单号</view>
- <view class="value">{{item.orderNo}}</view>
+ <view class="value">{{item.orderNo||'-'}}</view>
</view>
<view class="flex">
<view class="form-item flex1">
<view class="label">申请数量</view>
- <view class="value">{{item.num}}</view>
+ <view class="value">{{item.num||'-'}}</view>
</view>
<view class="form-item flex1">
<view class="label">订单金额</view>
@@ -78,24 +78,28 @@
<view class="flex">
<view class="form-item">
<view class="label">收货人</view>
- <view class="value">{{item.customer}}</view>
+ <view class="value">{{item.customer||'-'}}</view>
</view>
<view class="form-item">
<view class="label">联系方式</view>
- <view class="value">{{item.customerTel}}</view>
+ <view class="value">{{item.customerTel||'-'}}</view>
</view>
</view>
<view class="form-item width100">
<view class="label">提交时间</view>
- <view class="value">{{item.createTime}}</view>
+ <view class="value">{{item.createTime||'-'}}</view>
+ </view>
+ <view class="form-item">
+ <view class="label">售后类型</view>
+ <view class="value">{{item.salesTypeStr||'-'}}</view>
</view>
<view class="form-item">
<view class="label">理由</view>
- <view class="value">{{item.reason}}</view>
+ <view class="value">{{item.reason||'-'}}</view>
</view>
<view class="form-item">
<view class="label">平台回复</view>
- <view class="value">{{item.remarks}}</view>
+ <view class="value">{{item.remarks||'-'}}</view>
</view>
<view class="line-gray"></view>
<view class="flex buttons">
@@ -122,7 +126,10 @@
tabIndex: 0,
}
},
- onLoad() {
+ onLoad(options) {
+ if (options.orderItemId) {
+ this.query.orderItemId = options.orderItemId
+ }
// #ifdef PUB_SUPPLIER
this.listApi = '/api/supplier/sales/list'
// #endif
@@ -211,6 +218,8 @@
.label {
font-weight: 400;
color: #666666;
+ min-width: 140rpx;
+ // margin-right: 20rpx;
}
.label::after {
@@ -222,6 +231,7 @@
.value {
font-weight: 400;
color: #000000;
+ word-break: break-all;
}
.value.red {
@@ -280,13 +290,14 @@
vertical-align: middle;
}
}
- .flower-item{
+
+ .flower-item {
.title {
font-weight: 600;
font-size: 28rpx;
color: #000000;
line-height: 40rpx;
-
+
.level {
font-weight: 400;
font-size: 28rpx;
@@ -295,19 +306,19 @@
margin-right: 20rpx;
}
}
-
+
.flower-img {
width: 128rpx;
height: 118rpx;
min-width: 128rpx;
min-height: 118rpx;
}
-
+
.each-list {
display: flex;
flex-wrap: wrap;
margin-top: 6rpx;
-
+
.each-item {
min-width: 40%;
max-width: 50%;
@@ -315,7 +326,7 @@
margin-left: 0rpx;
margin-right: auto;
display: flex;
-
+
.label {
font-weight: 400;
font-size: 24rpx;
@@ -323,11 +334,11 @@
text-align: left;
padding-right: 10rpx;
}
-
+
.label::after {
content: ": "
}
-
+
.value {
font-weight: 400;
font-size: 24rpx;
@@ -335,7 +346,7 @@
}
}
}
-
+
}
}
}
--
Gitblit v1.9.3