简柏林 / thingskit-app · Commits

Commit 02ed73f5e2587f9e3ed1710bb4810ca69a24d980

Authored by fengtao
1 parent 2dfa0f22

pref:app端 登录用户名密码输入错误 不提示

Inline Side-by-side
Showing 2 changed files with 265 additions and 260 deletions
1 1 import base from "@/config/baseUrl";
2 2 import store from "@/store";
3   -import { judgeLogin } from "@/config/login";
  3 +import {
  4 + judgeLogin
  5 +} from "@/config/login";
4 6
5 7 // 初始化请求配置
6 8 uni.$u.http.setConfig((config) => {
7   - const token =
8   - store.state.userInfo.isToken ||
9   - uni.getStorageSync("userInfo").isToken ||
10   - undefined;
11   - // #ifdef H5
12   - window.sessionStorage.getItem("userInfo").isToken;
13   - // #endif
14   - /* config 为默认全局配置*/
15   - // const getConfiguration = uni.getStorageSync('getConfiguration').isConfiguration
16   - // console.log('getConfiguration', getConfiguration);
17   - // config.baseURL = getConfiguration == true ? base.baseDrawioUrl : base.baseUrl /* 根域名 */
18   - config.baseURL = base.baseUrl; /* 根域名 */
19   - config.header = {
20   - "Content-Type": "application/json",
21   - "X-Authorization": "Bearer " + token,
22   - };
23   - config.custom = {
24   - load: true, //是否显示加载动画
25   - isFactory: true, //true:返回的数据成功只返回data false:返回response
26   - catch: true, //默认数据返回不成功进入catch返回
27   - auth: true, //token
28   - };
29   - return config;
  9 + const token =
  10 + store.state.userInfo.isToken ||
  11 + uni.getStorageSync("userInfo").isToken ||
  12 + undefined;
  13 + // #ifdef H5
  14 + window.sessionStorage.getItem("userInfo").isToken;
  15 + // #endif
  16 + /* config 为默认全局配置*/
  17 + // const getConfiguration = uni.getStorageSync('getConfiguration').isConfiguration
  18 + // console.log('getConfiguration', getConfiguration);
  19 + // config.baseURL = getConfiguration == true ? base.baseDrawioUrl : base.baseUrl /* 根域名 */
  20 + config.baseURL = base.baseUrl; /* 根域名 */
  21 + config.header = {
  22 + "Content-Type": "application/json",
  23 + "X-Authorization": "Bearer " + token,
  24 + };
  25 + config.custom = {
  26 + load: true, //是否显示加载动画
  27 + isFactory: true, //true:返回的数据成功只返回data false:返回response
  28 + catch: true, //默认数据返回不成功进入catch返回
  29 + auth: true, //token
  30 + };
  31 + return config;
30 32 });
31 33
32 34 // 请求拦截
33 35 uni.$u.http.interceptors.request.use(
34   - (config) => {
35   - if (store.state.userInfo.isThirdLogin) {
36   - uni.switchTab({
37   - url: "../pages/personal/personal",
38   - });
39   - }
40   - // 初始化请求拦截器时，会执行此方法，此时data为undefined，赋予默认{}
41   - config.data = config.data || {};
42   - // 根据custom参数中配置的是否需要token，添加对应的请求头
43   - const getConfiguration =
44   - uni.getStorageSync("getConfiguration").isConfiguration;
45   - if (config?.custom?.auth) {
46   - config.header["X-Authorization"] =
47   - "Bearer " + store.state.userInfo.isToken ||
48   - uni.getStorageSync("userInfo").isToken ||
49   - undefined;
50   - config.baseURL =
51   - getConfiguration == true ? base.baseDrawioUrl : base.baseUrl;
52   - }
53   - if (config?.custom?.load) {
54   - //打开加载动画
55   - store.commit("setLoadingShow", true);
56   - }
57   - if (getConfiguration) {
58   - uni.setStorageSync("config", config);
59   - } else {
60   - uni.removeStorageSync("config");
61   - }
62   - return config;
63   - },
64   - (config) => {
65   - return Promise.reject(config);
66   - }
  36 + (config) => {
  37 + if (store.state.userInfo.isThirdLogin) {
  38 + uni.switchTab({
  39 + url: "../pages/personal/personal",
  40 + });
  41 + }
  42 + // 初始化请求拦截器时，会执行此方法，此时data为undefined，赋予默认{}
  43 + config.data = config.data || {};
  44 + // 根据custom参数中配置的是否需要token，添加对应的请求头
  45 + const getConfiguration =
  46 + uni.getStorageSync("getConfiguration").isConfiguration;
  47 + if (config?.custom?.auth) {
  48 + config.header["X-Authorization"] =
  49 + "Bearer " + store.state.userInfo.isToken ||
  50 + uni.getStorageSync("userInfo").isToken ||
  51 + undefined;
  52 + config.baseURL =
  53 + getConfiguration == true ? base.baseDrawioUrl : base.baseUrl;
  54 + }
  55 + if (config?.custom?.load) {
  56 + //打开加载动画
  57 + store.commit("setLoadingShow", true);
  58 + }
  59 + if (getConfiguration) {
  60 + uni.setStorageSync("config", config);
  61 + } else {
  62 + uni.removeStorageSync("config");
  63 + }
  64 + return config;
  65 + },
  66 + (config) => {
  67 + return Promise.reject(config);
  68 + }
67 69 );
68 70
69 71 // 响应拦截
70 72 uni.$u.http.interceptors.response.use(
71   - (response) => {
72   - // 关闭加载动画
73   - store.commit("setLoadingShow", false);
74   - const data = response.data;
75   - const custom = response.config?.custom;
76   - // code: 200、请求成功 其他，没有更多参数 401、被迫下线重新登录、
77   - if (response.statusCode == 200) {
78   - return Promise.resolve(data);
79   - } else if (response.statusCode == 401) {
80   - // 清空登录信息
81   - store.commit("emptyUserInfo");
82   - // 20秒节流，弹窗登录
83   - uni.$u.throttle(judgeLogin(), 20000);
84   - return new Promise(() => {});
85   - } else {
86   - }
87   - },
88   - (response) => {
89   - // 关闭加载动画
90   - store.commit("setLoadingShow", false);
91   - let show = true;
92   - let errorData = "请检查网络或服务器";
93   - let message =
94   - response.data?.message || response.data?.msg || response?.errMsg;
95   - if (message == "request:fail url not in domain list") {
96   - errorData = "检查请求域名是否添加了域名白名单";
97   - } else if (message == "request:fail timeout") {
98   - errorData = "请求超时:请检查网络";
99   - } else if (response.data.status == 401) {
100   - const isLoginFlag = uni.getStorageSync("userInfo");
101   - if (!store.state.userInfo.isThirdLogin) {
102   - const routers = getCurrentPages();
103   - const currentRoute = routers[routers.length - 1].route;
104   - const isLoginPage = currentRoute.includes(
105   - "publicLoginSubPage/public/login"
106   - );
107   - !isLoginPage &&
108   - uni.reLaunch({
109   - url: "/publicLoginSubPage/public/login",
110   - });
111   - // 清空登录信息
112   - store.commit("emptyUserInfo");
113   - show = false;
114   - } else {
115   - uni.switchTab({
116   - url: "../pages/personal/personal",
117   - });
118   - show = false;
119   - }
120   - } else if (message == "request:ok") {
121   - show = false;
122   - errorData = "";
123   - } else {
124   - errorData = message || "";
125   - }
126   - if (show) uni.$u.toast(errorData);
127   - return Promise.reject(response);
128   - }
129   -);
  73 + (response) => {
  74 + // 关闭加载动画
  75 + store.commit("setLoadingShow", false);
  76 + const data = response.data;
  77 + const custom = response.config?.custom;
  78 + // code: 200、请求成功 其他，没有更多参数 401、被迫下线重新登录、
  79 + if (response.statusCode == 200) {
  80 + return Promise.resolve(data);
  81 + } else if (response.statusCode == 401) {
  82 + // 清空登录信息
  83 + store.commit("emptyUserInfo");
  84 + // 20秒节流，弹窗登录
  85 + uni.$u.throttle(judgeLogin(), 20000);
  86 + return new Promise(() => {});
  87 + } else {}
  88 + },
  89 + (response) => {
  90 + // 关闭加载动画
  91 + store.commit("setLoadingShow", false);
  92 + let show = true;
  93 + let errorData = "请检查网络或服务器";
  94 + let message =
  95 + response.data?.message || response.data?.msg || response?.errMsg;
  96 + if (message == "request:fail url not in domain list") {
  97 + errorData = "检查请求域名是否添加了域名白名单";
  98 + } else if (message == "request:fail timeout") {
  99 + errorData = "请求超时:请检查网络";
  100 + } else if (response.data.status == 401) {
  101 + const isLoginFlag = uni.getStorageSync("userInfo");
  102 + if (!store.state.userInfo.isThirdLogin) {
  103 + const routers = getCurrentPages();
  104 + const currentRoute = routers[routers.length - 1].route;
  105 + const isLoginPage = currentRoute.includes(
  106 + "publicLoginSubPage/public/login"
  107 + );
  108 + !isLoginPage &&
  109 + uni.reLaunch({
  110 + url: "/publicLoginSubPage/public/login",
  111 + });
  112 + // 清空登录信息
  113 + store.commit("emptyUserInfo");
  114 + show = false;
  115 + } else {
  116 + uni.switchTab({
  117 + url: "../pages/personal/personal",
  118 + });
  119 + show = false;
  120 + }
  121 + } else if (message == "request:ok") {
  122 + show = false;
  123 + errorData = "";
  124 + } else {
  125 + errorData = message || "";
  126 + }
  127 + // console.log('errorData', errorData);
  128 + uni.$u.toast(message);
  129 + // if (show) uni.$u.toast(errorData);
  130 + return Promise.reject(response);
  131 + }
  132 +);
