From 7e738f69cf7b353492edefa1768005f19ea7e7ee Mon Sep 17 00:00:00 2001
From: xuxueyang <xuxy@fengyuntec.com>
Date: 星期三, 28 八月 2024 10:25:11 +0800
Subject: [PATCH] update上线更新
---
pages/order/order-sale/order-sale.vue | 169 ++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 146 insertions(+), 23 deletions(-)
diff --git a/pages/order/order-sale/order-sale.vue b/pages/order/order-sale/order-sale.vue
index e35e0bf..5f133bb 100644
--- a/pages/order/order-sale/order-sale.vue
+++ b/pages/order/order-sale/order-sale.vue
@@ -6,23 +6,69 @@
</view> -->
<view class="p15" style="min-height: calc(100vh - 160rpx);">
<no-data v-if="!list||list.length==0" style="width: 100%;"></no-data>
- <view v-for="(item,index) in list" :key="index" @click="toDetail(item)"
- class="m-b-24 order-sale-list list-container">
+ <!-- @click.stop="toDetail(item)" -->
+ <view v-for="(item,index) in list" :key="index" class="m-b-24 order-sale-list list-container">
<view class="order-sale-item br-4 list-item bg-white">
- <view class="title flex">
+ <view class="top-title flex">
<view>售后单号:{{item.salesNo}}</view>
- <view class="m-l-a m-r-0 status">审核状态：{{item.auditStatusStr||'-'}}</view>
+ <view class="m-l-a m-r-0 status">审核状态：{{item.statusStr||'-'}}</view>
</view>
<view class="line"></view>
+ <view class="supplier-name">
+ <image class="icon-dp br-4" src="/static/common/icon-dp.png"></image>
+ {{ item.supplierName }}
+ </view>
+ <view class="flex m-t-12 flex-wrap-normal flower-item">
+ <image class="flower-img img100 m-r-6" :src="item.flowerCover"
+ @click.stop="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>
+ </view>
+ <view class="each-list">
+ <view class="each-item">
+ <view class="label">颜色</view>
+ <view class="value">{{ item.flowerColor || '-' }}</view>
+
+ </view>
+ <view class="each-item">
+ <view class="label">规格</view>
+ <view class="value">{{ item.flowerUnit || '-' }}</view>
+ </view>
+
+ <view class="each-item">
+ <view class="label">数量</view>
+ <view class="value">{{ item.flowerNum || 0 }}</view>
+
+ </view>
+ <view class="each-item">
+ <view class="label">售价</view>
+ <view class="value">￥{{ item.price || 0 }}</view>
+
+ </view>
+ <view class="each-item">
+ <view class="label">商品总金额</view>
+ <view class="value">￥{{ item.total || 0 }}</view>
+
+ </view>
+ </view>
+ </view>
+ </view>
+ <view class="line-gray"></view>
+
+
<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.statusStr}}</view>
+ <view class="label">申请数量</view>
+ <view class="value">{{item.num||'-'}}</view>
</view>
<view class="form-item flex1">
<view class="label">订单金额</view>
@@ -32,31 +78,32 @@
<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">
- <view class="label">提交人</view>
- <view class="value">{{item.createName}}</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.reason}}</view>
+ <view class="value">{{item.reason||'-'}}</view>
</view>
- <!-- #ifdef PUB_CUSTOMER -->
- <view class="line-gray" v-if="item.status=='PENDING'"></view>
- <view class="flex buttons" v-if="item.status=='PENDING'">
- <view class="button button-1 m-l-15 m-r-0" @click="cancelSale(item)">取消售后</view>
+ <view class="form-item">
+ <view class="label">平台回复</view>
+ <view class="value">{{item.remarks||'-'}}</view>
</view>
- <!-- #endif -->
+ <view class="line-gray"></view>
+ <view class="flex buttons">
+ <view v-if="item.status=='PENDING'" class="button button-1 m-l-15 m-r-0"
+ @click.stop="cancelSale(item)">取消售后</view>
+ <view class="button button-0 m-l-15 m-r-0" @click.stop="toDetail(item)">查看详情</view>
+
+ </view>
</view>
</view>
</view>
@@ -75,7 +122,10 @@
tabIndex: 0,
}
},
- onLoad() {
+ onLoad(options) {
+ if (options.orderItemId) {
+ this.query.orderItemId = options.orderItemId
+ }
// #ifdef PUB_SUPPLIER
this.listApi = '/api/supplier/sales/list'
// #endif
@@ -89,7 +139,6 @@
},
onReachBottom() {
- this.page.current += 1
this.getMore()
},
async onPullDownRefresh() {
@@ -136,7 +185,7 @@
margin-bottom: 20rpx;
padding: 22rpx;
- .title {
+ .top-title {
font-weight: 600;
font-size: 28rpx;
color: #000000;
@@ -218,6 +267,80 @@
}
}
+
+ .supplier-name {
+ border-bottom: 2rpx solid #EEEEEE;
+ font-weight: 600;
+ font-size: 28rpx;
+ color: #000000;
+ padding-bottom: 10rpx;
+ line-height: 40rpx;
+
+ .icon-dp {
+ width: 27rpx;
+ height: 27rpx;
+ display: inline-block;
+ vertical-align: middle;
+ }
+ }
+
+ .flower-item {
+ .title {
+ font-weight: 600;
+ font-size: 28rpx;
+ color: #000000;
+ line-height: 40rpx;
+
+ .level {
+ font-weight: 400;
+ font-size: 28rpx;
+ color: #20613D;
+ line-height: 40rpx;
+ 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%;
+ text-align: center;
+ margin-left: 0rpx;
+ margin-right: auto;
+ display: flex;
+
+ .label {
+ font-weight: 400;
+ font-size: 24rpx;
+ color: #666666;
+ text-align: left;
+ padding-right: 10rpx;
+ }
+
+ .label::after {
+ content: ": "
+ }
+
+ .value {
+ font-weight: 400;
+ font-size: 24rpx;
+ color: #666666;
+ }
+ }
+ }
+
+ }
}
}
</style>
\ No newline at end of file
--
Gitblit v1.9.3