Merge branch 'feature/correct' into 'release/5.6'

全球购和品牌搜索修改



See merge request !507

@@ -238,7 +238,7 @@ const getBrandListByChannel = (channel) => {
 
 const getBrandForSearch = (channel) => {
     return api.get('', {
-        method: 'app.brand.brandlist',
+        method: 'app.brand.allBrandList',
         yh_channel: channel || 1
 
     }, {
@@ -434,7 +434,7 @@ const branchSearch = (params) => {
 
         if (result && result[0] && result[0].data) {
 
-            let brandList = result[0].data.brands;
+            let brandList = result[0].data.all_list;
 
             let obj = {};
 
@@ -447,7 +447,7 @@ const branchSearch = (params) => {
                             name: row.brand_name,
                             isHot: row.is_hot === 'Y' ? true : false,
                             isNew: row.is_show_new === 'Y' ? true : false,
-                            url: helpers.urlFormat('/product/index/brand?domain=' + row.brand_domain),
+                            url: _urlJump(parseInt(row.type, 10), row),
                             brandId: row.id,
                             brandDomain: row.brand_domain,
                             searchName: row.brand_name_en + row.brand_name_cn

@@ -57,3 +57,4 @@
     <div class="coupon-list coupon-tab2"></div>
     <div class="coupon-list coupon-tab3"></div>
 </div>
+<input type="hidden" id="no-download">

@@ -32,13 +32,13 @@ if (changeFiles.js) {
 
 if (changeFiles.css) {
     changeFiles.css = changeFiles.css.replace(/\n/g, ' ');
-    lintResult.css = shelljs.exec(`${lintPath.css}${ext} --syntax scss --config .stylelintrc "${changeFiles.css}"`);
+    lintResult.css = shelljs.exec(`${lintPath.css}${ext} --syntax scss --config .stylelintrc ${changeFiles.css}`);
 }
 
 if (changeFiles.vue) {
     changeFiles.vue = changeFiles.vue.replace(/\n/g, ' ');
     lintResult.vueScript = shelljs.exec(`${lintPath.js}${ext} -c .eslintrc --cache ${changeFiles.vue}`);
-    lintResult.vueStyle = shelljs.exec(`${lintPath.css}${ext} --syntax scss --extract --config .stylelintrc "${changeFiles.vue}"`); // eslint-disable-line
+    lintResult.vueStyle = shelljs.exec(`${lintPath.css}${ext} --syntax scss --extract --config .stylelintrc ${changeFiles.vue}`); // eslint-disable-line
 }
 
 const errorCode = lintResult.js.code || lintResult.css.code || lintResult.vueScript.code || lintResult.vueStyle.code;

@@ -12,8 +12,11 @@
         float: left;
         background: rgb(70, 46, 61);
         color: #fff;
-        padding: 2px 8px;
+        padding: 0 8px;
         font-size: 16px;
+        height: 28px;
+        display: flex;
+        align-items: center;
 
         span {
             float: left;
@@ -27,7 +30,6 @@
         background-repeat: no-repeat;
         background-size: cover;
         margin-right: 10px;
-        margin-top: 2px;
     }
 
     .global-limited {
@@ -37,6 +39,10 @@
         margin-left: 5px;
         padding: 0 5px;
         font-size: 16px;
+        height: 28px;
+        display: flex;
+        align-items: center;
+        box-sizing: border-box;
     }
 
     .banner-container {

@@ -204,8 +204,8 @@
     .service-cont .service-prob:before,
     .service-cont .service-answer:before {
         content: "";
-        width: 30px;
-        height: 30px;
+        width: 31px;
+        height: 31px;
         float: left;
         margin-right: 20px;
         position: absolute;
@@ -219,7 +219,6 @@
     }
 
     .service-cont .service-answer:before {
-        width: 29.5px;
         background-image: url("/product/service-a.png");
         background-repeat: no-repeat;
     }

@@ -85,7 +85,8 @@
             padding: 0 8px;
             font-size: 16px;
             height: 28px;
-            line-height: 28px;
+            display: flex;
+            align-items: center;
 
             span {
                 float: left;
@@ -99,7 +100,8 @@
             padding: 0 5px;
             font-size: 16px;
             height: 28px;
-            line-height: 26px;
+            display: flex;
+            align-items: center;
             box-sizing: border-box;
         }
 
@@ -141,7 +143,6 @@
             background-repeat: no-repeat;
             background-size: cover;
             margin-right: 10px;
-            margin-top: 3px;
         }
 
         .sale-price {