gift goods

@@ -45,6 +45,11 @@ const index = uid => {
                     `/product/pro_${theGoods.product_id}_${theGoods.goods_id}_${theGoods.cn_alphabet}.html`);
                     `/product/pro_${theGoods.product_id}_${theGoods.goods_id}_${theGoods.cn_alphabet}.html`);
 
 
                 // TODO：format brand url
                 // TODO：format brand url
+
+                // 处理商品是否是赠品
+                if (theGoods.goods_type === 'gift') {
+                    theGoods.isGift = true;
+                }
             });
             });
 
 
             theData.yoho_coin *= 100; // 有货币稀释
             theData.yoho_coin *= 100; // 有货币稀释

@@ -44,7 +44,7 @@
                         </a>
                         </a>
                     </p>
                     </p>
                     {{#with shopping_cart_data}}
                     {{#with shopping_cart_data}}
-                        {{#if is_multi_package}}
+                        {{#isY is_multi_package}}
                             <div class="multi-package-row">
                             <div class="multi-package-row">
                                 温馨提示：您购买的商品<em class="blue">分属不同仓库</em>，需要调拨，将被拆分成多个包裹送达
                                 温馨提示：您购买的商品<em class="blue">分属不同仓库</em>，需要调拨，将被拆分成多个包裹送达
                                 <span class="iconfont show-package">&#xe643;</span>
                                 <span class="iconfont show-package">&#xe643;</span>
@@ -65,7 +65,7 @@
                                     {{/each}}
                                     {{/each}}
                                 </div>
                                 </div>
                             </div>
                             </div>
-                        {{/if}}
+                        {{/isY}}
                     {{/with}}
                     {{/with}}
                     <div class="content">
                     <div class="content">
                         <p class="order-table-head clearfix">
                         <p class="order-table-head clearfix">
@@ -79,6 +79,10 @@
                                 <li class="order-goods clearfix">
                                 <li class="order-goods clearfix">
                                     <a class="goods-img inline-block" href="{{link}}">
                                     <a class="goods-img inline-block" href="{{link}}">
                                         <img class="lazy" data-original="{{image goods_images 100 148}}">
                                         <img class="lazy" data-original="{{image goods_images 100 148}}">
+
+                                        {{#if isGift}}
+                                            <span class="gift-tag">赠品</span>
+                                        {{/if}}
                                     </a>
                                     </a>
                                     <p class="brand-and-name inline-block">
                                     <p class="brand-and-name inline-block">
                                         <a class="brand-name" href="{{brandUrl}}">{{brandName}}</a>
                                         <a class="brand-name" href="{{brandUrl}}">{{brandName}}</a>

@@ -59,7 +59,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.18"
+    "yoho-node-lib": "0.0.19"
   },
   },
   "devDependencies": {
   "devDependencies": {
     "autoprefixer": "^6.3.6",
     "autoprefixer": "^6.3.6",

@@ -231,6 +231,7 @@
 
 
         /* [表格内容]商品图片 */
         /* [表格内容]商品图片 */
         .goods-img {
         .goods-img {
+            position: relative;
             width: 180px;
             width: 180px;
             padding: 0 40px;
             padding: 0 40px;
 
 
@@ -238,6 +239,19 @@
                 width: 100px;
                 width: 100px;
                 height: 148px;
                 height: 148px;
             }
             }
+
+            .gift-tag {
+                position: absolute;
+                bottom: 0;
+                left: 40px;
+                right: 40px;
+                height: 25px;
+                color: #fff;
+                background: #379ed6;
+                font-size: 12px;
+                text-align: center;
+                line-height: 25px;
+            }
         }
         }
 
 
         /* [表格内容]品牌和商品名称 */
         /* [表格内容]品牌和商品名称 */