bugfix

src/pages.json

@@ -543,13 +543,13 @@
           }
         },
         {
-          "path": "pages/edit-student-profile/edit-student-profile",
+          "path": "pages/edit-profile/edit-profile",
           "style": {
             "navigationBarTitleText": ""
           }
         },
         {
-          "path": "pages/edit-teacher-profile/edit-teacher-profile",
+          "path": "pages/bind-teacher-profile/bind-teacher-profile",
           "style": {
             "navigationBarTitleText": ""
           }

src/pagesMain/pages/index/index.vue

@@ -70,7 +70,7 @@ const checkProvinceInfo = () => {
   }
 }
 const checkTeacherInfo = async () => {
-  const isTeacherInfoComplete = await userStore.checkInfoComplete();
+  await userStore.checkInfoComplete();
 }
 const handleChangeLocation = () => {
   if (userStore.isLogin) {
@@ -89,7 +89,7 @@ onPageScroll((e) => {
 onShow(() => {
   setTimeout(() => {
     checkProvinceInfo();
-    // checkTeacherInfo();
+    checkTeacherInfo();
   }, 500);
   isHide.value = false;
   setTimeout(() => {

src/pagesMain/pages/me/components/me-menu.vue

@@ -13,7 +13,7 @@
     <view class="-mt-10 rounded-8 py-20">
       <uv-cell-group :border="false">
         <uv-cell isLink :cellStyle="cellStyle"
-          @click="handleEditInfo">
+          @click="handleNavigate('/pagesSystem/pages/edit-profile/edit-profile', '基本资料')">
           <template #title>
             <view class="flex items-center gap-x-10">
               <ie-image src="/static/personal/icon_jibenziliao@2x.png" custom-class="w-34 h-34" />
@@ -22,6 +22,15 @@
           </template>
 
         </uv-cell>
+        <!-- <uv-cell isLink :cellStyle="cellStyle"
+          @click="handleNavigate('/pagesOther/pages/personal-center/change-pwd/change-pwd', '修改密码')">
+          <template #title>
+            <view class="flex items-center gap-x-10">
+              <ie-image src="/static/personal/icon_password@2x.png" custom-class="w-36 h-36" />
+              <text class="text-30 text-fore-subtitle">修改密码</text>
+            </view>
+          </template>
+        </uv-cell> -->
         <uv-cell isLink :cellStyle="cellStyle" @click="handleQuestion">
           <template #title>
             <view class="flex items-center gap-x-10">
@@ -95,15 +104,6 @@ const handleNavigate = async (pagePath: string, title: string) => {
     });
   }
 }
-const handleEditInfo = () => {
-  if (userStore.isStudent) {
-    handleNavigate('/pagesSystem/pages/edit-student-profile/edit-student-profile', '基本资料')
-  } else {
-    transferTo('/pagesSystem/pages/edit-teacher-profile/edit-teacher-profile', {
-      data: {}
-    });
-  }
-}
 const handleQuestion = async () => {
   transferTo('/pagesOther/pages/h5/h5', {
     data: {

src/pagesSystem/pages/bind-profile/bind-profile.vue

@@ -38,7 +38,7 @@
         </uv-form-item>
 
       </content-card>
-      <content-card v-if="showInviteInfo" title="邀请信息">
+      <content-card title="邀请信息">
         <uv-form-item label="邀请码" prop="form.inviteCode">
           <uv-input v-model="form.inviteCode" border="none" placeholder="请输入邀请码（非必填）" font-size="30rpx"
             :custom-style="customStyle">
@@ -75,10 +75,10 @@
       </content-card>
 
       <content-card v-if="showSchoolInfo" title="学校信息">
-        <template v-if="!isImproveMode" #right>
+        <template #right>
           <view class="text-26 text-primary underline" @click="handleNoSchool">没有我的学校班级?</view>
         </template>
-        <uv-form-item v-if="showSchoolName" label="学校名称" prop="form.name" borderBottom :required="isBindMode">
+        <uv-form-item label="学校名称" prop="form.name" borderBottom :required="isBindMode">
           <ie-picker ref="pickerRef" v-model="form.schoolName" disabled :placeholder="pickerPlaceholder"
             :custom-style="customStyle" :custom-label="form.schoolName" @click="handleSchoolSelect">
             <template v-if="isSchoolDisabled" #right>
@@ -86,24 +86,15 @@
             </template>
           </ie-picker>
         </uv-form-item>
-        <template v-if="showClassName">
-          <uv-form-item v-if="isImproveMode" label="所在班级" prop="form.name" :required="isBindMode">
-            <ie-picker ref="pickerRef" v-model="form.schoolClassName" :list="classList" title="选择班级" placeholder="请选择"
-              disabled :custom-style="customStyle" key-label="name" key-value="classId">
-              <template #right>
-                <ie-image src="/static/image/icon-lock.png" custom-class="w-24 h-30" mode="aspectFill" />
-              </template>
-            </ie-picker>
-          </uv-form-item>
-          <uv-form-item v-else label="所在班级" prop="form.name" :required="isBindMode">
-            <ie-picker ref="pickerRef" v-model="form.classId" :list="classList" :disabled="!form.schoolId" title="选择班级"
-              placeholder="请选择" :custom-style="customStyle" key-label="name" key-value="classId">
-              <template v-if="isClassDisabled" #right>
-                <ie-image src="/static/image/icon-lock.png" custom-class="w-24 h-30" mode="aspectFill" />
-              </template>
-            </ie-picker>
-          </uv-form-item>
-        </template>
+        <uv-form-item label="所在班级" prop="form.name" :required="isBindMode">
+          <ie-picker ref="pickerRef" v-model="form.classId" :list="classList" :disabled="!form.schoolId" title="选择班级"
+            placeholder="请选择" :custom-style="customStyle" key-label="name" key-value="classId"
+            @click="handlePreCheck('classId')">
+            <template v-if="isClassDisabled" #right>
+              <ie-image src="/static/image/icon-lock.png" custom-class="w-24 h-30" mode="aspectFill" />
+            </template>
+          </ie-picker>
+        </uv-form-item>
       </content-card>
     </uv-form>
     <ie-safe-toolbar :height="84" :shadow="false">
@@ -145,9 +136,8 @@ const customStyle = {
 };
 
 const isBindMode = computed(() => [EnumBindScene.LOGIN_BIND, EnumBindScene.REGISTER_BIND].includes(prevData.value.scene));
-const isImproveMode = computed(() => prevData.value.scene === EnumBindScene.IMPROVE);
-const isSchoolDisabled = computed(() => (isBindMode.value && !!prevData.value.cardInfo.assignSchoolId) || isImproveMode.value);
-const isClassDisabled = computed(() => (isBindMode.value && !!prevData.value.cardInfo.classId) || isImproveMode.value);
+const isSchoolDisabled = computed(() => isBindMode.value && !!prevData.value.cardInfo.assignSchoolId);
+const isClassDisabled = computed(() => isBindMode.value && !!prevData.value.cardInfo.classId);
 const isProvinceDisabled = computed(() => isBindMode.value && !!prevData.value.cardInfo.assignLocation);
 const isExamTypeDisabled = computed(() => (isBindMode.value && !!prevData.value.cardInfo.assignExamType));
 const contactPhone = computed(() => userStore.orgInfo.contactPhone);
@@ -157,16 +147,10 @@ const inputPlaceholder = computed(() => {
 const pickerPlaceholder = computed(() => {
   return isBindMode.value ? '请选择(提交后不可修改)' : '请选择';
 });
-const showInviteInfo = computed(() => {
-  return !isImproveMode.value;
-})
+
 const showSchoolInfo = computed(() => {
-  return isBindMode.value || isImproveMode.value;
+  return isBindMode.value;
 })
-// 代理机构不显示学校
-const showSchoolName = computed(() => userStore.userInfo.userType !== EnumUserType.AGENT);
-// 代理机构不显示班级
-const showClassName = computed(() => userStore.userInfo.userType !== EnumUserType.AGENT);
 
 const classList = ref<ClassItem[]>([]);
 const showCulture = computed(() => {
@@ -188,11 +172,11 @@ const handleNoSchool = () => {
   });
 }
 const handleSchoolSelect = () => {
-  if (isSchoolDisabled.value || !examTypeForm.value.examType) {
+  if (isSchoolDisabled.value) {
     return;
   }
-  // 老师已有学校信息
-  if (isImproveMode.value) {
+  if (!examTypeForm.value.examType) {
+    uni.$ie.showToast('请选择考生类别');
     return;
   }
   transferTo('/pagesSystem/pages/school-select/school-select', {
@@ -246,6 +230,14 @@ const handlePreCheck = (type: string) => {
       }
       return true;
     }
+    case 'classId': {
+      const { schoolId } = form.value;
+      if (!schoolId) {
+        uni.$ie.showToast('请选择学校');
+        return false;
+      }
+      return true;
+    }
   }
 }
 
@@ -338,12 +330,6 @@ const handleSubmit = async () => {
       if (prevData.value.scene === EnumBindScene.REGISTER) {
         startRegister(params as BindCardInfo);
       } else {
-        // startRegisterBind(params as BindCardInfo);
-        // params = {
-        //   ...params,
-        //   username: prevData.value.registerInfo.username,
-        //   password: prevData.value.registerInfo.password,
-        // };
         console.log('初步提交信息:', params);
         if (prevData.value.scene === EnumBindScene.LOGIN_BIND) {
           startLoginBind(params as BindCardInfo);
@@ -351,30 +337,6 @@ const handleSubmit = async () => {
           startRegister(params as BindCardInfo);
         }
       }
-      // if (isBindMode.value) {
-      //   const { cardNo, password } = prevData.value;
-      //   params = {
-      //     ...params,
-      //     username: cardNo,
-      //     password,
-      //   }
-      //   console.log('params', params)
-      //   if (prevData.value.scene === 'card_improve') {
-      //     startRegister(params as BindCardInfo);
-      //   } else {
-      //     startRegisterBind(params as BindCardInfo)
-      //   }
-      // } else {
-      //   const { mobile, password, code, uuid } = prevData.value;
-      //   params = {
-      //     ...params,
-      //     mobile,
-      //     password,
-      //     code,
-      //     uuid,
-      //   }
-      //   startRegister(params as BindCardInfo);
-      // }
     } catch (error) {
       console.error(error)
     }

src/pagesSystem/pages/edit-teacher-profile/edit-teacher-profile.vue → src/pagesSystem/pages/bind-teacher-profile/bind-teacher-profile.vue

@@ -3,7 +3,7 @@
     <ie-navbar title="完善信息" custom-back @left-click="handleBack" />
     <uv-form labelPosition="left" :model="examTypeForm" labelWidth="70px" ref="formRef">
       <content-card title="个人信息">
-        <uv-form-item label="姓名" prop="name" borderBottom>
+        <uv-form-item label="姓名" prop="name" borderBottom required>
           <uv-input v-model="form.nickName" border="none" placeholder="请输入姓名" placeholderClass="text-30"
             font-size="30rpx" :custom-style="customStyle">
           </uv-input>
@@ -207,14 +207,6 @@ const loginValidate = () => {
       return false;
     }
   }
-  // if (!form.value.schoolName) {
-  //   uni.$ie.showToast('请选择学校');
-  //   return false;
-  // }
-  // if (!form.value.schoolClassName) {
-  //   uni.$ie.showToast('请选择班级');
-  //   return false;
-  // }
   return true;
 }
 const handleSubmit = async () => {

src/pagesSystem/pages/edit-student-profile/edit-student-profile.vue → src/pagesSystem/pages/edit-profile/edit-profile.vue

@@ -19,67 +19,68 @@
             <uv-input v-model="form.location" border="none" placeholder="" placeholderClass="text-30" font-size="30rpx"
               :custom-style="customStyle" readonly>
             </uv-input>
-            <ie-image slot="right" src="/static/image/icon-lock.png" custom-class="w-24 h-30"
-              mode="aspectFill" />
+            <ie-image slot="right" src="/static/image/icon-lock.png" custom-class="w-24 h-30" mode="aspectFill" />
           </uv-form-item>
           <uv-form-item label="考试类别" prop="name" borderBottom>
-            <view class="flex-1 pl-[26px]">
+            <view class="flex-1 pl-[26px] text-30">
               <ie-dict :dictName="EnumDictName.EXAM_TYPE" :dictValue="form.examType" />
             </view>
-            <ie-image slot="right" src="/static/image/icon-lock.png" custom-class="w-24 h-30"
-              mode="aspectFill" />
+            <ie-image slot="right" src="/static/image/icon-lock.png" custom-class="w-24 h-30" mode="aspectFill" />
           </uv-form-item>
           <uv-form-item label="单招年份" prop="name">
             <uv-input v-model="form.endYear" border="none" placeholder="" placeholderClass="text-30" font-size="30rpx"
               :custom-style="customStyle" readonly>
             </uv-input>
-            <ie-image slot="right" src="/static/image/icon-lock.png" custom-class="w-24 h-30"
-              mode="aspectFill" />
+            <ie-image slot="right" src="/static/image/icon-lock.png" custom-class="w-24 h-30" mode="aspectFill" />
           </uv-form-item>
         </content-card>
 
-        <content-card v-if="userStore.isStudent" title="文化素质">
+        <content-card title="文化素质">
           <uv-form-item label="语文" prop="name" borderBottom>
-            <uv-input v-model="scores.chinese" border="none" placeholder="请输入" placeholderClass="text-30"
+            <uv-input v-model="scores.chinese" border="none"
+              :placeholder="form.examType === EnumExamType.OHS ? '' : '请输入'" placeholderClass="text-30"
               font-size="30rpx" :custom-style="customStyle" :readonly="form.examType === EnumExamType.OHS">
             </uv-input>
-            <ie-image v-if="form.examType === EnumExamType.OHS" slot="right"
-              src="/static/image/icon-lock.png" custom-class="w-24 h-30" mode="aspectFill" />
+            <ie-image v-if="form.examType === EnumExamType.OHS" slot="right" src="/static/image/icon-lock.png"
+              custom-class="w-24 h-30" mode="aspectFill" />
           </uv-form-item>
           <uv-form-item label="数学" prop="name" borderBottom>
-            <uv-input v-model="scores.mathematics" border="none" placeholder="请输入" placeholderClass="text-30"
+            <uv-input v-model="scores.mathematics" border="none"
+              :placeholder="form.examType === EnumExamType.OHS ? '' : '请输入'" placeholderClass="text-30"
               font-size="30rpx" :custom-style="customStyle" :readonly="form.examType === EnumExamType.OHS">
             </uv-input>
-            <ie-image v-if="form.examType === EnumExamType.OHS" slot="right"
-              src="/static/image/icon-lock.png" custom-class="w-24 h-30" mode="aspectFill" />
+            <ie-image v-if="form.examType === EnumExamType.OHS" slot="right" src="/static/image/icon-lock.png"
+              custom-class="w-24 h-30" mode="aspectFill" />
           </uv-form-item>
           <uv-form-item label="外语" prop="name" :borderBottom="form.examType === EnumExamType.OHS">
-            <uv-input v-model="scores.foreign" border="none" placeholder="请输入" placeholderClass="text-30"
+            <uv-input v-model="scores.foreign" border="none"
+              :placeholder="form.examType === EnumExamType.OHS ? '' : '请输入'" placeholderClass="text-30"
               font-size="30rpx" :custom-style="customStyle" :readonly="form.examType === EnumExamType.OHS">
             </uv-input>
-            <ie-image v-if="form.examType === EnumExamType.OHS" slot="right"
-              src="/static/image/icon-lock.png" custom-class="w-24 h-30" mode="aspectFill" />
+            <ie-image v-if="form.examType === EnumExamType.OHS" slot="right" src="/static/image/icon-lock.png"
+              custom-class="w-24 h-30" mode="aspectFill" />
           </uv-form-item>
           <block v-if="[EnumExamType.OHS].includes(form.examType)">
             <uv-form-item label="物理" prop="name" borderBottom>
-              <uv-input v-model="scores.physics" border="none" placeholder="请输入" placeholderClass="text-30"
+              <uv-input v-model="scores.physics" border="none"
+                :placeholder="form.examType === EnumExamType.OHS ? '' : '请输入'" placeholderClass="text-30"
                 font-size="30rpx" :custom-style="customStyle" :readonly="form.examType === EnumExamType.OHS">
               </uv-input>
-              <ie-image v-if="form.examType === EnumExamType.OHS" slot="right"
-                src="/static/image/icon-lock.png" custom-class="w-24 h-30" mode="aspectFill" />
+              <ie-image v-if="form.examType === EnumExamType.OHS" slot="right" src="/static/image/icon-lock.png"
+                custom-class="w-24 h-30" mode="aspectFill" />
             </uv-form-item>
             <uv-form-item label="政治" prop="name">
-              <uv-input v-model="scores.political" border="none" placeholder="请输入" placeholderClass="text-30"
+              <uv-input v-model="scores.political" border="none"
+                :placeholder="form.examType === EnumExamType.OHS ? '' : '请输入'" placeholderClass="text-30"
                 font-size="30rpx" :custom-style="customStyle" :readonly="form.examType === EnumExamType.OHS">
               </uv-input>
-              <ie-image v-if="form.examType === EnumExamType.OHS" slot="right"
-                src="/static/image/icon-lock.png" custom-class="w-24 h-30" mode="aspectFill" />
+              <ie-image v-if="form.examType === EnumExamType.OHS" slot="right" src="/static/image/icon-lock.png"
+                custom-class="w-24 h-30" mode="aspectFill" />
             </uv-form-item>
           </block>
         </content-card>
 
-        <content-card v-if="userStore.isStudent && ([EnumExamType.OHS, EnumExamType.SVS].includes(form.examType))"
-          title="职业技能成绩">
+        <content-card v-if="([EnumExamType.OHS, EnumExamType.SVS].includes(form.examType))" title="职业技能成绩">
           <uv-form-item label="职业技能" prop="name">
             <uv-input v-model.number="scores.skill" border="none" placeholder="请输入" placeholderClass="text-30"
               font-size="30rpx" :custom-style="customStyle">
@@ -87,22 +88,39 @@
           </uv-form-item>
         </content-card>
 
-        <content-card v-if="userStore.isVip && userStore.isStudent" title="学校信息">
+        <template v-if="userStore.isStudent">
+          <content-card v-if="userStore.isVip" title="学校信息">
+            <uv-form-item label="学校名称" prop="form.name" borderBottom>
+              <uv-input v-model="form.schoolName" border="none" placeholder="" placeholderClass="text-30"
+                font-size="30rpx" :custom-style="customStyle" readonly>
+              </uv-input>
+              <ie-image slot="right" src="/static/image/icon-lock.png" custom-class="w-24 h-30" mode="aspectFill" />
+            </uv-form-item>
+            <uv-form-item label="所在班级" prop="form.name">
+              <ie-picker ref="pickerRef" v-model="form.classId" :list="classList" title="选择班级" placeholder="请选择所在班级"
+                :custom-style="customStyle" key-label="name" key-value="classId"></ie-picker>
+            </uv-form-item>
+          </content-card>
+        </template>
+        <content-card v-else title="学校信息">
           <uv-form-item label="学校名称" prop="form.name" borderBottom>
             <uv-input v-model="form.schoolName" border="none" placeholder="" placeholderClass="text-30"
               font-size="30rpx" :custom-style="customStyle" readonly>
             </uv-input>
-            <ie-image slot="right" src="/static/image/icon-lock.png" custom-class="w-24 h-30"
-              mode="aspectFill" />
+            <ie-image slot="right" src="/static/image/icon-lock.png" custom-class="w-24 h-30" mode="aspectFill" />
           </uv-form-item>
           <uv-form-item label="所在班级" prop="form.name">
-            <ie-picker ref="pickerRef" v-model="form.classId" :list="classList" title="选择班级" placeholder="请选择所在班级"
-              :custom-style="customStyle" key-label="name" key-value="classId"></ie-picker>
+            <ie-picker ref="pickerRef" v-model="form.schoolClassName" :list="classList" title="选择班级" disabled
+              placeholder="请选择所在班级" :custom-style="customStyle" key-label="name" key-value="classId">
+              <template #right>
+                <ie-image src="/static/image/icon-lock.png" custom-class="w-24 h-30" mode="aspectFill" />
+              </template>
+            </ie-picker>
           </uv-form-item>
         </content-card>
       </uv-form>
     </view>
-    <ie-safe-toolbar v-if="userStore.isStudent" :height="84" :shadow="false">
+    <ie-safe-toolbar :height="84" :shadow="false">
       <view class="px-30 py-16">
         <ie-button @click="handleSubmit">确认保存</ie-button>
       </view>
@@ -142,14 +160,23 @@ type SchoolInfo = {
   className: string;
   schoolId: number | null;
 }
-type UserProfile = Pick<UserInfo, 'nickName' | 'phonenumber' | 'location' | 'endYear' | 'examType'> & SchoolInfo;
+type UserProfile = Pick<UserInfo, 'nickName' | 'phonenumber' | 'location' | 'endYear' | 'examType' | 'schoolClassName'> & SchoolInfo;
+
 const form = ref<UserProfile>({
   ...userInfo.value,
-  schoolName: cardInfo.value?.schoolName || '',
-  classId: cardInfo.value?.classId || null,
-  className: cardInfo.value?.className || '',
-  schoolId: cardInfo.value?.schoolId || null
+  schoolName: '',
+  classId: null,
+  className: '',
+  schoolId: null
 });
+if (userStore.isStudent) {
+  form.value.schoolName = cardInfo.value?.schoolName || '';
+  form.value.classId = cardInfo.value?.classId || null;
+  form.value.className = cardInfo.value?.className || '';
+  form.value.schoolId = cardInfo.value?.schoolId || null
+} else {
+  form.value.schoolName = userInfo.value.schoolName
+}
 const scores = ref({
   ...userInfo.value.scores
 })

src/pagesSystem/pages/edit-teacher-profile/edit-teacher-profile copy.vue

@@ -1,102 +0,0 @@
-<template>
-  <ie-page bg-color="#F6F8FA" :safeAreaInsetBottom="false">
-    <ie-navbar title="完善信息" custom-back @left-click="handleBack" />
-    <uv-form labelPosition="left" :model="examTypeForm" labelWidth="70px" ref="formRef">
-      <content-card title="个人信息">
-        <uv-form-item label="姓名" prop="name" borderBottom>
-          <uv-input v-model="form.nickName" border="none" placeholder="请输入姓名"
-            placeholderClass="text-30" font-size="30rpx" :custom-style="customStyle">
-          </uv-input>
-        </uv-form-item>
-        <uv-form-item label="所在省份" prop="location" borderBottom required>
-          <ie-picker ref="pickerRef" v-model="examTypeForm.location" :list="provinceList" placeholder="选择省份"
-            :custom-style="customStyle" key-label="dictLabel" key-value="dictValue"></ie-picker>
-        </uv-form-item>
-        <uv-form-item label="考生类别" prop="examType" borderBottom required>
-          <ie-picker ref="pickerRef" v-model="examTypeForm.examType" :list="examTypeList"
-            :disabled="!examTypeForm.location" placeholder="选择考生类别" :custom-style="customStyle" key-label="dictLabel"
-            key-value="dictValue"></ie-picker>
-        </uv-form-item>
-        <uv-form-item label="毕业年份" prop="year" required>
-          <ie-picker ref="pickerRef" v-model="examTypeForm.endYear" :list="endYearList"
-            :disabled="!examTypeForm.examType" placeholder="选择毕业年份" :custom-style="customStyle" key-label="dictLabel"
-            key-value="dictValue"></ie-picker>
-        </uv-form-item>
-      </content-card>
-    </uv-form>
-    <ie-safe-toolbar :height="84" :shadow="false">
-      <view class="px-30 py-16">
-        <ie-button @click="handleSubmit">确认提交</ie-button>
-      </view>
-    </ie-safe-toolbar>
-  </ie-page>
-</template>
-
-<script lang="ts" setup>
-import ContentCard from '@/pagesSystem/components/content-card.vue';
-import { useExamType } from '@/composables/useExamType';
-import { updateUserInfo } from '@/api/modules/login';
-import { useUserStore } from '@/store/userStore';
-import { UserInfo } from '@/types/user';
-import { useTransferPage } from '@/hooks/useTransferPage';
-const { prevData, transferTo, transferBack } = useTransferPage();
-const { form: examTypeForm, examTypeList, examMajorList, provinceList, endYearList } = useExamType();
-const userStore = useUserStore();
-const userInfo = computed(() => userStore.userInfo);
-const cardInfo = computed(() => userStore.card);
-const customStyle = {
-  paddingLeft: '26px'
-};
-type SchoolInfo = {
-  schoolName: string;
-  classId: number | null;
-  className: string;
-  schoolId: number | null;
-}
-type UserProfile = Pick<UserInfo, 'nickName' | 'phonenumber' | 'location' | 'endYear' | 'examType'> & SchoolInfo;
-const form = ref<UserProfile>({
-  ...userInfo.value,
-  schoolName: cardInfo.value?.schoolName || '',
-  classId: cardInfo.value?.classId || null,
-  className: cardInfo.value?.className || '',
-  schoolId: cardInfo.value?.schoolId || null
-});
-
-const handleBack = () => {
-  uni.$ie.showToast('请先完善信息');
-};
-const handleSubmit = async () => {
-  console.log('handleSubmit', examTypeForm.value)
-  const { location, examType, endYear } = examTypeForm.value;
-  if (!location) {
-    uni.$ie.showToast('请先选择所在省份');
-    return;
-  }
-  if (!examType) {
-    uni.$ie.showToast('请先选择考试类别');
-    return;
-  }
-  if (!endYear) {
-    uni.$ie.showToast('请先选择毕业年份');
-    return;
-  }
-  const params = {
-    ...userStore.userInfo,
-    location,
-    examType,
-    endYear,
-  } as UserInfo;
-  uni.$ie.showLoading();
-  await updateUserInfo(params);
-  await userStore.getUserInfo();
-  uni.$ie.hideLoading();
-  uni.$ie.showToast('保存成功');
-  setTimeout(() => {
-    transferTo('/pagesMain/pages/index/index', {
-      type: 'reLaunch'
-    });
-  }, 800);
-};
-</script>
-
-<style></style>

src/pagesSystem/pages/login/login.vue

@@ -43,7 +43,7 @@
       </view>
       <view class="mt-42 ml-26">
         <uv-checkbox-group v-model="agreePrivacy">
-          <uv-checkbox name="true" shape="circle" label="记住密码" :labelSize="14" :iconSize="13" labelColor="#666666">
+          <uv-checkbox :name="true" shape="circle" label="记住密码" :labelSize="14" :iconSize="13" labelColor="#666666">
             <text class="text-28 text-fore-subcontent">已阅读并同意<text class="text-primary"
                 @click.stop="handleAgreePrivacy('user')">《用户协议》</text>和<text class="text-primary"
                 @click.stop="handleAgreePrivacy('privacy')">《隐私政策》</text></text>
@@ -216,27 +216,12 @@ const handleCardLogin = (params: LoginRequestDTO) => {
       userStore.login(res.token).then(({ success, userInfo }) => {
         uni.$ie.hideLoading();
         if (success && userInfo) {
-          console.log('登录成功', userInfo)
           const needComplete = needCompleteInfo(userInfo);
           if (needComplete) {
-            transferTo('/pagesSystem/pages/edit-teacher-profile/edit-teacher-profile');
-            // transferTo('/pagesSystem/pages/bind-profile/bind-profile', {
-            //   data: {
-            //     scene: EnumBindScene.IMPROVE,
-            //   }
-            // });
-            // transferTo('/pagesSystem/pages/phone-verify/phone-verify', {
-            //   data: {
-            //     scene: EnumBindScene.IMPROVE,
-            //     userInfo: userInfo,
-            //     cardInfo: {},
-            //     registerInfo: params
-            //   }
-            // });
+            transferTo('/pagesSystem/pages/bind-teacher-profile/bind-teacher-profile');
           } else {
             transferBack(true);
           }
-          // transferBack(true);
         } else {
           uni.$ie.showToast('登录失败')
         }
@@ -282,6 +267,9 @@ const handleValid = (data: { code: string; uuid: string }) => {
 
 onLoad(() => {
   rememberPassword.value[0] = userStore.rememberPwd;
+  if (import.meta.env.DEV) {
+    agreePrivacy.value = [true]
+  }
   if (userStore.rememberPwd) {
     cardNo.value = userStore.cardNo;
     cardPassword.value = userStore.cardPassword;

src/store/userStore.ts

@@ -173,7 +173,7 @@ export const useUserStore = defineStore('ie-user', {
       return new Promise((resolve, reject) => {
         if (this.needCompleteInfo && (!this.userInfo.location || !this.userInfo.examType || !this.userInfo.endYear)) {
           const { transferTo } = useTransferPage();
-          transferTo('/pagesSystem/pages/edit-teacher-profile/edit-teacher-profile').then(res => {
+          transferTo('/pagesSystem/pages/bind-teacher-profile/bind-teacher-profile').then(res => {
             resolve(res as boolean);
           }).catch(() => {
             resolve(false);