Merge branch 'feature/refactoring' into 'release/5.5.1'

重构APP使用的一些接口



See merge request !426

@@ -88,3 +88,31 @@ exports.receive = (req, res, next) => {
         res.jsonp(result);
         res.jsonp(result);
     }).catch(next);
     }).catch(next);
 };
 };
+
+/**
+ * 获取优惠券
+ */
+exports.couponSend = (req, res, next) => {
+    let token = req.query.token || '',
+        uid = req.user.uid,
+        app = req.query.app;
+
+    let resultData = {
+        code: 403,
+        message: '参数错误',
+        data: ''
+    };
+
+    // APP时用参数中的ID
+    if (!uid) {
+        uid = app && app.uid ? app.uid : 0;
+    }
+
+    if (uid === '' || uid === 0 || token === '' || token === 0) {
+        return res.jsonp(resultData);
+    }
+
+    model.couponSend(uid, token, app).then(result => {
+        res.jsonp(result);
+    }).catch(next);
+};

@@ -358,3 +358,20 @@ exports.receiveCoupon = (receiveData, uid) => {
         return returnData;
         return returnData;
     });
     });
 };
 };
+
+exports.couponSend = (uid, token) => {
+
+    return api.get('', {
+        method: 'app.coupons.couponSend',
+        uid: uid,
+        coupon_send_token: token
+    }).then(result => {
+
+        if (!result) {
+            result.code = 404;
+            result.message = '出错啦~';
+        }
+
+        return result;
+    });
+};

@@ -235,4 +235,6 @@ router.get('/annual-account', annualAccount.index);
 router.get('/annual-account/share', annualAccount.share);
 router.get('/annual-account/share', annualAccount.share);
 router.get('/app-downloads', appDownloads.index);
 router.get('/app-downloads', appDownloads.index);
 
 
+router.get('/couponSend', couponFloor.couponSend); // 获取优惠券
+
 module.exports = router;
 module.exports = router;

+'use strict';
+const md5 = require('md5');
+const PRIVATE_KEY = 'fd4ad5fcsa0de589af23234ks1923ks';
+
+const v1 = (req, res) => {
+    let result = {
+        code: 400,
+        message: 'Config Success',
+        data: {}
+    };
+
+    let version = req.body.app_version || '';
+
+    switch (version) {
+        case '4.0.1':
+            result.data.url = 'http://cdn.yoho.cn/app-reactnative/4.0.1/main.zip';
+            result.data.rnv = '101';
+            result.data.minv = '4.0.1';
+            result.data.filecode = md5('dffb998e43a33215b4c47a4ccd3cf619yohorn2016');
+            result.md5 = md5(PRIVATE_KEY + ':' + JSON.stringify(result.data));
+            break;
+        case '4.1.0':
+            result.data.url = 'http://cdn.yoho.cn/app-downfiles/index.android.bundle.zip';
+            result.data.rnv = '101';
+            result.data.minv = '4.1.0';
+            result.data.filecode = md5('47c47db1eec6159f940e2018d3a83676yohorn2016');
+            result.md5 = md5(PRIVATE_KEY + ':' + JSON.stringify(result.data));
+            break;
+        default:
+            result.data.url = '';
+            result.data.rnv = '';
+            result.data.minv = '';
+            result.data.filecode = '';
+            result.md5 = md5(PRIVATE_KEY + ':' + JSON.stringify(result.data));
+    }
+
+    return res.json(result);
+};
+
+module.exports = {
+    v1
+};

@@ -15,10 +15,12 @@ var multipartMiddleware = multipart();
 const uploadApi = require(cRoot + '/upload.js');
 const uploadApi = require(cRoot + '/upload.js');
 const hotfix = require(`${cRoot}/hotfix`);
 const hotfix = require(`${cRoot}/hotfix`);
 const apple = require(`${cRoot}/apple`);
 const apple = require(`${cRoot}/apple`);
+const rn = require(`${cRoot}/rn`);
 
 
 // routers
 // routers
 router.post('/api/upload/image', multipartMiddleware, uploadApi.uploadImg);
 router.post('/api/upload/image', multipartMiddleware, uploadApi.uploadImg);
 router.post('/hf/v1', hotfix.v1);
 router.post('/hf/v1', hotfix.v1);
