Merge remote-tracking branch 'origin/develop' into develop

@@ -43,7 +43,7 @@ module.exports = {
             order: req.query.order || 's_t_desc',
             order: req.query.order || 's_t_desc',
             limit: req.query.limit || '60',
             limit: req.query.limit || '60',
             color: req.query.color,
             color: req.query.color,
-            price: req.query.price,
+            price: req.query.priceRange,
             size: req.query.size,
             size: req.query.size,
             pd: req.query.pd,
             pd: req.query.pd,
             tagsFilter: req.query.tagsFilter
             tagsFilter: req.query.tagsFilter

@@ -34,19 +34,21 @@ Vue.mixin({
 $(() => {
 $(() => {
     const $body = $('body');
     const $body = $('body');
 
 
+    // 页面内无 JS 时， 自动隐藏 App 显示的 Loading
     if ($body.hasClass('no-local-js')) {
     if ($body.hasClass('no-local-js')) {
         yoho.showLoading(false); // 隐藏 App 默认显示的 loading
         yoho.showLoading(false); // 隐藏 App 默认显示的 loading
         util.visibilitychange();
         util.visibilitychange();
     }
     }
 
 
+    // 拦截页面内所有 a 标签的跳转
     $body.on('click', 'a[href]', function() {
     $body.on('click', 'a[href]', function() {
-        // 拦截跳转
         if (!$(this).hasClass('no-intercept')) {
         if (!$(this).hasClass('no-intercept')) {
             interceptClick.intercept($(this).attr('href'));
             interceptClick.intercept($(this).attr('href'));
             return false;
             return false;
         }
         }
     });
     });
 
 
+    // App 发送给 H5 的事件，统一转为 Vue-bus 的事件
     yoho.addNativeMethod('triggerH5Event', (eventName) => {
     yoho.addNativeMethod('triggerH5Event', (eventName) => {
         alert(eventName);
         alert(eventName);
         bus.$emit(eventName);
         bus.$emit(eventName);

@@ -233,7 +233,7 @@ const yoho = {
      */
      */
     goSearch(args, success, fail) {
     goSearch(args, success, fail) {
         if (this.isApp && window.yohoInterface) {
         if (this.isApp && window.yohoInterface) {
-            window.yohoInterface.triggerEvent(success || function() {}, fail || function() {}, {
+            window.yohoInterface.triggerEvent(success || nullFun, fail || nullFun, {
                 method: 'go.search',
                 method: 'go.search',
                 arguments: args
                 arguments: args
             });
             });
@@ -250,7 +250,7 @@ const yoho = {
      */
      */
     goSetting(args, success, fail) {
     goSetting(args, success, fail) {
         if (this.isApp && window.yohoInterface) {
         if (this.isApp && window.yohoInterface) {
-            window.yohoInterface.triggerEvent(success || function() {}, fail || function() {}, {
+            window.yohoInterface.triggerEvent(success || nullFun, fail || nullFun, {
                 method: 'go.setting',
                 method: 'go.setting',
                 arguments: args
                 arguments: args
             });
             });
@@ -267,7 +267,7 @@ const yoho = {
      */
      */
     goSetAvatar(args, success, fail) {
     goSetAvatar(args, success, fail) {
         if (this.isApp && window.yohoInterface) {
         if (this.isApp && window.yohoInterface) {
-            window.yohoInterface.triggerEvent(success || function() {}, fail || function() {}, {
+            window.yohoInterface.triggerEvent(success || nullFun, fail || nullFun, {
                 method: 'go.setAvatar',
                 method: 'go.setAvatar',
                 arguments: args
                 arguments: args
             });
             });
@@ -284,7 +284,7 @@ const yoho = {
      */
      */
     goPageView(args, success, fail) {
     goPageView(args, success, fail) {
         if (this.isApp && window.yohoInterface) {
         if (this.isApp && window.yohoInterface) {
-            window.yohoInterface.triggerEvent(success || function() {}, fail || function() {}, {
+            window.yohoInterface.triggerEvent(success || nullFun, fail || nullFun, {
                 method: 'go.pageView',
                 method: 'go.pageView',
                 arguments: args
                 arguments: args
             });
             });
@@ -301,7 +301,7 @@ const yoho = {
      */
      */
     showLoading(args, success, fail) {
     showLoading(args, success, fail) {
         if (this.isApp && window.yohoInterface) {
         if (this.isApp && window.yohoInterface) {
-            window.yohoInterface.triggerEvent(success || function() {}, fail || function() {}, {
+            window.yohoInterface.triggerEvent(success || nullFun, fail || nullFun, {
                 method: 'go.loading',
                 method: 'go.loading',
                 arguments: {
                 arguments: {
                     show: args ? 'yes' : 'no'
                     show: args ? 'yes' : 'no'