From dc6cdf2414ee7c453e1bca47898177f7af079945 Mon Sep 17 00:00:00 2001
From: xuxy <1059738716@qq.com>
Date: 星期一, 29 七月 2024 00:03:59 +0800
Subject: [PATCH] 1

---
 sub_pages/customer/trade/trade.vue |   57 +++++++++++++++++++++++++++++++++------------------------
 1 files changed, 33 insertions(+), 24 deletions(-)

diff --git a/sub_pages/customer/trade/trade.vue b/sub_pages/customer/trade/trade.vue
index 493cd48..275455e 100644
--- a/sub_pages/customer/trade/trade.vue
+++ b/sub_pages/customer/trade/trade.vue
@@ -1,15 +1,15 @@
 <template>
-	<view class="container-trade" style="min-height: calc(100vh - 20rpx );">
-		<view class="search-container m-t-12 flex" v-if="!(!list||list.length==0)&&true&&!hidefooter">
+	<view class="container-trade" :style="{'min-height':hidefooter?'':'calc(100vh - 20rpx)'}">
+		<view class="search-container m-t-12 flex" v-if="!hidefooter">
 			<view class="flex1 input">
-				<u-input placeholder="请输入分类名称" v-model="query.name">
+				<u-input placeholder="请输入分类名称" v-model="query.name" clearable>
 					<template slot="suffix">
 						<uni-icons color="#20613D" type="search" size="24" @tap="buttonSearchFlow"></uni-icons>
 					</template>
 				</u-input>
 			</view>
 		</view>
-		<view class="canteen-items" style="min-height: calc(100vh - 160rpx);">
+		<view class="canteen-items" :style="{'min-height':hidefooter?'':'calc(100vh - 160rpx)'}">
 			<view v-if="(!list||list.length==0)&&true" style="width: 100%;min-height: 200rpx;">
 				&nbsp;
 			</view>
@@ -22,23 +22,23 @@
 					</view>
 				</view>
 				<view class="canteen-item-container">
-<!--					<view class="component-filter-container" style="padding-top: 12rpx;">-->
-<!--						<view class="flex1" @click="openParamPop">-->
-<!--							筛选-->
-<!--						</view>-->
-<!--						<view class="flex1">-->
-<!--							颜色<image src="../../../static/common/icon-arrow-down.png" class="icon-arrow-down"></image>-->
-<!--						</view>-->
-<!--						<view class="flex1">-->
-<!--							筛选<image src="../../../static/common/icon-arrow-down.png" class="icon-arrow-down"></image>-->
-<!--						</view>-->
-<!--					</view>-->
-<!--					<u-divider></u-divider>-->
+					<!--					<view class="component-filter-container" style="padding-top: 12rpx;">-->
+					<!--						<view class="flex1" @click="openParamPop">-->
+					<!--							筛选-->
+					<!--						</view>-->
+					<!--						<view class="flex1">-->
+					<!--							颜色<image src="../../../static/common/icon-arrow-down.png" class="icon-arrow-down"></image>-->
+					<!--						</view>-->
+					<!--						<view class="flex1">-->
+					<!--							筛选<image src="../../../static/common/icon-arrow-down.png" class="icon-arrow-down"></image>-->
+					<!--						</view>-->
+					<!--					</view>-->
+					<!--					<u-divider></u-divider>-->
 					<view class="flex">
 						<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"
+								<image :src="item.imageUrl" mode="scaleToFill" class="cover" :lazy-load="true"
 									@click.stop="previewImg(item.imageUrl)">
 								</image>
 							</view>
@@ -54,13 +54,12 @@
 										<uni-icons type="plus-filled" size="32" @click="addnum(item)"></uni-icons>
 									</view> -->
 							</view>
-							<view style="padding-bottom:100rpx">
-							</view>
-						</view>
 
+						</view>
+						<view style="padding-bottom:100rpx">
+						</view>
 					</view>
-					<footer-msg
-						:more="page.total>0&&page.total>page.current*page.size"></footer-msg>
+					<footer-msg v-if="!hidefooter" :more="page.total>0&&page.total>page.current*page.size"></footer-msg>
 
 				</view>
 			</view>
@@ -103,6 +102,7 @@
 	export default {
 		props: {
 			hidefooter: false,
+			catgoryTree: [],
 		},
 		data() {
 			return {
@@ -131,7 +131,9 @@
 		async onLoad() {
 
 			//加载分类
+			this.$message.showLoading()
 			this.$http.request('get', '/api/customer/flower/category/tree', {}).then(res => {
+				this.$message.hideLoading()
 				var data = res.data
 				this.list = data || []
 				if (this.list.length > 0) {
@@ -141,7 +143,14 @@
 			})
 		},
 		methods: {
-			async updateParamsAndSearch(){
+			refInit(catgoryTree) {
+				this.list = catgoryTree || []
+				if (this.list.length > 0) {
+					this.query.categoryId = this.list[0].id || ''
+					this.currentCategory = this.list[0] || {}
+				}
+			},
+			async updateParamsAndSearch() {
 				//todo 设置参数并查询
 				await this.refreshList()
 				this.$refs.popup_param.close()
@@ -287,7 +296,7 @@
 				width: 164rpx;
 				// width: 690rpx;
 				// max-width: 690rpx;
-				height: 266rpx;
+				min-height: 266rpx;
 				background: #FFFFFF;
 				margin-bottom: 44rpx;
 				max-width: 164rpx;

--
Gitblit v1.9.3