Commit 52077c0f by Huang Linyu

后台资源添加vip价格

parent ad6d33c1
...@@ -84,6 +84,8 @@ public class ResourcePriceForm { ...@@ -84,6 +84,8 @@ public class ResourcePriceForm {
*/ */
private double memberCashRebate; private double memberCashRebate;
private double vipPrice;
/** /**
* 社员价 * 社员价
*/ */
...@@ -297,4 +299,12 @@ public class ResourcePriceForm { ...@@ -297,4 +299,12 @@ public class ResourcePriceForm {
this.size = size; this.size = size;
} }
public double getVipPrice() {
return vipPrice;
}
public void setVipPrice(double vipPrice) {
this.vipPrice = vipPrice;
}
} }
...@@ -593,6 +593,13 @@ ...@@ -593,6 +593,13 @@
</div> </div>
</div> </div>
<div class="control-group "> <div class="control-group ">
<label class="control-label" for="vipPrice">vip价</label>
<div class="controls">
<input type="number" id="vipPrice" name="vipPrice" value="0" required>
</div>
</div>
<div class="control-group ">
<label class="control-label" for="priceStatus">价格状态</label> <label class="control-label" for="priceStatus">价格状态</label>
<select id="priceStatus" name="status"> <select id="priceStatus" name="status">
<option value="0">请选择</option> <option value="0">请选择</option>
......
...@@ -93,13 +93,6 @@ $(function () { ...@@ -93,13 +93,6 @@ $(function () {
</div> </div>
</div> </div>
<!-- <#if id??>
<@form.textInput "form.theDate" "data-date-format=\"yyyy-mm-dd\" class=\"input-medium\" readonly required" "时间" />
<#else>
<@form.textInput "form.theDate" "data-date-format=\"yyyy-mm-dd\" class=\"datepicker input-medium\" required" "时间" />
</#if>
-->
<#--<@form.singleSelect "form.status" enums["com.ctrip.fun.common.vo.product.ResourcePriceStatusEnum"] "" "状态"/>--> <#--<@form.singleSelect "form.status" enums["com.ctrip.fun.common.vo.product.ResourcePriceStatusEnum"] "" "状态"/>-->
<@form.singleSelect "form.currency" enums["com.ctrip.fun.common.vo.CurrencyTypeEnum"] "" "币种"/> <@form.singleSelect "form.currency" enums["com.ctrip.fun.common.vo.CurrencyTypeEnum"] "" "币种"/>
<#if paymentType==4 > <#if paymentType==4 >
...@@ -109,6 +102,7 @@ $(function () { ...@@ -109,6 +102,7 @@ $(function () {
<@form.textInput "form.salePrice" "class=\"input-medium\"" "卖价" "number"/> <@form.textInput "form.salePrice" "class=\"input-medium\"" "卖价" "number"/>
<@form.textInput "form.floorPrice" "class=\"input-medium\"" "底价" "number"/> <@form.textInput "form.floorPrice" "class=\"input-medium\"" "底价" "number"/>
<@form.textInput "form.memberPrice" "class=\"input-medium\"" "会员价" "number"/> <@form.textInput "form.memberPrice" "class=\"input-medium\"" "会员价" "number"/>
<@form.textInput "form.vipPrice" "class=\"input-medium\"" "VIP价" "number"/>
<@form.singleSelect "form.status" enums["com.ctrip.fun.common.vo.product.ResourcePriceStatusEnum"] "" "状态"/> <@form.singleSelect "form.status" enums["com.ctrip.fun.common.vo.product.ResourcePriceStatusEnum"] "" "状态"/>
<@form.textInput "form.cashRebate" "class=\"input-medium\"" "返现" "number"/> <@form.textInput "form.cashRebate" "class=\"input-medium\"" "返现" "number"/>
<@form.textInput "form.memberCashRebate" "class=\"input-medium\"" "会员返现" "number"/> <@form.textInput "form.memberCashRebate" "class=\"input-medium\"" "会员返现" "number"/>
......
...@@ -46,6 +46,7 @@ ...@@ -46,6 +46,7 @@
<th>卖价</th> <th>卖价</th>
<th>底价</th> <th>底价</th>
<th>会员价</th> <th>会员价</th>
<th>vip价</th>
<th>佣金</th> <th>佣金</th>
<th>返现</th> <th>返现</th>
<th>会员返现</th> <th>会员返现</th>
...@@ -79,6 +80,7 @@ ...@@ -79,6 +80,7 @@
<td>${item.salePrice}</td> <td>${item.salePrice}</td>
<td>${item.floorPrice}</td> <td>${item.floorPrice}</td>
<td>${item.memberPrice}</td> <td>${item.memberPrice}</td>
<td>${item.vipPrice}</td>
<td>${item.commission}</td> <td>${item.commission}</td>
<td>${item.cashRebate}</td> <td>${item.cashRebate}</td>
<td>${item.memberCashRebate}</td> <td>${item.memberCashRebate}</td>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment