Merge branch 'hotfix/flex' into 'release/5.7'

Hotfix/flex



See merge request !558

@@ -55,11 +55,11 @@
     {{#unless @root.isApp}}
     {{#unless @root.isApp}}
         {{#if productList}}
         {{#if productList}}
         <div class="product-list-box">
         <div class="product-list-box">
-            <div class="product-list">
+            <ul class="product-list">
                 {{#productList}}
                 {{#productList}}
                     {{> index/product-list}}
                     {{> index/product-list}}
                 {{/productList}}
                 {{/productList}}
-            </div>
+            </ul>
         </div>
         </div>
         {{/if}}
         {{/if}}
     {{/unless}}
     {{/unless}}

-<div class="goods-box">
+<li class="goods-box">
     <div class="goods-img">
     <div class="goods-img">
         <a href="{{href}}">
         <a href="{{href}}">
             <img class="lazy" data-original="{{image2 pic_url w=106 h=138}}" />
             <img class="lazy" data-original="{{image2 pic_url w=106 h=138}}" />
@@ -10,4 +10,4 @@
             <p class="price">¥{{price}}</p>
             <p class="price">¥{{price}}</p>
         </a>
         </a>
     </div>
     </div>
-</div>
+</li>

@@ -13,7 +13,6 @@ const _ = require('lodash');
 const webpack = require('webpack');
 const webpack = require('webpack');
 const HappyPack = require('happypack');
 const HappyPack = require('happypack');
 const ExtractTextPlugin = require('extract-text-webpack-plugin');
 const ExtractTextPlugin = require('extract-text-webpack-plugin');
-const scss = require('postcss-scss');
 const postcssConfig = require('./postcss.config.js');
 const postcssConfig = require('./postcss.config.js');
 
 
 const happyThreadPool = HappyPack.ThreadPool({ // eslint-disable-line
 const happyThreadPool = HappyPack.ThreadPool({ // eslint-disable-line
@@ -46,7 +45,7 @@ const cssLoader = (env, type) => {
             loader: 'postcss-loader',
             loader: 'postcss-loader',
             options: {
             options: {
                 plugins: postcssConfig.postcssPlugin(env),
                 plugins: postcssConfig.postcssPlugin(env),
-                parser: scss
+                parser: 'postcss-scss'
             }
             }
         });
         });
     }
     }
@@ -109,7 +108,7 @@ module.exports = (env) => {
                     options: {
                     options: {
                         postcss: {
                         postcss: {
                             plugins: postcssConfig.postcssPlugin(env),
                             plugins: postcssConfig.postcssPlugin(env),
-                            parser: scss
+                            parser: 'postcss-scss'
                         },
                         },
                         autoprefixer: false,
                         autoprefixer: false,
                         loaders: {
                         loaders: {

@@ -26,6 +26,7 @@ let setting = {
 
 
 let $infos = $('#info-list');
 let $infos = $('#info-list');
 let getDynamicData = require('./list-dynamic');
 let getDynamicData = require('./list-dynamic');
+let productlistWith = require('./index/product-list');
 
 
 require('common');
 require('common');
 
 
@@ -93,3 +94,5 @@ $('.info-list').on('click', function(e) {
         }, true);
         }, true);
     }
     }
 });
 });
+
+productlistWith();

@@ -23,6 +23,7 @@ let $infoList = $('#info-list'),
     curType = $curNav.data('type');
     curType = $curNav.data('type');
 
 
 let getDynamicData = require('./list-dynamic');
 let getDynamicData = require('./list-dynamic');
+let productlistWith = require('./index/product-list');
 
 
 let state = {};
 let state = {};
 
 
@@ -128,3 +129,5 @@ $nav.on('touchstart', function(e) {
 }).on('touchend touchcancel', function() {
 }).on('touchend touchcancel', function() {
     $nav.find('li').removeClass('bytouch');
     $nav.find('li').removeClass('bytouch');
 });
 });
+
+productlistWith();

+const $ = require('yoho-jquery');
+
+function productlistWith($data) {
+    let $productList = $('.product-list');
+
+    if ($data) {
+        $productList = $data.find('.product-list');
+    }
+
+    $productList.each(function() {
+        $(this).css('width', $(this).children().length * 8.5 + 'rem');
+    });
+}
+
+module.exports = productlistWith;

@@ -21,6 +21,7 @@ let searching = false;
 let mySwiper = {};
 let mySwiper = {};
 
 
 let getDynamicData = require('./list-dynamic');
 let getDynamicData = require('./list-dynamic');
+let productlistWith = require('./index/product-list');
 
 
 require('common');
 require('common');
 
 
@@ -222,7 +223,10 @@ function loadMore($container, opt, url) {
                 return;
                 return;
             }
             }
 
 
-            $container.append(data);
+            let $data = $(data);
+
+            productlistWith($data);
+            $container.append($data);
 
 
             $swiper = $container.find('.swiper-container');
             $swiper = $container.find('.swiper-container');
             if ($swiper.length) {
             if ($swiper.length) {

@@ -66,6 +66,7 @@
     }
     }
 
 
     .guang-nav-item {
     .guang-nav-item {
+        width: 25%;
         color: #ccc;
         color: #ccc;
         font-size: 14PX;
         font-size: 14PX;
         text-align: center;
         text-align: center;

@@ -2,11 +2,13 @@
  * @Author: Targaryen
  * @Author: Targaryen
  * @Date: 2017-05-03 14:08:52
  * @Date: 2017-05-03 14:08:52
  * @Last Modified by: Targaryen
  * @Last Modified by: Targaryen
- * @Last Modified time: 2017-05-09 11:13:08
+ * @Last Modified time: 2017-05-15 19:22:38
  */
  */
 .guang-list-page {
 .guang-list-page {
     .product-list-box {
     .product-list-box {
-        margin: 40px 20px 0;
+        width: 100%;
+        margin-top: 40px;
+        padding: 0 20px;
         overflow-x: scroll;
         overflow-x: scroll;
         overflow-y: hidden;
         overflow-y: hidden;
     }
     }
@@ -14,7 +16,6 @@
     .product-list {
     .product-list {
         height: 138px;
         height: 138px;
         overflow-y: hidden;
         overflow-y: hidden;
-        display: inline-flex;
 
 
         .goods-box {
         .goods-box {
             width: 320px;
             width: 320px;