sileya-ai
/
vr-shopxo-source
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

细节优化+订单支付id错误修复

feat/task1-c-wallet
devil 2020-08-20 18:01:03 +08:00
parent 822c9e3456
commit d9a029b8c6
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
application/index/view/default/user/index.html
View File

@ -206,7 +206,7 @@
</ul>
</div>
{{if in_array($order['status'], [1])}}
<a class="am-btn am-btn-primary am-btn-xs am-radius am-fr order-submit" href="{{:MyUrl('index/order/detail', ['id'=>$order['id'], 'is_pay_auto'=>1])}}" target="_blank">支付</a>
<a class="am-btn am-btn-primary am-btn-xs am-radius am-fr order-submit" href="{{:MyUrl('index/order/detail', ['id'=>$order['id'], 'ids'=>$order['id'], 'is_pay_auto'=>1])}}" target="_blank">支付</a>
{{/if}}
{{if in_array($order['status'], [3])}}
<button type="button" class="am-btn am-btn-success am-btn-xs am-radius am-fr order-submit submit-ajax submit-confirm" data-url="{{:MyUrl('index/order/Collect')}}" data-id="{{$order.id}}" data-view="reload" data-msg="请仔细确认已收到货物、确认继续吗？">收货</button>

2
public/static/index/default/css/cart.css
View File

@ -41,7 +41,7 @@ strong.total-price-content, .selected-tips strong, .nav-total-price { color: #d2
.am-footer { margin-top: 10px; }
.nav-left { width: calc(30% - 5px); }
.nav-right { width: 70%; }
.nav-right { width: 68%; }
.cart-nav, .nav-left, .nav-right { overflow: hidden; }
.nav-right .nav-total-price { display: block;
width: calc(100% - 122px); height: 30px; -o-text-overflow: ellipsis; text-overflow: ellipsis; overflow: hidden; white-space: nowrap; }