Authored by weiqingting

Merge branch 'feature/personal' into develop

... ... @@ -6,7 +6,7 @@
'use strict';
const QRcodeModel = require('../models/QRcode');
const QRcodeModel = require('../models/qrcode');
const helpers = global.yoho.helpers;
exports.QRcode = (req, res, next) => {
... ...
... ... @@ -13,7 +13,7 @@ const _ = require('lodash');
const helpers = global.yoho.helpers;
const config = global.yoho.config;
const personalController = require(`${cRoot}/QRcode`);
const personalController = require(`${cRoot}/qrcode`);
const homeNav = [
{
... ... @@ -80,7 +80,6 @@ const sessionEffective = (req, res, next) => {
res.redirect(helpers.urlFormat('/signin.html', {
refer: refer
}));
// next();
};
// 查看二维码
... ...
... ... @@ -76,7 +76,7 @@
</div>
<div id="print_wrap" style='display:none'>
<div class='print_qrcode'>
<img src='http://localhost:5002/img/home/qrcode.png'/>
<img />
<div class='print_content'>
</div>
</div>
... ...
... ... @@ -4,7 +4,8 @@ var Slide = require('../plugins/yohoui/YH.slide');
var $item = $('li', '.qrctxt');
var len = $item.length, slide;
var src=/url\("([^'"]*)"\)/g.exec($(".print_qrcode").css("background"))[1];
$(".print_qrcode").find("img").attr("src",src);
function slideDo(to) {
$item.each(function(index) {
... ...
... ... @@ -139,6 +139,7 @@
height:860px;
margin: 0 auto;
position:relative;
background: resolve(img/home/qrcode.png) no-repeat;
.print_content{
width:109px;
position:absolute;
... ...