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

api/common.js

@@ -336,16 +336,16 @@ export const huntSubmit = async (data) => {
 }
 
 // 获得微信小程订阅模板列表
-export const getSubscribeTemplateList = async () => {
-  return request({
-    url: `/app-api/menduner/system/social-user/get-subscribe-template-list`,
-    method: 'GET',
-    custom: {
-      showLoading: false,
-      auth: false
-    }
-  })
-}
+// export const getSubscribeTemplateList = async () => {
+//   return request({
+//     url: `/app-api/menduner/system/social-user/get-subscribe-template-list`,
+//     method: 'GET',
+//     custom: {
+//       showLoading: false,
+//       auth: false
+//     }
+//   })
+// }
 
 // 求职端交易订单  创建
 export const orderCreated = async (data) => {

pages/index/my.vue

@@ -164,6 +164,24 @@ onLoad(() => {
   })
 })
 
+const openSubscribe = (path) => {
+  wx.requestSubscribeMessage({
+    tmplIds: ['2dByiI4wf6D3ZmxDH1QywH264F3N-9ysnvsS7xQm4PE'],
+    success:(res)=>{
+      console.log(res, 'uni.requestSubscribeMessage-res')
+			uni.navigateTo({
+				url: path
+			})
+    },
+    fail:(err)=>{
+      console.log('订阅失败', err)
+			uni.navigateTo({
+				url: path
+			})
+    }
+  })
+}
+
 // 列表跳转
 const dialogType = ref('')
 const handleToLink = (item) => {
@@ -181,10 +199,6 @@ const handleToLink = (item) => {
 		inputDialog.value.open()
 	}
 	if (item.key === 'recruit') {
-		// uni.showToast({
-		// 	title: '请前往网页版门墩儿招聘',
-		// 	icon: 'none'
-		// })
 		dialogType.value = 1
 		inputDialog.value.open()
 	}
@@ -209,6 +223,11 @@ const handleToLink = (item) => {
 		handleShareCode()
 		return
 	}
+	// 点击在线简历需调起订阅消息
+	if (item.title === '在线简历'){
+		openSubscribe(item.path)
+		return
+	}
 	uni.navigateTo({
 		url: item.path
 	})

pagesA/resumeOnline/index.vue

@@ -299,6 +299,7 @@ function getBaseInfo () {
 
 // 获取求职意向
 async function getJobInterested () {
+  intention.value = []
   const { data } = await getResumeJobInterested()
   if (!data || !data.length) {
     return
@@ -309,6 +310,7 @@ async function getJobInterested () {
 
 // 获取教育经历
 async function getEduExp () {
+  educationExp.value = []
   const { data: dict } = await getDict('menduner_education_type')
   if (dict.code !== 0) {
     return
@@ -330,6 +332,7 @@ async function getEduExp () {
 
 // 获取工作经验
 async function getWorkExp () {
+  workExp.value = []
   const { data } = await getResumeWorkExp()
   if (!data || !data.length) {
     return
@@ -345,6 +348,7 @@ async function getWorkExp () {
 
 // 培训经历
 async function getTrainExpData () {
+  trainExp.value = []
   const { data } = await getResumeTrainExp()
   if (!data || !data.length) {
     return
@@ -360,6 +364,7 @@ async function getTrainExpData () {
 
 // 职业技能
 async function getSkillExpData () {
+  skillExp.value = []
   const { data: _skillList} = await getDict('skillList', {}, 'skillList')
   const skillList = _skillList?.data
   if (!skillList || !skillList.length) {

pagesA/resumeOnline/jobIntention.vue

@@ -156,8 +156,6 @@ const payChange = (val) => {
   payToMin.value = val
   if (val > formData.value.payTo) formData.value.payTo = val
 }
-
-
 </script>
 
 <style lang="scss" scoped>
@@ -172,4 +170,8 @@ const payChange = (val) => {
 		z-index: 3;
 	}
 }
+:deep(.uni-forms-item__content) {
+	max-width: 100%;
+	overflow: hidden;
+}
 </style>

pagesA/student/internshipRecord.vue

@@ -125,9 +125,9 @@ const handleToReport = (val) => {
 // 查看证书详情
 const handleToCertificate = (val) => {
   const itemData = JSON.stringify({
-    student: { schoolName: val?.student?.schoolName, majorName: val?.student?.majorName },
+    student: { schoolName: formatName(val?.student?.schoolInfo?.name), majorName: val?.student?.major?.nameCn },
     person: { name: val?.person?.name },
-    enterprise: { anotherName: val?.enterprise?.anotherName || val?.enterprise?.name },
+    enterprise: { anotherName: formatName(val?.enterprise?.anotherName || val?.enterprise?.name) },
     startTime: val?.startTime,
     endTime: val?.endTime,
     evaluate: val?.evaluate,

pagesA/vipPackage/index.vue

@@ -3,11 +3,11 @@
     <view class="vipBox">
       <view class="avatar">
         <img :src="getUserAvatar(baseInfo?.avatar, baseInfo?.sex)" alt="" class="img-box" :class="{'img-box-atc': userInfo?.vipExpireDate}">
-        <image v-if="userInfo?.vipExpireDate" src="/static/svg/vip.svg" class="vipIcon"></image>
+        <image v-if="new Date().getTime() < userInfo?.vipExpireDate" src="/static/svg/vip.svg" class="vipIcon"></image>
       </view>
       <view class="nameBox">
         <view class="name font-weight-bold font-size-16">{{ baseInfo?.name || userInfo?.phone }}</view>
-        <view class="vipInfo font-size-14" v-if="remaining">
+        <view class="vipInfo font-size-14" v-if="new Date().getTime() < userInfo?.vipExpireDate">
           {{ pName }}
           <view>将于{{ remaining }}后过期</view>
         </view>
@@ -390,7 +390,7 @@ const getMemberList = async () => {
     // memberList.value = data
     let vipFlagIndex = null
     const list = data.map((item, index) => {
-      if (+item.id === +userInfo.value?.vipFlag) {
+      if (new Date().getTime() < userInfo.value?.vipExpireDate && +item.id === +userInfo.value?.vipFlag) {
         vipFlagIndex = index // 低于当前套餐的(套餐)不展示
       }
       if (item.recommend) {

pagesB/positionDetail/index.vue

@@ -247,7 +247,6 @@ import { getAccessToken, showNecessaryInfoPopup } from '@/utils/request'
 import { onLoad, onShareAppMessage } from '@dcloudio/uni-app'
 import { prologue, defaultText } from '@/hooks/useIM'
 import { userStore } from '@/store/user'
-import { getSubscribeTemplateList } from '@/api/common'
 import { formatName } from '@/utils/getText'
 import studentDeliveryForm from '@/components/studentDeliveryForm'
 // import { getShareQueryById } from '@/api/jobFair.js'
@@ -556,10 +555,8 @@ const handleDelivery = async () => {
   resumeList.value = data
 
   // 消息订阅
-  const { data: templateList } = await getSubscribeTemplateList()
-  const tmplIds = templateList.map(e => e.id)
-  console.log(tmplIds, '消息订阅模版ID')
-  uni.requestSubscribeMessage({
+  const tmplIds = ['2KOkuFsB-2MrvnQa_45OvqMJ9ik37Xz43YXPApiQ9es', 'tUTwKQTdWnZsen7Nhtu0ksMQj0lkEuMt2nBzCrm_7vY']
+  wx.requestSubscribeMessage({
     tmplIds,
     success:(res)=>{
       console.log(res, 'uni.requestSubscribeMessage-res')