fe / yohobuy-shop-fe2 · Commits

Go to a project

Authored by linlong
Commit d34f87f49acbe2b99c384eeffe45b741b71790cd 2 parents 8e6f62d7 f0b12255

Merge branch 'dev_2.2' of git.yoho.cn:fe/yohobuy-shop-fe2 into dev_2.2 

# By Zhongw
# Via Zhongw
* 'dev_2.2' of git.yoho.cn:fe/yohobuy-shop-fe2:
  学生价隐藏
  商家端隐藏学生价
Inline Side-by-side
Showing 2 changed files with 4 additions and 12 deletions
... ... @@ -95,7 +95,7 @@
<td width="120px"><b>说明：</b></td>
<td>
1、上传文件必须是<span style="color:red;">.xlsx</span>文件<br>
2、Excel表头为：<span style="color: #67D267;">SKN、吊牌价、销售价、学生价、VIP折扣类型、VIP价、白金价、金卡价、银卡价</span><br>
2、Excel表头为：<span style="color: #67D267;">SKN、吊牌价、销售价、VIP折扣类型、VIP价、白金价、金卡价、银卡价</span><br>
3、第一行为表头内容，第二行开始为正式内容<br>
4、每个文件控制在2500行以内<br>
5、<a href="/ajax/link/batchUpdatePrice" style="margin: 0; text-decoration: underline">下载样例.xlsx</a>
... ... @@ -144,7 +144,6 @@
<table class="table table-striped table-bordered" style="margin: 0;border: 0">
<tr>
<th style="border-top: 0; border-left: 0">销售价</th>
<th style="border-top: 0;">学生价</th>
<th style="border-top: 0">VIP折扣类型</th>
<th style="border-top: 0">VIP价</th>
<th style="border-top: 0">白金价</th>
... ... @@ -160,9 +159,6 @@
<td style="border-bottom: 0; border-left: 0">
<input class="sale-price form-control" type="text" value="{sales_price}" onkeyup="this.value=this.value.replace(/[^\d\.]|^\./gi,'')">
</td>
<td style="border-bottom: 0; border-left: 0">
<input class="student-price form-control" type="text" value="{student_price}" disabled>
</td>
<td style="border-bottom: 0">
<select class="discount-select form-control" style="width: 110px">
<option value="1">正常折扣</option>
... ... @@ -231,7 +227,6 @@
<tr>
<th>吊牌价</th>
<th>销售价</th>
<th>学生价</th>
<th>价格生效-<font color="green">开始时间</font></th>
<th>价格生效-<font color="red">结束时间</font></th>
<th>变价时间</th>
... ... @@ -245,7 +240,6 @@
<tr>
<td>[[item.retailPrice]]</td>
<td>[[item.salesPrice]]</td>
<td>[[item.studentPrice]]</td>
<td>[[item.effectiveTime]]</td>
<td>[[item.changePriceEndTime]]</td>
<td>[[item.createTime]]</td>
... ...
... ... @@ -93,7 +93,7 @@ var g = new common.grid({
}},
{display: '吊牌价', name: 'retail_price'},
{display: '销售价', name: 'sales_price'},
{display: '学生价', name: 'student_price'},
/*{display: '学生价', name: 'student_price'},*/
{display: 'VIP折扣类型', render: function(item) {
return ENUM.vipType[item.vip_discount_type];
}},
... ... @@ -166,7 +166,6 @@ $(document).on('click', '.modify-btn', function() {
var $wrap = parentTr.next('.product-detail'),
$price = $wrap.find('.sale-price'),
$student_price = $wrap.find('.student-price'),
$select = $wrap.find('.discount-select'),
$vipPrice = $wrap.find('.vip-price'),
$vip3Price = $wrap.find('.vip3-price'),
... ... @@ -195,7 +194,6 @@ $(document).on('click', '.modify-btn', function() {
data: {
product_skn: skn,
sales_price: $price.val(),
student_price: $student_price.val(),
vip_discount_type: $select.val(),
vip_price: $vipPrice.val(),
vip1_price: $vip1Price.val(),
... ... @@ -322,7 +320,7 @@ var p = new common.grid({
}},
{display: '学生价', render: function(item) {
/*{display: '学生价', render: function(item) {
var newPrice = item.newProductPriceBo,
newPriceHtml = '';
if (newPrice.student_price) {
... ... @@ -340,7 +338,7 @@ var p = new common.grid({
newPriceHtml += '<div>-</div>';
}
return newPriceHtml;
}},
}},*/
{display: 'VIP折扣类型', render: function(item) {
return '<p>'+ENUM.vipType[item.newProductPriceBo.vip_discount_type] + '</p>'+
... ...