Merge branch 'yohobuy_portak_dev_v4.8_20160620' into dongjunjie_4.9
Showing
2 changed files
with
10 additions
and
10 deletions
| @@ -97,7 +97,7 @@ | @@ -97,7 +97,7 @@ | ||
| 97 | <div id="yohoCoinImportResultSet"> | 97 | <div id="yohoCoinImportResultSet"> |
| 98 | <div class="title">返还方式设置：</div> | 98 | <div class="title">返还方式设置：</div> |
| 99 | <div class="form-inline" style="display: none"> | 99 | <div class="form-inline" style="display: none"> |
| 100 | - <label style="width: 80px">反币时间：</label> | 100 | + <label style="width: 80px">返币时间：</label> |
| 101 | <div class="form-group"> | 101 | <div class="form-group"> |
| 102 | <input type="radio" name="returnCoinTime" value="1"> | 102 | <input type="radio" name="returnCoinTime" value="1"> |
| 103 | <label>长期</label> | 103 | <label>长期</label> |
| @@ -199,8 +199,8 @@ | @@ -199,8 +199,8 @@ | ||
| 199 | <td colspan="9" style="padding: 0; border-left: 1px solid #ddd"> | 199 | <td colspan="9" style="padding: 0; border-left: 1px solid #ddd"> |
| 200 | <table> | 200 | <table> |
| 201 | <tr> | 201 | <tr> |
| 202 | - <!--td width="50%"><b>反币时间</b></td--> | ||
| 203 | - <td width="40%"><b>反币金额</b></td> | 202 | + <!--td width="50%"><b>返币时间</b></td--> |
| 203 | + <td width="40%"><b>返币金额</b></td> | ||
| 204 | <td width="40%"><b>审核人</b></td> | 204 | <td width="40%"><b>审核人</b></td> |
| 205 | <td width="20%"><b>操作</b></td> | 205 | <td width="20%"><b>操作</b></td> |
| 206 | </tr> | 206 | </tr> |
| @@ -220,7 +220,7 @@ | @@ -220,7 +220,7 @@ | ||
| 220 | </div> | 220 | </div> |
| 221 | </td--> | 221 | </td--> |
| 222 | <td> | 222 | <td> |
| 223 | - <input type="text" class="form-control center editor-yohoCoin" placeholder="反币金额" value="[[productPrice.returnCoinMoney]]" style="width: 100px"> | 223 | + <input type="text" class="form-control center editor-yohoCoin" placeholder="返币金额" value="[[productPrice.returnCoinMoney]]" style="width: 100px"> |
| 224 | </td> | 224 | </td> |
| 225 | <td> | 225 | <td> |
| 226 | <select class="form-control center editor-auditor" style="width: 150px"> | 226 | <select class="form-control center editor-auditor" style="width: 150px"> |
| @@ -250,7 +250,7 @@ | @@ -250,7 +250,7 @@ | ||
| 250 | <th>SKN</th> | 250 | <th>SKN</th> |
| 251 | <th>品牌</th> | 251 | <th>品牌</th> |
| 252 | <th>吊牌价</th> | 252 | <th>吊牌价</th> |
| 253 | - <th>反币金额</th> | 253 | + <th>返币金额</th> |
| 254 | <th>操作</th> | 254 | <th>操作</th> |
| 255 | </tr> | 255 | </tr> |
| 256 | </thead> | 256 | </thead> |
| @@ -97,7 +97,7 @@ | @@ -97,7 +97,7 @@ | ||
| 97 | <div id="yohoCoinImportResultSet"> | 97 | <div id="yohoCoinImportResultSet"> |
| 98 | <div class="title">返还方式设置：</div> | 98 | <div class="title">返还方式设置：</div> |
| 99 | <div class="form-inline" style="display: none"> | 99 | <div class="form-inline" style="display: none"> |
| 100 | - <label style="width: 80px">反币时间：</label> | 100 | + <label style="width: 80px">返币时间：</label> |
| 101 | <div class="form-group"> | 101 | <div class="form-group"> |
| 102 | <input type="radio" name="returnCoinTime" value="1"> | 102 | <input type="radio" name="returnCoinTime" value="1"> |
| 103 | <label>长期</label> | 103 | <label>长期</label> |
| @@ -199,8 +199,8 @@ | @@ -199,8 +199,8 @@ | ||
| 199 | <td colspan="9" style="padding: 0; border-left: 1px solid #ddd"> | 199 | <td colspan="9" style="padding: 0; border-left: 1px solid #ddd"> |
| 200 | <table> | 200 | <table> |
| 201 | <tr> | 201 | <tr> |
| 202 | - <!--td width="50%"><b>反币时间</b></td--> | ||
| 203 | - <td width="40%"><b>反币金额</b></td> | 202 | + <!--td width="50%"><b>返币时间</b></td--> |
| 203 | + <td width="40%"><b>返币金额</b></td> | ||
| 204 | <td width="40%"><b>审核人</b></td> | 204 | <td width="40%"><b>审核人</b></td> |
| 205 | <td width="20%"><b>操作</b></td> | 205 | <td width="20%"><b>操作</b></td> |
| 206 | </tr> | 206 | </tr> |
| @@ -220,7 +220,7 @@ | @@ -220,7 +220,7 @@ | ||
| 220 | </div> | 220 | </div> |
| 221 | </td--> | 221 | </td--> |
| 222 | <td> | 222 | <td> |
| 223 | - <input type="text" class="form-control center editor-yohoCoin" placeholder="反币金额" value="[[productPrice.returnCoinMoney]]" style="width: 100px"> | 223 | + <input type="text" class="form-control center editor-yohoCoin" placeholder="返币金额" value="[[productPrice.returnCoinMoney]]" style="width: 100px"> |
| 224 | </td> | 224 | </td> |
| 225 | <td> | 225 | <td> |
| 226 | <select class="form-control center editor-auditor" style="width: 150px"> | 226 | <select class="form-control center editor-auditor" style="width: 150px"> |
| @@ -250,7 +250,7 @@ | @@ -250,7 +250,7 @@ | ||
| 250 | <th>SKN</th> | 250 | <th>SKN</th> |
| 251 | <th>品牌</th> | 251 | <th>品牌</th> |
| 252 | <th>吊牌价</th> | 252 | <th>吊牌价</th> |
| 253 | - <th>反币金额</th> | 253 | + <th>返币金额</th> |
| 254 | <th>操作</th> | 254 | <th>操作</th> |
| 255 | </tr> | 255 | </tr> |
| 256 | </thead> | 256 | </thead> |
-
Please register or login to post a comment