Browse Source

Merge remote-tracking branch 'origin/20230223_pad_vue_new_branch' into 20230223_pad_vue_new_branch

28169 2 months ago
parent
commit
299be6b09b
1 changed files with 22 additions and 14 deletions
  1. 22 14
      src/pages/home/login.vue

+ 22 - 14
src/pages/home/login.vue View File

69
 <script>
69
 <script>
70
 import "../../styles/newStyle.scss";
70
 import "../../styles/newStyle.scss";
71
 import { loginByPwd } from "@/api/login";
71
 import { loginByPwd } from "@/api/login";
72
+import {checkMobileIp} from "@/api/newlogin"
72
 import { hex_md5 } from "@/utils/md5";
73
 import { hex_md5 } from "@/utils/md5";
73
 import { Toast } from "vant";
74
 import { Toast } from "vant";
74
 import { checkMobile } from "@/utils/tools";
75
 import { checkMobile } from "@/utils/tools";
254
         })
255
         })
255
     },
256
     },
256
     checkMobileIp(){
257
     checkMobileIp(){
257
-      console.log("000000000000000000000000000000000000")
258
-      var that = this
259
-      axios.get('https://192.168.2.80:8080/test').then(function(response) {
260
-          console.log("response",response)
261
-          console.log("response.data.data.flag",response.data.data.flag)
262
-          if (response.data.state == 0) {
263
-            that.$message.error(response.data.data.msg);
264
-            return false
265
-          } 
266
-          if(response.data.state == 1) {
267
-            console.log("hahahahh")
268
-            that.$router.replace({ path: "/" });
269
-          }
270
-        }).catch(function(error) {
258
+      checkMobileIp().then(response=>{
259
+        if(response.data.state == 1){
260
+          
261
+        }
271
       })
262
       })
272
     },
263
     },
264
+    // checkMobileIp(){
265
+    //   console.log("000000000000000000000000000000000000")
266
+    //   var that = this
267
+    //   axios.get('https://192.168.2.80:8080/test').then(function(response) {
268
+    //       console.log("response",response)
269
+    //       console.log("response.data.data.flag",response.data.data.flag)
270
+    //       if (response.data.state == 0) {
271
+    //         that.$message.error(response.data.data.msg);
272
+    //         return false
273
+    //       } 
274
+    //       if(response.data.state == 1) {
275
+    //         console.log("hahahahh")
276
+    //         that.$router.replace({ path: "/" });
277
+    //       }
278
+    //     }).catch(function(error) {
279
+    //   })
280
+    // },
273
     showForgetPwdDialog() {
281
     showForgetPwdDialog() {
274
       Dialog.confirm({
282
       Dialog.confirm({
275
         title: "账号或密码不正确",
283
         title: "账号或密码不正确",