WINDOWS-7IFQK7E\EDY 2 gadi atpakaļ
vecāks
revīzija
5daab1f614

+ 2 - 0
src/components.d.ts

@@ -13,6 +13,7 @@ declare module '@vue/runtime-core' {
     RouterView: typeof import('vue-router')['RouterView']
     VanButton: typeof import('vant/es')['Button']
     VanCard: typeof import('vant/es')['Card']
+    VanCascader: typeof import('vant/es')['Cascader']
     VanCellGroup: typeof import('vant/es')['CellGroup']
     VanCheckbox: typeof import('vant/es')['Checkbox']
     VanCheckboxGroup: typeof import('vant/es')['CheckboxGroup']
@@ -34,6 +35,7 @@ declare module '@vue/runtime-core' {
     VanLoading: typeof import('vant/es')['Loading']
     VanNavBar: typeof import('vant/es')['NavBar']
     VanOverlay: typeof import('vant/es')['Overlay']
+    VanPopup: typeof import('vant/es')['Popup']
     VanPullRefresh: typeof import('vant/es')['PullRefresh']
     VanRadio: typeof import('vant/es')['Radio']
     VanRadioGroup: typeof import('vant/es')['RadioGroup']

+ 4 - 4
src/pages/_home/xszc.vue

@@ -10,10 +10,10 @@
       <van-form @submit="onSubmit" class="bg-light-50 w-full p-0">
         <van-cell-group inset v-for="(g, i) in forms">
           <div
-            v-if="childrenList.length > 1 || forms.length > 1"
+            v-if="childrenList.length > 0 || forms.length > 1"
             class="text-center px-6 mt-2"
           >
-            <span v-if="childrenList.length > 1"
+            <span v-if="childrenList.length > 0"
               >学生{{ childrenList.length + i + 1}}</span
             >
             <span v-if="forms.length > 1 && childrenList.length==0">学生{{ i + 1 }}</span>
@@ -79,10 +79,10 @@
         </van-cell-group>
         <div style="margin: 32px 64px">
           <van-button icon="plus" block type="primary" @click="addStu">
-            <span v-if="childrenList.length <= 1 && forms.length <= 1"
+            <span v-if="childrenList.length <= 0 && forms.length <= 1"
               >多子女添加</span
             >
-            <span v-if="childrenList.length > 1 || forms.length > 1"
+            <span v-if="childrenList.length > 0 || forms.length > 1"
               >继续添加</span
             >
           </van-button>

+ 2 - 3
src/pages/_home/zcdl.vue

@@ -11,9 +11,8 @@
         <p class="text-xl text-current my-3">欢迎来到呼和浩特南马路小学教育集团智慧校园平台</p>
         <p class="text-sm text-gray-500 mt-4">赶快注册加入吧</p>
       </div>
-      <div class="w-80 h-10 my-20 mx-auto relative">
-        <img class="w-7 absolute top-2 left-15" src="../../assets/images/icon.png" alt=""> 
-        <button @click="register" class="w-full h-full rounded-3xl">微信一键注册登录</button>
+      <div class="w-80vw h-10 my-20 mx-auto ">
+        <button @click="register" class="w-full h-full rounded-3xl relative"><img class="w-7 absolute left-8vw" src="../../assets/images/icon.png" alt="">微信一键注册登录</button>
       </div>
     </div>
 </template>

+ 7 - 4
src/pages/_user/bzrgz.vue

@@ -181,9 +181,9 @@
       <van-icon class="cha" @click="cancel" name="cross" size="5vw"></van-icon>
       <h3>提醒</h3>
       <div>
-        此申请账号关系为{{ 11 }}。 此学生已经关联过{{
+        此申请账号关系为{{ nowParent.relation }}。 此学生已经关联过{{
           already.length
-        }}位家长账号,关系为:{{ 22 }}。
+        }}位家长账号,关系为:{{ already?.relation }}。
       </div>
       <div style="margin: 16px">
         <van-button round block type="primary" @click="keepUp">
@@ -235,6 +235,7 @@ export default {
       rejectData: "",
       already: [],
       baseURL: window.GLOBAL_CONFIG.uc,
+      nowParent:{},
     };
   },
   methods: {
@@ -281,8 +282,11 @@ export default {
     },
     audit(s) {
       this.show = true;
+      this.checked.push(s)
+      this.nowParent = s;
       if (s.already_parent.length == 0) {
         this.auditShow = true;
+        // this.checked = s;
       } else {
         if (this.code == 0) {
           return showToast("不可重复审核!");
@@ -290,7 +294,6 @@ export default {
         this.checkShow = true;
         this.already = s.already_parent;
       }
-      this.checked = s;
     },
     keepUp() {
       this.checkShow = false;
@@ -514,7 +517,7 @@ export default {
 }
 .title {
   width: 100%;
-  background-image: url("../../assets/images/img-title.png");
+  background-image: url("@/assets/images/img-title.png");
   background-size: 100%;
   height: 17vw;
   line-height: 39px;