+router.post('/rn/v1', rn.v1);
 
 
 router.get('/.well-known/apple-app-site-association', apple.appSiteAssociation);
 router.get('/.well-known/apple-app-site-association', apple.appSiteAssociation);
 
 

+'use strict';
+
+const shareorder = (req, res) => {
+    res.render('help/share-order', {
+        title: '晒单'
+    });
+};
+
+const limitcodeHelp = (req, res) => {
+    res.render('help/limitcode-help', {
+        title: '如何获得限购码'
+    });
+};
+
+const limitcodeColSize = (req, res) => {
+    res.render('help/limitcode-colsize', {
+        title: '选择限购码颜色和尺寸'
+    });
+};
+
+const limitcodeIntro = (req, res) => {
+    res.render('help/limitcode-intro', {
+        title: '什么是限购码'
+    });
+};
+
+module.exports = {
+    shareorder,
+    limitcodeHelp,
+    limitcodeColSize,
+    limitcodeIntro
+};

+'use strict';
+
+const systemUpdate = (req, res) => {
+    res.render('systemUpdate/systemUpdate', {
+        localCss: true,
+        module: 'service',
+        page: 'system'
+    });
+};
+
+module.exports = {
+    systemUpdate
+};

@@ -13,6 +13,10 @@ const chat = require(`${cRoot}/chat`);
 
 
 const chatQa = require(`${cRoot}/chatQa`); // 问题搜索列表页
 const chatQa = require(`${cRoot}/chatQa`); // 问题搜索列表页
 
 
+const system = require(`${cRoot}/systemUpdate`);
+
+const help = require(`${cRoot}/help`);
+
 // middlware
 // middlware
 
 
 const authGuard = require('../../doraemon/middleware/auth');
 const authGuard = require('../../doraemon/middleware/auth');
@@ -33,4 +37,10 @@ router.get('/qaSearch', chatQa.qaSearch); // 问题搜索页
 router.get('/qaDetail', chatQa.qaDetail); // 问题详情页
 router.get('/qaDetail', chatQa.qaDetail); // 问题详情页
 router.get('/keySearch', chatQa.keySearch); // 问题搜索关键词
 router.get('/keySearch', chatQa.keySearch); // 问题搜索关键词
 
 
+router.get('/systemUpdate', system.systemUpdate);// 升级公告 (APP使用)
+router.get('/shareorder', help.shareorder);// 晒单 (APP使用)
+router.get('/limitcodeHelp', help.limitcodeHelp);// 如何获得限购码 (APP使用)
+router.get('/limitcodeColSize', help.limitcodeColSize);// 选择限购码颜色和尺寸 (APP使用)
+router.get('/limitcodeIntro', help.limitcodeIntro);// 什么是限购码 (APP使用)
+
 module.exports = router;
 module.exports = router;

+{{!-- APP 限购码选择颜色和尺寸 --}}
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <title>限购码选择颜色和尺寸</title>
+    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, minimum-scale=1, user-scalable=no">
+    <meta http-equiv="cleartype" content="on">
+    <meta content="telephone=no" name="format-detection" />
+    <script type="text/javascript">
+        (function(doc, win) {
+            var docEl = doc.documentElement;
+            (function() {
+                var clientWidth = docEl.clientWidth;
+                if (!clientWidth) {
+                    return;
+                }
+                docEl.style.fontSize = 20 * (clientWidth / 320) + 'px';
+            }());
+        })(document, window);
+    </script>
+    <style>
+        html, body{
+            margin: 0;
+            padding: 0;
+            font-family: helvetica,Arial,"黑体";
+        }
+        .container {
+            width: 100%;
+            padding: 0.6rem;
+            background-color: #fff;
+            box-sizing: border-box;
+        }
+        p {
+            font-size: 0.75rem;
+            color: #444;
+            line-height: 1.2rem;
+        }
+    </style>
+</head>
+<body>
+    <div class="container">
+        <p>1.部分活动可在限定商品详情页选择颜色和尺码。</p>
+        <p>2.已选择的颜色尺码在活动结束前都可修改。</p>
+        <p>3.排队活动结束后，不管中没中奖都不可修改颜色和尺码。</p>
+        <p>4.如排队中奖或者分享获得限购码，将会匹配到之前选择的颜色和尺寸，仅可购买选中的颜色和尺码，不可跟换其他。</p>
+    </div>
+</body>
+</html>

