Merge branch 'master' of https://git.citupro.com/zhengnaiwen_citu/menduner-uniapp

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) {

pages/index/my.vue

@@ -2,8 +2,10 @@
   <layout-page>
 		<view class="pb-150">
 			<view class="text-center" :class="vip ? 'vipBox' : 'avatarBox'" @tap="handleTap">
-				<img :src="getUserAvatar(baseInfo?.avatar, baseInfo?.sex)" alt="" class="img-box">
-				<image v-if="vip" src="/static/svg/vip.svg" class="vipIcon" @click.stop="handleToLink({path: '/pagesA/vip/index'})"></image>
+				<view class="img-box">
+					<img :src="getUserAvatar(baseInfo?.avatar, baseInfo?.sex)" alt="" class="img">
+					<image v-if="vip" src="/static/svg/vip.svg" class="vipIcon" @click.stop="handleToLink({path: '/pagesA/vip/index'})"></image>
+				</view>
 				<view v-if="!useUserStore.isLogin" class="font-weight-bold font-size-20">点击登录</view>
 				<view v-else class="font-weight-bold font-size-20">{{ baseInfo?.name || userInfo?.phone }}</view>
 			</view>
@@ -323,22 +325,26 @@ const handleLogoutConfirm = () => {
 	padding-bottom: 100px;
 }
 .img-box {
-  width: 150rpx;
-  height: 150rpx;
-  border: 2rpx solid #ccc;
-  border-radius: 50%;
+	position: relative;
+	display: flex;
+	justify-content: center;
+	.img {
+		width: 150rpx;
+		height: 150rpx;
+		border: 2rpx solid #ccc;
+		border-radius: 50%;
+	}
 }
 .vipBox {
 	color: #a18a0f;
-	position: relative;
-	.img-box {
+	.img {
     border: 1px solid gold;
 	}
 	.vipIcon {
 		position: absolute;
 		width: 45px;
 		height: 24px;
-		bottom: 34px;
+		bottom: 1px;
 		left: 50%;
 	}
 }

pages/index/position.vue

@@ -207,6 +207,7 @@ const getData = async () => {
   }, {})
   const params = hasValue ? _query : { pageSize: query.pageSize, pageNo: query.pageNo, hire: 0 }
   if (params.pageNo === 1) positionListData.value = []
+  if (params.pageNo <= 0) return
   type.value = hasValue ? 'position' : 'recommend'
   try {
     more.value = 'loading'

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(() => {

pagesA/vip/blockEnt/index.vue

@@ -1,6 +1,6 @@
 <!-- 屏蔽企业 -->
 <template>
-  <view style="height: 100%; overflow: auto;">
+  <view style="height: 100%; overflow: auto; padding-bottom: 50px;">
     <!-- 搜索条 -->
     <view class="white-bgc stick ss-p-t-10">
       <view style="position: relative;">
@@ -89,23 +89,26 @@ const handleConfirm = async () => {
     await handleBlockEnterprise({ enterpriseId })
     uni.showToast({ title: '屏蔽企业成功！', icon: 'none' })
   }
+  popup.value.close()
+  dialogContent.value = ''
+  enterpriseId = ''
   getData()
 }
 const handleClose = () => {
-  confirm.value.close()
-  dialogContent = ''
+  dialogContent.value = ''
   enterpriseId = ''
+  confirm.value.close()
 }
 
 let enterpriseId = ''
-let dialogContent = ''
 let isDel = false
+const dialogContent = ref('')
 
 // 屏蔽
 const joinBlock = (item) => {
   isDel = false
   enterpriseId = item.key
-  dialogContent = `是否屏蔽【${item.value}】？`
+  dialogContent.value = item?.value ? `是否确定屏蔽《${item.value}》?` : '是否确定屏蔽'
   confirm.value.open()
 
 }
@@ -113,7 +116,7 @@ const joinBlock = (item) => {
 const handleDel = (item) => {
   isDel = true
   enterpriseId = item.id
-  dialogContent = `是否取消屏蔽【${item.name}】？`
+  dialogContent.value = (item?.name || item?.anotherName) ? `是否取消屏蔽《${item.name || item.anotherName}》?` : '是否取消屏蔽'
   confirm.value.open()
 }
 
@@ -124,7 +127,7 @@ const name = ref('')
 const entList = ref([])
 // 获取企业列表
 const getEntList = async () => {
-  if (!name.value || name.value === '公司' || name.value === '有限公司') {
+  if (!name.value || name.value === '公司' || name.value === '有限公司' || name.value === '酒店') {
     uni.showToast({ title: '请输入公司名称关键字查询', icon: 'none' })
     return
   }

pagesA/vip/index.vue

@@ -122,7 +122,7 @@ const getMemberList = async () => {
     //     ...item,
     //     my: vipFlagIndex === index,
     //     list: JSON.parse(item.text),
-    //     type: 3, // 订单类型 0平台订单|1求职端订单|2招聘端订单|3会员套餐
+    //     type: 3, // 订单类型 type:订单类型 0平台订单|1发布职位|2发布众聘职位|3会员套餐|4企业会员套餐|5招聘会门票
     //     loading: false
     //   }
     // })

pagesA/vipPackage/index.vue

@@ -364,7 +364,7 @@ const handlePay = async () => {
       spuId: val.id, // 商品编号
       spuName: val.name, // 商品名称
       price: val.price*100, // 价格
-      type: val.type // 订单类型 0平台订单|1求职端订单|2招聘端订单|3会员套餐
+      type: val.type // 订单类型 type:订单类型 0平台订单|1发布职位|2发布众聘职位|3会员套餐|4企业会员套餐|5招聘会门票
     })
 
     const _res = await getOrder({
@@ -401,7 +401,7 @@ const getMemberList = async () => {
         price: item.price/100,
         my: vipFlagIndex === index,
         list: JSON.parse(item.text),
-        type: 3, // 订单类型 0平台订单|1求职端订单|2招聘端订单|3会员套餐
+        type: 3, // 订单类型 type:订单类型 0平台订单|1发布职位|2发布众聘职位|3会员套餐|4企业会员套餐|5招聘会门票
         loading: false
       }
     })

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>

utils/config.js

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