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

src/pages/home/login.vue

@@ -69,6 +69,7 @@
 <script>
 import "../../styles/newStyle.scss";
 import { loginByPwd } from "@/api/login";
+import {checkMobileIp} from "@/api/newlogin"
 import { hex_md5 } from "@/utils/md5";
 import { Toast } from "vant";
 import { checkMobile } from "@/utils/tools";
@@ -254,22 +255,29 @@ export default {
         })
     },
     checkMobileIp(){
-      console.log("000000000000000000000000000000000000")
-      var that = this
-      axios.get('https://192.168.2.80:8080/test').then(function(response) {
-          console.log("response",response)
-          console.log("response.data.data.flag",response.data.data.flag)
-          if (response.data.state == 0) {
-            that.$message.error(response.data.data.msg);
-            return false
-          } 
-          if(response.data.state == 1) {
-            console.log("hahahahh")
-            that.$router.replace({ path: "/" });
-          }
-        }).catch(function(error) {
+      checkMobileIp().then(response=>{
+        if(response.data.state == 1){
+          
+        }
       })
     },
+    // checkMobileIp(){
+    //   console.log("000000000000000000000000000000000000")
+    //   var that = this
+    //   axios.get('https://192.168.2.80:8080/test').then(function(response) {
+    //       console.log("response",response)
+    //       console.log("response.data.data.flag",response.data.data.flag)
+    //       if (response.data.state == 0) {
+    //         that.$message.error(response.data.data.msg);
+    //         return false
+    //       } 
+    //       if(response.data.state == 1) {
+    //         console.log("hahahahh")
+    //         that.$router.replace({ path: "/" });
+    //       }
+    //     }).catch(function(error) {
+    //   })
+    // },
     showForgetPwdDialog() {
       Dialog.confirm({
         title: "账号或密码不正确",