From fc9bd6378d3bfbde6d5c71535757a3d44de8d8ff Mon Sep 17 00:00:00 2001
From: zhaojs <349234519@qq.com>
Date: 星期四, 20 七月 2023 15:18:06 +0800
Subject: [PATCH] Merge branch 'feature/1.1.4开发' into develop

---
 uniapp/pages/search/search.vue |   33 ++++++++++++++++++++++-----------
 1 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/uniapp/pages/search/search.vue b/uniapp/pages/search/search.vue
index beda641..5221a4c 100644
--- a/uniapp/pages/search/search.vue
+++ b/uniapp/pages/search/search.vue
@@ -27,7 +27,7 @@
 				<view class="onlineStore-container rowCen" v-if="searchText==''">
 					<view class="onlineStoreList rowSta">
 						<block v-for="(items,index) in onlineStoreList" :key="index">
-							<view class="store-items colCen" :class="storeCurrent==index?'store-items-active':''" @click="checkstore(index)">
+							<view class="store-items colCen" :class="storeCurrent==items.inde?'store-items-active':''" @click="checkstore(items.inde)">
 								<view class="store-name">
 									{{items.name}}
 								</view>
@@ -166,24 +166,30 @@
 			return {
 				onlineStoreList: [{
 						name: '娣樺疂',
-						type: 'tb'
+						type: 'tb',
+						inde:0
 					},
 					{
 						name: '浜笢',
-						type: 'jd'
+						type: 'jd',
+						inde:1
 					},
 					{
 						name: '鎷煎澶�',
-						type: 'pdd'
-					},
-					{
-						name: '鍞搧浼�',
-						type: 'vph'
+						type: 'pdd',
+						inde:2
 					},
 					{
 						name: '鎶栭煶',
-						type: 'dy'
+						type: 'dy',
+						inde:4
+					},
+					{
+						name: '鍞搧浼�',
+						type: 'vph',
+						inde:3
 					}
+					
 				],
 				searchText: '',
 				storeCurrent: 0,
@@ -206,6 +212,11 @@
 				this.storeCurrent = options.type
 			}else{
 				this.storeCurrent = 0;
+			}
+			if(options.searchText)
+			{
+				this.searchText=options.searchText;
+				this.searchInput(null);
 			}
 			this.appinfo = getApp().globalData.appinfo.iosExamine;
 			this.platform = getApp().globalData.platform
@@ -685,7 +696,7 @@
 										width: 60rpx;
 										height: 24rpx;
 										margin-right: 5rpx;
-										margin-top: 8rpx;
+										
 									}
 
 									.tradename {
@@ -702,7 +713,7 @@
 
 								.price-saleNums-container {
 									width: 100%;
-									margin-top: 30rpx;
+									margin-top: 10rpx;
 
 									.left-price-box {
 										.greytxt {

--
Gitblit v1.9.3