Authored by 王水玲

Merge branch 'feature/protocol' into 'release/6.8.4'

注册添加隐私政策,第三方绑定和未实名认证的老邮箱用户登录绑定页面协议逻辑修改



See merge request !413
... ... @@ -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) => {
... ... @@ -103,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
... ...
... ... @@ -36,9 +36,8 @@ const bind = {
sourceType: sourceType,
nickName: nickName,
region: req.ctx(passportHelper).getCountry(),
serviceUrl: helpers.urlFormat('/help', {
category_id: 9
}),
serviceUrl: helpers.urlFormat('/help/detail', {id: 254}),
privacyUrl: helpers.urlFormat('/help/detail', {id: 256}),
simpleHeader: simpleHeaderModel.setSimpleHeaderData(),
module: 'passport',
page: 'bind',
... ...
... ... @@ -21,10 +21,8 @@ const cert = {
res.render('cert/index', {
region: req.ctx(passportHelper).getCountry(),
refer: refer,
serviceUrl: helpers.urlFormat('/help', {
category_id: 9
}),
simpleHeader: simpleHeaderModel.setSimpleHeaderData(),
serviceUrl: helpers.urlFormat('/help/detail', {id: 254}),
privacyUrl: helpers.urlFormat('/help/detail', {id: 256}),
module: 'passport',
page: 'cert',
title: '登录完善信息'
... ...
... ... @@ -84,7 +84,8 @@ let index = (req, res, next) => {
location: area || '+86',
defaultMobile: mobile,
captchaUrl: helpers.urlFormat('/passport/imagesNode', {t: Date.now()}),
itemUrl: helpers.urlFormat('/help/detail', {id: 150, contId: 197}),
itemUrl: helpers.urlFormat('/help/detail', {id: 254}),
privacyUrl: helpers.urlFormat('/help/detail', {id: 256}),
referUrl: refer,
loginUrl: helpers.urlFormat('/signin.html', {refer: refer}),
coverHref: result.url,
... ...
... ... @@ -72,11 +72,10 @@
</form>
<div class="protoctolwrapper">
<div class="choosewrapper">
<input type="checkbox" class="choosetag" checked='checked'></div>
<span>
我已阅读并同意遵守
绑定即表示您已阅读并同意<br>
<a target="_blank" href="{{serviceUrl}}" class="protoctol">YOHO!BUY 有货服务条款</a>
<a class="protoctol" href="{{privacyUrl}}" target="_blank">YOHO!BUY 有货隐私政策</a>
</span>
</div>
<div class="btnwrapper">
... ...
... ... @@ -70,11 +70,10 @@
</form>
<div class="protoctolwrapper">
<div class="choosewrapper">
<input type="checkbox" class="choosetag" checked='checked'></div>
<span>
我已阅读并同意遵守
绑定即表示您已阅读并同意<br>
<a target="_blank" href="{{serviceUrl}}" class="protoctol">YOHO!BUY 有货服务条款</a>
<a class="protoctol" href="{{privacyUrl}}" target="_blank">YOHO!BUY 有货隐私政策</a>
</span>
</div>
<div class="btnwrapper clearfix">
... ...
... ... @@ -44,8 +44,9 @@
<li class="items-container clearfix">
<span>
注册即表示您已阅读并同意
注册即表示您已阅读并同意<br>
<a class="link go-yoho-items" href="{{itemUrl}}" target="_blank">YOHO!BUY 有货服务条款</a>
<a class="link go-yoho-items" href="{{privacyUrl}}" target="_blank">YOHO!BUY 有货隐私政策</a>
</span>
</li>
<li class="clearfix reg-btn-area">
... ...
... ... @@ -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');
... ...
... ... @@ -10,7 +10,6 @@ var phoneRegx = require('../common/mail-phone-regx').phoneRegx;
var nopermissionoption = $('#nopermissionmessage').html(); // 倒计时dom
var sendmessagehtml = $('.validatewrapper').html(); // 发送短信dom
var second = +$('.second').text(); // 倒计时秒数
var choosedpic = 'https://cdn.yoho.cn/yohobuy/assets/img/passport/choosed.png';// 已选择图片
var $wrapper = $('.bindwrapper'),
$phoneTip = $wrapper.find('.phone-err-tip'),
... ... @@ -30,39 +29,6 @@ passwordCaptchaImg.onSuccess(function() {
require('../../simple-header');
/**
* 选择协议
* @return {[type]} [description]
*/
function chooseProtocol() {
$('.choosetag').on('change', function() {
var btnColor = '#f02200';
if ($(this).attr('checked') === 'checked') {
$('.choosewrapper').css({
'background-image': 'url("' + choosedpic + '")'
});
} else {
$('.choosewrapper').css({
'background-image': 'none'
});
btnColor = '#CCCCCC';
}
$nextBtn.css({
'background-color': btnColor
});
});
}
/**
* 判断是否同意协议
* @return {[type]} [description]
*/
function isagree() {
return $('.choosetag').attr('checked') === 'checked';
}
/**
* 选择区域的开关
* @return {[type]} [description]
... ... @@ -232,9 +198,6 @@ function nextStep() {
areaCode = $('#areanum').text();
regx = phoneRegx['+' + areaCode];
if (!isagree()) {
return;
}
if (mobile === '' || !regx || !regx.test(mobile)) {
$phoneTip.find('em').text('手机格式错误');
$phoneTip.removeClass('hide');
... ... @@ -295,7 +258,6 @@ $wrapper.on('keydown', '.phonenum', function(e) {
function init() {
fixAreaNum(); // 去掉所有区域的+
sendMessageValidate(); // 有交互的发送短信
chooseProtocol(); // 选择协议
chooseArea(); // 选择区域
chooseAreaToogle(); // 选择区域展示或关闭
cancelChooseArea(); // 取消选择区域
... ...
... ... @@ -6,7 +6,6 @@
var $ = require('yoho-jquery');
var Captcha = require('../../plugins/captcha');
var phoneRegx = require('../common/mail-phone-regx').phoneRegx;
var choosedpic = 'https://cdn.yoho.cn/yohobuy/assets/img/passport/choosed.png';// 已选择图片
var $wrapper = $('.bindwrapper'),
$phoneTip = $wrapper.find('.phone-err-tip'),
... ... @@ -47,30 +46,6 @@ function circleTime() {
window.setTimeout(changeSecond, 1000);
}
/**
* 选择协议
* @return {[type]} [description]
*/
function chooseProtocol() {
$('.choosetag').on('change', function() {
var btnColor = '#f02200';
if ($(this).prop('checked')) {
$('.choosewrapper').css({
'background-image': 'url("' + choosedpic + '")'
});
} else {
$('.choosewrapper').css({
'background-image': 'none'
});
btnColor = '#CCCCCC';
}
$nextBtn.css({
'background-color': btnColor
});
});
}
function sendMessageValidate() {
var mobile = '';
var area = '';
... ... @@ -102,14 +77,6 @@ function sendMessageValidate() {
}
/**
* 判断是否同意协议
* @return {[type]} [description]
*/
function isagree() {
return $('.choosetag').prop('checked');
}
/**
* 选择区域的开关
* @return {[type]} [description]
*/
... ... @@ -204,9 +171,6 @@ function nextStep() {
regx = phoneRegx['+' + areaCode];
smsCode = $('#smscode').val();
if (!isagree()) {
return;
}
if (mobile === '' || !regx || !regx.test(mobile)) {
$phoneTip.find('em').text('手机格式错误');
$phoneTip.removeClass('hide');
... ... @@ -261,7 +225,6 @@ $wrapper.on('keydown', '.phonenum', function(e) {
function init() {
fixAreaNum(); // 去掉所有区域的+
chooseProtocol(); // 选择协议
chooseArea(); // 选择区域
chooseAreaToogle(); // 选择区域展示或关闭
cancelChooseArea(); // 取消选择区域
... ...
... ... @@ -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;
}
}
... ...
@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;
font-weight: bold;
}
}
td {
line-height: 40px;
text-align: center;
color: #171717;
}
td:first-child {
border-right: 1px solid #e0e0e0;
}
tr {
border-top: 1px solid #e0e0e0;
}
}
}
... ...
... ... @@ -163,9 +163,14 @@
/* 服务条款 */
&.items-container {
text-align: right;
text-align: left;
white-space: nowrap;
font-size: 13px;
.link {
margin: 8px 10px 0 0;
display: inline-block;
}
}
/* 立即注册 */
... ...
... ... @@ -379,6 +379,7 @@
margin: 38px auto 0;
padding-left: 85px;
width: 350px;
text-align: left;
.choosewrapper {
float: left;
... ... @@ -409,6 +410,8 @@
.protoctol {
color: #f02200;
text-decoration: underline;
margin: 8px 10px 0 0;
display: inline-block;
}
&:after {
... ...