简柏林 / thingskit-app · Commits

Commit cc902d0e6faf70495563c8275ee62337ffe162fc

Authored by xp.Huang
2 parents 1855513f 44bf5b77

Merge branch 'ft_local_dev' into 'main' 

fix：修改绑定账号手机号验证码登录接口路径

See merge request huang/thingskit-app!81
Inline Side-by-side
Showing 3 changed files with 127 additions and 123 deletions
... ... @@ -89,7 +89,7 @@ uni.$u.http.interceptors.response.use(
89 89 store.commit("setLoadingShow", false);
90 90 let show = true;
91 91 let errorData = '请检查网络或服务器'
92   - let message = response.data?.message || response?.errMsg;
  92 + let message = response.data?.message || response.data?.msg || response?.errMsg
93 93 if (message == "request:fail url not in domain list") {
94 94 errorData = "检查请求域名是否添加了域名白名单";
95 95 } else if (message == "request:fail timeout") {
... ...
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": true,
14   - "waiting": true,
15   - "autoclose": true,
16   - "delay": 0
17   - },
18   - "modules": {
19   - "VideoPlayer": {},
20   - "Contacts": {},
21   - "OAuth": {},
22   - "Messaging": {},
23   - "FaceID": {}
24   - },
25   - "distribute": {
26   - "android": {
27   - "permissions": [
28   - "<uses-feature android:name=\"android.hardware.camera\"/>",
29   - "<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
30   - "<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
31   - "<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
32   - "<uses-permission android:name=\"android.permission.CAMERA\"/>",
33   - "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
34   - "<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
35   - "<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
36   - "<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
37   - "<uses-permission android:name=\"android.permission.INSTALL_PACKAGES\"/>",
38   - "<uses-permission android:name=\"android.permission.MODIFY_AUDIO_SETTINGS\"/>",
39   - "<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
40   - "<uses-permission android:name=\"android.permission.READ_CONTACTS\"/>",
41   - "<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
42   - "<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
43   - "<uses-permission android:name=\"android.permission.READ_SMS\"/>",
44   - "<uses-permission android:name=\"android.permission.REQUEST_INSTALL_PACKAGES\"/>",
45   - "<uses-permission android:name=\"android.permission.SEND_SMS\"/>",
46   - "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
47   - "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
48   - "<uses-permission android:name=\"android.permission.WRITE_CONTACTS\"/>",
49   - "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>",
50   - "<uses-permission android:name=\"android.permission.WRITE_SMS\"/>"
51   - ]
52   - },
53   - "ios": {},
54   - "sdkConfigs": {
55   - "ad": {},
56   - "geolocation": {
57   - "system": {
58   - "__platform__": ["ios", "android"]
59   - },
60   - "amap": {
61   - "__platform__": ["ios", "android"],
62   - "appkey_ios": "",
63   - "appkey_android": ""
64   - }
65   - },
66   - "maps": {},
67   - "oauth": {}
68   - },
69   - "splashscreen": {
70   - "androidStyle": "default",
71   - "android": {
72   - "hdpi": "C:/Users/YunTeng/Pictures/logo.png",
73   - "xhdpi": "C:/Users/YunTeng/Pictures/logo.png",
74   - "xxhdpi": "C:/Users/YunTeng/Pictures/logo.png"
75   - }
76   - }
77   - }
78   - },
79   - "quickapp": {},
80   - "mp-weixin": {
81   - "appid": "wx99c411dc3c5571ef",
82   - "setting": {
83   - "urlCheck": false,
84   - "minified": true,
85   - "es6": true,
86   - "postcss": true
87   - },
88   - "usingComponents": true,
89   - "permission": {
90   - "scope.userLocation": {
91   - "desc": "如果没有位置信息则使用当前定位"
92   - }
93   - },
94   - "requiredPrivateInfos": ["getLocation"],
95   - "lazyCodeLoading": "requiredComponents",
96   - //开启分包优化
97   - "optimization": {
98   - "subPackages": true
99   - }
100   - },
101   - "mp-alipay": {
102   - "usingComponents": true
103   - },
104   - "mp-baidu": {
105   - "usingComponents": true
106   - },
107   - "mp-toutiao": {
108   - "usingComponents": true
109   - },
110   - "uniStatistics": {
111   - "enable": false
112   - },
113   - "vueVersion": "2",
114   - "h5": {
115   - "sdkConfigs": {
116   - "maps": {}
117   - },
118   - "router": {
119   - "base": "minImage/h5/"
120   - }
121   - }
  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" : true,
  14 + "waiting" : true,
  15 + "autoclose" : true,
  16 + "delay" : 0
  17 + },
  18 + "modules" : {
  19 + "VideoPlayer" : {},
  20 + "Contacts" : {},
  21 + "OAuth" : {},
  22 + "Messaging" : {},
  23 + "FaceID" : {},
  24 + "Maps" : {}
  25 + },
  26 + "distribute" : {
  27 + "android" : {
  28 + "permissions" : [
  29 + "<uses-feature android:name=\"android.hardware.camera\"/>",
  30 + "<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
  31 + "<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
  32 + "<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
  33 + "<uses-permission android:name=\"android.permission.CAMERA\"/>",
  34 + "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
  35 + "<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
  36 + "<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
  37 + "<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
  38 + "<uses-permission android:name=\"android.permission.INSTALL_PACKAGES\"/>",
  39 + "<uses-permission android:name=\"android.permission.MODIFY_AUDIO_SETTINGS\"/>",
  40 + "<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
  41 + "<uses-permission android:name=\"android.permission.READ_CONTACTS\"/>",
  42 + "<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
  43 + "<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
  44 + "<uses-permission android:name=\"android.permission.READ_SMS\"/>",
  45 + "<uses-permission android:name=\"android.permission.REQUEST_INSTALL_PACKAGES\"/>",
  46 + "<uses-permission android:name=\"android.permission.SEND_SMS\"/>",
  47 + "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
  48 + "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
  49 + "<uses-permission android:name=\"android.permission.WRITE_CONTACTS\"/>",
  50 + "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>",
  51 + "<uses-permission android:name=\"android.permission.WRITE_SMS\"/>"
  52 + ]
  53 + },
  54 + "ios" : {
  55 + "dSYMs" : false
  56 + },
  57 + "sdkConfigs" : {
  58 + "ad" : {},
  59 + "geolocation" : {
  60 + "system" : {
  61 + "__platform__" : [ "ios", "android" ]
  62 + },
  63 + "amap" : {
  64 + "__platform__" : [ "ios", "android" ],
  65 + "appkey_ios" : "",
  66 + "appkey_android" : ""
  67 + }
  68 + },
  69 + "maps" : {
  70 + "amap" : {
  71 + "appkey_ios" : "5221d1373233c782efac82fb176f7f7d",
  72 + "appkey_android" : "5221d1373233c782efac82fb176f7f7d"
  73 + }
  74 + },
  75 + "oauth" : {}
  76 + },
  77 + "splashscreen" : {
  78 + "androidStyle" : "default",
  79 + "android" : {}
  80 + }
  81 + }
  82 + },
  83 + "quickapp" : {},
  84 + "mp-weixin" : {
  85 + "appid" : "wx99c411dc3c5571ef",
  86 + "setting" : {
  87 + "urlCheck" : false,
  88 + "minified" : true,
  89 + "es6" : true,
  90 + "postcss" : true
  91 + },
  92 + "usingComponents" : true,
  93 + "permission" : {
  94 + "scope.userLocation" : {
  95 + "desc" : "如果没有位置信息则使用当前定位"
  96 + }
  97 + },
  98 + "requiredPrivateInfos" : [ "getLocation" ],
  99 + "lazyCodeLoading" : "requiredComponents",
  100 + //开启分包优化
  101 + "optimization" : {
  102 + "subPackages" : true
  103 + }
  104 + },
  105 + "mp-alipay" : {
  106 + "usingComponents" : true
  107 + },
  108 + "mp-baidu" : {
  109 + "usingComponents" : true
  110 + },
  111 + "mp-toutiao" : {
  112 + "usingComponents" : true
  113 + },
  114 + "uniStatistics" : {
  115 + "enable" : false
  116 + },
  117 + "vueVersion" : "2",
  118 + "h5" : {
  119 + "sdkConfigs" : {
  120 + "maps" : {}
  121 + },
  122 + "router" : {
  123 + "base" : "minImage/h5/"
  124 + }
  125 + }
122 126 }
... ...
... ... @@ -233,7 +233,7 @@ export default {
233 233 bindConfirm() {
234 234 //需要绑定
235 235 if (!this.bindPhone) {
236   - if (this.bindAccountObj.appUserKey == '') {
  236 + if (this.bindAccountObj.appUserKey == '' || this.bindAccountObj.appUserKey == undefined) {
237 237 return uni.$u.toast('请输入登录账号~');
238 238 }
239 239 const passReg = /^(?=.*?[A-Z])(?=(.*[a-z]){1,})(?=(.*[\d]){1,})(?=(.*[\W]){1,})(?!.*\s).{8,}$/;
... ... @@ -421,7 +421,7 @@ export default {
421 421 }
422 422 let httpData = {};
423 423 // 获取验证码接口
424   - uni.$u.http.post(`/yt/noauth/sendLoginSmsCode/${this.bindPhoneObj.appUserKey}`).then(res => {
  424 + uni.$u.http.post(`/yt/noauth/send_login_code/${this.bindPhoneObj.appUserKey}`).then(res => {
425 425 if (res) {
426 426 this.getCodeState(); //开始倒计时
427 427 }
... ...