学生注册

components/studentDeliveryForm/index.vue

@@ -1,13 +1,13 @@
 <template>
 	<view class="f-straight">
     <uni-forms ref="form" :modelValue="formData" :rules="rules" validateTrigger="bind" :label-width="formLabelWidth">
-      <uni-forms-item label="实习到岗开始时间" name="startTime" required>
+      <uni-forms-item :label="`${props.prefix}到岗日期`" name="startTime" required>
 				<picker mode="date" :value="formData.startTime" fields="month" @change="e => formData.startTime = e.detail.value">
 					<view v-if="formData.startTime" class="pickerText">{{ formData.startTime }}</view>
 					<view v-else class="pickerText">请选择</view>
 				</picker>
 			</uni-forms-item>
-      <uni-forms-item label="实习到岗结束时间" name="endTime" required>
+      <uni-forms-item :label="`${props.prefix}结束日期`" name="endTime" required>
 				<picker mode="date" :value="formData.endTime" fields="month" @change="e => formData.endTime = e.detail.value">
 					<view v-if="formData.endTime" class="pickerText">{{ formData.endTime }}</view>
 					<view v-else class="pickerText">请选择</view>
@@ -22,7 +22,8 @@ import { ref, unref } from 'vue'
 import { convertYearMonthToTimestamp } from '@/utils/date.js'
 
 const props = defineProps({
-  formLabelWidth: { type: [String, Number], default: '136px' },
+  formLabelWidth: { type: [String, Number], default: '84px' },
+  prefix: { type: String, default: '' },
 })
 
 const form = ref()
