合并分支 'li' 到 'master'

zhifu



查看合并请求 !18

@@ -31,10 +31,12 @@ class IndexController extends HomeBaseController
                         if(Db::name('user')->insert($data)) {
                             $userId = Db::name('user')->getLastInsID();
                             session('user.id', $userId);
+                            session('user.openid', $userInfo['openid']);
                         }
                     }else {
                         $userId = Db::name('user')->where(['openid'=>$userInfo['openid']])->value('id');
                         session('user.id', $userId);
+                        session('user.openid', $userInfo['openid']);
                     }
                 }
             }

@@ -62,7 +62,7 @@ class PayController extends HomeBaseController
                     if ($order['pay_type'] == 1) {
                         $info = [
                             'attach' => $oid,
-                            'openid' => session('openid'),
+                            'openid' => session('user.openid'),
                             'body' => '微信支付-' . $order['name'],
                             'total_fee' => $order['whole']
                         ];