Merge branch 'zxm_home_dev' into develop

pages/search/search.vue

@@ -9,11 +9,11 @@
 				</view>
 			</view>
 			<view class="search-condition">
-				<view class="search-condition_item" :class="{current: param.label === 'default'}" @click="tabClick('default')">
+				<view class="search-condition_item" :class="{current: param.label === 'synthesize'}" @click="tabClick('synthesize')">
 					<text>综合排序</text>
 					<view class="icon_tips">
-						<text :class="{active: param.order === 'asc' && param.label === 'default'}" class="yticon"></text>
-						<text :class="{active: param.order === 'desc' && param.label === 'default'}" class="yticon"></text>
+						<text :class="{active: param.order === 'asc' && param.label === 'synthesize'}" class="yticon"></text>
+						<text :class="{active: param.order === 'desc' && param.label === 'synthesize'}" class="yticon"></text>
 					</view>
 				</view>
 				<view class="search-condition_item" :class="{current: param.label === 'sales'}" @click="tabClick('sales')">
@@ -87,7 +87,7 @@
 					keyword: '',
 					pageSize: 20,
 					current: 1,
-					label: 'default',
+					label: 'synthesize',
 					order: 'desc'
 				}
 			};

pages/searchhistory/searchhistory.vue

@@ -3,7 +3,7 @@
 		<view class="search-content">
 			<uni-icons color="#212121" class="search-icon-arrowleft" size="24" type="arrowleft" @click="goBack" />
 			<view class="search-input_box" :class="{active: active}">
-				<uni-icons color="#999999" class="uni-searchbar__box-icon-search" size="20" type="search" />
+				<uni-icons color="#999999" class="uni-searchbar__box-icon-search" @click="handleIconSearch" size="20" type="search" />
 				<input type="text" :focus="showSync" class="search-input" v-model="searchVal" confirm-type="search" @focus="handlefocus" @confirm="handleSearch"/>
 				<uni-icons v-if="searchVal!==''" @click="clear" color="#AEAEAE" class="search-close" size="20" type="clear" />
 			</view>
@@ -101,7 +101,22 @@
 			goBack() {
 				history.back();
 			},
+			handleIconSearch(){
+				// #ifndef APP-PLUS
+				uni.hideKeyboard()
+				// #endif
+				// #ifdef APP-PLUS
+				plus.key.hideSoftKeybord()
+				// #endif
+				const value = this.searchVal;
+				this.setLocalStorage(value);
+				// 跳转商品搜索页面
+				uni.navigateTo({
+					url: `/pages/search/search?keyword=${value}`
+				})
+			},
 			jumpPage(goods_name) {
+				this.setLocalStorage(goods_name);
 				uni.navigateTo({
 					url: `/pages/search/search?keyword=${goods_name}`
 				})