Merge remote-tracking branch 'origin/master' into release/5.0.0

@@ -29,12 +29,11 @@ exports.index = (req, res, next) => {
 exports.main = (req, res, next) => {
 exports.main = (req, res, next) => {
     const isReplay = /^\/live\/replay\//.test(req.path);
     const isReplay = /^\/live\/replay\//.test(req.path);
     const id = req.params.id;
     const id = req.params.id;
-    const goDownload = req.query.no;
 
 
     res.locals.liveRoom = id;
     res.locals.liveRoom = id;
     res.locals.module = 'activity';
     res.locals.module = 'activity';
     res.locals.page = 'live-play';
     res.locals.page = 'live-play';
-    res.locals.enableFoot = goDownload !== 1;
+    res.locals.enableFoot = Number(req.query.no) !== 1;
 
 
     model.fetchInfo(id, isReplay)
     model.fetchInfo(id, isReplay)
         .then(result => {
         .then(result => {

@@ -11,6 +11,7 @@ const isTest = process.env.NODE_ENV === 'test';
 
 
 module.exports = {
 module.exports = {
     app: 'h5',
     app: 'h5',
+    appVersion: '4.9.2', // 调用api的版本
     port: 6001,
     port: 6001,
     siteUrl: '//m.yohobuy.com',
     siteUrl: '//m.yohobuy.com',
     domains: {
     domains: {

 {
 {
   "name": "m-yohobuy-node",
   "name": "m-yohobuy-node",
-  "version": "4.9.21",
+  "version": "4.9.22",
   "private": true,
   "private": true,
   "description": "A New Yohobuy Project With Express",
   "description": "A New Yohobuy Project With Express",
   "repository": {
   "repository": {

@@ -30,6 +30,9 @@ var debounceFn = debounce(function(cardNo, formModel) {
 
 
             // 返回1不支持, 孟令阶
             // 返回1不支持, 孟令阶
             if (result && result.data && result.data.businessSupport === '1') {
             if (result && result.data && result.data.businessSupport === '1') {
+                formModel.bankCode = '';
+                formModel.bankName = '';
+
                 $('#bank-name').text('暂不支持此银行卡');
                 $('#bank-name').text('暂不支持此银行卡');
                 $('#bank-desc').show();
                 $('#bank-desc').show();
                 $('#bank-icon').hide();
                 $('#bank-icon').hide();