修复bug

src/pages/promote/exam.vue

@@ -18,7 +18,7 @@
       <uv-icon name="/static/image/rand.png" label="随机练习" label-pos="right" label-color="white"/>
       <uv-icon name="arrow-right" color="white"/>
     </view>
-    <view class="card mb-20 flex justify-between items-center py-30 bg-orange" @click="toSim" v-if="exam.type === 1">
+    <view class="card mb-20 flex justify-between items-center py-30 bg-orange" @click="toSim">
       <uv-icon name="empty-favor" label="模拟考试" color="white" label-pos="right" label-color="white"/>
       <uv-icon name="arrow-right" color="white"/>
     </view>

src/pages/promote/promote.vue

@@ -618,7 +618,7 @@ export default {
           content: '请先完善个人信息,完成后才能进行培训',
           showCancel: false,
           success() {
-            uni.redirectTo({url: '/pages/user/userDetail'})
+            uni.navigateTo({url: '/pages/user/userDetail'})
           }
         })
       }

src/pages/promote/survey.vue

@@ -608,7 +608,7 @@ export default {
         content: '请先完善个人信息',
         showCancel: false,
         success() {
-          uni.redirectTo({url: '/pages/user/userDetail'})
+          uni.navigateTo({url: '/pages/user/userDetail'})
         }
       })
     } else {

src/pages/signUp/info.vue

@@ -84,7 +84,8 @@
               </uv-cell>
               <uv-cell title="手机号">
                 <template #value>
-                  <uv-input placeholder="请输入手机号" v-model="form.phone" inputAlign="right"></uv-input>
+                  <uv-input placeholder="请输入手机号" v-model="form.phone" inputAlign="right"
+                            maxlength="11"></uv-input>
                 </template>
                 <template #icon>
                   <text class="text-red">*</text>
@@ -330,7 +331,8 @@
       </view>
       <uv-gap height="100rpx"/>
     </uv-popup>
-    <uv-picker ref="picker" :columns="[workTypeList]" @confirm="confirmWorkType" keyName="title" title="选择工种"/>
+    <uv-picker ref="picker" :columns="[workTypeList, workTypeList[workTypeIndex].children]" @change="changeWorkType" @confirm="confirmWorkType"
+               keyName="title" title="选择工种"/>
     <uv-popup ref="conditionPicker" mode="bottom" round="15" closeable>
       <view class="p-50">
         <view style="line-height: 35rpx" class="text-25 text-center p-15 rounded border mb-15"
@@ -360,11 +362,12 @@
     <uv-picker ref="houseTypePicker" :columns="[houseTypeColumns]" @confirm="confirmHouseType"></uv-picker>
     <uv-popup ref="workExpPicker" mode="bottom" round="15" closeable>
       <view class="p-50">
+        <view class="text-25 text-gray my-15">温馨提示：请按实填写，并填写工作单位全称，否则可能影响材料制作</view>
         <uv-form labelPosition="left" labelWidth="120">
           <uv-form-item label="工作单位" borderBottom>
             <uv-input
               font-size="28rpx"
-              placeholder="请输入工作单位"
+              placeholder="请输入工作单位全称"
               v-model="currentWorkExp.company"
               border="none"
               inputAlign="right"
@@ -545,9 +548,19 @@ const picker = ref(null)
 const openPicker = () => {
   picker.value.open()
 }
+
+const workTypeIndex = ref(0)
 const confirmWorkType = ({value}) => {
-  form.value.workTypeId = value[0].id
-  form.value.workTypeName = value[0].title
+  // console.log(val)
+  form.value.workTypeId = value[1].id
+  form.value.workTypeName = value[1].title
+}
+
+const changeWorkType = ({columnIndex, index}) => {
+  if (columnIndex === 0) {
+    workTypeIndex.value = index
+    console.log(workTypeList.value[index].children)
+  }
 }
 
 const conditionPicker = ref()
@@ -580,12 +593,22 @@ const showPopup = () => {
 }
 
 const workTypeList = ref([])
+const workTypeListOrigin = ref([])
 const getWorkTypeList = async () => {
   const {data} = await workTypeListReq()
-  workTypeList.value = data
+  workTypeList.value = data.filter(item => !item.parentId)
+  workTypeListOrigin.value = JSON.parse(JSON.stringify(data))
+  workTypeList.value = workTypeList.value.map(item => {
+    item.children = workTypeListOrigin.value.filter(origin => origin.parentId === item.id)
+    return item
+  })
   workTypeList.value.unshift({
     title: '无',
     id: 0,
+    children: [{
+      title: '无',
+      id: 0,
+    }]
   })
 }
 
@@ -797,6 +820,10 @@ const join = async () => {
       return $toast('请上传劳动合同盖章页三页')
     }
   }
+  if (!['初中', '职业高中', '技工学校', '中等专科', '普通高中', '其他'].includes(form.value.education) && !form.value.school)
+    return $toast('请输入毕业院校')
+  if (!['初中', '普通高中', '其他'].includes(form.value.education) && !form.value.school)
+    return $toast('请输入所学专业')
   if (hasPaper.value && !form.value.schoolPaper) {
     return $toast('请上传毕业证')
   }

src/pages/signUp/self.vue

@@ -105,7 +105,8 @@
               </uv-cell>
               <uv-cell title="手机号">
                 <template #value>
-                  <uv-input placeholder="请输入手机号" v-model="form.phone" inputAlign="right"></uv-input>
+                  <uv-input placeholder="请输入手机号" v-model="form.phone" inputAlign="right"
+                            maxlength="11"></uv-input>
                 </template>
                 <template #icon>
                   <text class="text-red">*</text>
@@ -350,8 +351,13 @@
         </view>
       </view>
     </uv-popup>