+{{!-- APP 如何获得限购码 --}}
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <title>如何获得限购码</title>
+    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, minimum-scale=1, user-scalable=no">
+    <meta http-equiv="cleartype" content="on">
+    <meta content="telephone=no" name="format-detection" />
+    <script type="text/javascript">
+        (function(doc, win) {
+            var docEl = doc.documentElement;
+            (function() {
+                var clientWidth = docEl.clientWidth;
+                if (!clientWidth) {
+                    return;
+                }
+                docEl.style.fontSize = 20 * (clientWidth / 320) + 'px';
+            }());
+        })(document, window);
+    </script>
+    <style>
+    html, body, div, span, applet, object, iframe, h1, h2, h3, h4, h5, h6, p, blockquote, pre, a, abbr, acronym, address, big, cite, code, del, dfn, em, img, ins, kbd, q, s, samp, small, strike, strong, sub, sup, tt, var, b, u, i, center, dl, dt, dd, ol, ul, li, fieldset, form, label, legend, table, caption, tbody, tfoot, thead, tr, th, td, article, aside, canvas, details, embed, figure, figcaption, footer, header, hgroup, menu, nav, output, ruby, section, summary, time, mark, audio, video, .yoho-header .nav-back, .yoho-header .nav-home, .yoho-header .nav-btn {
+        margin: 0;
+        padding: 0;
+        border: 0;
+        font: inherit;
+        font-size: 100%;
+        vertical-align: baseline;
+    }
+
+    html {
+        line-height: 1;
+    }
+
+    ol, ul {
+        list-style: none;
+    }
+
+    table {
+        border-collapse: collapse;
+        border-spacing: 0;
+    }
+
+    caption, th, td {
+        text-align: left;
+        font-weight: normal;
+        vertical-align: middle;
+    }
+
+    q, blockquote {
+        quotes: none;
+    }
+
+    q:before, q:after, blockquote:before, blockquote:after {
+        content: "";
+        content: none;
+    }
+
+    a img {
+        border: none;
+    }
+
+    article, aside, details, figcaption, figure, footer, header, hgroup, main, menu, nav, section, summary, .yoho-header .nav-back, .yoho-header .nav-home, .yoho-header .nav-btn {
+        display: block;
+    }
+    /*Reset End*/
+
+    .clearfix:after{
+        content: '';
+        display: table;
+        clear: both;
+    }
+
+    * {
+        -webkit-tap-highlight-color: rgba(0,0,0,0);
+        -moz-tap-highlight-color: rgba(0,0,0,0);
+        tap-highlight-color: rgba(0,0,0,0);
+    }
+
+    html, body {
+        font-family: helvetica,Arial,"黑体";
+        width: 100%;
+        font-size: 12PX;
+        line-height: 1.4;
+    }
+
+    button, input, select, textarea {
+        font-size: 100%;
+        margin: 0;
+    }
+
+    img {
+        max-width: 100%;
+        display: block;
+        border: 0;
+        margin: 0 auto;
+    }
+
+    a {
+        text-decoration: none;
+        outline: none;
+        color: #000
+    }
+
+    a:link, a:visited, a:hover, a:actived{
+        color: #000;
+    }
+
+    *:focus {
+        outline: none;
+    }
+
+    .hide {
+        display: none;
+    }
+
+    .overflow-hidden {
+        overflow: hidden;
+    }
+
+    @font-face {
+        font-family: "iconfont";
+        src: url('../font/iconfont.eot'); /* IE9*/
+        src: url('../font/iconfont.eot?#iefix') format('embedded-opentype'),
+             url('../font/iconfont.woff') format('woff'),
+             url('../font/iconfont.ttf') format('truetype'),
+             url('../font/iconfont.svg#iconfont') format('svg'); /* iOS 4.1- */
+    }
+
+    .iconfont {
+        font-family: "iconfont" !important;
+        font-size: 16PX;
+        font-style: normal;
+        text-decoration: none;
+        -webkit-font-smoothing: antialiased;
+        -webkit-text-stroke-width: 0.2PX;
+        -moz-osx-font-smoothing: grayscale;
+    }
+    .limit-help-page{
+        padding: 0.7rem;
+        color: #444;
+    }
+    .limit-help-page h2{
+        font-size: 0.75rem;
+        font-weight: bold;
+    }
+    .limit-help-page .method{
+        display: block;
+        width: 2.3rem;
+        height: 0.875rem;
+        line-height: 0.9rem;
+        background-color: #444;
+        color: #fff;
+        border-radius: 0.5rem;
+        text-align: center;
+        margin: 0.5rem 0;
+    }
+    .limit-help-page li{
+        font-size: 0.6rem;
+    }
+    .limit-help-page .intro-img{
+        width: 100%;
+        height: 5.5rem;
+        background-size: 100%;
+        background-repeat: no-repeat;
+        margin: 0.5rem 0;
+    }
+    .limit-help-page .method-1 li:nth-child(1) .intro-img{
+        background-image: url('../img/product/help/1.png');
+    }
+    .limit-help-page .method-1 li:nth-child(2) .intro-img{
+        background-image: url('../img/product/help/2.png');
+    }
+    .limit-help-page .method-1 li:nth-child(3) .intro-img{
+        background-image: url('../img/product/help/3.png');
+    }
+    .limit-help-page .method-2 li:nth-child(1) .intro-img{
+        background-image: url('../img/product/help/4.png');
+    }
+    .limit-help-page .method-2 li:nth-child(2) .intro-img{
+        background-image: url('../img/product/help/5.png');
+    }
+    .limit-help-page .method-2 li:nth-child(3) .intro-img{
+        background-image: url('../img/product/help/6.png');
+    }
+    .limit-help-page .method-2 li:nth-child(4) .intro-img{
+        background-image: url('../img/product/help/7.png');
+    }
+    .limit-help-page .how li:nth-child(1) .intro-img{
+        background-image: url('../img/product/help/8.png');
+    }
+    .limit-help-page .how li:nth-child(2) .intro-img{
+        background-image: url('../img/product/help/9.png');
+        margin-bottom: 0;
+    }
+    </style>
+
+</head>
+<body>
+    <div class="limit-help-page yoho-page">
+        <h2>不同限定商品获取限购码方式不同，获取限购码目前有两种方式：</h2>
+        <span class="method">方式一</span>
+        <ul class="method-1">
+            <li>1.在限定发售详情页点击分享或者底部“获取限购码”图标。
+                <div class="intro-img"></div>
+            </li>
+            <li>2.从弹出的分享中选取需要分享的渠道。
+                <div class="intro-img"></div>
+            </li>
+            <li>3.分享成功后返回Yoho!Buy有货APP会提示已获得限购码。
+                <div class="intro-img"></div>
+            </li>
+        </ul>
+        <span class="method">方式二</span>
+        <ul class="method-2">
+            <li>1.在限定发售详情页点击参加排队赢取限购码图标。
+                <div class="intro-img"></div>
+            </li>
+            <li>2.进入限定发售排队页面，点击参加排队。
+                <div class="intro-img"></div>
+            </li>
+            <li>3.排队成功后凭排队序列号作为抽奖凭证，等待开奖时间。
+                <div class="intro-img"></div>
+            </li>
+            <li>4.开奖后，排队页面会公布中奖名单，限购码会直接发送至账户。
+                <div class="intro-img"></div>
+            </li>
+        </ul>
+        <h2>查看和使用限购码</h2>
+        <ul class="how">
+            <li>1.从个人中心进入我的限购码页面，可查看所获取的限购码。
+                <div class="intro-img"></div>
+            </li>
+            <li>2.商品开售后，可凭此限购码购买对应商品。
+                <div class="intro-img"></div>
+            </li>
+        </ul>
+    </div>
+</body>
+</html>

