Merge branch 'feature/3partyBind' into release/5.3

@@ -12,7 +12,6 @@ const _ = require('lodash');
 const userApi = require('./user-api');
 const helpers = global.yoho.helpers;
 
-const searchApi = global.yoho.SearchAPI;
 const Images = require('../../../utils/images');
 
 const configData = {
@@ -330,8 +329,8 @@ const getUserInfo = (uid) => {
 
             finalResult.userPersonalInfo = {
                 subTitle: '会员信息',
-                certified: parseInt(userInfo.is_student, 10) === 1,
-                tipsUrl: parseInt(userInfo.is_students, 10) === 1 ?
+                certified: parseInt(userInfo.vip_info.is_student, 10) === 1,
+                tipsUrl: parseInt(userInfo.vip_info.is_student, 10) === 1 ?
                     helpers.urlFormat('/list') : helpers.urlFormat('/product/students'),
                 firstBox: true,
                 submitId: 'base-info',
@@ -521,7 +520,6 @@ const getUserInfo = (uid) => {
                 ]
             };
         }
-
         if (result[4].code === 200 && result[5].code === 200) {
             let likeBrandStr = result[4].data.brand || '',
                 brandList = result[5].data,
@@ -672,7 +670,6 @@ const editUserHabitsInfo = (req, uid) => {
 
             return respData;
         }
-
         respData = yield userApi.editUserHabitsInfo(habitsInfo);
 
         return respData;
@@ -705,7 +702,8 @@ const editUserLikeBrand = (req, uid) => {
 const isBrandName = (req) => {
 
     return co(function*() {
-        let result = yield searchApi.get('/brand/list.json', {}, {cache: true});
+        let result = yield userApi.getFavorBrand();
+
 
         let brandList = result.data,
             brandName = _.trim(req.body.brandName),

@@ -14,7 +14,7 @@
                         <b class="no-binding">未绑定</b>
                     {{/if}}
                 </p>
-                <a href="javascript:void(0);" >收起</a>
+                <a href="javascript:void(0);" data-binding="{{#if wechatBind}}1{{else}}0{{/if}}" >收起</a>
             </div>
             <div class="account-item-body">
                 <div class="account-body-left">
@@ -47,7 +47,7 @@
                         <b class="no-binding">未绑定</b>
                     {{/if}}
                 </p>
-                <a href="javascript:void(0);" >收起</a>
+                <a href="javascript:void(0);" data-binding="{{#if qqBind}}1{{else}}0{{/if}}">收起</a>
             </div>
             <div class="account-item-body">
                 <div class="account-body-left">
@@ -80,7 +80,7 @@
                         <b class="no-binding">未绑定</b>
                     {{/if}}
                 </p>
-                <a href="javascript:void(0);" >收起</a>
+                <a href="javascript:void(0);" data-binding="{{#if sinaBind}}1{{else}}0{{/if}}" >收起</a>
             </div>
             <div class="account-item-body">
                 <div class="account-body-left">
@@ -113,7 +113,7 @@
                         <b class="no-binding">未绑定</b>
                     {{/if}}
                 </p>
-                <a href="javascript:void(0);" >收起</a>
+                <a href="javascript:void(0);" data-binding="{{#if alipayBind}}1{{else}}0{{/if}}">收起</a>
             </div>
             <div class="account-item-body">
                 <div class="account-body-left">
@@ -146,7 +146,7 @@
                         <b class="no-binding">未绑定</b>
                     {{/if}}
                 </p>
-                <a href="javascript:void(0);" >收起</a>
+                <a href="javascript:void(0);" data-binding="{{#if doubanBind}}1{{else}}0{{/if}}">收起</a>
             </div>
             <div class="account-item-body">
                 <div class="account-body-left">
@@ -179,7 +179,7 @@
                         <b class="no-binding">未绑定</b>
                     {{/if}}
                 </p>
-                <a href="javascript:void(0);" >收起</a>
+                <a href="javascript:void(0);" data-binding="{{#if renrenBind}}1{{else}}0{{/if}}">收起</a>
             </div>
             <div class="account-item-body">
                 <div class="account-body-left">

@@ -15,6 +15,27 @@ const simpleHeaderModel = require('../../../doraemon/models/simple-header');
 const config = global.yoho.config;
 
 const cert = {
+    headerTip: (req, res, next) => {
+
+        let uid = req.user.uid,
+            dest = {
+                code: 200,
+                data: 'N'
+            };
+
+        if (!uid) {
+            res.type('text/javascript');
+            return res.send(req.query.callback + '(' + JSON.stringify(dest) + ')');
+        }
+
+        certService.checkEmailCertTip(uid)
+            .then(ret => {
+                dest.data = _.get(ret, 'data.isBindedOrRelated') === 'N' ? 'Y' : 'N';
+                res.type('text/javascript');
+                res.send(req.query.callback + '(' + JSON.stringify(dest) + ')');
+            })
+            .catch(next);
+    },
     tip: (req, res) => {
         let refer = req.query.refer;
 
@@ -28,7 +49,7 @@ const cert = {
     },
     index: (req, res) => {
 
-        let refer = req.query.refer;
+        let refer = req.query.refer || `${config.siteUrl}`;
 
         res.render('cert/index', {
             region: passportHelper.getCountry(),

@@ -76,9 +76,20 @@ const relateMobile = (uid, email, code, mobile, area) => {
     });
 };*/
 
+const checkEmailCertTip = (uid) => {
+
+    let param = {
+        method: 'app.passport.checkIsBindedOrRelated',
+        uid: uid
+    };
+
+    return api.get('', param);
+};
+
 module.exports = {
     certCheck,
     sendCertMsg,
     certMobile,
-    relateMobile
+    relateMobile,
+    checkEmailCertTip
 };

@@ -77,6 +77,7 @@ router.post('/passport/autouserinfo/bindMobile', bind.bindMobile);
 router.post('/passport/autouserinfo/relateMobile', bind.relateMobile);
 
 // 未实名认证的老邮箱用户登录
+router.get('/passport/cert/headerTip', cert.headerTip);         /** 邮箱老用户头部提示 **/
 router.get('/passport/cert/tip', auth, cert.tip);         /** 提示是否完善资料页面 **/
 router.get('/passport/cert/index', auth, cert.index);     /** 输入手机号码页面 **/
 router.post('/passport/cert/cert', auth, cert.cert);      /** 认证页面 **/

@@ -50,7 +50,8 @@
             <a target="_blank" href="{{serviceUrl}}" class="protoctol">YOHO!BUY 有货服务条款</a>
         </span>
     </div>
-    <div class="btnwrapper">
-        <a href="javascript:void(0)" class="yohobindbtn" id="bindfirststep">下一步</a>
+    <div class="btnwrapper clearfix">
+        <a href="javascript:void(0)" class="yohobindbtn left" id="bindfirststep">下一步</a>
+        <a class="jump-btn" href="{{refer}}" style="margin-top:15px;">跳过</a>
     </div>
 </div>

@@ -17,7 +17,6 @@ module.exports = {
     cookieDomain: '.yohobuy.com',
     domains: {
         favApi: 'http://192.168.102.31:8092/brower',
-
         api: 'http://api-test3.yohops.com:9999/',
         service: 'http://service-test3.yohops.com:9999/',
 
@@ -27,10 +26,7 @@ module.exports = {
          // api: 'http://dev-api.yohops.com:9999/',
         // service: 'http://dev-service.yohops.com:9999/',
 
-        search: 'http://192.168.102.216:8080/yohosearch/',
-        imSocket: 'ws://socket.yohobuy.com:10240',
-        imCs: 'http://im.yohobuy.com/api',
-        imServer: 'http://im.yohobuy.com/server'
+        search: 'http://192.168.102.216:8080/yohosearch/'
     },
     subDomains: {
         host: '.yohobuy.com',
@@ -119,10 +115,7 @@ if (isProduction) {
         domains: {
             api: 'http://api.yoho.yohoops.org/',
             service: 'http://service.yoho.yohoops.org/',
-            search: 'http://search.yohoops.org/yohosearch/',
-            imSocket: 'ws://imsocket.yohobuy.com:10000',
-            imCs: 'https://imhttp.yohobuy.com/api',
-            imServer: 'https://imhttp.yohobuy.com/server'
+            search: 'http://search.yohoops.org/yohosearch/'
         },
         memcache: {
             master: ['memcache1.yohoops.org:12111', 'memcache2.yohoops.org:12111', 'memcache3.yohoops.org:12111'],
@@ -140,7 +133,7 @@ if (isProduction) {
             open: false,
             url: 'http://123.206.2.55/strategy'
         },
-        zookeeperServer: 'web.zookeeper.yohoops.org:2181'
+        zookeeperServer: 'zookeeper.web.yohoops.org:2181'
     });
 } else if (isTest) {
     Object.assign(module.exports, {
@@ -149,10 +142,7 @@ if (isProduction) {
             favApi: 'http://192.168.102.31:8092/brower',
             api: process.env.TEST_API || 'http://testapi.yoho.cn:28078/',
             service: process.env.TEST_SERVICE || 'http://testservice.yoho.cn:28077/',
-            search: process.env.TEST_SEARCH || 'http://192.168.102.216:8080/yohosearch/',
-            imSocket: 'ws://socket.yohobuy.com:10240',
-            imCs: 'http://im.yohobuy.com/api',
-            imServer: 'http://im.yohobuy.com/server'
+            search: process.env.TEST_SEARCH || 'http://192.168.102.216:8080/yohosearch/'
         },
         useOneapm: true,
         useCache: true,

@@ -15,6 +15,7 @@
                         </ul>
                     {{/if}}
                 </div>
+                <div class="left yoho-cert-tip"></div>
                 <div class="yoho-buy-tools right">
                     <ul>
                         <li id="loginBox">

@@ -2,7 +2,7 @@
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
 <svg xmlns="http://www.w3.org/2000/svg">
 <metadata>
-Created by FontForge 20120731 at Fri Nov  4 18:16:33 2016
+Created by FontForge 20120731 at Thu Dec 15 10:53:04 2016
  By admin
 </metadata>
 <defs>
@@ -19,7 +19,7 @@ Created by FontForge 20120731 at Fri Nov  4 18:16:33 2016
     bbox="-0.75 -212 1160 996"
     underline-thickness="0"
     underline-position="0"
-    unicode-range="U+0078-E671"
+    unicode-range="U+0078-E701"
   />
 <missing-glyph 
  />
@@ -41,6 +41,9 @@ d="M744 598h-488q-38 0 -64.5 -26.5t-26.5 -64.5v-290q0 -38 26.5 -64.5t64.5 -26.5h
 d="M751 766q21 -20 34 -33t19.5 -22.5t8.5 -16t2 -10.5v-13h-119q-8 0 -14 6t-10 14t-6 16.5t-2 12.5v100h3q6 0 13 -2t15.5 -8t22 -16t33.5 -28v0zM614 720q0 -16 5 -33.5t15 -32t26 -24t38 -9.5h117v-451q0 -24 -9.5 -42t-24.5 -31t-33.5 -20t-35.5 -7h-394q-15 0 -33 8.5
 t-33.5 23t-26 33t-10.5 38.5v543q0 17 7.5 35t21 33.5t30 25.5t35.5 10h305v-100v0zM664 221q21 0 35.5 14.5t14.5 35.5t-14.5 35.5t-35.5 14.5h-299q-21 0 -35.5 -14.5t-14.5 -35.5t14.5 -35.5t35.5 -14.5h299v0zM714 470q0 21 -14.5 36t-35.5 15h-299q-21 0 -35.5 -15
 t-14.5 -36t14.5 -35t35.5 -14h299q21 0 35.5 14t14.5 35v0zM714 470z" />
+    <glyph glyph-name="gou" unicode="&#xe63e;" horiz-adv-x="1000" 
+d="M901 754h-772q-21 0 -36 -15t-15 -37v-771q0 -22 15 -37t36 -15h772q21 0 36 15t15 37v771q0 22 -15 37t-36 15zM772 513l-278 -453q-15 -25 -44 -27h-3q-28 0 -44 23l-143 191q-13 18 -10 41t21.5 37.5t41 11t36.5 -21.5l94 -126l235 384q12 20 34.5 25t42 -7t24.5 -35
+t-7 -43z" />
     <glyph glyph-name="zuosanjiao" unicode="&#xe618;" horiz-adv-x="1000" 
 d="M662 662v-499l-299 250zM662 662z" />
     <glyph glyph-name="yousanjiao" unicode="&#xe619;" 
@@ -51,6 +54,11 @@ d="M286 509l-46 -45l272 -272l272 272l-46 45l-226 -226z" />
 d="M387 158l45 -46l272 272l-272 272l-45 -46l226 -226z" />
     <glyph glyph-name="duihao" unicode="&#xe605;" 
 d="M903 577l-68 69l-388 -388l-231 230l-68 -68l299 -298l65 65v0z" />
+    <glyph glyph-name="tongzhi" unicode="&#xe63f;" 
+d="M693 502q-5 13 -18 19q-11 6 -22 4q-15 -2 -23.5 -14t-6.5 -27q3 -16 17 -25q55 -58 55 -137q0 -88 -64 -148q-12 -10 -12 -26q0 -14 10 -24t24 -10q15 0 25 10q10 6 15 18q69 77 69 180t-69 180v0zM813 628q-10 19 -31 19q-15 0 -25.5 -10t-10.5 -25q0 -20 17 -30
+q97 -101 97 -240q0 -77 -31.5 -145t-87.5 -117v0q-19 -9 -19 -31q0 -14 10 -24t24 -10q18 0 28 14q1 0 1 1v0q67 58 104.5 139t37.5 173q0 81 -30 155t-84 131v0zM443 687l-173 -177h-106q-67 0 -67 -67v-225q0 -32 17 -49.5t50 -17.5h106l173 -177q24 -23 53.5 -25
+t50.5 18.5t21 57.5v611q0 37 -21 57.5t-50.5 18.5t-53.5 -25v0zM501 60q0 -13 -2.5 -20t-5.5 -8.5t-9 2.5t-10 7.5t-12 11.5l-7 7q-51 50 -152 158h-94q-26 0 -35.5 10t-9.5 35v135q0 25 10 35t35 10h95q101 109 151 158q3 2 7 7l12 12t10 7.5t9 1.5t5.5 -9t2.5 -21v-539v0z
+M501 60z" />
     <glyph glyph-name="gouwuche" unicode="&#xe61b;" 
 d="M482.5 167q-24.5 0 -42 -17.5t-17.5 -42.5t17.5 -42.5t42 -17.5t42 17.5t17.5 42.5t-17.5 42.5t-42 17.5zM769 167q-25 0 -42.5 -17.5t-17.5 -42.5t17.5 -42.5t42.5 -17.5t42.5 17.5t17.5 42.5t-17.5 42.5t-42.5 17.5zM839 277h-417l-143 425q-7 18 -29 18h-127
 q-13 0 -22 -8t-9 -20.5t9 -20.5t22 -8h105l143 -424q7 -19 29 -19h439q13 0 21.5 8t8.5 20.5t-8.5 20.5t-21.5 8zM904 608l-516 45q-12 1 -18.5 -7t-1.5 -20l90 -270q4 -12 16 -21.5t24 -9.5h377q12 0 22 10t11 23l23 216q2 12 -6 22t-21 12z" />
@@ -93,6 +101,8 @@ d="M510.5 -60q-90.5 0 -173 35.5t-142.5 95.5t-95.5 142.5t-35.5 173t35.5 173t95.5
 t54 -201t146 -146t200.5 -53.5t201 53.5t146 146t53.5 201t-53.5 201t-146 146t-201 53.5zM465 248v29q0 19 3 33q3 15 9 28q5 14 15 26t24 26l35 33q15 13 25.5 29.5t10.5 39.5q0 30 -19 50.5t-54 20.5q-18 0 -32 -6.5t-24.5 -17.5t-16.5 -26q-5 -15 -6 -30l-95 8
 q5 37 20 66t39 49t55 31q31 10 66 10q33 0 63 -9.5t53 -28.5t36 -46.5t13 -64.5q0 -25 -5.5 -43t-15.5 -34t-24 -30q-15 -15 -32 -30q-16 -13 -25.5 -23t-15.5 -20t-8 -21.5t-2 -28.5v-20h-92zM450 140q0 25 18 43t44 18q24 0 43 -17t19 -42t-18.5 -42.5t-43.5 -17.5
 q-12 0 -23.5 4.5t-20.5 12.5q-8 7 -13 18t-5 23z" />
+    <glyph glyph-name="add" unicode="&#xe644;" 
+d="M960 262h-410v-410h-76v410h-410v76h410v410h76v-410h410v-76z" />
     <glyph glyph-name="xiangxia" unicode="&#xe61d;" 
 d="M888 620q12 12 28.5 12t28.5 -12v0q12 -12 12 -28.5t-12 -28.5l-406 -405q-12 -12 -28.5 -12t-27.5 12v0q-12 11 -12 27.5t12 28.5zM539 214q11 -12 11 -28.5t-11 -27.5v0q-12 -12 -28.5 -12t-28.5 12l-406 405q-11 12 -11 28.5t11 28.5v0q12 12 28.5 12t28.5 -12z
 M539 214z" />
@@ -128,6 +138,12 @@ t-95.5 -142.5t-35.5 -173.5t35.5 -173.5t95.5 -142.5t142.5 -95t173 -35t173.5 35t14
 l-179 180l-38 -37l180 -180v0z" />
     <glyph glyph-name="circle" unicode="&#xe606;" 
 d="M512 599q47 0 88 -18t72 -49t49 -72t18 -89q0 -46 -18 -87t-49 -72t-72 -49t-88 -18t-88 18t-72 49t-49 72t-18 87q0 48 18 89t49 72t72 49t88 18v0v0zM512 599z" />
+    <glyph glyph-name="q" unicode="&#xe695;" 
+d="M512 508q-58 0 -96 -37q-47 -48 -47 -147q0 -84 40 -134t106 -50q32 0 55 13q-10 9 -24.5 23.5t-23.5 21.5l51 47q6 -6 21 -21.5t27 -29.5q38 47 38 133q0 96 -48 144q-48 37 -99 37zM512 812q-212 0 -362 -150t-150 -362t150 -362t362 -150t362 150t150 362t-150 362
+t-362 150zM693 123q14 -14 41 -35l-51 -51q-14 17 -58 62q-46 -28 -113 -28q-99 0 -160 62q-69 73 -69 191q0 115 64 185.5t168.5 70.5t166.5 -68.5t62 -184.5q0 -61 -20 -112q-15 -39 -48 -72z" />
+    <glyph glyph-name="a" unicode="&#xe696;" 
+d="M502 498q-10 -27 -10 -34l-65 -181h153l-65 181q-6 13 -13 34zM512 812q-212 0 -362 -150t-150 -362t150 -362t362 -150t362 150t150 362t-150 362t-362 150zM645 78q-6 38 -17 65l-24 68h-198l-24 -68q-14 -43 -17 -65h-102q6 10 17.5 35.5t16.5 36.5l136 355q4 11 9 25
+t7.5 22t4.5 14h106q4 -16 20 -61l137 -355q25 -62 31 -72h-103z" />
     <glyph glyph-name="eye" unicode="&#xe627;" horiz-adv-x="1025" 
 d="M512 719q-167 0 -304.5 -89.5t-205.5 -236.5q-4 -9 0 -18q68 -147 205.5 -236.5t304.5 -89.5t304.5 89.5t205.5 236.5q4 9 0 18q-68 147 -205.5 236.5t-304.5 89.5zM512 153q-96 0 -163.5 67.5t-67.5 163.5t67.5 163.5t163.5 67.5t163.5 -67.5t67.5 -163.5t-67.5 -163.5
 t-163.5 -67.5zM512 384zM364 384q0 61 43.5 104.5t104.5 43.5t104.5 -43.5t43.5 -104.5t-43.5 -104.5t-104.5 -43.5t-104.5 43.5t-43.5 104.5z" />
@@ -164,6 +180,10 @@ d="M512 63l-316 -166l60 352l-256 250l354 51l158 321l158 -321l354 -51l-256 -250l6
     <glyph glyph-name="7xiaoche" unicode="&#xe636;" horiz-adv-x="1163" 
 d="M295 196q67 0 114 -47t47 -113.5t-47 -114t-114 -47.5t-114 47.5t-47 114t47 113.5t114 47zM917.5 196q66.5 0 113.5 -47t47 -113.5t-47 -114t-113.5 -47.5t-114 47.5t-47.5 114t47.5 113.5t114 47zM400 894v-99h-210v0v0l-187 -294v-372h95q27 56 80 90.5t117 34.5
 t117 -34.5t80 -90.5h228q27 56 80 90.5t117.5 34.5t117.5 -34.5t79 -90.5h46v765h-760v0zM400 452h-283l159 250l124 1v-251v0v0zM893 701l-131 -276l-63 31l101 206h-105v68h198v-29v0v0z" />
+    <glyph glyph-name="qq" unicode="&#xe66d;" 
+d="M523 881q-101 0 -192.5 -39.5t-158 -105.5t-105.5 -158t-39 -192.5t39 -192.5t105.5 -158.5t158 -105.5t192.5 -39t192.5 39t158 105.5t105.5 158.5t39 192.5t-39 192.5t-105.5 158t-158 105.5t-192.5 39.5v0zM739 224q8 -8 7.5 -18.5t-8.5 -17.5q-11 -10 -15 -14
+q-7 -7 -17 -7v0q-10 0 -18 7l-34 34q-59 -42 -131 -42q-94 0 -160.5 66.5t-66.5 160.5t67 160.5t160.5 66.5t160 -66.5t66.5 -160.5q0 -75 -45 -135l34 -34v0zM592 337q8 7 18 6.5t17 -7.5l27 -27q25 39 25 84q0 64 -45.5 109.5t-110 45.5t-110 -45.5t-45.5 -109.5
+t45.5 -109.5t109.5 -45.5q44 0 80 21l-27 28q-8 7 -7.5 18t7.5 18l16 14v0z" />
     <glyph glyph-name="123123123" unicode="&#xe62a;" 
 d="M799 456l127 127v313h-830v-609l421 -413l409 404v181l-414 -401l-288 284v426h575v-312v0zM671 518l-107 22l-53 100l-52 -100l-108 -22l75 -83l-14 -114l99 49l99 -49l-14 114l75 83v0z" />
     <glyph glyph-name="iconfontroundcheck" unicode="&#xe638;" 
@@ -175,6 +195,11 @@ t-16 -38.5z" />
     <glyph glyph-name="iconshuchushouqifuzhi01" unicode="&#xe63b;" 
 d="M512 630q8 0 14 -6l308 -307q6 -6 6 -14.5t-6 -14.5t-14.5 -6t-14.5 6l-273 272v-504q0 -8 -6 -14t-14 -6t-14 6t-6 14v553q0 14 12 19q4 2 8 2zM860 732h-696q-9 0 -15 -6t-6 -14.5t6 -14.5t15 -6h696q9 0 15 6t6 14.5t-6 14.5t-15 6zM389.5 507q8.5 0 14.5 -6t6 -14.5
 t-6 -14.5l-185 -184q-6 -6 -14.5 -6t-14.5 6t-6 14.5t6 14.5l185 184q6 6 14.5 6z" />
+    <glyph glyph-name="naozhongxuanzhong" unicode="&#xe63d;" horiz-adv-x="1026" 
+d="M586 1q2 -2 2 -3q8 -22 1.5 -41.5t-21.5 -31.5q-1 -1 -1 -1.5t-2 -1.5q-12 -7 -26.5 -11t-28.5 -4q-27 0 -51.5 15t-43 32t-28.5 32t-6 15h205zM437 1h205q4 0 -6 -15t-28.5 -32.5t-43 -32t-51.5 -14.5zM866 105q-17 30 -39 66t-41.5 77.5t-32.5 88.5q-1 2 -1 5v0
+q-2 6 -4 14q-8 38 -8 79q-1 98 -41 157q-21 32 -41.5 49t-51.5 27q5 5 5 23q0 40 -28.5 67.5t-68.5 27.5v0h-7q-40 0 -68 -27.5t-28 -67.5l2 -23q-30 -11 -49.5 -27.5t-40.5 -48.5q-40 -58 -41 -157q0 -51 -13.5 -98t-33 -88.5t-41.5 -77.5t-38 -66q-11 -17 -4.5 -28
+t20.5 -11h677q15 0 21 11t-4 28zM533 691q-1 -1 -1 -2v0h-1v-0.5t-1 -0.5v0l-0.5 -0.5l-0.5 -0.5h-1v-1h-1l-1 -1v0h-1v-1h-1v0q-1 0 -2 -1v0h-1v0l-1 -1v0q-4 -1 -8 -1v0h-2q-13 1 -22 9.5t-9 21.5t9 22t23 9h2h2v0h1v0q4 -1 7 -2l1 -1v0h1l0.5 -0.5l0.5 -0.5l0.5 -0.5
+t1 -0.5h0.5l0.5 -0.5l0.5 -0.5l0.5 -0.5l0.5 -0.5l1 -1v0q1 0 1 -1q10 -9 10 -22t-9 -21z" />
     <glyph glyph-name="zhengchang" unicode="&#xe612;" 
 d="M0 896h1024v-1024h-1024v1024zM85 -43h854v854h-854v-854z" />
     <glyph glyph-name="weibiaoti7" unicode="&#xe613;" 
@@ -193,6 +218,10 @@ t-22 15.5v0zM751 552v83h-473v-83h206v-298h-72v237h-87v-237h-66v-84h506v84h-193v1
     <glyph glyph-name="chahaoyuan" unicode="&#xe629;" 
 d="M511 833q-91 0 -174 -36t-143 -96t-95.5 -143t-35.5 -174t35.5 -174t95.5 -143t143 -95.5t174 -35.5t174 35.5t143 95.5t95.5 143t35.5 174t-35.5 174t-95.5 143t-143 96t-174 36zM770 193q15 -14 15 -34t-14.5 -34t-34 -14t-33.5 14l-192 191l-192 -191q-14 -14 -34 -14
 t-34 14t-14 34t14 34l192 191l-192 192q-14 14 -14 34t14 34t34 14t34 -14l192 -192l192 192q14 14 33.5 14t34 -14t14.5 -34t-15 -34l-191 -192z" />
+    <glyph glyph-name="naozhong" unicode="&#xe701;" 
+d="M611 55h-39q-10 0 -10 -9q0 -21 -14.5 -36t-35.5 -15t-35.5 15t-14.5 36q0 9 -10 9h-40q-9 0 -9 -9q0 -45 32.5 -77t76.5 -32t76.5 32t32.5 77q0 9 -10 9v0zM920 105q0 6 -3 11q-6 48 -31.5 89t-65.5 69v170q0 96 -55 175t-145 113q-3 42 -34.5 70.5t-73.5 28.5
+t-73.5 -28.5t-35.5 -70.5q-89 -34 -144 -113t-55 -175v-170q-40 -28 -65.5 -69t-31.5 -89q-4 -8 -2 -16q-1 -7 -1 -15q0 -9 10 -9h796q10 0 10 9q0 7 -1 15q1 3 1 5v0zM569 686q20 -5 39 -12q69 -29 111 -92.5t42 -137.5v-198q0 -6 5 -9q66 -33 87 -102h-682q21 70 87 102
+q5 3 5 9v198q0 85 54 153.5t137 88.5q8 2 8 9v27q0 21 15 35.5t35 14.5t35 -14.5t15 -35.5v-27q0 -7 7 -9v0zM569 686z" />
     <glyph glyph-name="wenhao1" unicode="&#xe628;" 
 d="M512 886q-102 0 -195 -39.5t-160.5 -107t-107 -160.5t-39.5 -195t39.5 -195t107 -160.5t160.5 -107t195 -39.5t195 39.5t160.5 107t107 160.5t39.5 195t-39.5 195t-107 160.5t-160.5 107t-195 39.5zM521 -15q-34 0 -58.5 24t-24.5 58.5t24.5 58.5t58.5 24t58 -24t24 -58
 q1 -34 -23.5 -58.5t-58.5 -24.5zM738 477q-17 -34 -67 -83q-45 -43 -60 -61q-12 -16 -17 -35q-6 -22 -6 -61l1 -31h-142v30q0 56 9 90q11 38 30 64q17 23 62 71q43 44 52 60q8 13 8 44q0 28 -20 51q-20 21 -61 21q-29 0 -48.5 -9.5t-28.5 -27.5t-12.5 -36t-3.5 -43v-30h-142
@@ -200,5 +229,7 @@ l1 31q2 72 18 111q16 40 52 73q34 31 78 46q41 14 88 14q96 0 160 -56v0q66 -59 66 -
     <glyph glyph-name="2" unicode="&#xe62b;" 
 d="M562 224h109v-111h-109v111zM889 224h109v-111h-109v111zM562 113h109v-110h-109v110zM438 458h-438v438h438v-438zM111 569h216v216h-216v-216zM1000 458h-438v438h438v-438zM673 569h216v216h-216v-216zM438 -106h-438v438h438v-438zM111 5h216v216h-216v-216zM561 335
 h222v-111h-222v111zM889 334h109v-111h-109v111zM780 113h109v-111h-109v111zM562 2h218v-110h-218v110zM889 2h109v-110h-109v110z" />
+    <glyph glyph-name="subtract" unicode="&#xe63c;" 
+d="M928 418h-832q-13 0 -22.5 -9.5t-9.5 -23t9.5 -22.5t22.5 -9h832q13 0 22.5 9t9.5 22.5t-9.5 23t-22.5 9.5z" />
   </font>
 </defs></svg>

@@ -841,5 +841,17 @@ function actionAddKeyWords() {
     });
 }
 
+function emailUserCertTip() {
+
+    return $.getJSON('//www.yohobuy.com/passport/cert/headerTip?callback=?', function(jsonData) {
+        if (jsonData && jsonData.data === 'Y') {
+            $('#yoho-header .yoho-cert-tip').html(
+                '<i class="iconfont left">&#xe63f;</i> ' +
+                '<a href="//www.yohobuy.com/passport/cert/index">您的账号安全等级较低，建议您立即绑定手机号</a>');
+        }
+    });
+}
+
 actionCover();
 actionAddKeyWords();
+setTimeout(emailUserCertTip, 0);

@@ -106,13 +106,20 @@ $('#Y_bindAccount').on('click', '.account-item .account-item-title', function()
 
     var $t = $(this);
     var $b = $t.closest('.account-item').find('.account-item-body');
+    var $a = $t.find('a');
 
+    $a.removeClass('del-binding');
     $b.toggle();
 
     if ($b.is(':visible')) {
-        $t.find('a').html('收起');
+        $a.html('收起');
     } else {
-        $t.find('a').html('展开');
+        if ($a.attr('data-binding') === '1') {
+            $a.html('解绑');
+            $a.addClass('del-binding');
+        } else {
+            $t.find('a').html('绑定');
+        }
     }
 });
 

@@ -307,6 +307,13 @@
             height: 14px;
             margin-top: -2px;
         }
+
+        .yoho-cert-tip {
+            margin-left:20px;
+            .iconfont{
+                margin-right: 2px;
+            }
+        }
     }
 
     .head-wrapper {

@@ -1002,7 +1002,7 @@
                     font-weight: normal;
 
                     &.no-binding{
-                        color:#666;
+                        color:#ea4072;
                     }
                 }
             }
@@ -1011,6 +1011,10 @@
                 float: right;
                 color: #468fa2;
                 font-size: 14px;
+
+                &.del-binding{
+                    color:#bdbdbd;
+                }
             }
         }
 

@@ -68,3 +68,10 @@
         }
     }
 }
+
+.jump-btn{
+    float:left;
+    margin-top: 15px;
+    margin-left: 55px;
+    color: #AAA;
+}