diff --git a/pages/goods/goodsInfo/goodsInfo.js b/pages/goods/goodsInfo/goodsInfo.js
index 986b46c..ef3a417 100644
--- a/pages/goods/goodsInfo/goodsInfo.js
+++ b/pages/goods/goodsInfo/goodsInfo.js
@@ -852,7 +852,7 @@ Page({
               ee.get_sto();
             }
 
-            ee.get_sku(o.stoid, t.data.data.sku, gid);
+            ee.get_sku(o.stoid, t.data.data, gid);
           }
           else {
             var gg = "", item = t.data.data;
@@ -2070,14 +2070,15 @@ Page({
   },
 
   //----------装载同一条形码的商品----------
-  async get_sku(stoid, sku, g_id, is_normal, func) {
+  async get_sku(stoid, gd, g_id, is_normal, func) {
     var tt = this,arrdata=null;
     var now=ut.gettimestamp();
 
     await getApp().request.promiseGet("/api/weshop/goods/page", {
       data: {
         store_id: o.stoid,
-        sku: sku,
+        sku: gd.sku,
+        more_spec:gd.more_spec,
         isonsale: 1,
         is_on_sale: 1,
 		pageSize:500
@@ -2782,7 +2783,7 @@ Page({
                   prom_type: 0,
                   isshow: 1,
                 });
-                ee.get_sku(os.stoid, ee.data.data.sku, gid);
+                ee.get_sku(os.stoid, ee.data.data, gid);
                 return false;
               }
               //----已经结束-----
@@ -2791,7 +2792,7 @@ Page({
                   prom_type: 0,
                   isshow: 1,
                 });
-                ee.get_sku(os.stoid, ee.data.data.sku, gid);
+                ee.get_sku(os.stoid, ee.data.data, gid);
                 ee.get_sto();
                 return false;
               }
@@ -2802,7 +2803,7 @@ Page({
                   prom_type: 0,
                   isshow: 1,
                 });
-                ee.get_sku(os.stoid, ee.data.data.sku, gid);
+                ee.get_sku(os.stoid, ee.data.data, gid);
                 return false;
               }
 
@@ -2812,7 +2813,7 @@ Page({
                   prom_type: 0,
                   isshow: 1,
                 });
-                ee.get_sku(os.stoid, ee.data.data.sku, gid);
+                ee.get_sku(os.stoid, ee.data.data, gid);
                 ee.get_sto();
                 return false;
               }
@@ -2905,7 +2906,7 @@ Page({
 			  			   
 		   }else{
 			   ee.setData({prom_type: 0, isshow: 1,});
-			   ee.get_sku(os.stoid, ee.data.data.sku, gid);
+			   ee.get_sku(os.stoid, ee.data.data, gid);
 			   ee.get_sto();
 			   return false;
 		   }					   
@@ -2936,7 +2937,7 @@ Page({
                   prom_type: 0,
                   isshow: 1,
                 });
-                ee.get_sku(os.stoid, ee.data.data.sku, gid);
+                ee.get_sku(os.stoid, ee.data.data, gid);
                 ee.get_sto();
                 return false;
               }
@@ -2946,7 +2947,7 @@ Page({
                   prom_type: 0,
                   isshow: 1,
                 });
-                ee.get_sku(os.stoid, ee.data.data.sku, gid);
+                ee.get_sku(os.stoid, ee.data.data, gid);
                 return false;
               }
               //----已经过期-----
@@ -2956,7 +2957,7 @@ Page({
                   prom_type: 0,
                   isshow: 1,
                 });
-                ee.get_sku(os.stoid, ee.data.data.sku, gid);
+                ee.get_sku(os.stoid, ee.data.data, gid);
                 ee.get_sto();
                 return false;
               }
@@ -2967,7 +2968,7 @@ Page({
                   prom_type: 0,
                   isshow: 1,
                 });
-                ee.get_sku(os.stoid, ee.data.data.sku, gid);
+                ee.get_sku(os.stoid, ee.data.data, gid);
                 ee.get_sto();
                 return false;
               }
@@ -3313,7 +3314,7 @@ Page({
         });
       } else {
 		th.get_sto(1);  		  
-        th.get_sku(o.stoid, th.data.data.sku, th.data.gid, 1, function() {
+        th.get_sku(o.stoid, th.data.data, th.data.gid, 1, function() {
           th.setData({
             is_normal: ind,
             openSpecModal_pt: 1
diff --git a/pages/goods/search/search.js b/pages/goods/search/search.js
index de66ca8..ed397a4 100644
--- a/pages/goods/search/search.js
+++ b/pages/goods/search/search.js
@@ -193,8 +193,8 @@ Page({
     submitSearch: function(t) {
 		console.log(111,t);
 		var val=t.detail.value.word;
-		if(!val) val=t.detail.value;	
-		val=val.trim();
+		if(val==undefined) val=t.detail.value;	
+		val=val?val.trim():'';
 		if(!val){
 			a.showWarning("请输入搜索关键词");
 		}
@@ -205,8 +205,10 @@ Page({
 
     //热搜关键字
     searchHotWord: function(t) {
-			this.historyRecord();
-      this.search(t.currentTarget.dataset.word);
+		
+	  var word=	t.currentTarget.dataset.word;
+	  this.historyRecord(word);
+      this.search(word);
     },
 
     //-----点击搜索按钮----
@@ -287,10 +289,13 @@ Page({
 	 	});
 	 },
 	 
-	 historyRecord() {
+	 historyRecord(w) {	 
+		let keyword =w;		
 		let self = this;
-	 	let keyword = this.data.key_str.trim();
-	 	let searchRecord = this.data.searchRecord;	
+		if(!keyword){		 		
+    		keyword = this.data.key_str.trim();
+		}
+		let searchRecord = this.data.searchRecord;
 		if(!searchRecord || searchRecord.length==0) searchRecord=wx.getStorageSync('searchRecord') || [];
 	 	
 	 	if(keyword) {