分享积分fix

app/index/controller/Cart.php

@@ -36,7 +36,9 @@ class Cart extends Controller
     {
         $userId = Session::get('user_id');
         if (empty($userId)) {
-            return view('passport/logIn');
+            Cache::set('returnuri','/index/cart/shoppingCart.html');
+            return redirect('/index/passport/login');
+            //return view('passport/logIn');
         }
 
         // 购物车商品列表

app/index/controller/Passport.php

@@ -12,6 +12,7 @@ declare (strict_types=1);
 
 namespace app\index\controller;
 
+use think\facade\Cache;
 use app\index\service\passport\Login as LoginService;
 use think\facade\Session;
 
@@ -48,9 +49,11 @@ class Passport extends Controller
         Session::set('access_token', $token);
         Session::set('user_id', $userInfo['user_id']);
 
+       $returnUri = Cache::pull('returnuri');
         return $this->renderSuccess([
             'userId' => (int)$userInfo['user_id'],
-            'token' => $LoginService->getToken((int)$userInfo['user_id'])
+            'token' => $LoginService->getToken((int)$userInfo['user_id']),
+            'returnUri' => $returnUri ?? ''
         ], '登录成功');
     }
 

app/index/view/passport/logIn.html

@@ -204,7 +204,13 @@
                     if (obj.status === 200 || obj.status === '200') {
                         showToast('Login successful')
                         setTimeout(function () {
-                            jumpPage()
+                            //jumpPage()
+                            if (obj.data.returnUri !== ''){
+                                window.location.replace(obj.data.returnUri);
+                            }else {
+                                window.location.replace('/index/index/index.html');
+                            }
+
                         }, 2000)
                     } else {
                         showToast(obj.message)