Merge remote-tracking branch 'origin/release/5.1' into release/5.1

@@ -17,7 +17,7 @@ const shopIndex = (req, res) => {
             })
             })
         };
         };
     } else {
     } else {
-        uid = crypto.encryption('', req.query.uid + ''),
+        uid = crypto.encryption('', req.query.uid + '');
         parameter = {
         parameter = {
             appVersion: true,
             appVersion: true,
             uid: uid
             uid: uid

@@ -20,7 +20,7 @@ const shopList = (uid, tabName) => {
     }).then((result) => {
     }).then((result) => {
         if (result && result.code === 200) {
         if (result && result.code === 200) {
             _.forEach(result.data, function(data) {
             _.forEach(result.data, function(data) {
-                let href = '//m.yohobuy.com/product/index/brand?shop_id=' + data.shopsId + '&openby: yohobuy={"action":"go.shop","params":{"shop_id":"'
+                let href = '//m.yohobuy.com/product/index/brand?shop_id=' + data.shopsId + '&openby:yohobuy={"action":"go.shop","params":{"shop_id":"'
                 + data.shopsId + '","shop_template_type":"' + data.shopTemplateType + '","shop_name":"' + data.shopName + '"}}';
                 + data.shopsId + '","shop_template_type":"' + data.shopTemplateType + '","shop_name":"' + data.shopName + '"}}';
 
 
                 data.isFavorite = data.isFavorite === 'Y';
                 data.isFavorite = data.isFavorite === 'Y';

@@ -4,12 +4,9 @@
         {{> resources/banner-top}}
         {{> resources/banner-top}}
     {{/ bannerTop}}
     {{/ bannerTop}}
 
 
-    <div class="shop-nav nav">
-    </div>
+    <div class="shop-nav nav"></div>
 
 
-    <div class="shop-list">
-        
-    </div>
+    <div class="shop-list"></div>
 {{/ shopCollect}}
 {{/ shopCollect}}
 <input type="hidden" name="app_version" value="{{appVersion}}">
 <input type="hidden" name="app_version" value="{{appVersion}}">
 <input type="hidden" name="uid" value="{{uid}}">
 <input type="hidden" name="uid" value="{{uid}}">

@@ -3,15 +3,19 @@ const path = require('path');
 
 
 const changeFiles = {
 const changeFiles = {
     js: shelljs.exec('git diff --cached --name-only --diff-filter=ACM | grep .js$', {silent: true}).stdout,
     js: shelljs.exec('git diff --cached --name-only --diff-filter=ACM | grep .js$', {silent: true}).stdout,
-    css: shelljs.exec('git diff --cached --name-only --diff-filter=ACM | grep .css$', {silent: true}).stdout
+    css: shelljs.exec('git diff --cached --name-only --diff-filter=ACM | grep .css$', {silent: true}).stdout,
+    vue: shelljs.exec('git diff --cached --name-only --diff-filter=ACM | grep .vue$', {silent: true}).stdout,
 };
 };
+
 const lintPath = {
 const lintPath = {
     js: path.resolve('./node_modules/.bin/eslint'),
     js: path.resolve('./node_modules/.bin/eslint'),
     css: path.resolve('./node_modules/.bin/stylelint')
     css: path.resolve('./node_modules/.bin/stylelint')
 };
 };
 const lintResult = {
 const lintResult = {
     js: {},
     js: {},
-    css: {}
+    css: {},
+    vueScript: {},
+    vueStyle: {}
 };
 };
 
 
 const ext = process.platform === 'win32' ? '.cmd' : ''; // Windows 平台需要加后缀
 const ext = process.platform === 'win32' ? '.cmd' : ''; // Windows 平台需要加后缀
@@ -28,9 +32,17 @@ if (changeFiles.js) {
 
 
 if (changeFiles.css) {
 if (changeFiles.css) {
     changeFiles.css = changeFiles.css.replace(/\n/g, ' ');
     changeFiles.css = changeFiles.css.replace(/\n/g, ' ');
-    lintResult.css = shelljs.exec(`${lintPath.css}${ext} --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 --fix ${changeFiles.vue}`);
+    lintResult.vueStyle = shelljs.exec(`${lintPath.css}${ext} --syntax scss --extract --config .stylelintrc ${changeFiles.vue}`); // eslint-disable-line
 }
 }
 
 
-if (lintResult.js.code || lintResult.css.code) {
-    process.exit(lintResult.js.code || lintResult.css.code); // eslint-disable-line
+const errorCode = lintResult.js.code || lintResult.css.code || lintResult.vueScript.code || lintResult.vueStyle.code;
+
+if (errorCode) {
+    process.exit(errorCode); // eslint-disable-line
 }
 }

@@ -8,7 +8,7 @@
                 </div>
                 </div>
 
 
                 <div class="shop-tile">
                 <div class="shop-tile">
-                    <img src="{{logoUrl}}"></img>
+                    <img class="lazy" data-original="{{image logoUrl 110 70}}"></img>
                     <p>
                     <p>
                         <span class="shop-name">{{shopName}}</span><br>
                         <span class="shop-name">{{shopName}}</span><br>
                         <span class="giving">{{words}}</span>
                         <span class="giving">{{words}}</span>
@@ -17,7 +17,7 @@
             </div>
             </div>
 
 
             <div class="info-content">
             <div class="info-content">
-                <img class="content" src="{{bannerUrl}}"></img>
+                <img class="lazy content" data-original="{{image bannerUrl 690 175}}"></img>
             </div>
             </div>
         </a>
         </a>
     </div>
     </div>

@@ -4,7 +4,8 @@
 
 
 var $ = require('yoho-jquery'),
 var $ = require('yoho-jquery'),
     Swiper = require('yoho-swiper'),
     Swiper = require('yoho-swiper'),
-    tip = require('../plugin/tip');
+    tip = require('../plugin/tip'),
+    lazyLoad = require('yoho-jquery-lazyload');
 
 
 var searching,
 var searching,
     shopId,
     shopId,
@@ -76,6 +77,8 @@ function shopListData(tabName, stoping) {
 
 
             $('.shop-list').html(list);
             $('.shop-list').html(list);
 
 
+            lazyLoad($('img.lazy'));
+
             stoping = false;
             stoping = false;