Authored by dongjunjie

Merge branch 'yohobuy_portak_dev_v4.8_20160620' into dongjunjie_4.9

... ... @@ -97,7 +97,7 @@
<div id="yohoCoinImportResultSet">
<div class="title">返还方式设置:</div>
<div class="form-inline" style="display: none">
<label style="width: 80px">币时间:</label>
<label style="width: 80px">币时间:</label>
<div class="form-group">
<input type="radio" name="returnCoinTime" value="1">
<label>长期</label>
... ... @@ -199,8 +199,8 @@
<td colspan="9" style="padding: 0; border-left: 1px solid #ddd">
<table>
<tr>
<!--td width="50%"><b>反币时间</b></td-->
<td width="40%"><b>反币金额</b></td>
<!--td width="50%"><b>返币时间</b></td-->
<td width="40%"><b>返币金额</b></td>
<td width="40%"><b>审核人</b></td>
<td width="20%"><b>操作</b></td>
</tr>
... ... @@ -220,7 +220,7 @@
</div>
</td-->
<td>
<input type="text" class="form-control center editor-yohoCoin" placeholder="币金额" value="[[productPrice.returnCoinMoney]]" style="width: 100px">
<input type="text" class="form-control center editor-yohoCoin" placeholder="币金额" value="[[productPrice.returnCoinMoney]]" style="width: 100px">
</td>
<td>
<select class="form-control center editor-auditor" style="width: 150px">
... ... @@ -250,7 +250,7 @@
<th>SKN</th>
<th>品牌</th>
<th>吊牌价</th>
<th>币金额</th>
<th>币金额</th>
<th>操作</th>
</tr>
</thead>
... ...
... ... @@ -97,7 +97,7 @@
<div id="yohoCoinImportResultSet">
<div class="title">返还方式设置:</div>
<div class="form-inline" style="display: none">
<label style="width: 80px">币时间:</label>
<label style="width: 80px">币时间:</label>
<div class="form-group">
<input type="radio" name="returnCoinTime" value="1">
<label>长期</label>
... ... @@ -199,8 +199,8 @@
<td colspan="9" style="padding: 0; border-left: 1px solid #ddd">
<table>
<tr>
<!--td width="50%"><b>反币时间</b></td-->
<td width="40%"><b>反币金额</b></td>
<!--td width="50%"><b>返币时间</b></td-->
<td width="40%"><b>返币金额</b></td>
<td width="40%"><b>审核人</b></td>
<td width="20%"><b>操作</b></td>
</tr>
... ... @@ -220,7 +220,7 @@
</div>
</td-->
<td>
<input type="text" class="form-control center editor-yohoCoin" placeholder="币金额" value="[[productPrice.returnCoinMoney]]" style="width: 100px">
<input type="text" class="form-control center editor-yohoCoin" placeholder="币金额" value="[[productPrice.returnCoinMoney]]" style="width: 100px">
</td>
<td>
<select class="form-control center editor-auditor" style="width: 150px">
... ... @@ -250,7 +250,7 @@
<th>SKN</th>
<th>品牌</th>
<th>吊牌价</th>
<th>币金额</th>
<th>币金额</th>
<th>操作</th>
</tr>
</thead>
... ...