Merge branch 'release/6.6' of git.yoho.cn:fe/yohobuywap-node into release/6.6

 <div class="back-email-new-page">
     <div class="top-operation-bar">
-        <button class="back iconfont" onclick="javascript:history.go(-1);">&#xe72e;</button>
+        <button class="back iconfont" onclick="javascript:history.go(-1);" type="button">&#xe72e;</button>
         <span class="page-title">邮箱找回密码</span>
     </div>
-     <div class="back-email-form">
+     <form class="back-email-form">
         <div class="form-group email">
             <label for="email" class="iconfont">&#xe724;</label><input type="text" name="email" placeholder="请输入邮箱"><i id="clearEmail" class="iconfont clear hide">&#xe72a;</i>
         </div>
-        <button id="backEmailResetBtn" class="back-email-reset-btn">确 认</button>
-     </div>
+        <button id="backEmailResetBtn" class="back-email-reset-btn" type="button">确 认</button>
+     </form>
 </div>

 <div class="back-mobile-new-page">
     <div class="top-operation-bar">
-        <button class="back iconfont" onclick="javascript:history.go(-1);">&#xe72e;</button>
+        <button class="back iconfont" onclick="javascript:history.go(-1);" type="button">&#xe72e;</button>
         <span class="page-title">手机找回密码</span>
     </div>
-     <div class="back-mobile-form">
+     <form class="back-mobile-form">
         <div class="form-group mobile">
             <label for="mobile" class="iconfont">&#xe727;</label>
             <select name="" id="countryCodeSelector" class="country-select">
@@ -16,12 +16,12 @@
                 class="iconfont clear hide">&#xe72a;</i>
         </div>
         <div class="form-group verify-code">
