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 @@ @@ -21,12 +21,12 @@
21 <div class="panel-body nopadding"> 21 <div class="panel-body nopadding">
22 22
23 <div class="form-group"> 23 <div class="form-group">
24 - <div class="col-sm-3">店铺：[[shopName]]</div>  
25 - <div class="col-sm-3">品牌：[[brandName]]</div>  
26 - <div class="col-sm-3">供应商：[[supplierName]]</div> 24 + <div class="col-sm-4">店铺：[[shopName]]</div>
  25 + <div class="col-sm-4">品牌：[[brandName]]</div>
  26 + <div class="col-sm-4">供应商：[[supplierName]]</div>
27 </div> 27 </div>
28 <div class="form-group"> 28 <div class="form-group">
29 - <div class="col-sm-3">品类： 29 + <div class="col-sm-4">品类：
30 [[if maxSortName]] 30 [[if maxSortName]]
31 [[maxSortName]] 31 [[maxSortName]]
32 [[/if]] 32 [[/if]]
@@ -40,37 +40,38 @@ @@ -40,37 +40,38 @@
40 >[[sortName]] 40 >[[sortName]]
41 [[/if]] 41 [[/if]]
42 </div> 42 </div>
43 - <div class="col-sm-3">货品年/季：[[goodsYears]] / [[goodsSeason]]</div>  
44 - <div class="col-sm-3">厂家编号：[[factoryCode]]</div> 43 + <div class="col-sm-4">货品年/季：[[goodsYears]] / [[goodsSeason]]</div>
  44 + <div class="col-sm-4">厂家编号：[[factoryCode]]</div>
45 </div> 45 </div>
46 <div class="form-group"> 46 <div class="form-group">
47 - <div class="col-sm-2">SKN：[[productSkn]]</div>  
48 - <div class="col-sm-2">商品话题：[[productTag]]</div> 47 + <div class="col-sm-4">SKN：[[productSkn]]</div>
  48 + <div class="col-sm-4">商品话题：[[productTag]]</div>
  49 + <div class="col-sm-4">展示平台：[[appType]]</div>
49 </div> 50 </div>
50 51
51 <div class="form-group"> 52 <div class="form-group">
52 - <div class="col-sm-2">商品名称：[[productName]]</div>  
53 - <div class="col-sm-2">商品类型：[[attribute]]</div> 53 + <div class="col-sm-4">商品名称：[[productName]]</div>
  54 + <div class="col-sm-4">商品类型：[[attribute]]</div>
54 </div> 55 </div>
55 56
56 <div class="form-group"> 57 <div class="form-group">
57 - <div class="col-sm-3">年龄层：[[ageLevel]]</div>  
58 - <div class="col-sm-3">性别：[[gender]]</div>  
59 - <div class="col-sm-3">重点款：[[grade||""]]</div> 58 + <div class="col-sm-4">年龄层：[[ageLevel]]</div>
  59 + <div class="col-sm-4">性别：[[gender]]</div>
60 </div> 60 </div>
61 61
62 <div class="form-group"> 62 <div class="form-group">
63 - <div class="col-sm-3">限量款：[[isLimited]]</div> 63 + <div class="col-sm-4">限量款：[[isLimited]]</div>
  64 + <div class="col-sm-4">重点款：[[grade||""]]</div>
64 </div> 65 </div>
65 66
66 <div class="form-group"> 67 <div class="form-group">
67 - <div class="col-sm-3">吊牌价：[[retailPrice]]</div>  
68 - <div class="col-sm-3">销售价：[[salesPrice]]</div> 68 + <div class="col-sm-4">吊牌价：[[retailPrice]]</div>
  69 + <div class="col-sm-4">销售价：[[salesPrice]]</div>
69 </div> 70 </div>
70 71
71 <div class="form-group"> 72 <div class="form-group">
72 - <div class="col-sm-2">预计上架时间：[[expectShelfTimeStr]]</div>  
73 - <div class="col-sm-2">预计到货时间：[[expectArrivalTimeStr]]</div> 73 + <div class="col-sm-4">预计上架时间：[[expectShelfTimeStr]]</div>
  74 + <div class="col-sm-4">预计到货时间：[[expectArrivalTimeStr]]</div>
