fe / yohobuy-portal-fe · Commits

Go to a project

Authored by 王钱钧
Commit f5ef0f98f1960a96f7b10d1f884a29566ffe7bc0 2 parents 7f0370e1 ad57578e

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

Inline Side-by-side
Showing 3 changed files with 7 additions and 6 deletions
@@ -145,7 +145,7 @@ $(document).on('click', '.btn-save', function() { @@ -145,7 +145,7 @@ $(document).on('click', '.btn-save', function() {
145 data: { 145 data: {
146 "productSkn": productSkn, 146 "productSkn": productSkn,
147 "returnCoin": yohoCoinInput.val(), 147 "returnCoin": yohoCoinInput.val(),
148 - "auditorId": auditorInput.val() 148 + "salesPrice": salesPrice
149 } 149 }
150 },function(rs){ 150 },function(rs){
151 //common.util.__tip("YOHO币编辑成功！","success"); 151 //common.util.__tip("YOHO币编辑成功！","success");
@@ -56,7 +56,8 @@ exports.res = [ @@ -56,7 +56,8 @@ exports.res = [
56 url: "/yohoCoin/set", 56 url: "/yohoCoin/set",
57 params:[ 57 params:[
58 {name: 'productSkn', type: 'Number'}, 58 {name: 'productSkn', type: 'Number'},
59 - {name: 'returnCoin', type: 'Number'} 59 + {name: 'returnCoin', type: 'Number'},
  60 + {name: 'salesPrice', type: 'Number'}
60 ] 61 ]
61 }, 62 },
62 63
@@ -162,8 +162,8 @@ @@ -162,8 +162,8 @@
162 <td style="width: 5%">吊牌价</td> 162 <td style="width: 5%">吊牌价</td>
163 <td style="width: 5%">销售价</td> 163 <td style="width: 5%">销售价</td>
164 <td style="width: 5%">返币数</td> 164 <td style="width: 5%">返币数</td>
165 - <td style="width: 5%">状态</td>  
166 - <td style="width: 15%">操作信息</td> 165 + <td style="width: 8%">状态</td>
  166 + <td style="width: 12%">操作信息</td>
167 <td style="width: 5%">操作</td> 167 <td style="width: 5%">操作</td>
168 </tr> 168 </tr>
169 </tbody></table> 169 </tbody></table>
@@ -192,8 +192,8 @@ @@ -192,8 +192,8 @@
192 <td class="center" style="width: 5%">[[retailPrice]]</td> 192 <td class="center" style="width: 5%">[[retailPrice]]</td>
193 <td class="center" style="width: 5%">[[salesPrice]]</td> 193 <td class="center" style="width: 5%">[[salesPrice]]</td>
194 <td class="center" style="width: 5%">[[productPrice.returnCoin]]</td> 194 <td class="center" style="width: 5%">[[productPrice.returnCoin]]</td>
195 - <td class="center" style="width: 5%">[[statusName]]</td>  
196 - <td style="width: 15%"> 195 + <td class="center" style="width: 8%">[[statusName]]</td>
  196 + <td style="width: 12%">
197 [[if productPrice.founder]][[productPrice.founder]][[/if]] 197 [[if productPrice.founder]][[productPrice.founder]][[/if]]
198 [[if productPrice.updateTime]]<br>[[productPrice.updateTime]][[/if]] 198 [[if productPrice.updateTime]]<br>[[productPrice.updateTime]][[/if]]
199 </td> 199 </td>