-            <label for="verifyCode" class="iconfont">&#xe71c;</label><input type="text" name="verifyCode"  placeholder="请输入验证码" class="verify-code-input"><button id="getVerifyCodeBtn" class="get-verify-code">获取验证码</button>
+            <label for="verifyCode" class="iconfont">&#xe71c;</label><input type="text" name="verifyCode"  placeholder="请输入验证码" class="verify-code-input"><button id="getVerifyCodeBtn" class="get-verify-code" type="button">获取验证码</button>
         </div>
         <div class="form-group password">
             <label for="password" class="iconfont">&#xe723;</label><input type="password" name="password" placeholder="请重置新密码"><span id="passwordEyeIcon" class="eye"><i class="iconfont eye-close">&#xe716;</i><i class="iconfont eye-open hide">&#xe714;</i></span>
         </div>
         <div data-userverify="{{captchaShow}}" data-geetest="{{useGeetest}}" id="js-img-check" {{#unless useGeetest}} class="full-img-verify" {{/unless}}></div>
-        <button id="backMobileResetBtn" class="back-mobile-reset-btn">重置登录密码</button>
-     </div>
-</div>
\ No newline at end of file
+        <button id="backMobileResetBtn" class="back-mobile-reset-btn" type="button">重置登录密码</button>
+     </form>
+</div>

@@ -8,4 +8,4 @@ yarn build
 else
 npm i --production
 fi
-tar -czvf yoho-yohobuy-wap.tar.gz *
+tar -czf yoho-yohobuy-wap.tar.gz *

 {
   "name": "yohobuywap-node",
-  "version": "6.5.53",
+  "version": "96.5.53",
   "private": true,
   "description": "A New Yohobuy Project With Express",
   "repository": {
@@ -106,7 +106,6 @@
     "extract-text-webpack-plugin": "^4.0.0-beta.0",
     "friendly-errors-webpack-plugin": "^1.7.0",
     "handlebars-loader": "^1.7.0",
-    "happypack": "^5.0.0-beta.3",
     "husky": "^0.14.3",
     "intersection-observer": "^0.5.0",
     "jquery-lazyload": "^1.9.7",

@@ -6,19 +6,13 @@
 
 'use strict';
 
-const os = require('os');
 const path = require('path');
 const shelljs = require('shelljs');
 const _ = require('lodash');
 const webpack = require('webpack');
-const HappyPack = require('happypack');
 const { cssLoader, hbsLoader } = require('./utils.js');
 const postcssConfig = require('./postcss.config.js');
 
-const happyThreadPool = HappyPack.ThreadPool({ // eslint-disable-line
-    size: os.cpus().length
-});
-
 
 const getEntries = () => {
     const entries = {
@@ -83,16 +77,14 @@ module.exports = (env) => {
                 test: /\.js$/,
                 exclude: [/node_modules/],
                 use: [{
-                    loader: 'happypack/loader?id=js'
+                    loader: 'babel-loader'
                 }]
             }, {
                 test: /\.css$/,
                 use: cssLoader(env, 'css')
             }, {
                 test: /\.hbs$/,
-                use: [{
-                    loader: 'happypack/loader?id=hbs'
-                }]
+                use: [hbsLoader]
             }]
         },
         resolve: {
@@ -138,21 +130,6 @@ module.exports = (env) => {
             maxAssetSize: 512000
         },
         plugins: [
-            new HappyPack({
-                id: 'js',
-                threadPool: happyThreadPool,
-                loaders: ['babel-loader'],
-            }),
-            new HappyPack({
-                id: 'hbs',
-                threadPool: happyThreadPool,
-                loaders: [hbsLoader]
-            }),
-
-            // new webpack.optimize.CommonsChunkPlugin({
-            //     name: 'libs',
-            //     filename: 'libs.js'
-            // }),
             new webpack.ProvidePlugin({
                 $: 'yoho-jquery',
                 jQuery: 'yoho-jquery',

-const webpack = require('webpack');
+
 const path = require('path');
 
 module.exports = {
+    mode: 'production',
     entry: {
         sw: path.join(__dirname, '../js/pwa/sw.js')
     },
@@ -16,13 +17,5 @@ module.exports = {
             include: [path.join(__dirname, '../../node_modules/workbox-sw'), path.join(__dirname, '../js')],
             use: 'babel-loader'
         }]
-    },
-    plugins: [
-        new webpack.DefinePlugin({
-            'process.env': {
-                NODE_ENV: '"production"'
-            }
-        }),
-        new webpack.optimize.UglifyJsPlugin()
-    ]
+    }
 };

@@ -21,6 +21,7 @@ let emptyFn = function() {};
 
 /* 提示信息 */
 let tipInfo = '暂不支持，请在YOHO!BUY应用中打开';
+let unknownInfo = '未知异常，请刷新页面后重试';
 
 let qs = window.queryString;
 
@@ -54,7 +55,8 @@ yoho = {
     data: window.yohoInterfaceData,
 
     ready: function(callback) {
-        if (this.isApp) {
+        // App 未注入 yohoInterface 的时候，延迟执行
+        if (this.isApp && !window.yohoInterface) {
             document.addEventListener('deviceready', callback);
         } else {
             return callback();
@@ -71,11 +73,15 @@ yoho = {
     invokeMethod: function(method, args, success, fail) {
         let appInterface = window.yohoInterface;
 
-        if (this.isApp && appInterface) {
-            appInterface.triggerEvent(success || emptyFn, fail || emptyFn, {
-                method: method,
-                arguments: args
-            });
+        if (this.isApp) {
+            if (appInterface) {
+                appInterface.triggerEvent(success || emptyFn, fail || emptyFn, {
+                    method: method,
+                    arguments: args
+                });
+            } else {
+                tip.show(unknownInfo);
+            }
         } else {
             tip.show(tipInfo);
         }

@@ -180,7 +180,7 @@ const getFilterValueForSeo = (queryParams, apiData) => {
  * @param isNewArrival 是否是新品到着
  */
 const getListSeoData = (params, isNewArrival) => {
-    let genderName = params.channel;
+    let genderName = _.get(params, 'channel', '');
     let seoData = {};
     let seoParams = {
         color: '',
@@ -194,7 +194,7 @@ const getListSeoData = (params, isNewArrival) => {
         channel: ''
     };
 
-    if (params.channel === '') {
+    if (_.get(params, 'channel', null) === '') {
         delete params.channel;
     }