From 81b833a5c49d7e13b12a022d9ee4c8eca9f603a4 Mon Sep 17 00:00:00 2001
From: 陶杰 <1378534974@qq.com>
Date: 星期二, 10 九月 2024 18:18:22 +0800
Subject: [PATCH] 1.收货地址新增手机号码校验

---
 sub_pages/customer/trade/trade.vue |   46 ++++++++++++++++++++++++++++++++++++++--------
 1 files changed, 38 insertions(+), 8 deletions(-)

diff --git a/sub_pages/customer/trade/trade.vue b/sub_pages/customer/trade/trade.vue
index e99cd81..48e7afa 100644
--- a/sub_pages/customer/trade/trade.vue
+++ b/sub_pages/customer/trade/trade.vue
@@ -1,13 +1,17 @@
 <template>
 	<view class="container-trade" :style="{'min-height':hidefooter?'':'calc(100vh - 20rpx)'}">
 		<view class="search-container m-t-12 flex" v-if="!hidefooter">
-			<view class="flex m-r-20">
+			<!-- <view class="flex m-r-20">
 				<view class="m-r-10" style="line-height: 80rpx;" @click="changeSearchType">
 					{{type=='category'?'按分类':'按店铺'}}
 				</view>
 				<u-icon name="arrow-down"></u-icon>
 
+			</view> -->
+			<view class="flex m-r-20">
+				<um-dropdown width="200rpx" style="line-height: 80rpx;" @change="fnChange" :defaultIndex="def" rangeKey="label" :optionList="typeList"></um-dropdown>
 			</view>
+			
 			<view class="flex1 input">
 				<u-input :placeholder="type==='category'?'请输入分类名称':'请输入店铺名称'" v-model="query.name" clearable
 					@confirm="buttonSearchFlow" @clear="()=>{
@@ -19,7 +23,7 @@
 				</u-input>
 			</view>
 		</view>
-		<view class="canteen-items" :style="{'min-height':hidefooter?'':'calc(100vh - 160rpx)'}">
+		<view class="canteen-items" :style="{'min-height':hidefooter?'':'calc(100vh - 340rpx)'}">
 			<view v-if="(!list||list.length==0)&&true" style="width: 100%;min-height: 200rpx;">
 				&nbsp;
 			</view>
@@ -55,12 +59,23 @@
 							</view>
 							<view class="cateen_infos list">
 								<view class="title">{{item.name}}</view>
+								<!-- #ifdef PUB_CUSTOMER_DEV -->
+								
+								<view class="price">
+									<view>会员价</view>
+									<view>￥{{item.priceLowMember || 0}}-{{item.priceHighMember||0}}</view>
+								</view>								
+								<view class="price component-price-old">￥{{item.priceLow || 0}}-{{item.priceHigh||0}}</view>
+								
+								<!-- #endif -->
+								<!-- #ifndef PUB_CUSTOMER_DEV -->
 								<view class="price">￥{{item.priceLow || 0}}-{{item.priceHigh||0}}</view>
+								<!-- #endif -->
 								<view class="desc">在售 {{item.stock||'0'}} 扎</view>
 							</view>
 
 						</view>
-						<view style="padding-bottom:100rpx">
+						<view style="padding-bottom:40rpx">
 						</view>
 					</view>
 					<footer-msg v-if="!hidefooter" :more="page.total>0&&page.total>page.current*page.size"></footer-msg>
@@ -72,7 +87,7 @@
 
 
 
-		<view style="min-height:200rpx" v-if="!hidefooter">
+		<view style="min-height:100rpx" v-if="!hidefooter">
 		</view>
 		<common-footer flg="1" v-if="!hidefooter">></common-footer>
 
@@ -119,10 +134,22 @@
 				},
 				currentCategory: {},
 				type: 'category', //supplier
+				def: 0,
+				typeList:[
+					{
+						label: '按分类',
+						value: 'category',
+					},
+					{
+						label: '按店铺',
+						value: 'supplier',
+					},
+				],
 
 
 			}
 		},
+
 		// #ifdef PUB_CUSTOMER
 		onShareAppMessage() {
 			let that = this;
@@ -185,6 +212,9 @@
 			})
 		},
 		methods: {
+			fnChange(e) {
+				this.type = e.value
+			},
 			changeSearchType() {
 				if (this.type == 'category') {
 					this.type = 'supplier'
@@ -290,7 +320,7 @@
 				}
 			},
 			toDetailList(item) {
-				//去商品列表页面
+				//去商品列表页面
 				console.log('toDetailList',this.supplierId)
 				uni.navigateTo({
 					url: `/sub_pages/customer/trade/list?categoryId=${item.id}&supplierId=${this.supplierId||''}`
@@ -358,8 +388,8 @@
 			min-width: 178rpx;
 			background: #EEF7F5;
 			border-radius: 8rpx;
-			min-height: calc(100vh - 300rpx);
-			max-height: calc(100vh - 300rpx);
+			min-height: calc(100vh - 270rpx);
+			max-height: calc(100vh - 270rpx);
 			overflow-y: scroll;
 			margin-right: 16rpx;
 
@@ -455,7 +485,7 @@
 			.canteen-item-container {
 				width: 100%;
 				min-height: 300rpx;
-				max-height: calc(100vh - 200rpx);
+				max-height: calc(100vh - 270rpx);
 				overflow-y: scroll;
 			}
 

--
Gitblit v1.9.3