Merge branch 'hotfix/shop-js' into gray

@@ -667,14 +667,14 @@ function search(opt, callback) {
 
             bindGoodThumbClick();
             setTimeout(function() {
-                callback && callback();
+                callback && typeof callback === 'function' && callback();
             }, 0);
         },
         error: function() {
             tip.show('网络断开连接了~');
             searching = false;
             loading.hideLoadingMask();
-            callback && callback();
+            callback && typeof callback === 'function' && callback();
         }
     });
 }