-    <uv-picker ref="picker" :columns="[workTypeList]" @confirm="confirmWorkType" keyName="title" title="选择工种"/>
-    <uv-picker ref="reqWorkTypePicker" :columns="[workTypeListOrigin]" @confirm="confirmReqWorkType" keyName="title"
+    <uv-picker ref="picker" :columns="[workTypeList, workTypeList[workTypeIndex].children]" @change="changeWorkType"
+               @confirm="confirmWorkType"
+               keyName="title" title="选择工种"/>
+    <uv-picker ref="reqWorkTypePicker" v-if="workTypeListOrigin.length"
+               :columns="[workTypeListOrigin, workTypeListOrigin[reqWorkTypeIndex].children]"
+               @change="changeReqWorkType"
+               @confirm="confirmReqWorkType" keyName="title"
                title="选择工种"/>
     <uv-picker ref="jobPicker" :columns="[jobList]" @confirm="confirmJob" keyName="position"
                title="选择岗位"/>
@@ -385,11 +391,12 @@
     <uv-picker ref="houseTypePicker" :columns="[houseTypeColumns]" @confirm="confirmHouseType"></uv-picker>
     <uv-popup ref="workExpPicker" mode="bottom" round="15" closeable>
       <view class="p-50">
+        <view class="text-25 text-gray my-15">温馨提示：请按实填写，并填写工作单位全称，否则可能影响材料制作</view>
         <uv-form labelPosition="left" labelWidth="120">
           <uv-form-item label="工作单位" borderBottom>
             <uv-input
               font-size="28rpx"
-              placeholder="请输入工作单位"
+              placeholder="请输入工作单位全称"
               v-model="currentWorkExp.company"
               border="none"
               inputAlign="right"
@@ -581,9 +588,23 @@ const picker = ref(null)
 const openPicker = () => {
   picker.value.open()
 }
+
+const workTypeIndex = ref(0)
 const confirmWorkType = ({value}) => {
-  form.value.workTypeId = value[0].id
-  form.value.workTypeName = value[0].title
+  form.value.workTypeId = value[1].id
+  form.value.workTypeName = value[1].title
+}
+
+const changeWorkType = ({columnIndex, index}) => {
+  if (columnIndex === 0) {
+    workTypeIndex.value = index
+  }
+}
+
+const changeReqWorkType = ({columnIndex, index}) => {
+  if (columnIndex === 0) {
+    reqWorkTypeIndex.value = index
+  }
 }
 
 const reqLevelStr = ref()
@@ -600,9 +621,11 @@ const reqWorkTypePicker = ref(null)
 const openReqWorkTypePicker = () => {
   reqWorkTypePicker.value.open()
 }
+
+const reqWorkTypeIndex = ref(0)
 const confirmReqWorkType = ({value}) => {
-  form.value.reqWorkTypeId = value[0].id
-  form.value.reqWorkTypeName = value[0].title
+  form.value.reqWorkTypeId = value[1].id
+  form.value.reqWorkTypeName = value[1].title
 
 }
 
@@ -620,7 +643,21 @@ const openJobPicker = () => {
 const confirmJob = ({value}) => {
   if (value[0]) {
     form.value.job = value[0].position
-    workTypeListOrigin.value = workTypeListOrigin.value.filter(item => item.id === value[0].workTypeId)
+    const children = workTypeListOriginTmp.value.filter(item => item.id === value[0].workTypeId)
+    const parent = workTypeListOriginTmp.value.find(item => item.id === children[0].parentId)
+    workTypeListOrigin.value = [
+      {
+        title: parent.title,
+        id: parent.id,
+        children: [
+          {
+            title: children[0].title,
+            id: children[0].id,
+            children: children[0].children
+          }
+        ]
+      }
+    ]
   }
 }
 
@@ -656,13 +693,24 @@ const showPopup = () => {
 
 const workTypeList = ref([])
 const workTypeListOrigin = ref([])
+const workTypeListOriginTmp = ref([])
+
 const getWorkTypeList = async () => {
   const {data} = await workTypeListReq()
-  workTypeList.value = data
-  workTypeListOrigin.value = JSON.parse(JSON.stringify(data))
+  workTypeList.value = data.filter(item => !item.parentId)
+  workTypeListOriginTmp.value = JSON.parse(JSON.stringify(data))
+
+  workTypeList.value = workTypeList.value.map(item => {
+    item.children = workTypeListOriginTmp.value.filter(origin => origin.parentId === item.id)
+    return item
+  })
   workTypeList.value.unshift({
     title: '无',
     id: 0,
+    children: [{
+      title: '无',
+      id: 0,
+    }]
   })
 }
 
@@ -844,6 +892,10 @@ const join = async () => {
   if (hasPaper.value && !form.value.schoolPaper) {
     return $toast('请上传毕业证')
   }
+  if (!['初中', '职业高中', '技工学校', '中等专科', '普通高中', '其他'].includes(form.value.education) && !form.value.school)
+    return $toast('请输入毕业院校')
+  if (!['初中', '普通高中', '其他'].includes(form.value.education) && !form.value.school)
+    return $toast('请输入所学专业')
   if (!backPass.value) return $toast('请上传身份证反面')
   if (!workDateEndJudge.value) form.value.workDateEnd = '无'
   if (info.value.needContact === 1) {

src/pages/user/login.vue

@@ -114,7 +114,7 @@ export default {
             content: '请先完善个人信息',
             showCancel: false,
             success() {
-              uni.redirectTo({url: '/pages/user/userDetail'})
+              uni.navigateTo({url: '/pages/user/userDetail'})
             }
           })
         } else uni.switchTab({url: '/pages/index/index'})