Merge branch 'gray' into 'master'

Gray



See merge request !1047

@@ -3,11 +3,12 @@
 
 const model = require('../models/coupon-floor'),
     headerModel = require('../../../doraemon/models/header');
+const CONTENT_CODE_DEFAULT = 'b78b32ed81b18dde8ac84fd33602b88b'; // 取得是潮童频道的资源码
 
 exports.index = (req, res, next) => {
     let uid = req.user.uid || req.query.uid;
     let param = {
-        contentCode: req.query.code
+        contentCode: req.query.code || CONTENT_CODE_DEFAULT
     };
 
     if (uid) {

 {
   "name": "m-yohobuy-node",
-  "version": "6.2.7",
+  "version": "6.2.8",
   "private": true,
   "description": "A New Yohobuy Project With Express",
   "repository": {

@@ -18,7 +18,7 @@
                     <span class="coin-pic-s"></span>
                     <span>{{#if points}}{{points}}{{/if}}{{#if point}}{{point}}{{/if}}</span>
                     <span class="old-price">{{discountPoints}}</span>
-                    <span class="discount">Lv.3会员9折优惠</span>
+                    {{#if vipDesc}}<span class="discount">{{vipDesc}}</span>{{/if}}
                 </div>
                 <div class="remain">仅剩{{#if stock}}{{stock}}{{/if}}{{#if num}}{{num}}{{/if}}份</div>
             </div>

@@ -399,6 +399,9 @@
 
                 .next {
                     float: left;
+                    display: inline-block;
+                    width: 100%;
+                    line-height: 40px;
                 }
             }
 

@@ -191,7 +191,7 @@ function tranformPayment(data, orderInfo, cartType, skuList, orderComputeData) {
             obj.id = good.product_sku;
             obj.thumb = helpers.image(good.goods_images, 120, 160);
             obj.name = good.product_name;
-            obj.color = good.color_name;
+            obj.color = good.factory_goods_name || good.color_name;
             obj.size = good.size_name;
             obj.count = good.buy_number;
             obj.price = good.sales_price;