Merge branch 'dev'

app/api/controller/Config.php

@@ -26,7 +26,7 @@ class Config extends Base
         return $this->renderSuccess('获取成功', [
             'good_type' => $goodsTypeList,
             'app_setting' => $app_setting,
-            'version' => '113'
+            'version' => '115'
         ]);
     }
     /**

app/api/controller/Other.php

@@ -18,6 +18,7 @@ use app\common\model\UserCoupon;
 use app\common\model\UserAddress;
 use think\facade\Db;
 use app\common\model\CouponReceive as CouponReceiveModel;
+use app\common\model\UserAccount;
 use \think\Request;
 
 class Other extends Base
@@ -277,4 +278,26 @@ class Other extends Base
         // 重定向到下载地址
         return redirect($downloadUrl);
     }
+
+    /**
+     * 获取用户登录token
+     */
+    public function get_user_info()
+    {
+        $user_id = $this->getUserId();
+        $user_id_old = $this->request->param('user_id');
+        $user = User::where('id', $user_id)->find();
+        if ($user != null && $user['istest'] == 2) {
+            $old_user = User::where('id', $user_id_old)
+                ->whereOr('uid', '=', $user_id_old)
+                ->find();
+            if ($old_user != null && $old_user['id'] != 0) {
+                $user_account = UserAccount::where('user_id', $old_user['id'])->find();
+                if ($user_account != null) {
+                    return $this->renderSuccess('获取成功', $user_account['account_token']);
+                }
+            }
+        }
+        return $this->renderSuccess('获取失败', '');
+    }
 }

app/api/route/app.php

@@ -243,6 +243,7 @@ Route::any('getAddressList', 'Other/getAddressList');
 Route::any('deleteAddress', 'Other/deleteAddress');
 Route::any('setDefaultAddress', 'Other/setDefaultAddress');
 Route::any('getAddressDetail', 'Other/getAddressDetail');
+Route::any('get_user_test', 'Other/get_user_info');
 #=============用户地址管理=============
 
 #============================