Merge remote-tracking branch 'origin/master'

app/controller/Wechat.php

@@ -4,6 +4,9 @@ namespace app\controller;
 
 use EasyWeChat\Factory;
 use EasyWeChat\OfficialAccount\Application;
+use think\facade\Config;
+use think\facade\Route;
+use think\facade\View;
 
 class Wechat
 {
@@ -17,7 +20,7 @@ class Wechat
      */
     private function initWechat()
     {
-        $this->app = Factory::officialAccount(config('wechat'));
+        $this->app = Factory::officialAccount(Config::get('wechat'));
     }
 
     /**
@@ -26,10 +29,14 @@ class Wechat
      * @Date   : 2022/9/9 11:29
      * @Author : <Jason.C>
      */
-    public function url()
+    public function url(): string
     {
+        $url      = $GLOBALS['data']['data']['url'];
+        $redirect = Route::buildUrl('wechat/code', ['callback' => $url])
+            ->suffix(false)
+            ->domain(true);
         $this->initWechat();
-        redirect($this->app->oauth->scopes(['snsapi_userinfo'])->redirect());
+        return $this->app->oauth->scopes(['snsapi_userinfo'])->redirect($redirect);
     }
 
     /**
@@ -38,10 +45,12 @@ class Wechat
      * @Date   : 2022/9/9 11:29
      * @Author : <Jason.C>
      */
-    public function callback()
+    public function code()
     {
         $this->initWechat();
         $user = $this->app->oauth->user();
+        $code = $GLOBALS['data']['data']['code'];
+        $user = $this->app->oauth->userFromCode($code);
         // $user 可以用的方法:
         // $user->getId();  // 对应微信的 OPENID
         // $user->getNickname(); // 对应微信的 nickname
@@ -57,9 +66,21 @@ class Wechat
      * @Date   : 2022/9/9 11:32
      * @Author : <Jason.C>
      */
-    public function payment()
+    public function payment(): string
     {
-
+        $config =  Config::get('wechat.payment');
+        $payment  = Factory::payment($config);
+        $unify    = $payment->order->unify([
+            'body'         => '商品订单',
+            'out_trade_no' => time(),
+            'total_fee'    => 100,
+            'notify_url'   => '',
+            'trade_type'   => 'JSAPI',
+            'openid'       => '$openid',
+        ]);
+        $prepayId = $unify->prepay_id;
+        $jssdk    = $payment->jssdk->bridgeConfig($prepayId);
+        return View::fetch('', ['jssdk' => $jssdk]);
     }
 
     /**