@@ -33,10 +34,10 @@ let formData = ref({
 
 const rules = {
 	startTime:{
-		rules: [{required: true, errorMessage: '请选择实习到岗开始时间' }]
+		rules: [{required: true, errorMessage: '请选择到岗日期' }]
 	},
 	endTime:{
-		rules: [{required: true, errorMessage: '请选择实习到岗结束时间' }]
+		rules: [{required: true, errorMessage: '请选择结束日期' }]
 	}
 }
 
@@ -47,11 +48,11 @@ const getQueryParams = async () => {
   const startTime = convertYearMonthToTimestamp(formData.value.startTime)
   const endTime = convertYearMonthToTimestamp(formData.value.endTime)
   if (rules?.startTime && !startTime) {
-    uni.showToast({ icon: 'none', title: '请选择实习到岗开始时间' })
+    uni.showToast({ icon: 'none', title: '请选择到岗日期' })
     return
   }
   if (rules?.endTime && !endTime) {
-    uni.showToast({ icon: 'none', title: '请选择实习到岗结束时间' })
+    uni.showToast({ icon: 'none', title: '请选择结束日期' })
     return
   }
   if (startTime > endTime) {

pagesA/chart/index.vue

@@ -203,7 +203,7 @@
         <uni-icons type="closeempty" size="20" @tap="handleClose"></uni-icons>
       </view>
       <view v-if="isStudent" class="ss-p-x-50" style="width: 272px;">
-        <studentDeliveryForm ref="studentDeliveryFormRef" />
+        <studentDeliveryForm ref="studentDeliveryFormRef" prefix="实习" formLabelWidth="110px" />
       </view>
       <view v-for="resume in resumeList" :key="resume.id" class="popup-content" @tap="resumeCheck = resume">
         <view class="iconBox">
@@ -294,8 +294,8 @@ const isSendResume = ref(false)
 const positionInfo = ref({})
 const isEmployment = ref('-1')
 
-const isStudent = ref(false) // 已测试，待开放上线 
-// const isStudent = ref(useUserStore.baseInfo?.type && Boolean(Number(useUserStore.baseInfo.type) === 1))
+// const isStudent = ref(false) // 已测试，待开放上线 
+const isStudent = ref(useUserStore?.baseInfo?.type && Boolean(Number(useUserStore.baseInfo.type) === 1))
 
 onMounted(() => {
   setTimeout(() => {

pagesB/positionDetail/index.vue

@@ -127,11 +127,11 @@
     <!-- 选择简历 -->
     <uni-popup ref="popup" background-color="#fff" :mask-click="false" >
       <view class="dialogBox" style="width: 86vw;">
-        <view class="dialog-title">
+        <view class="dialog-title border-bottom">
           <view class="title">选择简历</view>
           <uni-icons type="close" color="grey" size="26" @click="popupClose" />
         </view>
-        <view style="height: 1px; margin: 0 20rpx; background-color: #dedede;"></view>
+        <!-- <view style="height: 1px; margin: 0 20rpx; background-color: #dedede;"></view> -->
         <scroll-view class="dialog-content" scroll-y="true" style="max-height: 50vh; width: auto;">
           <uni-card
             v-for="(item, index) in resumeList"
@@ -163,18 +163,18 @@
     </uni-popup>
 
     <!-- 实习到岗时间 -->
-    <uni-popup ref="practicePopup" background-color="#fff" :mask-click="false" >
-      <view class="dialogBox">
-        <view class="dialog-title">
+    <uni-popup ref="practicePopup" :mask-click="false" >
+      <view class="dialogBox" style="width: 86vw; border-radius: 8px; background-color: #fff;">
+        <view class="dialog-title border-bottom">
           <view class="title">实习到岗信息</view>
           <uni-icons type="close" color="grey" size="26" @click="practicePopupClose" />
         </view>
-        <scroll-view class="dialog-content" scroll-y="true" style="max-height: 50vh; width: auto;">
-          <view v-if="isStudent" class="ss-p-x-50">
+        <scroll-view class="dialog-content" scroll-y="true" style="max-height: 50vh;">
+          <view class="ss-p-x-50">
             <studentDeliveryForm ref="studentDeliveryFormRef" />
           </view>
         </scroll-view>
-        <view class="dialog-bottom" @click="beforeHandleUploadSubmit()">确认</view>
+        <view class="d-bottom" @click="beforeHandleUploadSubmit()">确 认</view>
       </view>
     </uni-popup>
 
@@ -264,7 +264,8 @@ const imgSrc = ref('')
 const appInfo = ref({})
 const poster = ref()
 const beenLogin = ref(false)
-const isStudent = ref(false) // 已测试，待开放上线 const isStudent = computed(() => useUserStore.baseInfo?.type && Boolean(Number(useUserStore.baseInfo.type) === 1))
+// const isStudent = ref(false) // 已测试，待开放上线 
+const isStudent = computed(() => useUserStore?.baseInfo?.type && Boolean(Number(useUserStore.baseInfo.type) === 1))
 const areaName = ref('')
 const canvasToTempFilePath = ref('')
 
@@ -819,4 +820,17 @@ const handleLoginConfirm = () => {
     top: 100rpx;
   }
 }
+.border-bottom {
+  border-bottom: 1px solid #eee;
+}
+.d-bottom {
+  border-radius: 0 0 8px 8px;
+  background-color: #fff;
+  color: #00B760;
+  width: 100%;
+  height: 44px;
+  line-height: 44px;
+  text-align: center;
+  border-top: 1px solid #eee;
+}
 </style>

store/user.js

@@ -105,10 +105,10 @@ export const userStore = defineStore('user', {
     checkPersonBaseInfoFun(data) {
       data = data || {}
       // 待门墩儿测试后开放
-      // if (!data || !Object.keys(data).length || data.type === undefined || data.type === null) {
-      //   showAuthModal('selectUserType')
-      //   return
-      // }
+      if (!data || !Object.keys(data).length || data.type === undefined || data.type === null) {
+        showAuthModal('selectUserType')
+        return
+      }
       const necessaryInfoReady = checkPersonBaseInfo(data)
       data.necessaryInfoReady = necessaryInfoReady
       if (necessaryInfoReady) closeAuthModal()

utils/config.js

@@ -13,7 +13,7 @@ const config = {
   }
 }
 
-export const envObj = config['produce']
+export const envObj = config['httpsTest']
 
 export const baseUrl = envObj.baseUrl