From b37bca8f7a6cdae798e74f14b51936e3a6a9637c Mon Sep 17 00:00:00 2001
From: xuxueyang <xuxy@fengyuntec.com>
Date: 星期四, 29 八月 2024 22:42:14 +0800
Subject: [PATCH] update 售后问题

---
 pages/order/order-detail.vue |  113 ++++++++++++++++++++++++++++++--------------------------
 1 files changed, 60 insertions(+), 53 deletions(-)

diff --git a/pages/order/order-detail.vue b/pages/order/order-detail.vue
index 589f663..a7e0920 100644
--- a/pages/order/order-detail.vue
+++ b/pages/order/order-detail.vue
@@ -168,11 +168,12 @@
 									tmp.$message.showLoading()
 									const {
 										code
-									} = await tmp.$http.request('get', '/api/customer/order/receive/confirm', {
-										params: {
-											id: tmp.id,
-										}
-									})
+									} = await tmp.$http.request('get',
+										'/api/customer/order/receive/confirm', {
+											params: {
+												id: tmp.id,
+											}
+										})
 									tmp.$message.hideLoading()
 									if (code === 0) {
 										tmp.getDetail()
@@ -392,12 +393,13 @@
 				})
 				this.$message.hideLoading()
 				if (code == 0) {
-					this.$message.showToast('提交成功')
-					this.showSales = false
-					this.$forceUpdate()
-					setTimeout(() => {
-						uni.navigateBack()
-					}, 1200)
+					await this.$message.showToast('提交成功')
+					uni.navigateBack()
+					// this.showSales = false
+					// this.$forceUpdate()
+					// setTimeout(() => {
+						// uni.navigateBack()
+					// }, 1200)
 				}
 			},
 		},
@@ -432,59 +434,64 @@
 				</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 || ''}}
-			</view>
-			<view class="flex m-t-12">
-				<radio v-if="showSales" disabled :checked="submitForm.orderItemId == item.id"></radio>
-				<!-- @click="changeSalesOrderItem(item)" -->
-				<!-- :checked="submitForm.orderItems.indexOf(item.id)>=0" -->
+		<view v-for="(item,index) of list" :key="index">
+			<view class="flower-info m-b-20 m-t-12 br-4" v-if="!showSales||showSales&&(submitForm.orderItemId == item.id)">
+				<view class="supplier-name ">
+					<image class="icon-dp" src="/static/common/icon-dp.png"></image>
+					{{ item.supplierName || ''}}
+				</view>
+				<!-- submitForm.orderItemId:{{submitForm.orderItemId}} -->
+				<!-- itemId:{{item.id}} -->
+				<view class="flex m-t-12">
+					<!-- <radio v-if="showSales" disabled :checked="submitForm.orderItemId == item.id"></radio> -->
+					<!-- @click="changeSalesOrderItem(item)" -->
+					<!-- :checked="submitForm.orderItems.indexOf(item.id)>=0" -->
 
-				<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>
-					</view>
-					<view class="each-list">
-						<view class="each-item">
-							<view class="label">货位号</view>
-							<view class="value">{{ item.warehouseLocationCode || dto.warehouseLocationCode  || '-' }}
+					<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>
 						</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>
+							<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>
+							<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.num || 0 }}</view>
+							<view class="each-item">
+								<view class="label">数量</view>
+								<view class="value">{{ item.num || 0 }}</view>
 
-						</view>
-						<view class="each-item">
-							<view class="label">售价</view>
-							<view class="value">¥{{ item.price || '-' }}</view>
-						</view>
-						<view class="each-item">
-							<view class="label">总金额</view>
-							<view class="value t-red">¥{{ item.total || '-' }}</view>
+							</view>
+							<view class="each-item">
+								<view class="label">售价</view>
+								<view class="value">¥{{ item.price || '-' }}</view>
+							</view>
+							<view class="each-item">
+								<view class="label">总金额</view>
+								<view class="value t-red">¥{{ item.total || '-' }}</view>
+							</view>
 						</view>
 					</view>
 				</view>
-			</view>
 
+			</view>
 		</view>
 		<view class="info-container bg-white br-4" v-if="!showSales">
 			<view class="form-item">

--
Gitblit v1.9.3