74 </div> 75 </div>
75 76
76 </div> 77 </div>
@@ -16,6 +16,7 @@ data.data.goodsSeason={"0":"四季","1":"春","2":"夏","3":"秋","4":"冬","5": @@ -16,6 +16,7 @@ data.data.goodsSeason={"0":"四季","1":"春","2":"夏","3":"秋","4":"冬","5":
16 data.data.isPromotionalGifts={"N":"否","Y":"是"}[""+data.data.isPromotionalGifts]; 16 data.data.isPromotionalGifts={"N":"否","Y":"是"}[""+data.data.isPromotionalGifts];
17 data.data.isLimited={"N":"否","Y":"是"}[""+data.data.isLimited]; 17 data.data.isLimited={"N":"否","Y":"是"}[""+data.data.isLimited];
18 data.data.isLimitbuy={"N":"否","Y":"是"}[""+data.data.isLimitbuy]; 18 data.data.isLimitbuy={"N":"否","Y":"是"}[""+data.data.isLimitbuy];
  19 +data.data.appType={"0":"有货平台","1":"有货，BLK平台"}[""+data.data.appType];
19 20
20 var param=[data.data.productSkn] 21 var param=[data.data.productSkn]
21 var a=common.util.__template2($("#template").html(), data.data); 22 var a=common.util.__template2($("#template").html(), data.data);
@@ -21,12 +21,12 @@ @@ -21,12 +21,12 @@
21 <div class="panel-body nopadding"> 21 <div class="panel-body nopadding">
22 22
23 <div class="form-group"> 23 <div class="form-group">
24 - <div class="col-sm-3">店铺：[[shopName]]</div>  
25 - <div class="col-sm-3">品牌：[[brandName]]</div>  
26 - <div class="col-sm-3">供应商：[[supplierName]]</div> 24 + <div class="col-sm-4">店铺：[[shopName]]</div>
  25 + <div class="col-sm-4">品牌：[[brandName]]</div>
  26 + <div class="col-sm-4">供应商：[[supplierName]]</div>
27 </div> 27 </div>
28 <div class="form-group"> 28 <div class="form-group">
29 - <div class="col-sm-3">品类： 29 + <div class="col-sm-4">品类：
30 [[if maxSortName]] 30 [[if maxSortName]]
31 [[maxSortName]] 31 [[maxSortName]]
32 [[/if]] 32 [[/if]]
@@ -40,37 +40,38 @@ @@ -40,37 +40,38 @@
40 >[[sortName]] 40 >[[sortName]]
41 [[/if]] 41 [[/if]]
42 </div> 42 </div>
43 - <div class="col-sm-3">货品年/季：[[goodsYears]] / [[goodsSeason]]</div>  
44 - <div class="col-sm-3">厂家编号：[[factoryCode]]</div> 43 + <div class="col-sm-4">货品年/季：[[goodsYears]] / [[goodsSeason]]</div>
  44 + <div class="col-sm-4">厂家编号：[[factoryCode]]</div>
45 </div> 45 </div>
46 <div class="form-group"> 46 <div class="form-group">
47 - <div class="col-sm-2">SKN：[[productSkn]]</div>  
48 - <div class="col-sm-2">商品话题：[[productTag]]</div> 47 + <div class="col-sm-4">SKN：[[productSkn]]</div>
  48 + <div class="col-sm-4">商品话题：[[productTag]]</div>
  49 + <div class="col-sm-4">展示平台：[[appType]]</div>
49 </div> 50 </div>
50 51
51 <div class="form-group"> 52 <div class="form-group">
52 - <div class="col-sm-2">商品名称：[[productName]]</div>  
53 - <div class="col-sm-2">商品类型：[[attribute]]</div> 53 + <div class="col-sm-4">商品名称：[[productName]]</div>
  54 + <div class="col-sm-4">商品类型：[[attribute]]</div>
54 </div> 55 </div>
55 56
56 <div class="form-group"> 57 <div class="form-group">
57 - <div class="col-sm-3">年龄层：[[ageLevel]]</div>  
58 - <div class="col-sm-3">性别：[[gender]]</div>  
59 - <div class="col-sm-3">重点款：[[grade||""]]</div> 58 + <div class="col-sm-4">年龄层：[[ageLevel]]</div>
  59 + <div class="col-sm-4">性别：[[gender]]</div>
60 </div> 60 </div>
61 61
62 <div class="form-group"> 62 <div class="form-group">
63 - <div class="col-sm-3">限量款：[[isLimited]]</div> 63 + <div class="col-sm-4">限量款：[[isLimited]]</div>
  64 + <div class="col-sm-4">重点款：[[grade||""]]</div>
64 </div> 65 </div>
65 66
66 <div class="form-group"> 67 <div class="form-group">
67 - <div class="col-sm-3">吊牌价：[[retailPrice]]</div>  
68 - <div class="col-sm-3">销售价：[[salesPrice]]</div> 68 + <div class="col-sm-4">吊牌价：[[retailPrice]]</div>
  69 + <div class="col-sm-4">销售价：[[salesPrice]]</div>
69 </div> 70 </div>
70 71
71 <div class="form-group"> 72 <div class="form-group">
72 - <div class="col-sm-2">预计上架时间：[[expectShelfTimeStr]]</div>  
73 - <div class="col-sm-2">预计到货时间：[[expectArrivalTimeStr]]</div> 73 + <div class="col-sm-4">预计上架时间：[[expectShelfTimeStr]]</div>
  74 + <div class="col-sm-4">预计到货时间：[[expectArrivalTimeStr]]</div>
74 </div> 75 </div>
75 76
76 </div> 77 </div>