From 1b78e33e0d0340f3d45f87160abcb0f13f013774 Mon Sep 17 00:00:00 2001
From: xuxueyang <xuxy@fengyuntec.com>
Date: 星期五, 02 八月 2024 00:10:56 +0800
Subject: [PATCH] fix bug

---
 sub_pages/customer/trade/trade.vue |   83 ++++++++++++++++++++++++++++++++++-------
 1 files changed, 69 insertions(+), 14 deletions(-)

diff --git a/sub_pages/customer/trade/trade.vue b/sub_pages/customer/trade/trade.vue
index 275455e..61d8823 100644
--- a/sub_pages/customer/trade/trade.vue
+++ b/sub_pages/customer/trade/trade.vue
@@ -38,21 +38,16 @@
 						<view v-for="(item,index) of listFilter" :key="item.id" class="canteen-item list"
 							@click.stop="toDetailList(item)">
 							<view class="m-r-10">
-								<image :src="item.imageUrl" mode="scaleToFill" class="cover" :lazy-load="true"
-									@click.stop="previewImg(item.imageUrl)">
+								<!-- @click.stop="previewImg(item.imageUrl)" -->
+								<image :src="item.imageUrl"   :class="[!item.stock?'':'']"
+								mode="scaleToFill" class="cover" :lazy-load="true">
 								</image>
 							</view>
 							<view class="cateen_infos list">
 								<view class="title">{{item.name}}</view>
-								<view class="price">¥29.01-30.01</view>
+								<view class="price">¥{{item.priceLow || 0}}-{{item.priceHigh||0}}</view>
+								<view class="desc">在售 {{item.stock||'0'}} 扎</view>
 
-								<view class="desc">在售14410扎</view>
-								<!-- 								<view class="icons flex">
-										<uni-icons v-if="item.shopnum&&item.shopnum>=1" type="minus" size="32"
-											@click="mulnum(item)"></uni-icons>
-										<view class="curnums" v-if="item.shopnum&&item.shopnum>=1">{{item.shopnum}}</view>
-										<uni-icons type="plus-filled" size="32" @click="addnum(item)"></uni-icons>
-									</view> -->
 							</view>
 
 						</view>
@@ -128,8 +123,8 @@
 				uni.stopPullDownRefresh()
 			})
 		},
-		async onLoad() {
-
+		async onLoad(options) {
+			let selectId = options.categoryId || ''
 			//加载分类
 			this.$message.showLoading()
 			this.$http.request('get', '/api/customer/flower/category/tree', {}).then(res => {
@@ -137,12 +132,70 @@
 				var data = res.data
 				this.list = data || []
 				if (this.list.length > 0) {
-					this.query.categoryId = this.list[0].id || ''
-					this.currentCategory = this.list[0] || {}
+					if (selectId) {
+						for (var item of this.list) {
+							if (item.id == selectId) {
+								this.query.categoryId = item.id || ''
+								this.currentCategory = item
+								break
+							}
+						}
+					} else {
+						this.query.categoryId = this.list[0].id || ''
+						this.currentCategory = this.list[0] || {}
+					}
+
 				}
 			})
 		},
 		methods: {
+			maxWeightPrice(item) {
+				var p = 0
+				if (item.weightA && item.weightA > p) {
+					p = item.weightA
+				}
+				if (item.weightB && item.weightB > p) {
+					p = item.weightB
+				}
+				if (item.weightC && item.weightC > p) {
+					p = item.weightC
+				}
+				if (item.weightD && item.weightD > p) {
+					p = item.weightD
+				}
+				if (item.weightE && item.weightE > p) {
+					p = item.weightE
+				}
+				if (item.weightO && item.weightO > p) {
+					p = item.weightO
+				}
+				return p
+			},
+			minWeightPrice(item) {
+				var p = -1
+				if (item.weightA && item.weightA < p) {
+					p = item.weightA
+				}
+				if (item.weightB && item.weightB < p) {
+					p = item.weightB
+				}
+				if (item.weightC && item.weightC < p) {
+					p = item.weightC
+				}
+				if (item.weightD && item.weightD < p) {
+					p = item.weightD
+				}
+				if (item.weightE && item.weightE < p) {
+					p = item.weightE
+				}
+				if (item.weightO && item.weightO < p) {
+					p = item.weightO
+				}
+				if (p < 0) {
+					p = 0
+				}
+				return p
+			},
 			refInit(catgoryTree) {
 				this.list = catgoryTree || []
 				if (this.list.length > 0) {
@@ -314,6 +367,8 @@
 					font-size: 28rpx;
 					color: #000000;
 					line-height: 40rpx;
+					min-height: 80rpx;
+					text-align: center;
 				}
 
 				.desc {

--
Gitblit v1.9.3