From d7b11a6c0be8f9059439d9a32c2c97165c0d4b00 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E8=BE=89?= <814457906@qq.com>
Date: Fri, 14 Oct 2022 16:25:53 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=B4=E6=8A=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development                       |  2 +-
 src/api/baseurl.js                     |  2 +-
 src/layout/index.vue                   | 11 ++++++-----
 src/views/system/info/index.vue        | 25 ++-----------------------
 src/views/system/studentInfo/index.vue |  3 +++
 5 files changed, 13 insertions(+), 30 deletions(-)

diff --git a/.env.development b/.env.development
index ea88cf7..7f71848 100644
--- a/.env.development
+++ b/.env.development
@@ -5,7 +5,7 @@ VUE_APP_TITLE = 智慧幼儿体质评估与促进系统
 ENV = 'development'
 
 # 智慧幼儿体质评估与促进系统/开发环境
-VUE_APP_BASE_API = 'http://192.168.16.81:8081'
+VUE_APP_BASE_API = 'https://kindergarten.xinelu.cn'
 #'/dev-api'
 
 # 路由懒加载
diff --git a/src/api/baseurl.js b/src/api/baseurl.js
index 10f4072..578fa91 100644
--- a/src/api/baseurl.js
+++ b/src/api/baseurl.js
@@ -1,3 +1,3 @@
-var baseurl = "http://192.168.16.62:8080";
+var baseurl = "https://kindergarten.xinelu.cn";
 
 export default baseurl
\ No newline at end of file
diff --git a/src/layout/index.vue b/src/layout/index.vue
index 85ebde8..fea38a6 100644
--- a/src/layout/index.vue
+++ b/src/layout/index.vue
@@ -72,8 +72,8 @@ export default {
       return variables;
     },
   },
-  created(){
-   this.info()
+  created() {
+    this.info();
   },
   watch: {
     $route(to, from) {
@@ -86,9 +86,10 @@ export default {
     },
   },
   methods: {
-    info(){
-      console.log(this.$router.path)
-       if (this.$router.path != "/index") {
+    info() {
+      console.log(this.$router.path);
+      console.log(this.$route.path);
+      if (this.$route.path != "/index") {
         this.show = false;
       } else {
         this.show = true;
diff --git a/src/views/system/info/index.vue b/src/views/system/info/index.vue
index 51b9c55..99a89c0 100644
--- a/src/views/system/info/index.vue
+++ b/src/views/system/info/index.vue
@@ -175,11 +175,7 @@
             v-model="form.parentId"
           />
         </el-form-item>
-        <el-form-item
-          label="所属区域"
-          prop="areaId"
-          v-if="List.length != 0 && form.parentId != 0"
-        >
+        <el-form-item label="所属区域" prop="areaId">
           <el-select
             v-model="value"
             placeholder="请选择省"
@@ -224,23 +220,6 @@
           </el-select>
         </el-form-item>
 
-        <el-form-item label="所属区域" prop="areaId" v-else>
-          <el-select
-            v-model="form.areaName"
-            placeholder="请选择省"
-            style="width: 380px"
-            disabled
-          >
-            <el-option
-              v-for="item in provincelist"
-              :key="item.areaId"
-              :label="item.name"
-              :value="item.areaId"
-              @click.native="province(item)"
-            >
-            </el-option>
-          </el-select>
-        </el-form-item>
         <el-form-item label="组织名称" prop="organizeName">
           <el-input
             v-model="form.organizeName"
@@ -416,7 +395,7 @@ export default {
     province(item) {
       this.value1 = "";
       this.value2 = "";
-      this.form.areaId = "";
+      this.form.areaId = item.id;
       getSubordinateInfo(item.id).then((res) => {
         this.citylist = res.data;
       });
diff --git a/src/views/system/studentInfo/index.vue b/src/views/system/studentInfo/index.vue
index 5d9e32f..c23d94f 100644
--- a/src/views/system/studentInfo/index.vue
+++ b/src/views/system/studentInfo/index.vue
@@ -1015,10 +1015,13 @@ export default {
     //验证身份证
     var isCardId = (rule, value, callback) => {
       if (!value) {
+        console.log(value);
         callback();
       } else {
         if (!this.checkSpecialKey(value)) {
           callback(new Error("不能含有特殊字符！！"));
+        } else {
+          callback();
         }
       }
     };