fe / yohobuywap-node · Commits

Go to a project

Authored by zzzzzzz
Commit 68992b0cb7b5ed4cf25cda5e08367e5c9573612d 1 parent a06ca7e0

修复qrcode版本

Inline Side-by-side
Showing 1 changed file with 8 additions and 2 deletions
@@ -4,13 +4,19 @@ const model = require('../models/myqrcode'), @@ -4,13 +4,19 @@ const model = require('../models/myqrcode'),
4 headerModel = require('../../../doraemon/models/header'); // 头部model 4 headerModel = require('../../../doraemon/models/header'); // 头部model
5 5
6 exports.index = (req, res, next) => { 6 exports.index = (req, res, next) => {
7 - let params = req.query; 7 + let params = req.query,
  8 + esc = false,
  9 + appversion = req.query.app_version;
  10 +
  11 + if (Number(appversion.substr(0, 1) < 5) || (Number(appversion.substr(0, 1)) === 5 && Number(appversion.substr(2, 1)) < 2)) {
  12 + esc = true;
  13 + }
8 14
9 model.getQr({ 15 model.getQr({
10 token: params.token, 16 token: params.token,
11 }).then(result => { 17 }).then(result => {
12 params.token = result; 18 params.token = result;
13 - params.uname = decodeURIComponent(params.uname.replace(/\%/g, escape('%'))); 19 + params.uname = esc ? decodeURIComponent(params.uname) : decodeURIComponent(params.uname.replace(/\%/g, escape('%')));
14 params.icon = params.icon || 'https://img11.static.yhbimg.com/yhb-img01/2016/07/05/13/017ec560b82c132ab2fdb22f7cf6f42b83.png?imageView/2/w/{width}/h/{height}'; 20 params.icon = params.icon || 'https://img11.static.yhbimg.com/yhb-img01/2016/07/05/13/017ec560b82c132ab2fdb22f7cf6f42b83.png?imageView/2/w/{width}/h/{height}';
15 res.render('myqrcode', { 21 res.render('myqrcode', {
16 title: '查看二维码', 22 title: '查看二维码',