Authored by 徐炜

Merge branch 'release/4.9.2'

@@ -29,12 +29,11 @@ exports.index = (req, res, next) => { @@ -29,12 +29,11 @@ exports.index = (req, res, next) => {
29 exports.main = (req, res, next) => { 29 exports.main = (req, res, next) => {
30 const isReplay = /^\/live\/replay\//.test(req.path); 30 const isReplay = /^\/live\/replay\//.test(req.path);
31 const id = req.params.id; 31 const id = req.params.id;
32 - const goDownload = req.query.no;  
33 32
34 res.locals.liveRoom = id; 33 res.locals.liveRoom = id;
35 res.locals.module = 'activity'; 34 res.locals.module = 'activity';
36 res.locals.page = 'live-play'; 35 res.locals.page = 'live-play';
37 - res.locals.enableFoot = goDownload !== 1; 36 + res.locals.enableFoot = Number(req.query.no) !== 1;
38 37
39 model.fetchInfo(id, isReplay) 38 model.fetchInfo(id, isReplay)
40 .then(result => { 39 .then(result => {
@@ -30,6 +30,9 @@ var debounceFn = debounce(function(cardNo, formModel) { @@ -30,6 +30,9 @@ var debounceFn = debounce(function(cardNo, formModel) {
30 30
31 // 返回1不支持, 孟令阶 31 // 返回1不支持, 孟令阶
32 if (result && result.data && result.data.businessSupport === '1') { 32 if (result && result.data && result.data.businessSupport === '1') {
  33 + formModel.bankCode = '';
  34 + formModel.bankName = '';
  35 +
33 $('#bank-name').text('暂不支持此银行卡'); 36 $('#bank-name').text('暂不支持此银行卡');
34 $('#bank-desc').show(); 37 $('#bank-desc').show();
35 $('#bank-icon').hide(); 38 $('#bank-icon').hide();