From 1e4e7cd60f996a00d289b7017dd35d8fe100a1fd Mon Sep 17 00:00:00 2001
From: devil_gong <devil_gong@wochacha.com>
Date: Mon, 8 Apr 2019 14:57:12 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E6=89=8B=E6=9C=BA=E7=AB=AF?=
 =?UTF-8?q?=E5=9C=B0=E5=9D=80=E4=B8=BA=E7=A9=BA=EF=BC=8C=E5=BE=AE=E4=BF=A1?=
 =?UTF-8?q?H5=E6=94=AF=E4=BB=98=E8=BF=94=E5=9B=9E=E5=9C=B0=E5=9D=80?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/index/controller/Buy.php          | 3 ++-
 application/index/view/default/buy/index.html | 2 +-
 application/service/OrderService.php          | 1 +
 extend/payment/Weixin.php                     | 4 ++++
 4 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/application/index/controller/Buy.php b/application/index/controller/Buy.php
index 44140c364..0f8723588 100755
--- a/application/index/controller/Buy.php
+++ b/application/index/controller/Buy.php
@@ -63,7 +63,8 @@ class Buy extends Common
             if(isset($ret['code']) && $ret['code'] == 0)
             {
                 // 用户地址
-                $this->assign('user_address_list', UserService::UserAddressList(['user'=>$this->user])['data']);
+                $address = UserService::UserAddressList(['user'=>$this->user]);
+                $this->assign('user_address_list', $address['data']);
 
                 // 支付方式
                 $this->assign('payment_list', PaymentService::BuyPaymentList(['is_enable'=>1, 'is_open_user'=>1]));
diff --git a/application/index/view/default/buy/index.html b/application/index/view/default/buy/index.html
index e083e30db..f5bc33bc9 100755
--- a/application/index/view/default/buy/index.html
+++ b/application/index/view/default/buy/index.html
@@ -26,7 +26,7 @@
             {{if !empty($user_address_list)}}
                 <ul class="address-list">
                     {{foreach $user_address_list as $address}}
-                        <li class="{{if (isset($params['address_id']) and $params['address_id'] eq $address['id']) or (!isset($params['address_id']) and isset($address['is_default']) and $address['is_default'] eq 1)}}address-default{{/if}}" id="data-list-{{$address.id}}" data-value="{{$address.id}}">
+                        <li class="{{if (isset($params['address_id']) and $params['address_id'] eq $address['id']) or (!isset($params['address_id']) and isset($address['is_default']) and $address['is_default'] eq 1) or (count($user_address_list) eq 1)}}address-default{{/if}}" id="data-list-{{$address.id}}" data-value="{{$address.id}}">
                             <div class="address-left">
                                 <div class="user-base">
                                     {{if !empty($address.alias)}}
diff --git a/application/service/OrderService.php b/application/service/OrderService.php
index 5bd89e4dd..fa3678289 100755
--- a/application/service/OrderService.php
+++ b/application/service/OrderService.php
@@ -109,6 +109,7 @@ class OrderService
         $pay_data = array(
             'user'          => $params['user'],
             'out_user'      => md5($params['user']['id']),
+            'order_id'      => $order['id'],
             'order_no'      => $order['order_no'],
             'name'          => '订单支付',
             'total_price'   => $order['total_price'],
diff --git a/extend/payment/Weixin.php b/extend/payment/Weixin.php
index 0077e06fb..c9be284f9 100755
--- a/extend/payment/Weixin.php
+++ b/extend/payment/Weixin.php
@@ -183,6 +183,10 @@ class Weixin
 
             // h5支付
             case 'MWEB' :
+                if(!empty($params['order_id']))
+                {
+                    $data['mweb_url'] .= '&redirect_url='.urlencode(MyUrl('index/order/detail', ['id'=>$params['order_id']]));
+                }
                 $result = DataReturn('success', 0, $data['mweb_url']);
                 break;