Merge branch 'master' into wjw_logistics

pages/search/search.vue

@@ -48,7 +48,7 @@
 				<view class="image-outer" @click="jumpPhpPage(`app=goods&id=${item._source.goods_id}`)">
 					<image :src="item._source.default_image || $noGoodsImg" lazy-load  @error="$__reloadResource(item)" mode="aspectFill"></image>
 				</view>
-				<view class="title">{{item._source.goods_name}}</view>
+				<view class="title">{{item._source.brand}} {{item._source.goods_name}}</view>
 				<view class="sub-title">{{item._source.goods_subname}}</view>
 				<view v-if="isLogin">
 					<view v-if="item._source.is_pro === 1">
@@ -180,7 +180,7 @@
 							if(type === 'refresh'){
 								this.goods_list = [];
 							}
-							this.goods_list = this.goods_list.concat(data.data);
+							this.goods_list = this.goods_list.concat(data.data || []);
 							this.goods_list.map((item, key) => {
 								if(item._source.is_pro === 1  && new Date(item._source.end_time).getTime() < new Date().getTime())
 								item._source.is_pro = 0;

pages/searchhistory/searchhistory.vue

@@ -90,7 +90,7 @@
 					success: (res) => {
 						const {data} = res;
 						if(data.code == 0){
-							this.goods_names = data.data;
+							this.goods_names = data.data || [];
 						}
 					}
 				});