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/searchResult.vue |   32 ++++++++++++++++++++------------
 1 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/uniapp/pages/search/searchResult.vue b/uniapp/pages/search/searchResult.vue
index b30a793..e8157a7 100644
--- a/uniapp/pages/search/searchResult.vue
+++ b/uniapp/pages/search/searchResult.vue
@@ -23,8 +23,8 @@
 				<view class="onlineStore-container rowCen">
 					<view class="onlineStoreList rowSta" v-if="!showtar || platform!='iOS'">
 						<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>
@@ -151,24 +151,30 @@
 				advertPic: '',
 				onlineStoreList: [{
 						name: '娣樺疂',
-						type: 'tb'
+						type: 'tb',
+						inde:0
 					},
 					{
 						name: '浜笢',
-						type: 'jd'
+						type: 'jd',
+						inde:1
 					},
 					{
 						name: '鎷煎澶�',
-						type: 'pdd'
-					},
-					{
-						name: '鍞搧浼�',
-						type: 'wph'
+						type: 'pdd',
+						inde:2
 					},
 					{
 						name: '鎶栭煶',
-						type: 'dy'
+						type: 'dy',
+						inde:4
+					},
+					{
+						name: '鍞搧浼�',
+						type: 'wph',
+						inde:3
 					}
+					
 				],
 
 				sortList: [{
@@ -264,6 +270,7 @@
 				}).then(e => {
 					if (e.code != 0) return that.$alert(e.msg)
 					uni.stopPullDownRefresh();
+					console.log(e.data)
 					var res = e.data;
 					if (res.list.length < 10) {
 						that.canloadmore = false
@@ -364,7 +371,8 @@
 					sort: this.sortType,
 					selectCoupon: this.selectCoupon == true ? 1 : 0
 				}).then(e => {
-					if (e.code != 0) return that.$alert(e.msg)
+					console.log(e);
+					if (e.code != 0) return;
 					var res = e.data;
 					uni.stopPullDownRefresh();
 					if (res.list.length < 10) {
@@ -862,7 +870,7 @@
 
 					.goods-items {
 						width: 346rpx;
-						height: 526rpx;
+						height: 546rpx;
 						margin-bottom: 20rpx;
 					}
 				}

--
Gitblit v1.9.3