fe / yohobuywap-node · Commits

Go to a project

Authored by 毕凯
Commit 5c8ad942ef8bbb5663f804a2fc046493bc5a8a07 2 parents ed907ec3 a92750c9

Merge branch 'feature/promotion' into 'release/5.4' 

Feature/promotion



See merge request !112
Inline Side-by-side
Showing 2 changed files with 7 additions and 7 deletions
... ... @@ -25,8 +25,8 @@ exports.index = (req, res, next) => {
};
let params = {
uid: req.user.uid,
shareUid: req.query.uid
uid: req.query.uid || req.user.uid,
shareUid: req.query.userUid
};
indexModel.index(params).then(result => {
... ... @@ -70,7 +70,7 @@ exports.school = (req, res, next) => {
exports.checkStudent = (req, res, next) => {
let params = {
uid: req.user.uid
uid: req.query.uid || req.user.uid,
};
indexModel.checkStudent(params).then((result) => {
... ... @@ -93,7 +93,7 @@ exports.schoolNum = (req, res, next) => {
exports.addStudent = (req, res, next) => {
let params = {
uid: req.query.uid,
uid: req.query.userUid,
shareUid: req.query.shareUid
};
... ...
... ... @@ -33,8 +33,8 @@
</div>
<div class="title" style="background-image: url({{picList.title2}});"></div>
<div class="invite" style="background-image:url('{{picList.invite}}')">
<a class="invite-now"></a>
<a class="more-rule open-dia"></a>
<a class="invite-now" href="javascript:void(0);"></a>
<a class="more-rule open-dia" href="javascript:void(0);"></a>
</div>
{{#if shareLog}}
<div class="title" style="background-image: url({{picList.title3}});"></div>
... ... @@ -108,7 +108,7 @@
<div class="pic">
<img src="{{picList.dia5.src}}" />
</div>
<div class="close-btn"></div>
<a class="close-btn" href="javascript:void(0);"></a>
</div>
</div>
<article class="aslider" data-aslider="province">
... ...