From d9a029b8c6af7c56e6a8686aeedc013074fa1bae Mon Sep 17 00:00:00 2001
From: devil <fuxiang.gong@qq.com>
Date: Thu, 20 Aug 2020 18:01:03 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=86=E8=8A=82=E4=BC=98=E5=8C=96+=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=E6=94=AF=E4=BB=98id=E9=94=99=E8=AF=AF=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/index/view/default/user/index.html | 2 +-
 public/static/index/default/css/cart.css       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/application/index/view/default/user/index.html b/application/index/view/default/user/index.html
index 25b6fbef2..968bfbca2 100755
--- a/application/index/view/default/user/index.html
+++ b/application/index/view/default/user/index.html
@@ -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>
diff --git a/public/static/index/default/css/cart.css b/public/static/index/default/css/cart.css
index 3e05be361..07b8487b3 100755
--- a/public/static/index/default/css/cart.css
+++ b/public/static/index/default/css/cart.css
@@ -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; }