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

Feature/protocol



See merge request !1641

@@ -8,11 +8,19 @@ const headerModel = require('../../../doraemon/models/header'); // 头部model
 const aboutModel = require('../../../doraemon/models/about');
 
 const privacy = (req, res) => {
+    let parameter = {};
+
+    if (req.yoho.isApp) {
+        parameter = {
+            appVersion: '1'
+        };
+    }
 
-    res.render('agreement/privacy', {
+    res.render('agreement/privacy', Object.assign({
         title: '隐私条款',
+        page: 'agreement',
         width750: true
-    });
+    }, parameter));
 };
 
 const newpower = (req, res) => {

@@ -230,7 +230,7 @@ class Reg {
 
     sendCodeBusyBoy(req, res, next) {
         let count = _.get(req.session, 'phoneReg.count');
-        let expire = _.get(req.session, 'phoneReg.expire');
+        let expire = _.get(req.session, 'phoneReg.expire') || 0;
 
         if (count) {
             return next();

 <div class="agreement-page yoho-page">
+    <div class="download-protocol">YOHO!BUY有货app服务条款 <span class="download-protocol-btn" data-type="agreement">下载</span></div>
     <h3>服务条款</h3>
     <p><strong>重要须知：有货（江苏）商贸服务有限公司（下称“YOHO!BUY”）在此特别提醒您仔细阅读</strong>（未成年人应在其法定监护人的陪同下阅读）本《YOHO!BUY用户服务协议》（下称“本协议”）中的各个条款，包括但不限于免除或者限制YOHO!BUY责任的条款、对用户权利进行限制的条款以及约定争议解决方式、司法管辖的条款。您有权选择同意或者不同意本协议。<br>
     </p>
@@ -137,7 +138,7 @@
     <p>19.10 本协议及其补充协议签订地为江苏省南京市建邺区，均受中华人民共和国法律、法规管辖，YOHO!BUY保留最终解释权。</p><br>
 
     <div class="select-btn">
-        <span><i class="iconfont pitch select">&#xe60a;</i>我已阅读并同意遵守YOHO!BUY有货app服务条款</span>
+        <span><i class="iconfont pitch">&#xe647;</i>我已阅读并同意遵守YOHO!BUY有货app服务条款</span>
         <div class="submit-btn" href="">确&nbsp;&nbsp;定</div>
     </div>
 

 <div class="privacy-page yoho-page">
+    <div class="download-protocol">YOHO!BUY有货app隐私条款 <span class="download-protocol-btn" data-type="privacy">下载</span></div>
     <br />
     <p>尊敬的YOHO!BUY有货用户：</p>
     <br />
@@ -139,4 +140,5 @@
     <br />
     <p>如果您就本隐私政策有任何疑问，请与我们客服联系客服热线：400-889-9646。</p>
     <br />
+    <input type="hidden" name="app_version" value="{{appVersion}}">
 </div>
\ No newline at end of file

@@ -31,8 +31,7 @@
         <div data-userverify="{{captchaShow}}" data-geetest="{{useGeetest}}" id="js-img-check"{{#unless useGeetest}} class="full-img-verify"{{/unless}}></div>
         <button id="regBtn" class="reg-btn" type="button">注册</button>
         <div class="protocol">
-            <span class="iconfont checkbox icon-cb-radio"></span>
-            我已阅读并同意遵守<a href="/service/qaDetail?keyword=服务条款&sonId=197" title="Yoho!Buy有货服务条款" target="_blank">Yoho!Buy有货服务条款</a>
+            注册即表示您已阅读并同意<a href="/service/qaDetail?keyword=服务条款&sonId=197" title="Yoho!Buy有货服务条款" target="_blank">Yoho!Buy有货服务条款</a>
         </div>
     </form>
 </div>

@@ -82,7 +82,8 @@ exports.qaDetail = (req, res, next) => {
         title: `${title} | Yoho!Buy有货 | 潮流购物逛不停`,
         width750: true,
         pageFooter: true,
-        isApp: req.yoho.isApp
+        isApp: req.yoho.isApp,
+        isProtocol: req.query.sonId === '197'
     };
 
     co(function* () {

@@ -2,7 +2,7 @@
 	<div class="qa-c clearfix">
 		<div class="q-c clearfix">
 			<div class="pic q"></div>
-			<div class="text">{{caption}}</div>
+			<div class="text">{{caption}} {{#if isProtocol}}<a class="download-protocol" href="https://cdn.yoho.cn/yohobuy/pdf/YOHO!BUY有货用户服务协议1.pdf" target="_blank">下载</a>{{/if}}</div>
 		</div>
 		<div class="a-c clearfix">
 			<div class="pic a"></div>

 {
   "name": "yohobuywap-node",
-  "version": "6.8.59",
+  "version": "6.8.62",
   "private": true,
   "description": "A New Yohobuy Project With Express",
   "repository": {

@@ -46,3 +46,30 @@ $('.submit-btn').on('click', function() {
         }
     }
 });
+
+$('.download-protocol-btn').on('click', function() {
+    let type = $(this).data('type');
+    let url = 'https://cdn.yoho.cn/yohobuy/pdf/YOHO!BUY用户服务协议.pdf';
+
+    if (type === 'privacy') {
+        url = 'https://cdn.yoho.cn/yohobuy/pdf/YOHO!BUY有货隐私条款.pdf';
+    }
+
+    if (appVersion === '1') {
+        let params = {
+            action: 'go.downloadProtocol',
+            params: {
+                url: url,
+                type: type
+            }
+        };
+
+        yoho.invokeMethod('go.downloadProtocol', params.params);
+    } else {
+        if (type === 'privacy') {
+            window.open(url);
+        } else {
+            window.open(url);
+        }
+    }
+});

@@ -44,7 +44,8 @@ class RegisterNew {
         this.view.passwordInput.bind('input', this.changeBtnStatus.bind(this));
         this.view.passwordEyeIcon.on('click', this.passwordShowStatus.bind(this));
         this.view.getVerifyCodeBtn.on('click', this.getVerifyCode.bind(this));
-        this.view.protocolCheckbox.on('click', this.changePrtclckbxStatus.bind(this));
+
+        // this.view.protocolCheckbox.on('click', this.changePrtclckbxStatus.bind(this));
 
     }
 
@@ -134,8 +135,7 @@ class RegisterNew {
         if (this.view.mobileInput.val() &&
             this.view.passwordInput.val() &&
             this.view.verifyCodeInput.val() &&
-            this.view.getVerifyCodeBtn.data('oneClick') &&
-            this.view.protocolCheckbox.hasClass('icon-cb-radio')) {
+            this.view.getVerifyCodeBtn.data('oneClick')) {
             this.view.regBtn.addClass('active');
         } else {
             this.view.regBtn.removeClass('active');

@@ -64,6 +64,31 @@
     }
 }
 
+.download-protocol {
+    border-bottom: 1px solid #e0e0e0;
+    position: relative;
+    height: 102px;
+    line-height: 102px;
+    font-weight: bold;
+    text-align: left;
+
+    .download-protocol-btn {
+        font-weight: normal;
+        width: 126px;
+        height: 46px;
+        line-height: 44px;
+        text-align: center;
+        box-sizing: border-box;
+        border: 1px solid #444;
+        border-radius: 4px;
+        float: right;
+        font-size: 24px;
+        position: absolute;
+        right: 26px;
+        top: 26px;
+    }
+}
+
 .agreement-page {
     margin: 0 30px;
     font-size: 30px;

@@ -369,6 +369,24 @@
                 border-bottom: solid 1px #e0e0e0;
                 padding: 20px 30px 20px 0;
                 line-height: 30px;
+                position: relative;
+            }
+
+            .download-protocol {
+                width: 126px;
+                height: 46px;
+                line-height: 44px;
+                text-align: center;
+                box-sizing: border-box;
+                border: 1px solid #444;
+                border-radius: 4px;
+                float: right;
+                font-size: 24px;
+                position: absolute;
+                right: 26px;
+                top: 12px;
+                font-weight: normal;
+                z-index: 10;
             }
         }