Authored by 王钱钧

Merge branch 'develop' of http://git.dev.yoho.cn/platform/yohobuy-portal-fe into develop

... ... @@ -145,7 +145,7 @@ $(document).on('click', '.btn-save', function() {
data: {
"productSkn": productSkn,
"returnCoin": yohoCoinInput.val(),
"auditorId": auditorInput.val()
"salesPrice": salesPrice
}
},function(rs){
//common.util.__tip("YOHO币编辑成功!","success");
... ...
... ... @@ -56,7 +56,8 @@ exports.res = [
url: "/yohoCoin/set",
params:[
{name: 'productSkn', type: 'Number'},
{name: 'returnCoin', type: 'Number'}
{name: 'returnCoin', type: 'Number'},
{name: 'salesPrice', type: 'Number'}
]
},
... ...
... ... @@ -162,8 +162,8 @@
<td style="width: 5%">吊牌价</td>
<td style="width: 5%">销售价</td>
<td style="width: 5%">返币数</td>
<td style="width: 5%">状态</td>
<td style="width: 15%">操作信息</td>
<td style="width: 8%">状态</td>
<td style="width: 12%">操作信息</td>
<td style="width: 5%">操作</td>
</tr>
</tbody></table>
... ... @@ -192,8 +192,8 @@
<td class="center" style="width: 5%">[[retailPrice]]</td>
<td class="center" style="width: 5%">[[salesPrice]]</td>
<td class="center" style="width: 5%">[[productPrice.returnCoin]]</td>
<td class="center" style="width: 5%">[[statusName]]</td>
<td style="width: 15%">
<td class="center" style="width: 8%">[[statusName]]</td>
<td style="width: 12%">
[[if productPrice.founder]][[productPrice.founder]][[/if]]
[[if productPrice.updateTime]]<br>[[productPrice.updateTime]][[/if]]
</td>
... ...