Authored by 邱骏

merge

... ... @@ -66,7 +66,7 @@ const shoes = {
let userInfo = await req.ctx(ShoesModel).checkUserPlayed(actId, unionId);
let result = [];
console.log(userInfo);
// console.log(userInfo);
_.each(userInfo.data || [], (obj) => {
// console.log(obj);
... ... @@ -115,7 +115,7 @@ const shoes = {
if (userId) {
let getUserPlayed = await req.ctx(ShoesModel).getUserPlayedInfo(actId, unionId);
console.log(getUserPlayed);
// console.log(getUserPlayed);
if (getUserPlayed.code === 200 || (getUserPlayed.data && getUserPlayed.data.length === 0)) {
for (let i = 0; i < list.length; i++) {
... ... @@ -207,7 +207,7 @@ const shoes = {
if (userId) {
let getUserPlayed = await req.ctx(ShoesModel).getUserPlayedInfo(actId, unionId);
console.log(getUserPlayed);
// console.log(getUserPlayed);
if (getUserPlayed.code === 200 || (getUserPlayed.data && getUserPlayed.data.length === 0)) {
for (let i = 0; i < list.length; i++) {
... ... @@ -364,7 +364,7 @@ const shoes = {
let htmlEnd = '</table>';
console.log(htmlHead + innerHtml + htmlEnd);
// console.log(htmlHead + innerHtml + htmlEnd);
return res.send(htmlHead + innerHtml + htmlEnd);
} catch (err) {
... ... @@ -420,7 +420,8 @@ const shoes = {
if (referer && referer.indexOf('ad.yoho.cn') > 0) {
req.session.shoesToken = token;
console.log('shoesToken:', req.session.shoesToken);
// console.log('shoesToken:', req.session.shoesToken);
res.json({
data: token,
});
... ...
... ... @@ -94,7 +94,7 @@ module.exports = {
},
mysql: {
connect: {
host: '192.168.102.219',
host: 'localhost',
port: '3306',
user: 'yh_test',
password: 'yh_test'
... ...