Merge branch 'master' of http://git.luyuan.tk/luyuan/deming into zmr

common/api/shop.js

@@ -172,6 +172,12 @@ export default {
 					goods_id: id
 				});
 			},
+			// 商品搜索
+			ShopSearch({keyword,page = 1,order = 'goods_salenum'}){
+				return vm.$u.post('ShopSearch/search',{
+					keyword,page,order
+				})
+			},
 			// 秒杀推荐
 			recommendedSpike() {
 				return vm.$u.post('Spike/recommendedSpike');