Merge branch 'recruit-enterprise' of https://git.citupro.com/zhengnaiwen_citu/menduner-uniapp into recruit-enterprise

components/PositionList/index.vue

@@ -185,13 +185,13 @@ const closeJob = async () => {
 }
 
 // 编辑职位
-const handleEdit = async (val) => {
-  if (!val.id || !val.edit) {
-    uni.showToast({ title: '职位发布时间超过24小时的不支持编辑', icon: 'none', duration: 2000 })
-    return
-  }
-  uni.navigateTo({ url: `/pagesB/positionEdit/index?jobId=${val.id}` })
-}
+// const handleEdit = async (val) => {
+//   if (!val.id || !val.edit) {
+//     uni.showToast({ title: '职位发布时间超过24小时的不支持编辑', icon: 'none', duration: 2000 })
+//     return
+//   }
+//   uni.navigateTo({ url: `/pagesB/positionEdit/index?jobId=${val.id}` })
+// }
 
 // 职位详情
 const handleDetail = (item) => {

components/payPopup/index.vue

@@ -218,7 +218,9 @@ const checkPayStatus = async (id) => {
     if (payLoading || !interTimer) return
     payLoading = true
     const res = await getOrderPayStatus({ id })
+    console.log('getOrderPayStatusApi:', res)
     if (res?.data?.status === 10) {
+      console.log('checkPayStatus-支付成功')
       handleClose()
       if (interTimer) clearInterval(interTimer)
       uni.hideLoading()
@@ -271,6 +273,7 @@ const weChatMiniProgramPay = async (data) => {
     paySign: payConfig.paySign,
     success: (res) => {
       // 用户支付成功
+      console.log('用户支付成功')
       initIntervalFun()
       // handleClose()
     },
@@ -324,9 +327,12 @@ const setOrderCreated = async () => {
 }
 
 onShow(() => {
-  if (orderInfo && orderInfo.value?.id) initIntervalFun()
+  const id = orderInfo.value?.payOrder?.id || orderInfo.value?.order?.payOrderId
+  console.log('onShow:', id)
+  if (id) initIntervalFun()
 })
 onHide(() => {
+  console.log('onHide:', 789)
   if (interTimer) clearInterval(interTimer)
 })
 

pagesB/positionDetail/index.vue

@@ -164,14 +164,14 @@ const handleEdit = async () => {
   }
   uni.showLoading({ title: '加载中 . . . ' })
   try {
-    const { data } = await getEnterprisePubJobTypePermission()
-    if (!data || !data.length) {
+    const res = await getEnterprisePubJobTypePermission()
+    if (!res?.data?.length) {
       uni.showToast({ title: '没有该操作权限，请联系平台管理员升级后再试', icon: 'none', duration: 2000 })
       return
     }
-    uni.hideLoading()
+    uni.navigateTo({ url: `/pagesB/positionEdit/index?jobId=${jobId}` })
     // 跳转编辑页面
-  } catch {
+  } finally {
     uni.hideLoading()
   }
 }