Merge branch 'feature/qrcodeMe' into 'release/6.3'

样式更改



See merge request !1127

@@ -145,6 +145,7 @@ try {
     const seo = require('./doraemon/middleware/seo');
     const pageCache = require('./doraemon/middleware/page-cache');
     const downloadBar = require('./doraemon/middleware/download-bar');
+    const routeEncode = require('./doraemon/middleware/route-encode');
 
     // YOHO 前置中间件
     app.use(tdkUrl());
@@ -163,6 +164,7 @@ try {
 
     app.use(layoutTools());
     app.use(pageCache());
+    app.use(routeEncode.md);
     app.use(downloadBar());
 
     require('./dispatch')(app);

@@ -39,6 +39,7 @@ exports.photography = (req, res, next) => {
         title: '个人中心',
         width750: true,
         localCss: true,
+        pageFooter: true
     };
 
     let params = {
@@ -61,6 +62,7 @@ exports.coffee = (req, res, next) => {
         title: '个人中心',
         width750: true,
         localCss: true,
+        pageFooter: true
     };
 
     let params = {
@@ -83,6 +85,7 @@ exports.green = (req, res, next) => {
         title: '个人中心',
         width750: true,
         localCss: true,
+        pageFooter: true
     };
 
     let params = {

@@ -26,8 +26,6 @@ module.exports = class extends global.yoho.BaseModel {
                 result.data.isApp = isApp;
 
                 result.data.copyCode = result.data.trendWord ? result.data.trendWord : result.data.inviteCode;
-                result.data.copyUrl = result.data.shareUrl ?
-                    result.data.shareUrl.replace(/"/g, '"').replace(/=/g, ':') : '';
 
                 return result.data;
             } else {

 'use strict';
 
 const _ = require('lodash');
+const rightsJson = require('../../../public/js/activity/store-home/rights-detail.json'); // 写死的会员特权
 
 class storeHome extends global.yoho.BaseModel {
     constructor(ctx) {
@@ -38,7 +39,7 @@ class storeHome extends global.yoho.BaseModel {
                     photography: photography,
                     coffee: coffee,
                     green: green,
-                    process: this.getProcess(result[0].data.cousume_amount, result[0].data.vip_type)
+                    process: this.getProcess(_.get(result[0], 'data.credit_points'), result[0].data.vip_type)
                 });
 
                 result[0].data.parentsGender = result[0].data.gender === '1' ? '男' : '女';
@@ -61,6 +62,31 @@ class storeHome extends global.yoho.BaseModel {
                     }
                 }
 
+                let rightsObj = {};
+                let build = [];
+                let rightsUrl = '';
+                let vipLevel = `vip${result[0].data.vip_level}`;
+
+                if (photography) {
+                    rightsObj = rightsJson.photography;
+                    rightsUrl = '//mp.weixin.qq.com/s/iSd__pG6tEodktIlPMJgoQ';
+                }
+                if (green) {
+                    rightsObj = rightsJson.green;
+                    rightsUrl = '//mp.weixin.qq.com/s/JJgJW77sT9Ur87BR0iWevw';
+                }
+                if (coffee) {
+                    rightsObj = rightsJson.coffee;
+                    rightsUrl = '//mp.weixin.qq.com/s/o04mbaNXZ_kmvT2Bvlqg9w';
+                }
+
+                _.forEach(rightsObj, (val, key) => {
+                    if (key === vipLevel) {
+                        build = val;
+                    }
+                });
+                result[0].data.rights = build;
+                result[0].data.rightsUrl = rightsUrl;
                 result = result[0].data;
             }
             return result;
@@ -92,7 +118,7 @@ class storeHome extends global.yoho.BaseModel {
 
                 _.forEach(result.data.consume_list, val => {
                     build.push({
-                        amount: val.trade_amount,
+                        amount: val.trade_amount_desc,
                         date: val.trade_date,
                         title: val.trade_title
                     });
@@ -129,13 +155,18 @@ class storeHome extends global.yoho.BaseModel {
 
         switch (type) {
             case 1:
-                if (amount < 0) {
-                    amount = 0;
+                if (amount <= 0) {
+                    process = 0;
+                }
+                if (amount > 0 && amount <= 800) {
+                    process = (amount / 800 * 0.5) * 100;
+                }
+                if (amount > 800 && amount < 2000) {
+                    process = ((amount - 800) / 1200 * 0.5 + 0.5) * 100;
                 }
-                if (amount > 2000) {
-                    amount = 2000;
+                if (amount >= 2000) {
+                    process = 100;
                 }
-                process = (amount / 2000) * 100;
                 return process;
             case 2:
                 amount -= 1000;

@@ -59,6 +59,8 @@ const storeHome = require(`${cRoot}/store-home`);
 
 const couponList = require(`${cRoot}/coupon-list`);
 
+const disableBFCache = require('../../doraemon/middleware/disable-BFCache');
+
 // routers
 
 router.get('/demo', demo.index);
@@ -288,9 +290,9 @@ router.get('/free-mail/list', auth, freeMail.freeMailList); // 免邮券列表
 router.get('/free-mail/verify', auth, freeMail.receiveVerify); // 免邮券领取验证
 router.get('/free-mail/verifyCoupon', auth, freeMail.receiveCoupon); // 免邮券领取
 
-router.get('/store-home/photography', storeHome.storeAuth, storeHome.photography); // 线下店个人中心-摄影
-router.get('/store-home/coffee', storeHome.storeAuth, storeHome.coffee); // 线下店个人中心-咖啡
-router.get('/store-home/green', storeHome.storeAuth, storeHome.green); // 线下店个人中心-绿植
+router.get('/store-home/photography', disableBFCache, storeHome.storeAuth, storeHome.photography); // 线下店个人中心-摄影
+router.get('/store-home/coffee', disableBFCache, storeHome.storeAuth, storeHome.coffee); // 线下店个人中心-咖啡
+router.get('/store-home/green', disableBFCache, storeHome.storeAuth, storeHome.green); // 线下店个人中心-绿植
 router.get('/store-home/history', storeHome.storeAuth, storeHome.history); // 线下店个人中心-消费明细
 router.get('/store-home/ewm', storeHome.storeAuth, storeHome.ewm); // 线下店个人中心-二维码
 router.get('/store-home/coupon', storeHome.storeAuth, storeHome.coupon); // 线下店个人中心-优惠券

@@ -23,7 +23,7 @@
        <div class="title">方法二：使用潮流口令</div>
         <div class="code-content">
             <div class="invite-content">
-                <span class="code trend-code">{{#if trendWord}}{{trendWord}}{{else}}{{inviteCode}}{{/if}}</span>
+                <span class="code trend-code{{#unless isApp}} code-len{{/unless}}">{{#if trendWord}}{{trendWord}}{{else}}{{inviteCode}}{{/if}}</span>
                 <span class="modify button">修改</span>
                 {{#if isApp}}
                     <a class="copy button" href='//m.yohobuy.com/?openby:yohobuy={"action":"go.copy","params":{"text":"{{copyCode}}","message":"复制成功"}}'>复制</a>
@@ -36,10 +36,9 @@
         <div class="title">方法三：使用邀请链接</div>
         <div class="code-content">
             <div class="invite-content">
-                <span class="code{{#unless isApp}} code-len{{/unless}}">{{shareUrl}}</span>
+                <span class="code code-len{{#unless isApp}} input-longer{{/unless}}">{{shareUrl}}</span>
                 {{#if isApp}}
                     <span class="share button">分享</span>
-                    <a class="copy button" href='//m.yohobuy.com/?openby:yohobuy={"action":"go.copy","params":{"text":"{{copyUrl}}","message":"复制成功"}}'>复制</a>
                 {{/if}}
             </div>
             <p class="link-info">

 <div class="store-home">
     {{> store-home/user-info}}
-    {{> store-home/yoho-family}}
 </div>
\ No newline at end of file

 <div class="store-home">
     <div class="coupon-list">
+        {{#if coupons}}
         {{# coupons}}
         <div class="coupon-item">
             <div class="coupon-title eps">{{coupon_name}}</div>
@@ -26,5 +27,11 @@
             </div>
         </div>
         {{/ coupons}}
+        {{else}}
+        <div class="no-result">
+            <div class="pic coupon"></div>
+            <p>暂无优惠券</p>
+        </div>
+        {{/if}}
     </div>
 </div>
\ No newline at end of file

 <div class="store-home">
     {{> store-home/user-info}}
-    {{> store-home/yoho-family}}
 </div>
\ No newline at end of file

 <div class="store-home">
+    {{#if list}}
     <ul class="his-ul">
         {{# list}}
         <li class="item">
@@ -6,8 +7,14 @@
                 <p class="name">{{title}}</p>
                 <p class="time">{{date}}</p>
             </div>
-            <div class="price">¥{{amount}}</div>
+            <div class="price">{{amount}}</div>
         </li>
         {{/ list}}
     </ul>
+    {{else}}
+    <div class="no-result">
+        <div class="pic history"></div>
+        <p>暂无消费</p>
+    </div>
+    {{/if}}
 </div>
\ No newline at end of file

 <div class="store-home">
     {{> store-home/user-info}}
-    <div class="edit-title">编辑宝宝资料</div>
+    <div class="edit-title clearfix">编辑宝宝资料</div>
     <ul class="list">
         <li class="list-item">
             <span class="title">宝宝昵称</span>
@@ -26,5 +26,4 @@
             </div>
         </li>
     </ul>
-    {{> store-home/yoho-family}}
 </div>
\ No newline at end of file

@@ -5,28 +5,24 @@
     <div class="base-info">
         <div class="left">
             <div class="user">
-                <span class="name">{{nick_name}}</span>
+                <span class="name eps">{{nick_name}}</span>
                 <span class="vip vip-{{vip_level}}"></span>
-            </div>
-            <div class="tel">{{mobile}}</div>
-        </div>
-        <div class="right">
-            <div class="ewm-c">
                 <a class="ewm" href="//m.yohobuy.com/home/newQrcode"></a>
             </div>
-            <div class="id hide">ID:475247198</div>
+            {{#if mobile}}
+            <div class="tel"><span class="tel-icon"></span>{{mobile}}</div>
+            {{/if}}
+            <a class="family" href="//m.yohobuy.com/home/family"></a>
         </div>
     </div>
 </div>
-<div class="user-info">
+<div class="user-info clearfix">
     <div class="logo {{#if coffee}}coffee{{/if}} {{#if photography}}photography{{/if}} {{#if green}}green{{/if}}"></div>
     <ul class="info-list">
         <li>
             <div class="left">消费金额</div>
-            <a class="right"{{#if cousume_amount}} href="//m.yohobuy.com/activity/store-home/history?shopType={{vip_type}}"{{/if}}>¥{{cousume_amount}}
-                {{#if cousume_amount}}
+            <a class="right" href="//m.yohobuy.com/activity/store-home/history?shopType={{vip_type}}">¥{{cousume_amount}}
                 <span class="iconfont">&#xe604;</span>
-                {{/if}}
             </a>
         </li>
         <li>
@@ -35,57 +31,86 @@
         </li>
         <li>
             <div class="left">我的积分</div>
-            <div class="right">{{credit_points}}</div>
+            <div class="right">{{yohoCoin}}</div>
         </li>
     </ul>
     <div class="process-c">
         <div class="process-line">
-            <div style="width: {{process}}%;"></div>
+            <div class="line" style="width: {{process}}%;"></div>
+            <div class="growth-line">
+                <div class="growth-c" style="left: {{process}}%;">
+                    <div class="growth">&nbsp;&nbsp;成长值：{{credit_points}}&nbsp;&nbsp;</div>
+                    <div class="arr"></div>
+                </div>
+            </div>
         </div>
         <ul class="level-c" data-vip="{{vip_level}}">
             <li class="disable">
                 <div class="dot"></div>
                 <span class="vip vip-1"></span>
-                <div class="price">¥{{#if coffee}}0{{/if}}{{#if photography}}0{{/if}}{{#if green}}1000{{/if}}</div>
+                <div class="price">{{#if coffee}}0{{/if}}{{#if photography}}0{{/if}}{{#if green}}1000{{/if}}</div>
             </li>
             <li class="disable">
                 <div class="dot"></div>
                 <span class="vip vip-2"></span>
-                <div class="price">¥{{#if coffee}}800{{/if}}{{#if photography}}5000{{/if}}{{#if green}}3000{{/if}}</div>
+                <div class="price">{{#if coffee}}800{{/if}}{{#if photography}}5000{{/if}}{{#if green}}3000{{/if}}</div>
             </li>
             <li class="disable">
                 <div class="dot"></div>
                 <span class="vip vip-3"></span>
-                <div class="price">¥{{#if coffee}}2000{{/if}}{{#if photography}}10000{{/if}}{{#if green}}5000{{/if}}</div>
+                <div class="price">{{#if coffee}}2000{{/if}}{{#if photography}}10000{{/if}}{{#if green}}5000{{/if}}</div>
             </li>
         </ul>
     </div>
-    <ul class="list coupon">
-        <a href="//m.yohobuy.com/activity/store-home/coupon?shopType={{vip_type}}">
-            <li class="list-item">
-                <span class="title">我的优惠券</span>
-                <span class="iconfont">&#xe604;</span>
-                <span class="s-title">{{coupons_num}}</span>
-            </li>
-        </a>
+</div>
+<a href="{{rightsUrl}}">
+    <ul class="list">
+        <li class="list-item">
+            <span class="title">我的会员权益</span>
+            <span class="iconfont">&#xe604;</span>
+            <span class="s-title">更多</span>
+        </li>
+    </ul>
+</a>
+<a href="{{rightsUrl}}">
+<div class="right-c">
+    <ul>
+        {{# rights}}
+        <li>
+            <div class="pic right-{{type}}"></div>
+            <p>{{name}}</p>
+        </li>
+        {{/ rights}}
     </ul>
 </div>
-<div class="edit-title hide">编辑资料</div>
-<ul class="list hide">
-    <li class="list-item">
-        <span class="title">昵称</span>
-        <span class="iconfont">&#xe604;</span>
-        <span class="s-title">{{nick_name}}</span>
-    </li>
-    <li class="list-item">
-        <span class="title">生日</span>
-        <span class="iconfont">&#xe604;</span>
-        <span class="s-title">{{birth_day}}</span>
-    </li>
-    <li class="list-item">
-        <span class="title">性别</span>
-        <span class="iconfont">&#xe604;</span>
-        <span class="s-title">{{parentsGender}}</span>
-        </select>
-    </li>
-</ul>
\ No newline at end of file
+</a>
+<ul class="list coupon">
+    <a href="//m.yohobuy.com/activity/store-home/coupon?shopType={{vip_type}}">
+        <li class="list-item">
+            <span class="title">我的优惠券</span>
+            <span class="iconfont">&#xe604;</span>
+            <span class="s-title">{{coupons_num}}</span>
+        </li>
+    </a>
+</ul>
+<div class="edit-title">编辑资料</div>
+<a href="//m.yohobuy.com/home/family/userInfo">
+    <ul class="list">
+        <li class="list-item">
+            <span class="title">昵称</span>
+            <span class="iconfont">&#xe604;</span>
+            <span class="s-title">{{nick_name}}</span>
+        </li>
+        <li class="list-item">
+            <span class="title">生日</span>
+            <span class="iconfont">&#xe604;</span>
+            <span class="s-title">{{birth_day}}</span>
+        </li>
+        <li class="list-item">
+            <span class="title">性别</span>
+            <span class="iconfont">&#xe604;</span>
+            <span class="s-title">{{parentsGender}}</span>
+            </select>
+        </li>
+    </ul>
+</a>
\ No newline at end of file

-<ul class="list hide">
-    <li class="list-item">
-        <span class="title">YOHO!FAMILY</span>
-        <span class="iconfont">&#xe604;</span>
-        <span class="s-title"></span>
-    </li>
-</ul>
\ No newline at end of file

@@ -348,7 +348,6 @@ const listNew = (req, res, next) => {
                 seoTitle = decodeURIComponent(params.sort_name);
             } catch (e) {
                 logger.error('decodeURIComponent seoTitle: ' + e);
-                return res.redirect('/');
             }
         }
 

@@ -20,21 +20,22 @@ const domains = {
     platformApi: 'http://192.168.102.48:8088/',
     store: 'http://192.168.102.47:8080/portal-gateway/wechat/',
     extstore: 'http://extstore-test1.yohops.com',
-    family: 'http://192.168.103.73:8096/uic/',
+    family: 'http://192.168.102.31:8096/uic/',
     yohoNowApi: 'http://yohonow-test.yohops.com:9999/'
 };
 
 module.exports = {
     app: 'h5',
     appVersion: '6.2.3', // 调用api的版本
+    appName: 'yohobuywap-node',
     port: 6001,
     siteUrl: '//m.yohobuy.com',
     assetUrl: '//127.0.0.1:5001',
     testCode: 'yoho4946abcdef#$%&!@',
     domains: domains,
     report: {
-        host: '10.66.0.139',
-        port: 8086,
+        host: 'badjs.yoho.cn',
+        port: 80,
         db: 'web-apm'
     },
     subDomains: {
@@ -134,7 +135,6 @@ module.exports = {
 
 if (isProduction) {
     Object.assign(module.exports, {
-        appName: 'm.yohobuy.com',
         assetUrl: `//cdn.yoho.cn/yohobuywap-node/${pkg.version}/`,
         domains: {
             api: 'http://api.yoho.yohoops.org/',
@@ -214,14 +214,13 @@ if (isProduction) {
             }
         },
         report: {
-            host: 'influxdblog.web.yohoops.org',
-            port: 8086,
+            host: 'badjs.yoho.cn',
+            port: 80,
             db: 'web-apm'
         }
     });
 } else if (isTest) {
     Object.assign(module.exports, {
-        appName: 'm.yohobuy.com for test',
         assetUrl: `//cdn.yoho.cn/yohobuywap-node/${pkg.version}/`,
         domains: {
             api: process.env.TEST_API || 'http://api-test1.yohops.com:9999/',
@@ -234,7 +233,7 @@ if (isProduction) {
             imCs: process.env.TEST_IM_CS || 'http://im.yohobuy.com/api',
             platformApi: 'http://192.168.102.48:8088/',
             extstore: 'http://extstore-test1.yohops.com',
-            family: 'http://192.168.103.73:8096/uic/',
+            family: 'http://192.168.102.31:8096/uic/',
             yohoNowApi: process.env.YOHO_NOW_API || 'http://yohonow-test.yohops.com:9999/'
         },
         memcache: {

@@ -7,6 +7,7 @@ const logger = global.yoho.logger;
 const helpers = global.yoho.helpers;
 const sender = global.yoho.apmSender;
 const hostname = require('os').hostname();
+const routeEncode = require('./route-encode');
 
 const forceNoCache = (res) => {
     if (res && !res.finished) {
@@ -66,7 +67,8 @@ exports.serverError = () => {
                     reqID: req.reqID,
                     uid,
                     udid,
-                    code: err.code || 500
+                    code: err.code || 500,
+                    path: `[${req.method}]${routeEncode.getRouter(req)}`
                 },
                 fields: {
                     message: err.message,

+const _ = require('lodash');
+const crypto = global.yoho.crypto;
+
+function urlJoin(a, b) {
+    if (_.endsWith(a, '/') && _.startsWith(b, '/')) {
+        return a + b.substring(1, b.length);
+    } else if (!_.endsWith(a, '/') && !_.startsWith(b, '/')) {
+        return a + '/' + b;
+    } else {
+        return a + b;
+    }
+}
+
+function _encode(str) {
+    return encodeURIComponent(crypto.encryption(null, str));
+}
+
+const encode = _.memoize(_encode);
+
+function getRouter(req) {
+    let route = req.route ? req.route.path : '';
+    let appPath = req.app.mountpath;
+
+    if (_.isArray(route) && route.length > 0) {
+        route = route[0];
+    }
+
+    let key = urlJoin(appPath, route.toString()); // route may be a regexp
+
+    if (key) {
+        return encode(key);
+    }
+
+    return '';
+}
+
+module.exports.md = function(req, res, next) {
+    function onRender() {
+        res.locals._router = getRouter(req);
+    }
+
+    res.on('beforeRender', onRender);
+    next();
+};
+
+module.exports.getRouter = getRouter;

@@ -26,8 +26,9 @@
             {{#ifand isProduction wap.open.bughd}}
             window._timeStart = new Date().getTime();
             window._yohoAppName = 'yohobuywap-node';
+            window._router = '{{_router}}';
 
-            !function(e){function t(n){if(r[n])return r[n].exports;var o=r[n]={exports:{},id:n,loaded:!1};return e[n].call(o.exports,o,o.exports,t),o.loaded=!0,o.exports}var r={};return t.m=e,t.c=r,t.p="",t(0)}([function(e,t,r){String.prototype.trim||(String.prototype.trim=function(){return this.replace(/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g,"")});var n=r(13),o=r(14);n.init(),o.init()},function(e,t){e.exports=function(e,t,r){if("undefined"==typeof t){var n=null;if(document.cookie)for(var o=document.cookie.split(";"),i=0;i<o.length;i++){var a=(o[i]||"").trim();if(a.substring(0,e.length+1)==e+"="){n=decodeURIComponent(a.substring(e.length+1));break}}return n}r=r||{},null===t&&(t="",r.expires=-1);var d="";if(r.expires&&("number"==typeof r.expires||r.expires.toUTCString)){var u;"number"==typeof r.expires?(u=new Date,u.setTime(u.getTime()+24*r.expires*60*60*1e3)):u=r.expires,d="; expires="+u.toUTCString()}var s=r.path?"; path="+r.path:"",p=r.domain?"; domain="+r.domain:"",c=r.secure?"; secure":"";document.cookie=[e,"=",encodeURIComponent(t),d,s,p,c].join("")}},,function(e,t,r){var n=r(1),o=window._yohoAppName||"unknown",i={config:{reportUrl:"//badjs.yoho.cn/apm/yas.gif"},stringify:function(e){for(var t=[],r=0;r<e.length;r++){var n=e[r],o=[];for(var i in n)n.hasOwnProperty(i)&&o.push(i+"::"+n[i]);t.push(o.join("$$"))}return t.join("**")},report:function(e,t){if(e){var r=new Image;r.src=this.config.reportUrl+"?s="+o+"&l="+e+"&t="+(new Date).getTime(),t&&t()}},getUdid:function(){var e=(n("yohobuy_session")||"").slice(2).split(".")[0];return e||0},getUid:function(){var e=(n("_UID")||"").split("::")[1];return e||0},getReqId:function(){return n("docreqid")||0}};e.exports=i},,,,,,,,,,function(e,t,r){var n=r(1),o=r(3),i="_errLog",a={writeError:function(e,t,r,a,d){var u=JSON.parse(n(i)||"[]");u.push({tp:"err",msg:e,sc:t,ln:r,cn:a,pt:encodeURIComponent(location.href),u:o.getUid(),ud:o.getUdid(),rid:o.getReqId(),st:JSON.stringify(d&&d.stack)}),n(i,JSON.stringify(u)),u.length>=5&&this.reportError()},clearError:function(){n(i,"[]")},reportError:function(){var e=this,t=JSON.parse(n(i)||"[]"),r=o.stringify(t);o.report(r,function(){e.clearError()})},init:function(){var e=this;window.onerror=function(t,r,n,o,i){e.writeError(t,r,n,o,i)},this.reportError()}};e.exports=a},function(e,t,r){function n(e){var t=e.offsetTop;return null!==e.offsetParent&&(t+=n(e.offsetParent)),t}var o=r(3),i=window.screen.height,a=[],d=!1,u=!1,s=0,p=setInterval(function(){var e,t;if(d){if(a.length)for(e=0;e<a.length;e++){if(t=a[e],!t.complete){u=!1;break}u=!0}else u=!0;u&&(s=(new Date).getTime()-_timeStart,clearInterval(p))}else{var r=document.body&&document.body.querySelectorAll("img")||[];for(e=0;e<r.length;e++){t=r[e];var o=n(t);if(o>i){d=!0;break}o<=i&&!t.hasPushed&&(t.hasPushed=1,a.push(t))}}},0),c={reportTime:function(e){var t=o.stringify(e);o.report(t)},addEvent:function(){var e=this,t=[],r=encodeURIComponent(location.href),n=o.getUid(),i=o.getUdid(),a=o.getReqId(),c=window.performance&&window.performance.timing.navigationStart||0;_timeStart=window._timeStart||0,document.addEventListener&&document.addEventListener("DOMContentLoaded",function(e){t.push({tp:"dcl",t:(new Date).getTime()-_timeStart,pt:r,u:n,ud:i,rid:a});var o=document.body&&document.body.querySelectorAll("img")||[];o.length||(d=!0)},!1),window.addEventListener&&window.addEventListener("load",function(o){t.push({tp:"ld",t:(new Date).getTime()-_timeStart,pt:r,u:n,ud:i,rid:a}),u=!0,d=!0,p&&clearInterval(p),s&&t.push({tp:"fs",t:s,pt:r,u:n,ud:i,rid:a}),t.push({tp:"pf",dcl:(window.performance&&window.performance.timing.domComplete||0)-c,ld:(window.performance&&window.performance.timing.loadEventStart||0)-c,pt:r,u:n,ud:i,rid:a}),e.reportTime(t)},!1)},init:function(){this.addEvent()}};e.exports=c}]);
+            !function(e){function t(n){if(r[n])return r[n].exports;var i=r[n]={exports:{},id:n,loaded:!1};return e[n].call(i.exports,i,i.exports,t),i.loaded=!0,i.exports}var r={};t.m=e,t.c=r,t.p="",t(0)}([function(e,t,r){String.prototype.trim||(String.prototype.trim=function(){return this.replace(/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g,"")});var n=r(13),i=r(14);n.init(),i.init()},function(e,t){e.exports=function(e,t,r){if(void 0===t){var n=null;if(document.cookie)for(var i=document.cookie.split(";"),o=0;o<i.length;o++){var a=(i[o]||"").trim();if(a.substring(0,e.length+1)==e+"="){n=decodeURIComponent(a.substring(e.length+1));break}}return n}r=r||{},null===t&&(t="",r.expires=-1);var d="";if(r.expires&&("number"==typeof r.expires||r.expires.toUTCString)){var u;"number"==typeof r.expires?(u=new Date,u.setTime(u.getTime()+24*r.expires*60*60*1e3)):u=r.expires,d="; expires="+u.toUTCString()}var s=r.path?"; path="+r.path:"",p=r.domain?"; domain="+r.domain:"",c=r.secure?"; secure":"";document.cookie=[e,"=",encodeURIComponent(t),d,s,p,c].join("")}},,function(e,t,r){var n=r(1),i=window._yohoAppName||"unknown",o={config:{reportUrl:"//badjs.yoho.cn/apm/yas2.gif"},stringify:function(e){for(var t=[],r=0;r<e.length;r++){var n=e[r],i=[];for(var o in n)n.hasOwnProperty(o)&&i.push(o+"::"+n[o]);t.push(i.join("$$"))}return t.join("**")},report:function(e,t){if(e){(new Image).src=this.config.reportUrl+"?s="+i+"&l="+e+"&t="+(new Date).getTime(),t&&t()}},getUdid:function(){return(n("yohobuy_session")||"").slice(2).split(".")[0]||0},getUid:function(){return(n("_UID")||"").split("::")[1]||0},getReqId:function(){return n("docreqid")||0},getRoute:function(){return window._router||""}};e.exports=o},,,,,,,,,,function(e,t,r){var n=r(1),i=r(3),o="_errLog",a={writeError:function(e,t,r,a,d){var u=JSON.parse(n(o)||"[]");u.push({tp:"err",msg:e,sc:t,ln:r,cn:a,pt:location.href,u:i.getUid(),ud:i.getUdid(),rid:i.getReqId(),st:JSON.stringify(d&&d.stack),r:i.getRoute()}),n(o,JSON.stringify(u)),u.length>=5&&this.reportError()},clearError:function(){n(o,"[]")},reportError:function(){var e=this,t=JSON.parse(n(o)||"[]"),r=i.stringify(t);i.report(r,function(){e.clearError()})},init:function(){var e=this;window.onerror=function(t,r,n,i,o){e.writeError(t,r,n,i,o)},this.reportError()}};e.exports=a},function(e,t,r){function n(e){var t=e.offsetTop;return null!==e.offsetParent&&(t+=n(e.offsetParent)),t}var i=r(3),o=window.screen.height,a=[],d=!1,u=!1,s=0,p=setInterval(function(){var e,t;if(d){if(a.length)for(e=0;e<a.length;e++){if(t=a[e],!t.complete){u=!1;break}u=!0}else u=!0;u&&(s=(new Date).getTime()-_timeStart,clearInterval(p))}else{var r=document.body&&document.body.querySelectorAll("img")||[];for(e=0;e<r.length;e++){t=r[e];var i=n(t);if(i>o){d=!0;break}i<=o&&!t.hasPushed&&(t.hasPushed=1,a.push(t))}}},0),c={reportTime:function(e){var t=i.stringify(e);i.report(t)},addEvent:function(){var e=this,t=[],r=location.href,n=i.getUid(),o=i.getUdid(),a=i.getReqId(),c=window.performance&&window.performance.timing.navigationStart||0,f=i.getRoute();_timeStart=window._timeStart||0,document.addEventListener&&document.addEventListener("DOMContentLoaded",function(e){t.push({tp:"dcl",t:(new Date).getTime()-_timeStart,pt:r,u:n,ud:o,rid:a,r:f}),(document.body&&document.body.querySelectorAll("img")||[]).length||(d=!0)},!1),window.addEventListener&&window.addEventListener("load",function(i){t.push({tp:"ld",t:(new Date).getTime()-_timeStart,pt:r,u:n,ud:o,rid:a,r:f}),u=!0,d=!0,p&&clearInterval(p),s&&t.push({tp:"fs",t:s,pt:r,u:n,ud:o,rid:a,r:f}),t.push({tp:"pf",dcl:(window.performance&&window.performance.timing.domComplete||0)-c,ld:(window.performance&&window.performance.timing.loadEventStart||0)-c,pt:r,u:n,ud:o,rid:a,r:f}),e.reportTime(t)},!1)},init:function(){this.addEvent()}};e.exports=c}]);
             {{/ifand}}
         </script>
 

 {
   "name": "yohobuywap-node",
-  "version": "6.2.34",
+  "version": "6.2.35",
   "private": true,
   "description": "A New Yohobuy Project With Express",
   "repository": {
@@ -73,7 +73,7 @@
     "xml2js": "^0.4.19",
     "yoho-express-session": "^2.0.0",
     "yoho-md5": "^2.0.0",
-    "yoho-node-lib": "=0.5.21",
+    "yoho-node-lib": "=0.5.29",
     "yoho-zookeeper": "^1.0.8"
   },
   "devDependencies": {

@@ -13,6 +13,8 @@ class Photography extends Page {
             $gender: $('.s-title.baby-gender'),
             $birthday: $('.s-title.baby-birthday'),
             $noDate: $('.s-title.modify[type!=date]'),
+            $growthC: $('.growth-c'),
+            $growth: $('.growth')
         };
 
         this.init();
@@ -23,6 +25,30 @@ class Photography extends Page {
         let vipLevel = this.selector.$levelC.data('vip');
 
         this.selector.$levelC.find(`li:lt(${vipLevel})`).removeClass('disable');
+        this.growthRePosition();
+    }
+
+    growthRePosition() {
+        let gWidth = this.selector.$growth.width() / 2;
+        let growthW = this.selector.$growth.width();
+
+        this.selector.$growthC.css('width', `${growthW}px`);
+        this.selector.$growthC.css('margin-left', `-${gWidth}px`);
+        setTimeout(() => {
+            let limit = $(window).width() / 750 * 30;
+            let offset = this.selector.$growthC.offset().left;
+            let limitRight = $(window).width() - offset - limit - growthW;
+            let limitLeft = offset - limit;
+
+            if (limitRight <= 0) {
+                // 右边超出
+                this.selector.$growth.css('margin-left', `${limitRight}px`);
+            }
+            if (limitLeft <= 0) {
+                // 左边超出
+                this.selector.$growth.css('margin-left', `${-limitLeft}px`);
+            }
+        }, 100);
     }
 
     bindEvents() {

+{
+    "photography": {
+        "vip1": [
+            {
+                "name": "免费服务(2)",
+                "type": 1
+            },
+            {
+                "name": "免费产品(2)",
+                "type": 5
+            },
+            {
+                "name": "生日礼物(3)",
+                "type": 4
+            },
+            {
+                "name": "有货会员专享",
+                "type": 2
+            },
+            {
+                "name": "积分抵扣",
+                "type": 3
+            }
+        ],
+        "vip2": [
+            {
+                "name": "免费服务(2)",
+                "type": 1
+            },
+            {
+                "name": "免费产品(3)",
+                "type": 5
+            },
+            {
+                "name": "生日礼物(3)",
+                "type": 4
+            },
+            {  
+                "name": "有货会员专享",
+                "type": 2
+            },
+            {
+                "name": "积分抵扣",
+                "type": 3
+            }
+        ],
+        "vip3": [
+            {
+                "name": "免费服务(4)",
+                "type": 1
+            },
+            {
+                "name": "免费产品(4)",
+                "type": 5
+            },
+            {
+                "name": "生日礼物(3)",
+                "type": 4
+            },
+            {
+                "name": "有货会员专享",
+                "type": 2
+            },
+            {
+                "name": "积分抵扣",
+                "type": 3
+            }
+        ]
+    },
+    "coffee": {
+        "vip1": [
+            {
+                "name": "乐享 9.5 折",
+                "type": 1
+            },
+            {
+                "name": "有货会员专享",
+                "type": 2
+            },
+            {
+                "name": "积分抵扣",
+                "type": 3
+            }
+        ],
+        "vip2": [
+            {
+                "name": "乐享 9.0 折",
+                "type": 1
+            },
+            {
+                "name": "有货会员专享",
+                "type": 2
+            },
+            {
+                "name": "积分抵扣",
+                "type": 3
+            }
+        ],
+        "vip3": [
+            {
+                "name": "乐享 8.5 折",
+                "type": 1
+            },
+            {
+                "name": "有货会员专享",
+                "type": 2
+            },
+            {
+                "name": "积分抵扣",
+                "type": 3
+            }
+        ]
+    },
+    "green": {
+        "vip0": [
+            {
+                "name": "有货会员专享",
+                "type": 1
+            },
+            {
+                "name": "积分抵扣",
+                "type": 3
+            }
+        ],
+        "vip1": [
+            {
+                "name": "乐享 9.5 折",
+                "type": 1
+            },
+            {
+                "name": "生日福利(3)",
+                "type": 4
+            },
+            {
+                "name": "有货会员专享",
+                "type": 2
+            },
+            {
+                "name": "积分抵扣",
+                "type": 3
+            }
+        ],
+        "vip2": [
+            {
+                "name": "乐享 9.0 折",
+                "type": 1
+            },
+            {
+                "name": "生日福利(3)",
+                "type": 4
+            },
+            {
+                "name": "有货会员专享",
+                "type": 2
+            },
+            {  
+                "name": "积分抵扣",
+                "type": 3
+            }
+        ],
+        "vip3": [
+            {
+                "name": "乐享 8.8 折",
+                "type": 1
+            },
+            {
+                "name": "生日福利(3)",
+                "type": 4
+            },
+            {
+                "name": "有货会员专享",
+                "type": 2
+            },
+            {
+                "name": "积分抵扣",
+                "type": 3
+            }
+        ]
+    }
+}
\ No newline at end of file

 .my-promotion-page {
     .my-code {
-        height: 550px;
+        height: 600px;
         overflow: hidden;
         background-image: resolve("activity/expand-new/qrcode-back.png");
         background-size: 100% 100%;
@@ -13,12 +13,12 @@
             height: 120px;
             text-align: center;
             font-size: 38px;
-            margin: 35px 0 20px;
+            margin: 30px 0 20px;
             font-family: "SourceHanSansCN";
             font-weight: 700;
             font-style: oblique;
             color: #000;
-            line-height: 56px;
+            line-height: 53px;
             margin-left: 143px;
             background-repeat: no-repeat;
 
@@ -39,26 +39,26 @@
         }
 
         .code-outer {
-            width: 200px;
-            height: 200px;
-            padding: 10px;
+            width: 250px;
+            height: 250px;
+            padding: 5px;
             background-color: #fff;
-            margin: 6px 0 0 283px;
+            margin: 6px 0 0 252px;
         }
 
         .code-qr {
-            width: 180px;
-            height: 180px;
+            width: 240px;
+            height: 240px;
         }
 
         .qrcode-avatar {
-            width: 58px;
-            height: 58px;
+            width: 70px;
+            height: 70px;
             position: absolute;
             top: 50%;
             left: 50%;
-            margin-top: 44px;
-            margin-left: -20px;
+            margin-top: 35px;
+            margin-left: -32px;
             background-position: center center;
             background-size: contain;
             border-radius: 50%;
@@ -134,6 +134,14 @@
                 width: 444px;
             }
 
+            .input-len {
+                width: 444px;
+            }
+
+            .input-longer {
+                width: 564px;
+            }
+
             .button {
                 height: 68px;
                 width: 120px;

@@ -3,6 +3,18 @@ html {
     background-color: #f0f0f0;
 }
 
+.yoho-footer {
+    margin-bottom: 20px;
+}
+
+.copyright {
+    display: none !important;
+}
+
+.back-to-top {
+    display: none !important;
+}
+
 select {
     -moz-appearance: none;
     -webkit-appearance: none;
@@ -196,42 +208,60 @@ input::-webkit-calendar-picker-indicator {
             left: 0;
             color: #fff;
             width: 100%;
-            padding-top: 70px;
+            padding-top: 55px;
             line-height: 60px;
 
             .left {
-                width: 50%;
-                float: left;
+                .vip {
+                    float: left;
+                    margin-top: 14px;
+                }
 
                 .user {
                     font-size: 38px;
+                    line-height: 60px;
+                    height: 60px;
                 }
 
                 .tel {
                     font-size: 24px;
                 }
-            }
-
-            .right {
-                width: 50%;
-                float: right;
-                text-align: right;
 
                 .ewm {
-                    width: 35px;
-                    height: 35px;
+                    margin-left: 30px;
+                    width: 44px;
+                    height: 44px;
                     background-image: url("/activity/store-home/ewm.png");
-                    display: inline-block;
-                    vertical-align: middle;
+                    float: left;
+                    margin-top: 7px;
                 }
 
-                .id {
-                    font-size: 24px;
+                .family {
+                    width: 140px;
+                    height: 140px;
+                    display: block;
+                    position: absolute;
+                    right: 0;
+                    top: 0;
+                    background-image: resolve("activity/store-home/family.png");
+                    background-size: 100% 100%;
                 }
             }
 
             .name {
                 margin-right: 10px;
+                height: 60px;
+                max-width: 350px;
+                float: left;
+            }
+
+            .tel-icon {
+                width: 22px;
+                height: 28px;
+                background-image: url("/activity/store-home/phone.png");
+                float: left;
+                margin-right: 10px;
+                margin-top: 15px;
             }
         }
     }
@@ -239,7 +269,7 @@ input::-webkit-calendar-picker-indicator {
     .user-info {
         width: 690px;
         background-color: #fff;
-        margin: -130px auto 0;
+        margin: -130px auto 30px;
         position: relative;
         padding-top: 40px;
 
@@ -289,18 +319,58 @@ input::-webkit-calendar-picker-indicator {
 
         .process-c {
             position: relative;
-            padding-top: 30px;
+            padding-top: 80px;
             clear: both;
 
             .process-line {
                 width: 578px;
-                height: 2px;
+                height: 2PX;
                 background-color: #e0e0e0;
                 margin: 0 auto;
 
-                div {
+                .line {
                     background-color: #000;
                     height: 100%;
+                    width: 0;
+                }
+
+                .growth-line {
+                    width: 100%;
+                    height: 0;
+                    position: relative;
+                }
+            }
+
+            .growth-c {
+                position: absolute;
+                bottom: 15px;
+                left: 0;
+                height: 49px;
+
+                .growth {
+                    padding: 8px 0;
+                    background-color: #eaeaea;
+                    color: #000;
+                    font-size: 18px;
+                    border-radius: 10px;
+                    white-space: nowrap;
+                    height: 41px;
+                    line-height: 25px;
+                    position: absolute;
+                    top: 0;
+                }
+
+                .arr {
+                    width: 16px;
+                    height: 16px;
+                    background-color: #eaeaea;
+                    margin: -8px auto 0;
+                    transform: rotate(45deg);
+                    border-radius: 100% 0 0;
+                    position: absolute;
+                    bottom: 0;
+                    left: 50%;
+                    margin-left: -8px;
                 }
             }
 
@@ -373,6 +443,72 @@ input::-webkit-calendar-picker-indicator {
         }
     }
 
+    .right-c {
+        height: 166px;
+        width: 750px;
+        overflow: hidden;
+        background-color: #fff;
+        margin-top: -20px;
+        border-top: solid 1px #e0e0e0;
+        margin-bottom: 30px;
+
+        ul {
+            padding: 23px 30px 23px 0;
+            font-size: 0;
+            line-height: 0;
+            white-space: nowrap;
+            overflow-y: hidden;
+            overflow-x: scroll;
+
+            li {
+                display: inline-block;
+                width: 180px;
+                height: 120px;
+                background-color: #f3f3f3;
+                border-radius: 5px;
+                margin-left: 30px;
+                padding: 15px 0 5px;
+                vertical-align: middle;
+            }
+
+            .pic {
+                width: 50px;
+                height: 50px;
+                margin: 0 auto;
+            }
+
+            p {
+                height: 50px;
+                font-size: 24px;
+                color: #444;
+                width: 180px;
+                overflow: hidden;
+                line-height: 50px;
+                text-align: center;
+            }
+
+            .right-1 {
+                background-image: url("/activity/store-home/right-1.png");
+            }
+
+            .right-2 {
+                background-image: url("/activity/store-home/right-2.png");
+            }
+
+            .right-3 {
+                background-image: url("/activity/store-home/right-3.png");
+            }
+
+            .right-4 {
+                background-image: url("/activity/store-home/right-4.png");
+            }
+
+            .right-5 {
+                background-image: url("/activity/store-home/right-5.png");
+            }
+        }
+    }
+
     .his-ul {
         padding: 0 25px;
         background-color: #fff;
@@ -549,4 +685,30 @@ input::-webkit-calendar-picker-indicator {
             }
         }
     }
+
+    .no-result {
+        .pic {
+            background-size: 100% 100%;
+            margin: 350px auto 0;
+        }
+
+        .coupon {
+            background-image: resolve("activity/store-home/no-coupon.png");
+            width: 215px;
+            height: 124px;
+        }
+
+        .history {
+            background-image: resolve("activity/store-home/no-history.png");
+            width: 213px;
+            height: 201px;
+        }
+
+        p {
+            font-size: 28px;
+            color: #444;
+            text-align: center;
+            line-height: 110px;
+        }
+    }
 }

@@ -8,11 +8,11 @@
                     <input type="hidden" name="id" value="">
                     <label class="username">
                         收 货 人 :
-                        <input type="text" name="consignee" maxlength="21" v-model="editAddressInfo.consignee" v-bind:value="editAddressInfo.consignee">
+                        <input type="text" name="consignee" maxlength="21" v-model="editAddressInfo.consignee">
                     </label>
                     <label class="mobile">
                         联系电话:
-                        <input type="text" name="mobile" v-model="editAddressInfo.mobile" v-bind:value="editAddressInfo.mobile">
+                        <input type="text" name="mobile" v-model="editAddressInfo.mobile">
                     </label>
                     <label class="area" @click="showAct">
                         所在地区:
@@ -22,7 +22,7 @@
                     </label>
                     <label class="address">
                         详细地址:
-                        <textarea name="address" maxlength="255" v-model="editAddressInfo.address">{{editAddressInfo.address}}</textarea>
+                        <textarea name="address" maxlength="255" v-model="editAddressInfo.address"></textarea>
                     </label>
                 </form>
 
@@ -32,7 +32,7 @@
         </div>
         <div v-else class="address-list-wrap">
             <div class="address-list">
-                <div class="address-item" v-for="addr in addressList" @click="choseAddress(addr)">
+                <div class="address-item" v-for="(addr, index) in addressList" @click="choseAddress(addr)" :key="index">
                     <span class="name">{{addr.consignee}}</span>
                     <span class="tel">{{addr.mobile}}</span>
                     <p class="address-info">{{addr.area}} {{addr.address}}</p>