... ...
1 1 {
2   - "name" : "yun-teng-app",
3   - "appid" : "__UNI__AD0D64F",
4   - "description" : "thingskit",
5   - "versionName" : "1.0.0",
6   - "versionCode" : 100,
7   - "transformPx" : false,
8   - "app-plus" : {
9   - "usingComponents" : true,
10   - "nvueStyleCompiler" : "uni-app",
11   - "compilerVersion" : 3,
12   - "splashscreen" : {
13   - "alwaysShowBeforeRender" : false,
14   - "waiting" : false,
15   - "autoclose" : true,
16   - "delay" : 0
17   - },
18   - "modules" : {
19   - "VideoPlayer" : {},
20   - "Maps" : {},
21   - "Contacts" : {},
22   - "FaceID" : {},
23   - "Messaging" : {},
24   - "OAuth" : {},
25   - "Camera" : {}
26   - },
27   - "compatible" : {
28   - "ignoreVersion" : true
29   - },
30   - "distribute" : {
31   - "android" : {
32   - "permissions" : [
33   - "<uses-feature android:name=\"android.hardware.camera\"/>",
34   - "<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
35   - "<uses-permission android:name=\"android.permission.ACCESS_COARSE_LOCATION\"/>",
36   - "<uses-permission android:name=\"android.permission.ACCESS_FINE_LOCATION\"/>",
37   - "<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
38   - "<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
39   - "<uses-permission android:name=\"android.permission.CAMERA\"/>",
40   - "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
41   - "<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
42   - "<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
43   - "<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
44   - "<uses-permission android:name=\"android.permission.INSTALL_PACKAGES\"/>",
45   - "<uses-permission android:name=\"android.permission.INTERNET\"/>",
46   - "<uses-permission android:name=\"android.permission.MODIFY_AUDIO_SETTINGS\"/>",
47   - "<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
48   - "<uses-permission android:name=\"android.permission.READ_CONTACTS\"/>",
49   - "<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
50   - "<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
51   - "<uses-permission android:name=\"android.permission.READ_SMS\"/>",
52   - "<uses-permission android:name=\"android.permission.REQUEST_INSTALL_PACKAGES\"/>",
53   - "<uses-permission android:name=\"android.permission.SEND_SMS\"/>",
54   - "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
55   - "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
56   - "<uses-permission android:name=\"android.permission.WRITE_CONTACTS\"/>",
57   - "<uses-permission android:name=\"android.permission.WRITE_EXTERNAL_STORAGE\"/>",
58   - "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>",
59   - "<uses-permission android:name=\"android.permission.WRITE_SMS\"/>"
60   - ],
61   - "autoSdkPermissions" : false
62   - },
63   - "ios" : {
64   - "dSYMs" : false
65   - },
66   - "sdkConfigs" : {
67   - "ad" : {},
68   - "geolocation" : {
69   - "system" : {
70   - "__platform__" : [ "ios", "android" ]
71   - },
72   - "amap" : {
73   - "__platform__" : [ "ios", "android" ],
74   - "appkey_ios" : "",
75   - "appkey_android" : ""
76   - }
77   - },
78   - "maps" : {
79   - "amap" : {
80   - "appkey_ios" : "5221d1373233c782efac82fb176f7f7d",
81   - "appkey_android" : "5221d1373233c782efac82fb176f7f7d"
82   - }
83   - },
84   - "oauth" : {
85   - "weixin" : {
86   - "appid" : "wx0ad61d7bf6808e02",
87   - "UniversalLinks" : ""
88   - }
89   - }
90   - },
91   - "splashscreen" : {
92   - "androidStyle" : "default",
93   - "android" : {}
94   - },
95   - "icons" : {
96   - "android" : {
97   - "xxhdpi" : "static/logo.png",
98   - "xhdpi" : "static/logo.png",
99   - "hdpi" : "static/logo.png",
100   - "xxxhdpi" : "static/logo.png"
101   - }
102   - }
103   - }
104   - },
105   - "quickapp" : {},
106   - "mp-weixin" : {
107   - "appid" : "wx99c411dc3c5571ef",
108   - "setting" : {
109   - "urlCheck" : false,
110   - "minified" : true,
111   - "es6" : false,
112   - "postcss" : true
113   - },
114   - "usingComponents" : true,
115   - "permission" : {
116   - "scope.userLocation" : {
117   - "desc" : "你的位置信息将用于小程序位置接口的效果展示"
118   - }
119   - },
120   - "lazyCodeLoading" : "requiredComponents",
121   - "optimization" : {
122   - "subPackages" : true
123   - }
124   - },
125   - "mp-alipay" : {
126   - "usingComponents" : true
127   - },
128   - "mp-baidu" : {
129   - "usingComponents" : true
130   - },
131   - "mp-toutiao" : {
132   - "usingComponents" : true
133   - },
134   - "uniStatistics" : {
135   - "enable" : false
136   - },
137   - "vueVersion" : "2",
138   - "h5" : {
139   - "sdkConfigs" : {
140   - "maps" : {}
141   - },
142   - "router" : {
143   - "base" : "minImage/h5/"
144   - }
145   - }
  2 + "name": "ThingsKit",
  3 + "appid": "__UNI__AD0D64F",
  4 + "description": "thingskit",
  5 + "versionName": "1.0.0",
  6 + "versionCode": 100,
  7 + "transformPx": false,
  8 + "app-plus": {
  9 + "usingComponents": true,
  10 + "nvueStyleCompiler": "uni-app",
  11 + "compilerVersion": 3,
  12 + "splashscreen": {
  13 + "alwaysShowBeforeRender": false,
  14 + "waiting": false,
  15 + "autoclose": true,
  16 + "delay": 0
  17 + },
  18 + "modules": {
  19 + "VideoPlayer": {},
  20 + "Maps": {},
  21 + "Contacts": {},
  22 + "FaceID": {},
  23 + "Messaging": {},
  24 + "OAuth": {},
  25 + "Camera": {}
  26 + },
  27 + "compatible": {
  28 + "ignoreVersion": true
  29 + },
  30 + "distribute": {
  31 + "android": {
  32 + "permissions": [
  33 + "<uses-feature android:name=\"android.hardware.camera\"/>",
  34 + "<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
  35 + "<uses-permission android:name=\"android.permission.ACCESS_COARSE_LOCATION\"/>",
  36 + "<uses-permission android:name=\"android.permission.ACCESS_FINE_LOCATION\"/>",
  37 + "<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
  38 + "<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
  39 + "<uses-permission android:name=\"android.permission.CAMERA\"/>",
  40 + "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
  41 + "<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
  42 + "<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
  43 + "<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
  44 + "<uses-permission android:name=\"android.permission.INSTALL_PACKAGES\"/>",
  45 + "<uses-permission android:name=\"android.permission.INTERNET\"/>",
  46 + "<uses-permission android:name=\"android.permission.MODIFY_AUDIO_SETTINGS\"/>",
  47 + "<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
  48 + "<uses-permission android:name=\"android.permission.READ_CONTACTS\"/>",
  49 + "<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
  50 + "<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
  51 + "<uses-permission android:name=\"android.permission.READ_SMS\"/>",
  52 + "<uses-permission android:name=\"android.permission.REQUEST_INSTALL_PACKAGES\"/>",
  53 + "<uses-permission android:name=\"android.permission.SEND_SMS\"/>",
  54 + "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
  55 + "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
  56 + "<uses-permission android:name=\"android.permission.WRITE_CONTACTS\"/>",
  57 + "<uses-permission android:name=\"android.permission.WRITE_EXTERNAL_STORAGE\"/>",
  58 + "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>",
  59 + "<uses-permission android:name=\"android.permission.WRITE_SMS\"/>"
  60 + ],
  61 + "autoSdkPermissions": false
  62 + },
  63 + "ios": {
  64 + "dSYMs": false
  65 + },
  66 + "sdkConfigs": {
  67 + "ad": {},
  68 + "geolocation": {
  69 + "system": {
  70 + "__platform__": ["ios", "android"]
  71 + },
  72 + "amap": {
  73 + "__platform__": ["ios", "android"],
  74 + "appkey_ios": "",
  75 + "appkey_android": ""
  76 + }
  77 + },
  78 + "maps": {
  79 + "amap": {
  80 + "appkey_ios": "5221d1373233c782efac82fb176f7f7d",
  81 + "appkey_android": "5221d1373233c782efac82fb176f7f7d"
  82 + }
  83 + },
  84 + "oauth": {
  85 + "weixin": {
  86 + "appid": "wx0ad61d7bf6808e02",
  87 + "UniversalLinks": ""
  88 + }
  89 + }
  90 + },
  91 + "splashscreen": {
  92 + "androidStyle": "default",
  93 + "android": {},
  94 + "useOriginalMsgbox": false
  95 + },
  96 + "icons": {
  97 + "android": {
  98 + "xxhdpi": "static/logo.png",
  99 + "xhdpi": "static/logo.png",
  100 + "hdpi": "static/logo.png",
  101 + "xxxhdpi": "static/logo.png"
  102 + }
  103 + }
  104 + }
  105 + },
  106 + "quickapp": {},
  107 + "mp-weixin": {
  108 + "appid": "wx99c411dc3c5571ef",
  109 + "setting": {
  110 + "urlCheck": false,
  111 + "minified": true,
  112 + "es6": false,
  113 + "postcss": true
  114 + },
  115 + "usingComponents": true,
  116 + "permission": {
  117 + "scope.userLocation": {
  118 + "desc": "你的位置信息将用于小程序位置接口的效果展示"
  119 + }
  120 + },
  121 + "lazyCodeLoading": "requiredComponents",
  122 + "optimization": {
  123 + "subPackages": true
  124 + }
  125 + },
  126 + "mp-alipay": {
  127 + "usingComponents": true
  128 + },
  129 + "mp-baidu": {
  130 + "usingComponents": true
  131 + },
  132 + "mp-toutiao": {
  133 + "usingComponents": true
  134 + },
  135 + "uniStatistics": {
  136 + "enable": false
  137 + },
  138 + "vueVersion": "2",
  139 + "h5": {
  140 + "sdkConfigs": {
  141 + "maps": {}
  142 + },
  143 + "router": {
  144 + "base": "minImage/h5/"
  145 + }
  146 + },
  147 + "locale": "zh-Hans"
146 148 }
... ...