Merge branch 'master' into hotfix/couponselect

@@ -13,7 +13,8 @@ exports.index = (req, res) => {
         page: 'birthday',
         page: 'birthday',
         title: '生日券',
         title: '生日券',
         width750: true,
         width750: true,
-        localCss: true
+        localCss: true,
+        isApp: req.yoho.isApp
     };
     };
 
 
     res.render('birthday', responseData);
     res.render('birthday', responseData);

@@ -54,7 +54,7 @@ module.exports = {
             yh_channel: params.yh_channel,
             yh_channel: params.yh_channel,
             limit: params.limit || 60,
             limit: params.limit || 60,
             need_filter: 'null',
             need_filter: 'null',
-            rec_pos: '100004',
+            rec_pos: '100053',
             gender: params.gender || gender[params.yh_channel]
             gender: params.gender || gender[params.yh_channel]
         }, {
         }, {
             cache: true
             cache: true

@@ -11,7 +11,7 @@
         </div>
         </div>
         <div class="rule-item">
         <div class="rule-item">
             <div>领取资格:</div>
             <div>领取资格:</div>
-            <div>您在领取时，必须是有货VIP银卡、金卡、白金卡用户，<a href="//m.yohobuy.com/home/grade">(了解您当前的VIP级别)</a>，且在个人信息中已完善生日信息<a href="//m.yohobuy.com/home/mydetails">(查看/完善个人信息)</a>。</div>
+            <div>您在领取时，必须是有货VIP银卡、金卡、白金卡用户，<a href='//m.yohobuy.com/home/grade?openby:yohobuy={"action":"go.vipInfo"}'>(了解您当前的VIP级别)</a>，且在个人信息中已完善生日信息{{#unless @root.isApp}}<a href="//m.yohobuy.com/home/mydetails">(查看/完善个人信息)</a>{{/unless}}。</div>
         </div>
         </div>
     </div>
     </div>
     <p class="foot-tip">温馨提示:同一用户一年内(365天)仅可以领取一次生日特惠哦!</p>
     <p class="foot-tip">温馨提示:同一用户一年内(365天)仅可以领取一次生日特惠哦!</p>

@@ -8,8 +8,9 @@ exports.familyIndex = (req, res, next) => {
     let contentCodeOne = '486e6adc7c83001b2e9e83996438fab8';
     let contentCodeOne = '486e6adc7c83001b2e9e83996438fab8';
     let contentCodeTwo = 'eebbcc60607ac443922d8fabe44eb222';
     let contentCodeTwo = 'eebbcc60607ac443922d8fabe44eb222';
     let isMarsApp = req.yoho.isMarsApp;
     let isMarsApp = req.yoho.isMarsApp;
+    let protocol = req.protocol;
 
 
-    req.ctx(family).familyIndex(uid, contentCodeOne, contentCodeTwo, isMarsApp).then(result => {
+    req.ctx(family).familyIndex(uid, contentCodeOne, contentCodeTwo, isMarsApp, protocol).then(result => {
         res.render('family/index', {
         res.render('family/index', {
             page: 'family',
             page: 'family',
             title: 'YOHO!Family',
             title: 'YOHO!Family',

@@ -433,7 +433,7 @@ class familyModel extends global.yoho.BaseModel {
     /**
     /**
     * family主页
     * family主页
     */
     */
-    familyIndex(uid, contentCodeOne, contentCodeTwo, isMarsApp) {
+    familyIndex(uid, contentCodeOne, contentCodeTwo, isMarsApp, protocol) {
         return Promise.all([
         return Promise.all([
             this._userData(uid),
             this._userData(uid),
             this._getCode(uid),
             this._getCode(uid),
@@ -445,6 +445,11 @@ class familyModel extends global.yoho.BaseModel {
             let familyIndexData = {};
             let familyIndexData = {};
 
 
             if (result[0] && result[0].data) {
             if (result[0] && result[0].data) {
+
+                if (result[0].data.headIco) {
+                    result[0].data.headIco = result[0].data.headIco.replace('img01.yohomars.com', 'imgmars.yohobuy.com').replace('img02.yohomars.com', 'imgmars.yohobuy.com'); // eslint-disable-line
+                }
+
                 familyIndexData = _.assign(familyIndexData, {
                 familyIndexData = _.assign(familyIndexData, {
                     head_ico: result[0].data.headIco,
                     head_ico: result[0].data.headIco,
                     nickname: result[0].data.nickName,
                     nickname: result[0].data.nickName,
@@ -472,9 +477,9 @@ class familyModel extends global.yoho.BaseModel {
             }
             }
 
 
             if (isMarsApp) {
             if (isMarsApp) {
-                familyIndexData.userInfoLink = 'http://m.yohobuy.com/home/family/userInfo?openby:mars={"action":"go.h5","params":{"url":"http://m.yohobuy.com/home/family/userInfo"}}';
+                familyIndexData.userInfoLink = `${protocol}://m.yohobuy.com/home/family/userInfo?openby:mars={"action":"go.h5","params":{"url":"${protocol}://m.yohobuy.com/home/family/userInfo"}}`;
             } else {
             } else {
-                familyIndexData.userInfoLink = 'http://m.yohobuy.com/home/family/userInfo?openby:yohobuy={"action":"go.h5","params":{"url":"http://m.yohobuy.com/home/family/userInfo"}}';
+                familyIndexData.userInfoLink = `${protocol}://m.yohobuy.com/home/family/userInfo?openby:yohobuy={"action":"go.h5","params":{"url":"${protocol}://m.yohobuy.com/home/family/userInfo"}}`;
             }
             }
 
 
             return familyIndexData;
             return familyIndexData;
@@ -545,6 +550,9 @@ class familyModel extends global.yoho.BaseModel {
                 let vip = 0; // 从family进入二维码，暂时显示0
                 let vip = 0; // 从family进入二维码，暂时显示0
                 let hideTips = true;
                 let hideTips = true;
 
 
+                if (result[0].data.headIco) {
+                    result[0].data.headIco = result[0].data.headIco.replace('img01.yohomars.com', 'imgmars.yohobuy.com').replace('img02.yohomars.com', 'imgmars.yohobuy.com'); // eslint-disable-line
+                }
 
 
                 result[0].data.gender = (thisGender === '1' ? 'BOY' : 'GIRL');
                 result[0].data.gender = (thisGender === '1' ? 'BOY' : 'GIRL');
                 result[0].data.otherGender = (thisGender === '1' ? 'GIRL' : 'BOY');
                 result[0].data.otherGender = (thisGender === '1' ? 'GIRL' : 'BOY');

@@ -27,7 +27,7 @@
             </a>
             </a>
             <a class="iconfont qrcode" href="/home/newQrcode">&#xe73a;</a>
             <a class="iconfont qrcode" href="/home/newQrcode">&#xe73a;</a>
             <div class="gif-part hide"></div>
             <div class="gif-part hide"></div>
-            <!-- <a class="family-entry" href="//m.yohobuy.com/home/family"></a> -->
+            <a class="family-entry" href="//m.yohobuy.com/home/family">
             {{/ baseInfo}}
             {{/ baseInfo}}
         {{else}}
         {{else}}
             <a class="login-btn" href="{{signinUrl}}" data-refer="{{referUrl}}">
             <a class="login-btn" href="{{signinUrl}}" data-refer="{{referUrl}}">

@@ -26,7 +26,7 @@ const domains = {
 
 
 module.exports = {
 module.exports = {
     app: 'h5',
     app: 'h5',
-    appVersion: '6.3.0', // 调用api的版本
+    appVersion: '6.2.3', // 调用api的版本
     port: 6001,
     port: 6001,
     siteUrl: '//m.yohobuy.com',
     siteUrl: '//m.yohobuy.com',
     assetUrl: '//127.0.0.1:5001',
     assetUrl: '//127.0.0.1:5001',

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

@@ -4,7 +4,7 @@ require('3party/question-list.page.css');
 let $ = require('yoho-jquery'),
 let $ = require('yoho-jquery'),
     yoho = require('yoho-app');
     yoho = require('yoho-app');
 
 
-const DETAIL_URI = 'http://m.yohobuy.com/3party/questionnaire';
+const DETAIL_URI = location.protocol + '//m.yohobuy.com/3party/questionnaire';
 
 
 require('../common');
 require('../common');
 
 
@@ -115,7 +115,7 @@ $list.on('click', 'li', function() {
             if (canShare && yoho && yoho.isApp) {
             if (canShare && yoho && yoho.isApp) {
                 yoho.invokeMethod('go.showShareAlert', {
                 yoho.invokeMethod('go.showShareAlert', {
                     title: data.title,
                     title: data.title,
-                    link: 'https://m.yohobuy.com/3party/questionnaire/' + data.id,
+                    link: DETAIL_URI + '/' + data.id,
                     desc: data.desc,
                     desc: data.desc,
                     imgUrl: data.img
                     imgUrl: data.img
                 });
                 });