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

api/common.js

@@ -3,7 +3,7 @@ import request from "@/utils/request"
 // 刷新令牌
 export const refreshToken = (refreshToken) => {
   return request({
-    url: '/menduner/system/auth/refresh-token',
+    url: '/app-api/menduner/system/auth/refresh-token',
     method: "POST",
     params: {
       refreshToken
@@ -18,7 +18,7 @@ export const refreshToken = (refreshToken) => {
 // 发送手机验证码
 export const sendSmsCode = (data) => {
   return request({
-    url: '/menduner/system/auth/send-sms-code',
+    url: '/app-api/menduner/system/auth/send-sms-code',
     method: "POST",
     data,
     custom: {
@@ -32,7 +32,7 @@ export const sendSmsCode = (data) => {
 // 短信登录
 export const smsLogin = (data) => {
   return request({
-    url: '/menduner/system/auth/sms-login',
+    url: '/app-api/menduner/system/auth/sms-login',
     method: 'POST',
     data,
     custom: {
@@ -44,7 +44,7 @@ export const smsLogin = (data) => {
 // 密码登录
 export const passwordLogin = (data) => {
   return request({
-    url: '/menduner/system/auth/login',
+    url: '/app-api/menduner/system/auth/login',
     method: 'POST',
     data,
     custom: {
@@ -56,7 +56,7 @@ export const passwordLogin = (data) => {
 // 退出登录
 export const logout = () => {
   return request({
-    url: '/menduner/system/auth/logout',
+    url: '/app-api/menduner/system/auth/logout',
     method: 'POST',
     custom: {
       showLoading: false,
@@ -68,7 +68,7 @@ export const logout = () => {
 // 字典
 export const getDictData = (params) => {
   return request({
-    url: '/system/dict-data/type',
+    url: '/app-api/system/dict-data/type',
     method: 'GET',
     params,
     custom: {
@@ -81,7 +81,7 @@ export const getDictData = (params) => {
 // 获取行业列表
 export const getIndustryListData = (params) => {
   return request({
-    url: '/menduner/system/industry/list',
+    url: '/app-api/menduner/system/industry/list',
     method: 'GET',
     params,
     custom: {
@@ -94,7 +94,7 @@ export const getIndustryListData = (params) => {
 // 获取技能列表
 export const getSkillList = () => {
   return request({
-    url: '/menduner/system/skill/list',
+    url: '/app-api/menduner/system/skill/list',
     method: 'GET',
     custom: {
       showLoading: false,
@@ -106,7 +106,7 @@ export const getSkillList = () => {
 // 获取行业树形
 export const getIndustryTreeData = (params) => {
   return request({
-    url: '/menduner/system/industry/get/tree',
+    url: '/app-api/menduner/system/industry/get/tree',
     method: 'GET',
     params,
     custom: {
@@ -119,7 +119,7 @@ export const getIndustryTreeData = (params) => {
 // 获取地区列表
 export const getAreaListData = (params) => {
   return request({
-    url: '/menduner/system/area/list',
+    url: '/app-api/menduner/system/area/list',
     method: 'GET',
     params,
     custom: {
@@ -132,7 +132,7 @@ export const getAreaListData = (params) => {
 // 获取地区获取地区map
 export const getAreaMapData = (params) => {
   return request({
-    url: '/menduner/system/area/map',
+    url: '/app-api/menduner/system/area/map',
     method: 'GET',
     params,
     custom: {
@@ -145,7 +145,7 @@ export const getAreaMapData = (params) => {
 // 获得职位类型
 export const getPositionTreeData = (params) => {
   return request({
-    url: '/menduner/system/position/get/tree',
+    url: '/app-api/menduner/system/position/get/tree',
     method: 'GET',
     params,
     custom: {
@@ -158,7 +158,7 @@ export const getPositionTreeData = (params) => {
 // 获取职位列表
 export const getPositionData = (params) => {
   return request({
-    url: '/menduner/system/position/list',
+    url: '/app-api/menduner/system/position/list',
     method: 'GET',
     params,
     custom: {
@@ -171,7 +171,7 @@ export const getPositionData = (params) => {
 // 获取区域树形
 export const getAreaTreeData = () => {
   return request({
-    url: '/menduner/system/area/get/tree',
+    url: '/app-api/menduner/system/area/get/tree',
     method: 'GET',
     custom: {
       showLoading: false,

api/position.js

@@ -3,7 +3,7 @@ import request from "@/utils/request"
 // 根据条件搜索招聘职位
 export const getJobAdvertisedSearch = (params) => {
   return request({
-    url: '/menduner/system/job/advertised/search',
+    url: '/app-api/menduner/system/job/advertised/search',
     method: 'GET',
     params,
     custom: {

api/user.js

@@ -3,7 +3,7 @@ import request from "@/utils/request"
 // 获取用户基本信息
 export const getUserInfo = (params) => {
   return request({
-    url: '/menduner/system/person/get',
+    url: '/app-api/menduner/system/person/get',
     method: 'GET',
     params,
     custom: {
@@ -16,7 +16,7 @@ export const getUserInfo = (params) => {
 // 获取附件列表
 export const getPersonResumeCv = () => {
   return request({
-    url: '/menduner/system/person/resume/get/person/cv',
+    url: '/app-api/menduner/system/person/resume/get/person/cv',
     method: 'GET',
     custom: {
       showLoading: false,
@@ -28,7 +28,7 @@ export const getPersonResumeCv = () => {
 // 获取收藏的招聘职位列表
 export const getJobFavoriteList = (params) => {
   return request({
-    url: '/menduner/system/person/get/job/favorite/page',
+    url: '/app-api/menduner/system/person/get/job/favorite/page',
     method: 'GET',
     params,
     custom: {
@@ -41,7 +41,7 @@ export const getJobFavoriteList = (params) => {
 // 谁看过我
 export const getInterestedMePage = (params) => {
   return request({
-    url: '/menduner/system/job-cv-rel/look/page',
+    url: '/app-api/menduner/system/job-cv-rel/look/page',
     method: 'GET',
     params,
     custom: {
@@ -54,7 +54,7 @@ export const getInterestedMePage = (params) => {
 // 众聘比例信息
 export const getPublicRatio = () => {
   return request({
-    url: '/menduner/system/hire-commission-ratio/get',
+    url: '/admin-api/menduner/system/hire-commission-ratio/get',
     method: 'GET',
     custom: {
       showLoading: false,
@@ -66,7 +66,7 @@ export const getPublicRatio = () => {
 // 上传附件简历
 export const saveResume = (data) => {
   return request({
-    url: '/menduner/system/person/resume/person/cv/save',
+    url: '/app-api/menduner/system/person/resume/person/cv/save',
     method: 'POST',
     data,
     custom: {
@@ -79,7 +79,7 @@ export const saveResume = (data) => {
 // 删除附件简历
 export const deleteResume = (id) => {
   return request({
-    url: '/menduner/system/person/resume/person/cv/remove',
+    url: '/app-api/menduner/system/person/resume/person/cv/remove',
     method: 'DELETE',
     params: {
       id

pages.json

@@ -15,7 +15,8 @@
 		{
 			"path": "pages/index/position",
 			"style": {
-				"navigationBarTitleText": "职位"
+				"navigationBarTitleText": "职位",
+				"enablePullDownRefresh": true
 			}
 		},
 		{

pages/index/position.vue

@@ -27,6 +27,8 @@ import { positionList, swiperAdListTest } from '@/utils/testData'
 import { dealDictObjData } from '@/utils/position'
 import { getJobAdvertisedSearch } from '@/api/position';
 import { ref, reactive } from 'vue'
+import { onPullDownRefresh } from '@dcloudio/uni-app';
+
 
 let searchContent = ''
 const swiperAdList = ref(swiperAdListTest)
@@ -72,10 +74,17 @@ const loadingMore = () => { // 加载更多
   getData()
 }
 
-const refresh = () => {  // 下拉刷新
+const refresh = () => { // 下拉刷新
   onSearch(searchContent)
 }
 
+
+//下拉刷新
+onPullDownRefresh(() => { // 下拉刷新
+  // debugger
+  onSearch(searchContent)
+})
+
 </script>
 
 <style scoped lang="scss">

pagesB/positionDetail/index.vue

@@ -1,10 +1,49 @@
 <template>
-  <div>position</div>
+  <view>
+    <view v-if="loading" class="vertical-center">{{ loadingText }}</view>
+    <view v-else>
+      {{ loadingText }}
+    </view>
+  </view>
 </template>
-
 <script setup>
-</script>
+// import { commissionCalculation } from '@/utils/position'
+// import loginPage from '@/views/common/loginDialog.vue'
+// import simplePage from './sendResume/simple.vue'
+// import selectPage from './sendResume/select.vue'
+import { reactive, ref } from 'vue';
+// import { getPositionDetails, jobCvRelCheckSend, getPersonJobUnfavorite, getPersonJobFavorite, getJobFavoriteCheck } from '@/api/position'
+import { dealDictObjData } from '@/utils/position'
+// import { getToken } from '@/utils/auth'
+// import Snackbar from '@/plugins/snackbar'
+import { onLoad } from '@dcloudio/uni-app';
 
-<style scoped lang="scss">
+const loading = ref(false)
+const loadingText = ref('加载中 . . . ')
+
+
+// 职位详情
+const info = ref({})
+const positionInfo = ref({})
+const getPositionDetail = async () => {
+  const data = await getPositionDetails({ id: jobId })
+  info.value = data
+  positionInfo.value = { ...dealDictObjData({}, info.value), ...info.value }
+}
 
+let jobId = ''
+onLoad((options) => {
+  jobId = options?.id || ''
+  if (jobId) {
+    loading.value = true
+    loadingText.value = '加载中 . . . '
+    getPositionDetail()
+  } else {
+    loadingText.value = '加载失败 . . . '
+  }
+})
+
+
+</script>
+<style scoped lang="scss">
 </style>

static/style/index.scss

@@ -25,6 +25,7 @@
 .cursor-pointer { cursor: pointer; }
 .font-weight-bold { font-weight: bold; }
 .text-center { text-align: center; }
+.vertical-center { text-align: center; line-height: 80vh; } // 左右居中，高度80居中
 .d-flex { display: flex; }
 .flex-column { flex-direction: column; }
 .align-center { align-items: center; }
@@ -84,71 +85,8 @@
 	justify-content: center;
 	align-items: center;
 	flex-direction: row;
-	margin:5rpx;
+	margin: 5rpx;
 }
-/* 列表触底暂无更多 */
-.noMore{
-	text-align:center;
-	color:grey;
-}
-.salary-text {
-	float: right;
-	color: #ff770d;
-}
-.list-shape {
-	padding: 10px 30rpx 10px;
-  margin-top: 10px;
-  background-color: #fff;
-}
-.tag-gap{
-	margin: 10rpx 10rpx 10rpx 0;
-}
-.tag-gap1{
-	margin: 10rpx;
-}
-.viewider{
-	margin: 0 10rpx;
-}
-.mt{
-	margin-top: 10rpx;
-}
-.mb{
-	margin-bottom: 10rpx;
-}
-.ml{
-	margin-left: 20rpx;
-}
-.mr {
-	margin-right: 20rpx;
-}
-//公司名称
-.cer-end{
-  position: absolute;
-  top: 85%;
-  right: 16%;
-}
-.cer-text{
-  text-decoration: underline;
-  margin: 0 5rpx;
-}
-//一行展示不全...
-.dis{
-	display: flex;
-	align-items: center;
-}
-.show-more{
-	width: 26vw;
-	white-space: nowrap;
-	overflow: hidden;
-	text-overflow: ellipsis;
-}
-.mr-10{
-	margin-right: 10rpx;
-}
-.divider {
-	color:#e4d4d2;
-}
-
 
 // 高亮
 .default-active {

utils/config.js

@@ -4,4 +4,6 @@ export const baseUrl = 'http://menduner.citupro.com:7878'
 // 租户id
 export const tenantId = '155'
 
-export const apiPath = '/app-api'
+export const apiPath = '/app-api'
+
+export const adminPath = '/admin-api'

utils/position.js

@@ -86,9 +86,10 @@ export const getDictValueWithLabel = (dict, value, valueKey = 'value', labelKey
 let data
 const list = ['headhuntRate', 'recommendRate', 'cvRate'] // 平台、推荐人、投递人
 const getRation = async () => {
-  data = await getPublicRatio()
+  const res = await getPublicRatio()
+  data = res?.data
 }
-// getRation()
+getRation()
 
 export const rechargeRatio = () => { return 10 }
 

utils/request.js

@@ -44,7 +44,8 @@ function closeLoading() {
  * @description 请求基础配置 可直接使用访问自定义请求
  */
 const http = new Request({
-	baseURL: baseUrl + apiPath,
+	// baseURL: baseUrl + apiPath,
+	baseURL: baseUrl,
 	timeout: 8000,
 	method: 'GET',
 	header: {