+{{!-- APP 什么是限购码 --}}
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <title>什么是限购码</title>
+    <meta name="description" content="">
+    <meta name="viewport" content="width=device-width">
+    <script type="text/javascript">
+    (function(doc, win) {
+        var docEl = doc.documentElement;
+        (function() {
+            var clientWidth = docEl.clientWidth;
+            if (!clientWidth) {
+                return;
+            }
+            docEl.style.fontSize = 20 * (clientWidth / 320) + 'px';
+        }());
+    })(document, window);
+    </script>
+    <style>
+        html, body, p {
+            margin: 0;
+            padding: 0;
+            font-family: helvetica,Arial,"黑体";
+        }
+        body {
+            background-color: #ccc;
+        }
+        .container {
+            padding: 0.7rem;
+            background-color: #fff;
+        }
+        .row {
+            border-bottom: 1px solid #b4b4b4;
+            padding-bottom: 0.2rem;
+        }
+        .block {
+            margin-bottom: 0.5rem
+        }
+        p {
+            font-size: 0.7rem;
+            color: #444;
+            margin: 0.3rem 0;
+            line-height: 1rem;
+        }
+    </style>
+</head>
+<body>
+    <div class="container">
+        <p> 1.当稀缺商品上架，同一用户账号在一定时间段内，仅支持购买1件该商品。 </p>
+        <p> 2.可通过分享或其他活动获得该商品的限购码，每个商品仅可获得1次限购码。 </p>
+        <p> 3.若下单未付款导致交易取消，不会扣限购额度。已付款状态下，无论是否退款则扣除限购额度。 </p>
+        <br>
+        <div class="block">
+            <p class="row">
+                Q：限购码可以送给我的朋友吗？
+            </p>
+            <p>
+                A：限购码不可赠送，只能自己账号使用。可以把活动告诉朋友，参与即可获得限购码。
+            </p>
+        </div>
+
+        <div>
+            <p class="row">
+                Q：下单发现买错码数了，取消订单后我还能再买吗？
+            </p>
+            <p>
+                A：尚未付款的订单取消后，可以再次购买。
+            </p>
+        </div>
+
+    </div>
+</body>
+</html>

