Merge branch 'master' of…

src/pages/login/test.vue

@@ -4,6 +4,12 @@
             手机号
             <input type="text" v-model="phone" />
         </p>
+        <button @click="getSmsCodeFn">获取验证码</button>
+        <p>
+            验证码
+            <input type="text" v-model="code" />
+        </p>
+
         <button @tap="login">登录</button>
     </div>
 </template>
@@ -11,14 +17,17 @@
 <script setup>
 import { testLogin, getSmsCode, getLoginUserApi } from "@/api/user";
 import { setToken, removeToken } from "@/utils/token";
-getLoginUserApi;
 const phone = ref("");
+const code = ref("");
+const getSmsCodeFn = () => {
+    const a = getSmsCode({ username: phone.value });
+};
 const login = async () => {
     removeToken();
-    const a = await getSmsCode({ username: phone.value });
     const loginRes = await testLogin({
         username: phone.value,
-        code: "000000"
+        code: code.value,
+        userType: "business"
     });
     if (loginRes.code === 200) {
         setToken(loginRes.data);

src/pages/recommend/releasePostion/common.scss

@@ -20,7 +20,10 @@
 }
 .content {
     flex-grow: 1;
+    height: 200rpx;
     padding: 32rpx;
+    padding-bottom: 100rpx;
+    overflow-y: auto;
     .form-item {
         padding-top: 0;
         padding-bottom: 16rpx;

src/pages/recommend/releasePostion/step4.vue

@@ -344,7 +344,13 @@ const next = () => {
     if (certificateInputValue.value && certificateSelectValue.value)
         pinias.formData.professionalCertificates = certificateInputValue.value + "-" + certificateSelectValue.value;
     console.log(pinias.formData);
-    if (validateForm(pinias.formData, ["identityRequirement", "educationRequirement"], "post")) {
+    if (
+        validateForm(
+            pinias.formData,
+            ["identityRequirement", "educationRequirement", "maxAgeRequirement", "majorRequirement"],
+            "post"
+        )
+    ) {
         /* uni.redirectTo({
             url: "/pages/recommend/releasePostion/step5"
         }); */

src/utils/utils.js

@@ -95,6 +95,7 @@ export const validateForm = (formData, requiredFields, type) => {
         jobType: "职位类型",
         position: "职位",
         name: "名字",
+        majorRequirement: "专业",
         positionalTitle: "专业技术职称",
         professionalCertificates: "职业等级证书",
         specialCertificates: "特种作业证书",