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

@@ -7,7 +7,6 @@
 'use strict';
 'use strict';
 
 
 const brandApi = require('./brand-api');
 const brandApi = require('./brand-api');
-const logger = global.yoho.logger;
 const _ = require('lodash');
 const _ = require('lodash');
 const camelCase = global.yoho.camelCase;
 const camelCase = global.yoho.camelCase;
 
 
@@ -57,8 +56,6 @@ const getBrandListData = params => {
     return brandApi.getBrandListOriginData(params).then(result => {
     return brandApi.getBrandListOriginData(params).then(result => {
         if (result.data) {
         if (result.data) {
             Object.assign(finalResult, handleBrandList(result.data.all_list));
             Object.assign(finalResult, handleBrandList(result.data.all_list));
-        } else {
-            logger.error('getBrandListOriginData api data is null');
         }
         }
 
 
         return finalResult;
         return finalResult;

@@ -6,7 +6,6 @@
  */
  */
 'use strict';
 'use strict';
 
 
-const logger = global.yoho.logger;
 const editorialListApi = require('./list-api');
 const editorialListApi = require('./list-api');
 const camelCase = global.yoho.camelCase;
 const camelCase = global.yoho.camelCase;
 
 
@@ -27,8 +26,6 @@ const editorialList = params => {
                 },
                 },
                 code: 200
                 code: 200
             });
             });
-        } else {
-            logger.error('getEitorialListData api no data');
         }
         }
 
 
         return camelCase(finalResult);
         return camelCase(finalResult);

@@ -66,14 +66,10 @@ const getShopData = params => {
                                         });
                                         });
                                     }
                                     }
                                 });
                                 });
-                            } else {
-                                logger.error('getShopsDecoratorList api no data');
                             }
                             }
 
 
                             return finalResult;
                             return finalResult;
                         });
                         });
-                    } else {
-                        logger.error('getShopInfoData api no data');
                     }
                     }
                     return finalResult;
                     return finalResult;
                 });
                 });
@@ -87,8 +83,6 @@ const getShopData = params => {
                 logger.info('brand has no shop');
                 logger.info('brand has no shop');
             }
             }
             return finalResult;
             return finalResult;
-        } else {
-            logger.error('getBrandInfoByDomain api no data');
         }
         }
 
 
         return finalResult;
         return finalResult;
@@ -121,13 +115,9 @@ const getBrandShopGoodsData = params => {
                         },
                         },
                         code: 200
                         code: 200
                     };
                     };
-                } else {
-                    logger.error('getBrandShopGoodsOriginData api no data');
                 }
                 }
                 return camelCase(finalResult);
                 return camelCase(finalResult);
             });
             });
-        } else {
-            logger.error('getBrandInfoByDomain api no data');
         }
         }
         return camelCase(finalResult);
         return camelCase(finalResult);
     });
     });

@@ -294,6 +294,23 @@ const yoho = {
     },
     },
 
 
     /**
     /**
+     * 更新头部信息
+     * @param args {""}
+     * @param success
+     * @param fail
+     */
+    updateNavigationBar(args, success, fail) {
+        if (this.isApp) {
+            window.yohoInterface.triggerEvent(success || nullFun, fail || nullFun, {
+                method: 'update.navigationBarStyle',
+                arguments: args
+            });
+        } else {
+            tip(tipInfo);
+        }
+    },
+
+    /**
      * 显示 loading
      * 显示 loading
      * @param args Boolen
      * @param args Boolen
      * @param success
      * @param success

@@ -274,14 +274,16 @@
             tab
             tab
         },
         },
         created() {
         created() {
-            const self = this;
-
             this.getCateList();
             this.getCateList();
 
 
-            bus.$on('channel.change', function(page, channel) {
-                self.gender = channelTrans[channel].code;
-                self.cateNavLeftData = self.brandCate[channelTrans[channel].key];
-                self.cateNavRightData = self.cateNavLeftData ? self.cateNavLeftData[0].sub : [];
+            bus.$on('channel.change', (page, channel) => {
+                this.gender = channelTrans[channel].code;
+                this.cateNavLeftData = this.brandCate[channelTrans[channel].key];
+                this.cateNavRightData = this.cateNavLeftData ? this.cateNavLeftData[0].sub : [];
+                this.rightAll = {
+                    sortId: this.cateNavLeftData[0].relationParameter.sort,
+                    categoryName: this.cateNavLeftData[0].categoryName
+                };
             });
             });
         }
         }
     };
     };

@@ -210,7 +210,7 @@
 
 
                 header.defaultSelectedIndex = '1';
                 header.defaultSelectedIndex = '1';
                 header.right.des = this.editmodel ? '完成' : '编辑';
                 header.right.des = this.editmodel ? '完成' : '编辑';
-                return yoho.goPageView({
+                return yoho.updateNavigationBar({
                     header: header
                     header: header
                 });
                 });
             });
             });

@@ -228,7 +228,7 @@
 
 
                 header.defaultSelectedIndex = '0';
                 header.defaultSelectedIndex = '0';
                 header.right.des = this.editmodel ? '完成' : '编辑';
                 header.right.des = this.editmodel ? '完成' : '编辑';
-                return yoho.goPageView({
+                return yoho.updateNavigationBar({
                     header: header
                     header: header
                 });
                 });
             });
             });

 <template>
 <template>
-    <div class="top-box clearfix" v-bind:class='{"top-box-left" : this.$parent.$refs.filter.isVisible,"top-change" : topChange || !shareData.isBlkShop}' v-infinite-scroll="changeTopStatus()">
+    <div class="top-box clearfix" v-bind:class='{"top-change" : topChange || !shareData.isBlkShop}' v-infinite-scroll="changeTopStatus()">
         <span class="icon icon-back back" @click="goBack()"></span>
         <span class="icon icon-back back" @click="goBack()"></span>
         <span class="brand-name" v-if="!shareData.isBlkShop">{{shareData.brandName}}</span>
         <span class="brand-name" v-if="!shareData.isBlkShop">{{shareData.brandName}}</span>
         <div class="right">
         <div class="right">
@@ -54,10 +54,6 @@
         }
         }
     }
     }
 
 
-    .top-box-left {
-        left: -665px;
-    }
-
     .top-change {
     .top-change {
         background-color: #fff;
         background-color: #fff;
         color: #000;
         color: #000;