+{{!-- APP 内置晒单介绍 --}}
+<!DOCTYPE html>
+<html>
+    <head>
+        <meta charset="utf-8">
+        <title>晒单评价规则</title>
+        <style type="text/css">
+            * {
+                margin: 0;
+                padding: 0;
+            }
+            ul {
+                list-style: none;
+                margin-bottom: 30px;
+            }
+            .help {
+                padding: 30px 30px;
+                font-size: 26px;
+                line-height: 1.5;
+                color: #444;
+            }
+        </style>
+    </head>
+    <body>
+        <div class="help">
+            <p>晒单评价规则：</p>
+            <ul>
+                <li>1. 只能对您购买过的商品进行晒单评价；</li>
+                <li>2. 晒单通过审核后即可获得奖励，且一件商品只能获得一次晒单奖励；</li>
+                <li>3. 未通过审核的晒单评价内容将会被删除，若多次出现晒单评价未审核通过的情况，YOHO!BUY有货有权禁止该用户对商品继续晒单评价；</li>
+            </ul>
+            <p>如何通过审核：</p>
+            <ul>
+                <li>1. 晒单图片应与商品相关、且不得出现含违反法律、法规的内容的；</li>
+                <li>2. 评价应有一定参考价值的信息，不可以直接拷贝别人的评价文字哦~</li>
+            </ul>
+            <p>其他说明：</p>
+            <ul>
+                <li>YOHO!BUY有货对用户在本站进行晒单评价的文字、图片享有使用权利</li>
+            </ul>
+        </div>
+    </body>
+</html>

+<div class="system-main">
+	<P>尊敬的顾客：</P>
+	<P>您好！</P>
+	<P>为了向您提供更优质的服务，目前系统正在升级，请您耐心等待。</P>
+	<P>系统升级期间，部分地区用户体验会有暂 时中断，如遇紧急事宜，欢迎垂询客服热线：400-889-9646 09:00-22:30(周一至周日)。</P>
+	<P>稍后系统将恢复正常使用，欢迎您继续光顾 Yoho!Buy有货！</P>
+	<P>带来不便之处深表 歉意，请您谅解！</P>
+	<P>特此公告</P>
+	<P>Yoho!Buy有货 客户服务中心。</P>
+</div>

@@ -43,4 +43,3 @@ function scrollHandler() {
 $(window).scroll(function() {
 $(window).scroll(function() {
     window.requestAnimationFrame(scrollHandler);
     window.requestAnimationFrame(scrollHandler);
 });
 });
-

+var $ = require('yoho-jquery');
+
+require('service/system.page.css');
+
+if ($('.systemMain').height() < $(window).height()) {
+    $('.systemMain').height($(window).height());
+}

+@import "system/system";

+.system-main {
+    overflow: hidden;
+    background-color: #444;
+    color: #fff;
+    padding: 0 4%;
+    position: absolute;
+    top: 0;
+    left: 0;
+
+    p {
+        font-size: 52px;
+        line-height: 60px;
+
+        &:first-of-type {
+            padding-top: 90px;
+        }
+    }
+}