fe / yohobuy-portal-fe2 · Commits

Go to a project

Authored by dongjunjie
Commit 4e22bd3c6ea2cedb6eb929d3fea61f27bacbba0a 2 parents cd9e3d9d c0e8acb7

Merge branch 'testBLK' into portal_dev_4.9

Inline Side-by-side
Showing 3 changed files with 39 additions and 36 deletions
... ... @@ -21,12 +21,12 @@
<div class="panel-body nopadding">
<div class="form-group">
<div class="col-sm-3">店铺：[[shopName]]</div>
<div class="col-sm-3">品牌：[[brandName]]</div>
<div class="col-sm-3">供应商：[[supplierName]]</div>
<div class="col-sm-4">店铺：[[shopName]]</div>
<div class="col-sm-4">品牌：[[brandName]]</div>
<div class="col-sm-4">供应商：[[supplierName]]</div>
</div>
<div class="form-group">
<div class="col-sm-3">品类：
<div class="col-sm-4">品类：
[[if maxSortName]]
[[maxSortName]]
[[/if]]
... ... @@ -40,37 +40,38 @@
>[[sortName]]
[[/if]]
</div>
<div class="col-sm-3">货品年/季：[[goodsYears]] / [[goodsSeason]]</div>
<div class="col-sm-3">厂家编号：[[factoryCode]]</div>
<div class="col-sm-4">货品年/季：[[goodsYears]] / [[goodsSeason]]</div>
<div class="col-sm-4">厂家编号：[[factoryCode]]</div>
</div>
<div class="form-group">
<div class="col-sm-2">SKN：[[productSkn]]</div>
<div class="col-sm-2">商品话题：[[productTag]]</div>
<div class="col-sm-4">SKN：[[productSkn]]</div>
<div class="col-sm-4">商品话题：[[productTag]]</div>
<div class="col-sm-4">展示平台：[[appType]]</div>
</div>
<div class="form-group">
<div class="col-sm-2">商品名称：[[productName]]</div>
<div class="col-sm-2">商品类型：[[attribute]]</div>
<div class="col-sm-4">商品名称：[[productName]]</div>
<div class="col-sm-4">商品类型：[[attribute]]</div>
</div>
<div class="form-group">
<div class="col-sm-3">年龄层：[[ageLevel]]</div>
<div class="col-sm-3">性别：[[gender]]</div>
<div class="col-sm-3">重点款：[[grade||""]]</div>
<div class="col-sm-4">年龄层：[[ageLevel]]</div>
<div class="col-sm-4">性别：[[gender]]</div>
</div>
<div class="form-group">
<div class="col-sm-3">限量款：[[isLimited]]</div>
<div class="col-sm-4">限量款：[[isLimited]]</div>
<div class="col-sm-4">重点款：[[grade||""]]</div>
</div>
<div class="form-group">
<div class="col-sm-3">吊牌价：[[retailPrice]]</div>
<div class="col-sm-3">销售价：[[salesPrice]]</div>
<div class="col-sm-4">吊牌价：[[retailPrice]]</div>
<div class="col-sm-4">销售价：[[salesPrice]]</div>
</div>
<div class="form-group">
<div class="col-sm-2">预计上架时间：[[expectShelfTimeStr]]</div>
<div class="col-sm-2">预计到货时间：[[expectArrivalTimeStr]]</div>
<div class="col-sm-4">预计上架时间：[[expectShelfTimeStr]]</div>
<div class="col-sm-4">预计到货时间：[[expectArrivalTimeStr]]</div>
</div>
</div>
... ...
... ... @@ -16,6 +16,7 @@ data.data.goodsSeason={"0":"四季","1":"春","2":"夏","3":"秋","4":"冬","5":
data.data.isPromotionalGifts={"N":"否","Y":"是"}[""+data.data.isPromotionalGifts];
data.data.isLimited={"N":"否","Y":"是"}[""+data.data.isLimited];
data.data.isLimitbuy={"N":"否","Y":"是"}[""+data.data.isLimitbuy];
data.data.appType={"0":"有货平台","1":"有货，BLK平台"}[""+data.data.appType];
var param=[data.data.productSkn]
var a=common.util.__template2($("#template").html(), data.data);
... ...
... ... @@ -21,12 +21,12 @@
<div class="panel-body nopadding">
<div class="form-group">
<div class="col-sm-3">店铺：[[shopName]]</div>
<div class="col-sm-3">品牌：[[brandName]]</div>
<div class="col-sm-3">供应商：[[supplierName]]</div>
<div class="col-sm-4">店铺：[[shopName]]</div>
<div class="col-sm-4">品牌：[[brandName]]</div>
<div class="col-sm-4">供应商：[[supplierName]]</div>
</div>
<div class="form-group">
<div class="col-sm-3">品类：
<div class="col-sm-4">品类：
[[if maxSortName]]
[[maxSortName]]
[[/if]]
... ... @@ -40,37 +40,38 @@
>[[sortName]]
[[/if]]
</div>
<div class="col-sm-3">货品年/季：[[goodsYears]] / [[goodsSeason]]</div>
<div class="col-sm-3">厂家编号：[[factoryCode]]</div>
<div class="col-sm-4">货品年/季：[[goodsYears]] / [[goodsSeason]]</div>
<div class="col-sm-4">厂家编号：[[factoryCode]]</div>
</div>
<div class="form-group">
<div class="col-sm-2">SKN：[[productSkn]]</div>
<div class="col-sm-2">商品话题：[[productTag]]</div>
<div class="col-sm-4">SKN：[[productSkn]]</div>
<div class="col-sm-4">商品话题：[[productTag]]</div>
<div class="col-sm-4">展示平台：[[appType]]</div>
</div>
<div class="form-group">
<div class="col-sm-2">商品名称：[[productName]]</div>
<div class="col-sm-2">商品类型：[[attribute]]</div>
<div class="col-sm-4">商品名称：[[productName]]</div>
<div class="col-sm-4">商品类型：[[attribute]]</div>
</div>
<div class="form-group">
<div class="col-sm-3">年龄层：[[ageLevel]]</div>
<div class="col-sm-3">性别：[[gender]]</div>
<div class="col-sm-3">重点款：[[grade||""]]</div>
<div class="col-sm-4">年龄层：[[ageLevel]]</div>
<div class="col-sm-4">性别：[[gender]]</div>
</div>
<div class="form-group">
<div class="col-sm-3">限量款：[[isLimited]]</div>
<div class="col-sm-4">限量款：[[isLimited]]</div>
<div class="col-sm-4">重点款：[[grade||""]]</div>
</div>
<div class="form-group">
<div class="col-sm-3">吊牌价：[[retailPrice]]</div>
<div class="col-sm-3">销售价：[[salesPrice]]</div>
<div class="col-sm-4">吊牌价：[[retailPrice]]</div>
<div class="col-sm-4">销售价：[[salesPrice]]</div>
</div>
<div class="form-group">
<div class="col-sm-2">预计上架时间：[[expectShelfTimeStr]]</div>
<div class="col-sm-2">预计到货时间：[[expectArrivalTimeStr]]</div>
<div class="col-sm-4">预计上架时间：[[expectShelfTimeStr]]</div>
<div class="col-sm-4">预计到货时间：[[expectArrivalTimeStr]]</div>
</div>
</div>
... ...