From 8478015e961b93963e0a269d92c281d84da44f63 Mon Sep 17 00:00:00 2001
From: xuxueyang <xuxy@fengyuntec.com>
Date: 星期一, 09 九月 2024 23:47:09 +0800
Subject: [PATCH] update 会员信息、兑换商品等

---
 pages/order/order-detail.vue |   48 ++++++++++++++++++++++++++++++++++++++++++++----
 1 files changed, 44 insertions(+), 4 deletions(-)

diff --git a/pages/order/order-detail.vue b/pages/order/order-detail.vue
index 4ff01fd..6018509 100644
--- a/pages/order/order-detail.vue
+++ b/pages/order/order-detail.vue
@@ -101,7 +101,12 @@
 				if (code === 0) {
 					this.dto = {
 						...this.dto,
-						...data
+						...data,
+						// pointGoodsList: [{
+						// 	name: '1',
+						// 	num: 1,
+						// 	description: 'descriptiondescriptiondescriptiondescriptiondescription'
+						// }]
 					}
 				}
 			},
@@ -223,7 +228,7 @@
 								id: this.id,
 							}
 						})
-						
+
 						this.$message.hideLoading()
 						if (code === 0) {
 							//微信接口
@@ -399,7 +404,7 @@
 					// this.showSales = false
 					// this.$forceUpdate()
 					// setTimeout(() => {
-						// uni.navigateBack()
+					// uni.navigateBack()
 					// }, 1200)
 				}
 			},
@@ -436,7 +441,8 @@
 			</view>
 		</view>
 		<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="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 || ''}}
@@ -494,6 +500,7 @@
 
 			</view>
 		</view>
+
 		<view class="info-container bg-white br-4" v-if="!showSales">
 			<view class="form-item">
 				<view class="label">订单编号:</view>
@@ -573,6 +580,39 @@
 			</view>
 
 		</view>
+		<view class="info-container bg-white br-4 m-t-12"
+			v-if="!showSales&& dto.pointGoodsList&& dto.pointGoodsList.length>0">
+			<view v-for="(item,j) of dto.pointGoodsList" :key="j" class="m-b-12">
+				<view class="flower-info  br-4">
+					<view class="flex flex-wrap-normal">
+						<image class="flower-img img100 br-4 m-r-6" :src="item.cover" @click="previewImg(item.cover)">
+						</image>
+						<view class="flex1">
+							<view class=" flex">
+								<view class="title">
+									{{ item.name || ''}}
+								</view>
+							</view>
+							<view class="each-list" style="display: contents;">
+								<view class="each-item">
+									<view class="label">数量</view>
+									<view class="value">{{ item.num || 0 }}</view>
+
+								</view>
+								<view class="each-item" style="min-width: unset;max-width: unset;">
+									<view class="label" style="min-width: 55rpx;">描述</view>
+									<view class="value" style="word-break: break-all;text-align: left;">{{ item.description || '-' }}
+									</view>
+								</view>
+							</view>
+						</view>
+					</view>
+
+				</view>
+			</view>
+
+
+		</view>
 
 		<view class="info-container bg-white br-4 m-t-12" v-if="!showSales">
 			<view class="icon-view">

--
Gitblit v1.9.3