Merge remote-tracking branch 'origin/release/detail' into release/detail

@@ -28,8 +28,7 @@ const getWxOauthUrl = (callback) => {
  * @returns {string}
  * @returns {string}
  */
  */
 const createShareUrl = (shareUid, actId, nums) => {
 const createShareUrl = (shareUid, actId, nums) => {
-//    return 'm.yohobuy.com/activity/invite/share_' + shareUid + '_' + actId + '_' + nums + '.html';
-    return 'm.yohobuy.com/share_' + shareUid + '_' + actId + '_' + nums + '.html';
+    return 'http://m.yohobuy.com/activity/invite/share_' + shareUid + '_' + actId + '_' + nums + '.html';
 };
 };
 
 
 /**
 /**
@@ -54,10 +53,6 @@ const mergeBindLogDate = (data) => {
     let openIds = [];
     let openIds = [];
     let photo = '//static.yohobuy.com/m/v1/activity/newyear/images/108.png';
     let photo = '//static.yohobuy.com/m/v1/activity/newyear/images/108.png';
 
 
-    if (_.isEmpty(data)) {
-        return [];
-    }
-
     // 取5条
     // 取5条
     data = _.slice(data, 0, 5);
     data = _.slice(data, 0, 5);
 
 

@@ -56,7 +56,7 @@
     "uuid": "^2.0.2",
     "uuid": "^2.0.2",
     "winston": "^2.2.0",
     "winston": "^2.2.0",
     "winston-daily-rotate-file": "^1.1.4",
     "winston-daily-rotate-file": "^1.1.4",
-    "yoho-node-lib": "0.0.27"
+    "yoho-node-lib": "0.0.31"
   },
   },
   "devDependencies": {
   "devDependencies": {
     "autoprefixer": "^6.3.7",
     "autoprefixer": "^6.3.7",
@@ -100,7 +100,7 @@
     "yoho-jquery": "^2.2.4",
     "yoho-jquery": "^2.2.4",
     "yoho-jquery-lazyload": "^1.9.7",
     "yoho-jquery-lazyload": "^1.9.7",
     "yoho-mlellipsis": "0.0.3",
     "yoho-mlellipsis": "0.0.3",
-    "yoho-node-lib": "0.0.27",
+    "yoho-node-lib": "0.0.31",
     "yoho-swiper": "^3.3.1"
     "yoho-swiper": "^3.3.1"
   }
   }
 }
 }

 .invite-page-bg {
 .invite-page-bg {
-    background: resolve('../img/activity/invite/body_bg.png');
+    background-image: resolve('activity/invite/body_bg.png');
     min-height: 200px;
     min-height: 200px;
 }
 }
 
 
 .invite-page {
 .invite-page {
+    font-family: 'Microsoft YaHei';
+    color: #fff;
+
     * {
     * {
         margin: 0;
         margin: 0;
         padding: 0;
         padding: 0;
         font-size: 28px;
         font-size: 28px;
     }
     }
 
 
-    font-family: 'Microsoft YaHei';
-    color: #fff;
-
     /* 手机号 领福利 */
     /* 手机号 领福利 */
     .invite-content-page {
     .invite-content-page {