Merge branch 'master' into feature/first-buy-share

@@ -34,6 +34,7 @@ function index(req, res, next) {
             title: 'YO!LUCK',
             page: 'yoluck-list',
             tabpanel: result,
+            tabIndex: type,
             localCss: true,
             nodownload: true,
             width750: true,

@@ -133,7 +133,7 @@ class YoLuckService extends global.yoho.BaseModel {
             if (type === YOLUCK_LIST_TYPE.joined) {
                 if (!uid) {
                     return {
-                        error: 400,
+                        error: 401,
                     };
                 }
 

@@ -56,7 +56,7 @@
 
             {{#ifcond pageGo '===' 4}}
             <div class="status-text">拼团成功</div>
-            <a href="../group/list?activityId={{activityId}}" class="status-btn">查看更多拼团活动</a>
+            <a href="/activity/group" class="status-btn">查看更多拼团活动</a>
             {{/ifcond}}
 
             {{#ifcond pageGo '===' 5}}
@@ -68,12 +68,12 @@
 
             {{#ifcond pageGo '===' 6}}
             <div class="status-text">拼团失败</div>
-            <a href="../group/list?activityId={{activityId}}" class="status-btn">查看更多拼团活动</a>
+            <a href="/activity/group" class="status-btn">查看更多拼团活动</a>
             {{/ifcond}}
 
             {{#ifcond pageGo '===' 7}}
             <div class="status-text">拼团失败</div>
-            <a href="../group/list?activityId={{activityId}}" class="status-btn">查看更多拼团活动</a>
+            <a href="/activity/group" class="status-btn">查看更多拼团活动</a>
             {{/ifcond}}
 
             <a class="tip" href="https://m.yohobuy.com/activity/feature/1555.html?nodownload=1">支付开团-支付参团-凑齐人数发货-凑不齐退款 玩法介绍》</a>

@@ -6,6 +6,14 @@
             <div class="fellow-bar-wrap">
                 {{> yoluck/fellow-bar}}
             </div>
+
+            <div id="fellow-guide" class="js-fellow-guide" style="display: none">
+              <div class="js-fellow-guide-bg"></div>
+              <div class="fellow-guide">
+                <div class="js-fellow-ok"></div>
+              </div>
+            </div>
+                
         {{/unless}}
     {{/if}}
 
@@ -13,6 +21,8 @@
         {{> yoluck/product-detail-header product=product avatars=avatars}}
     </div>
 
+    <div class="jion-tips"></div>
+
     {{> yoluck/lottery-machine}}
 
     <div class="help">

 {{#tabpanel}}
     <div class="js-tab-comp" data-type="{{currentType}}">
         <!--tab切-->
-        <div class="js-tabs tabs tabs-class">
-            {{#each tabs}}
-                <div class="js-tab tab {{#if active}}active{{/if}}" data-key="{{key}}" data-index="{{@index}}">
-                    {{key}}
-                </div>
-            {{/each}}
-        </div>
-
-        <div class="list-top-blank"></div>
+        {{#ifcond ../tabIndex '!==' 3}}
+          <div class="js-tabs tabs tabs-class">
+              {{#each tabs}}
+                {{#ifcond @index '!==' 3}}
+                  <div class="js-tab tab {{#if active}}active{{/if}}" data-key="{{key}}" data-index="{{@index}}">
+                      {{key}}
+                  </div>
+                {{/ifcond}}
+              {{/each}}
+          </div>
+          
+          <div class="list-top-blank"></div>
+        {{/ifcond}}
 
         <!--panel体-->
         <div class="js-panels panel-body">
@@ -46,6 +50,9 @@
                                 </a>
                             {{/if}}
                         </div>
+
+                        <!-- 我的抽奖码 -->
+                        <div class="js-my-draw-code" data-type=3>我的抽奖码</div>
                     {{/ifcond}}
                 </div>
             {{/each}}

@@ -70,8 +70,11 @@ module.exports = class extends global.yoho.BaseModel {
             // 统一频道名称
             result.data.boys = result.data.boy;
             result.data.girls = result.data.girl;
+            result.data.lifestyle = result.data.lifestyle || result.data.LifeStyle;
+
             _.unset(result.data, 'boy');
             _.unset(result.data, 'girl');
+            _.unset(result.data, 'LifeStyle');
 
             return result.data;
         }).then((list) => {

 {
   "name": "yohobuywap-node",
-  "version": "6.9.4-6",
+  "version": "6.9.7-2",
   "private": true,
   "description": "A New Yohobuy Project With Express",
   "repository": {

@@ -35,6 +35,7 @@ let store = {
 let hideInfo = $('#hide-info').remove().data();
 
 let $fellowBar = $('#fellow-bar');
+let $fellowGuide = $('#fellow-guide');
 let $product = $('.product_name');
 let name = $product.data('name');
 let img = $product.data('img');
@@ -189,12 +190,21 @@ if (+fellowInfo.type === 2) {
     });
 
     clipboardFellow.on('success', function(e) {
-        fellow(fellowInfo.tip);
-        tip.show('内容已复制', 2000);
+        if (fellowInfo.copy.length > 0) {
+            fellow(fellowInfo.tip);
+            tip.show('内容已复制', 2000);
+        } else {
+            $fellowGuide.show();
+        }
         e.clearSelection();
     });
 }
 
+// 隐藏关注公众号引导
+$('.js-fellow-guide').on('click', '.js-fellow-ok,.js-fellow-guide-bg', function() {
+    $fellowGuide.hide();
+});
+
 (function() {
     let lotteryInfo = $('.js-lottery').data('lottery') || {};
 

@@ -318,6 +318,28 @@ $tabpanel
     .on('click', '.js-fellow', function() {
         fellow($(this).data('id'), $(this).data('lottery'));
         return false;
+    })
+    .on('click', '.js-my-draw-code', function() {
+        let type = $(this).data('type');
+        let href = DETAIL_URI + '/index.html?type=' + type;
+
+        if (yoSdk.env === 'app') {
+            let link = yoho.parseUrl(href);
+
+            yoho.goH5(href, JSON.stringify({
+                action: 'go.h5',
+                params: {
+                    islogin: 'N',
+                    type,
+                    updateflag: Date.now() + '',
+                    url: link.path,
+                    param: link.query
+                }
+            }));
+        } else {
+            window.location.href = href;
+        }
+        return false;
     });
 
 $(window).on('scroll', function() {

@@ -310,6 +310,8 @@ let chat = {
             self._sysInfo(`您对我们的服务评价为：${data}`);
             self.canEvalute = false;
             cmEntity.type = socketConf.recType.EVALUTE_SUCCESS;
+            cmEntity.chatMessage.type = 1;
+            cmEntity.chatMessage.content = '';
             if (state === WebSocket.OPEN) {
                 socket.send(JSON.stringify(cmEntity));
             }

@@ -25,8 +25,8 @@
 
     .new-group-product-image {
         margin: 20px;
-        width: 162px;
-        height: 220px;
+        width: 200px;
+        height: 260px;
     }
 
     .new-group-product-info-bg {
@@ -45,7 +45,7 @@
         color: #222;
         letter-spacing: 0;
         line-height: 30px;
-        font-size: 26px;
+        font-size: 28px;
         display: -webkit-box;
         overflow: hidden;
         text-overflow: ellipsis;

@@ -14,23 +14,24 @@
     color: #444;
     margin-left: 32px;
     margin-right: 32px;
-    text-align: left;
+    text-align: center;
 }
 
 .product_lucky_bg {
     display: flex;
     flex-direction: row;
     align-items: baseline;
-    justify-content: space-between;
+    justify-content: center;
     margin-left: 32px;
     margin-right: 32px;
 }
 
 .product_price {
     color: #b0b0b0;
-    font-size: 30px;
+    font-size: 32px;
     margin-left: 20px;
     text-decoration: line-through;
+    font-weight: bold;
 }
 
 .product_time {

@@ -13,10 +13,26 @@
 
     .ok {
         color: white;
-        background-color: #222;
+        background-color: #d0021b;
+        -webkit-animation: product-status-ok-animate 0.8s linear infinite;
+        animation: product-status-ok-animate 0.8s linear infinite;
     }
 
     .cancel {
         background: #b0b0b0;
     }
 }
+
+@-webkit-keyframes product-status-ok-animate {
+    0% {
+        transform: scale(1);
+    }
+
+    70% {
+        transform: scale(1.05);
+    }
+
+    100% {
+        transform: scale(1);
+    }
+}

@@ -27,6 +27,16 @@
     overflow: hidden;
 }
 
+.jion-tips {
+    width: 690px;
+    height: 70px;
+    margin-bottom: 20px;
+    background: url("img/activity/yoluck/jion_tips@2x.png");
+    background-size: 100% 100%;
+    margin-left: auto;
+    margin-right: auto;
+}
+
 .help {
     width: 100%;
     text-align: center;
@@ -133,3 +143,36 @@
 .yoho-tip {
     top: 350px;
 }
+
+.js-fellow-guide-bg {
+    width: 100%;
+    height: 100%;
+    position: fixed;
+    top: 0;
+    left: 0;
+    background: #000;
+    opacity: 0.5;
+    z-index: 999;
+}
+
+.fellow-guide {
+    width: 600px;
+    height: 1028px;
+    position: fixed;
+    top: 46%;
+    left: 50%;
+    background: url("img/activity/yoluck/fellow_guide@2x.png");
+    margin-right: -50%;
+    transform: translate(-50%, -50%);
+    z-index: 1000;
+    overflow: visible;
+    background-size: 100% 100%;
+
+    .js-fellow-ok {
+        position: absolute;
+        left: 50px;
+        bottom: 50px;
+        width: 500px;
+        height: 100px;
+    }
+}

@@ -93,3 +93,17 @@
 .yoho-tip {
     top: 350px;
 }
+
+.js-my-draw-code {
+    position: fixed;
+    left: 0;
+    bottom: 0;
+    width: 100%;
+    height: 98px;
+    background-color: white;
+    border-top: 1px solid #e0e0ee;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    font-size: 30px;
+}