fe / yohobuy-node · Commits

Go to a project

Authored by 陈峰
Commit 95df948e41051cb32df2ae8b213a9cbeb7bb451c 2 parents 9fac412a ab54066f

Merge branch 'feature/protocol' into 'master' 

Feature/protocol



See merge request !412
Inline Side-by-side
Showing 14 changed files with 116 additions and 23 deletions
... ... @@ -6,6 +6,7 @@
'use strict';
const helpModel = require('../models/help-service');
const simpleHeaderModel = require('../../../doraemon/models/simple-header');
const _ = require('lodash');
exports.index = (req, res, next) => {
... ... @@ -79,6 +80,7 @@ exports.detail = (req, res, next) => {
res.render('detail', Object.assign({
module: 'help',
page: 'help',
isProtocol: +req.query.contId === 197,
content: Object.assign({
isHelp: true,
pathNav: nav,
... ... @@ -102,3 +104,11 @@ exports.onlineService = (req, res, next) => {
res.json(url);
}).catch(next);
};
exports.qualificationInfo = (req, res) => {
res.render('qualification-info', {
page: 'qualification',
simpleHeader: simpleHeaderModel.setSimpleHeaderData(),
});
};
... ...
... ... @@ -18,5 +18,6 @@ router.get('/', help.index);
router.get('/detail', help.detail);
router.get('/search', help.search);
router.get('/onlineService', help.onlineService);
router.get('/qualificationInfo', help.qualificationInfo);
module.exports = router;
... ...
<div class="qualification-info">
<h2 style="">Yoho!buy有货自营出版物经营资质信息公示</h2>
<h4>根据国家相关政策要求对经营者资质公示如下</h4>
<table>
<thead>
<tr>
<td>公司名称</td>
<td>证照明细</td>
</tr>
</thead>
<tbody>
<tr>
<td>有货（江苏）商贸服务有限公司</td>
<td><a href="https://www.yohobuy.com/help/detail?id=240" target="_blank">营业执照</a></td>
</tr>
<tr>
<td>有货（江苏）商贸服务有限公司</td>
<td><a href="https://www.yohobuy.com/help/detail?id=242" target="_blank">出版物经营许可证</a></td>
</tr>
<tr>
<td>南京新与力文化传播有限公司</td>
<td><a href="https://www.yohobuy.com/help/detail?id=244" target="_blank">营业执照</a></td>
</tr>
<tr>
<td>南京新与力文化传播有限公司</td>
<td><a href="https://www.yohobuy.com/help/detail?id=246" target="_blank">出版物经营许可证</a></td>
</tr>
</tbody>
</table>
</div>
\ No newline at end of file
... ...
... ... @@ -10,7 +10,7 @@
<div class="help-cont">
{{#cont}}
<h2 class="nav-title">{{caption}}</h2>
<h2 class="nav-title">{{caption}} {{#if @root.isProtocol}}<a class="download-protocol" href="https://cdn.yoho.cn/yohobuy/pdf/YOHO!BUY有货用户服务协议2.pdf">下载</a>{{/if}}</h2>
<div class="cont">{{{content}}}</div>
{{/cont}}
</div>
... ...
... ... @@ -43,9 +43,8 @@
</li>
<li class="items-container clearfix">
<input id="agree-terms" class="agree-terms" type="checkbox" checked="">
<span>
我已阅读并同意遵守
注册即表示您已阅读并同意
<a class="link go-yoho-items" href="{{itemUrl}}" target="_blank">YOHO!BUY 有货服务条款</a>
</span>
</li>
... ...
... ... @@ -200,6 +200,10 @@
<a href="//www.yohobuy.com/guang/boys-t22">潮流视频</a>
<span>|</span>
<a class="police" target="_blank" href="http://www.beian.gov.cn/portal/registerSystemInfo?recordcode=32010502010132" rel="nofollow">苏公网安备 32010502010132号</a>
<span>|</span>
<a target="_blank" href="http://www.yohobuy.com/help/qualificationInfo" rel="nofollow">出版物经营许可证</a>
<span>|</span>
<a target="_blank" href="https://www.yohobuy.com/help/detail?id=238" rel="nofollow">合字苏B2-20120395</a>
</p>
</div>
<div class="copyright">
... ...
{
"name": "yohobuy-node",
"version": "6.8.3",
"version": "6.8.31",
"private": true,
"description": "A New Yohobuy Project With Express",
"repository": {
... ...
require('../simple-header');
... ...
... ... @@ -361,27 +361,13 @@ $(window).resize(function() {
exports.init = function(page) {
$('#agree-terms').click(function() {
var $this = $(this),
i,
passI = 0;
var $this = $(this);
if ($this.attr('notchecked')) {
$this.removeAttr('notchecked');
// 勾选
for (i = 0; i < validateResult.length; i++) {
if (validateResult[i].status) {
passI++;
}
}
if (passI === validateResult.length) {
$registerBtn.removeClass('disable').removeAttr('disabled');
}
} else {
// 取消勾选
$registerBtn.addClass('disable').attr('disabled', 'disabled');
$this.attr('notchecked', 'notchecked');
}
});
... ... @@ -416,7 +402,7 @@ exports.init = function(page) {
}
if (statusLen === validateResult.length && !$('#agree-terms').attr('notchecked')) {
if (statusLen === validateResult.length) {
$registerBtn.removeClass('disable').removeAttr('disabled');
} else {
$registerBtn.addClass('disable').attr('disabled', 'disabled');
... ...
... ... @@ -323,7 +323,7 @@
.about-us {
line-height: 20px;
color: #666;
padding-left: 230px;
padding-left: 300px;
position: relative;
a {
... ... @@ -343,6 +343,7 @@
margin-top: 3px;
position: absolute;
left: 0;
top: 12px;
a {
margin-right: 5px;
... ... @@ -354,14 +355,15 @@
border-radius: 2px;
margin-right: 8px;
background: #fff;
width: 26px;
width: 76px;
height: 34px;
}
.govimg {
width: 100%;
height: 100%;
background: resolve(layout/ebsIcon.png) no-repeat;
margin-top: 5px;
background: resolve(layout/ebsIcon-new.png) no-repeat;
}
}
... ...
... ... @@ -111,6 +111,21 @@
margin: 0 auto;
padding-left: 15px;
box-sizing: border-box;
position: relative;
.download-protocol {
width: 44px;
height: 17px;
line-height: 17px;
text-align: center;
box-sizing: border-box;
border: 1px solid #444;
float: right;
font-size: 12px;
position: absolute;
right: 20px;
top: 7px;
}
}
.menu-common {
... ...
@import "base";
@import "help";
@import "detail";
@import "qualification";
@import "../variables";
... ...
.qualification-info {
h2,
h4 {
text-align: center;
line-height: 30px;
}
h2 {
font-size: 24px;
font-weight: bold;
margin-top: 100px;
}
h4 {
font-size: 16px;
}
table {
margin: 40px auto 100px;
border: 1px solid #e0e0e0;
width: 600px;
thead {
td {
background: #eee;
}
}
td {
line-height: 40px;
text-align: center;
}
td:first-child {
border-right: 1px solid #e0e0e0;
}
tr {
border-top: 1px solid #e0e0e0;
}
}
}
... ...