diff --git a/apiRc/policy/index.js b/apiRc/policy/index.js new file mode 100644 index 0000000..dcc8c96 --- /dev/null +++ b/apiRc/policy/index.js @@ -0,0 +1,17 @@ +import request from "@/utilsRc/request"; +//政策列表 +export function getPolicyList(queryParams) { + return request({ + url: "/portal/policyInfo/portalList", + method: "get", + params: queryParams, + }); +} +//政策详情 +export function getPolicyDetail(queryParams) { + return request({ + url: "/portal/policyInfo/getInfo", + method: "get", + params: queryParams, + }); +} \ No newline at end of file diff --git a/packageB/priority/helpFilter.vue b/packageB/priority/helpFilter.vue index 5e41f6d..ad3a496 100644 --- a/packageB/priority/helpFilter.vue +++ b/packageB/priority/helpFilter.vue @@ -1,497 +1,500 @@ - - - - - - 筛选和帮扶 - - - - - - 人员姓名: - - - - - 身份证号: - - - - - 帮扶类型: - - {{filters.helpType || '请选择帮扶类型'}} - - - - - 帮扶人员: - - - - - 所属区域: - - {{filters.region || '请选择所属区域'}} - - - - - 帮扶时间: - - - 至 - + + + + + + 筛选条件 + + + + 查询 + 重置 + + + + + + + 人员姓名: + + + + + + 身份证号: + + + + + + 帮扶类型: + + {{ helpTypes[helpTypeIndex] || '请选择帮扶类型' }} + + + + + + 帮扶人员: + + + + + + 所属区域: + + {{ regions[regionIndex] || '请选择所属区域' }} + + + + + + 开始时间: + + {{ formData.startTime || '请选择开始时间' }} + + + + + + 结束时间: + + {{ formData.endTime || '请选择结束时间' }} + + + + - - - - 查询 - 重置 - - - - - - - 帮扶记录列表 - 共{{helpRecords.length}}条记录 - - - - - - {{record.personName}} - {{record.jobTag}} - - - - - - 联系电话: - {{record.phone}} - - - - - 身份证号: - {{record.idCard}} - - - - - 所属区域: - {{record.region}} - - - - - 帮扶人员: - {{record.helperName}} - - - - - 帮扶单位: - {{record.helperUnit}} - - - - - 帮扶日期: - {{record.helpDate}} - - - - - 下次联系: - {{record.nextContactDate}} - - - - - 详情 - 跟进 - 智能推荐 - - - - - + + + + 帮扶记录列表 + + + + 共7条记录 + + + + + + + + {{item.name}} + + + {{item.type}} + + + + + + + 联系电话: + + + + {{item.phone}} + + + + + + + 身份证号: + + + + {{item.idCard}} + + + + + + + 所属区域: + + + + {{item.region}} + + + + + + + 帮扶人员: + + + + {{item.helperName}} + + + + + + + 帮扶单位: + + + + {{item.unit}} + + + + + + + 帮扶日期: + + + + {{item.assistanceDate}} + + + + + + + 下次联系: + + + + {{item.nextContact}} + + + + 详情 + 跟进 + 智能推荐 + + + + + + - - \ No newline at end of file + border: 2rpx solid #FF7D26; + font-size: 24rpx + color: #F1690E + padding: 4rpx 10rpx +.form-item + display: flex + align-items: center + justify-content: space-between + margin-top: 30rpx +.item-left + display: flex + align-items: center +.item-img + width: 26rpx + height: 26rpx + margin-right: 10rpx +.item-label + font-size: 26rpx + color: #B3B3B3 +.item-right + font-size: 26rpx + color: #737373 +.form-btns + margin-top:30rpx +.form-box-btn + border-radius: 50rpx !important + margin-right: 24rpx + padding: 0rpx 40rpx +.detail-btn + background: #EDF5FF + border: 1px solid #3088FF + font-size: 28rpx + color: #3088FF +.follow-btn + background: #EEF9F3 + border: 1px solid #00933E + font-size: 28rpx + color: #00933E +.recommend-btn + background: linear-gradient(92deg, #0DCCFF 0%, #4760FF 100%) + font-size: 28rpx + color: #FFFFFF + diff --git a/packageB/priority/helpFollow.vue b/packageB/priority/helpFollow.vue index 1daf656..893c672 100644 --- a/packageB/priority/helpFollow.vue +++ b/packageB/priority/helpFollow.vue @@ -1,442 +1,503 @@ - - - - - - 跟进 - - - - - - - 人员姓名 - {{personInfo.personName}} - - - - 帮扶类型 - {{personInfo.helpType}} - - - - - - 新增跟进记录 - - - 跟进日期: - - - - - 跟进方式: - - {{followData.followMethod || '请选择跟进方式'}} - - - - - 跟进内容: - - - - - 跟进结果: - - - - - 下一步计划: - - - - - 下次联系: - - - - - 保存跟进 - 重置 - - - - - - - 跟进历史记录 - 共{{historyRecords.length}}条记录 - - - - - - - {{record.date}} - - - - 跟进方式: - {{record.method}} + + + + + + + 人员姓名 + + + 王小美 + + + + + + 帮扶类型 + + + 招聘岗位推荐 + + + + + + + 新增跟进记录 + + + + + + + + + + {{ formData.followDate || '请选择跟进日期' }} + + + + + + + {{ followMethods[methodIndex] || '请选择跟进方式' }} + + + + + + + + + + + + + + + + + + + + + + {{ formData.nextContactDate || '请选择下次联系时间' }} + + + + + + + 保存跟进 + 重置 + + - - - + + + + 跟进历史记录 + + + + 共7条记录 + + + + + + + + + - - \ No newline at end of file +:deep(.uni-steps__column-circle ) + width: 24rpx !important + height: 24rpx !important + background: radial-gradient(circle, + #00C0FA 0%, + #015EEA 50%, + #FFFFFF 51%, + #FFFFFF 100%) !important + border-radius: 50% + border: 2rpx solid #015EEA +:deep(.uni-steps__column-title) + font-size: 28rpx !important + color: #006CFF !important + margin-bottom: 24rpx +:deep(.uni-steps__column-desc) + font-size: 28rpx + color: #898989 !important + line-height: 1.5 +:deep(.uni-steps__column-text ) + padding: 16rpx 0 !important + border: none +:deep(.uni-steps__column-line) + background-color: #368BFF !important +:deep(.uni-steps__column-line--before) + background-color:rgba(0,0,0,0) !important + diff --git a/packageB/train/mockExam/examList.vue b/packageB/train/mockExam/examList.vue index fa2ad83..19b9bf2 100644 --- a/packageB/train/mockExam/examList.vue +++ b/packageB/train/mockExam/examList.vue @@ -26,38 +26,103 @@ - + - 2025年注册会计师证 - 未开始 + {{item.name}} + 已完成 + 未开始 + + 进行中 + + 已过期 - 立即练习 + 开始考试 + 继续考试 - 考试时长:120分钟 - 题目数量:88题 - 及格分数:60分 - 截止日期:2025-12-31 + 考试时长:{{item.timeLimit}}分钟 + 题目数量:{{item.totalQuestions}}题 + 分类: + + {{ val.dictLabel }} + + + 成绩: + {{ item.gradeUser.score }}分 + -- + + 开始时间:{{item.startDate}} + 截止时间:{{item.dueDate}} - 查看成绩 - 详情 - 收藏 + 查看成绩 + 详情 + + + 收藏 + + + + 取消 + - - - - + + {{examInfo.name}} × + + 已完成 + 未开始 + + 进行中 + + 已过期 + 初级 + 中级 + 高级 + + 考试简介 + {{ examInfo.description }} + + + {{ examInfo.timeLimit }} + 考试时长 + (分钟) + + + + {{ examInfo.totalQuestions }} + 题目总数 + + + + {{ examInfo.passScore }} + 及格分数 + + + + {{ examInfo.totalScore }} + 总分 + + + 考试要求 + 考试过程中请勿刷新页面或关闭浏览器 + 请在规定时间内完成所有题目 + 考试开始后不可暂停,请确保网络连接稳定 + 考试结束后可查看成绩和答案解析 + + + 开始考试 + 继续考试 + @@ -66,22 +131,138 @@ + + \ No newline at end of file diff --git a/packageB/train/practice/startPracticing.vue b/packageB/train/practice/startPracticing.vue index c91adb4..921ad75 100644 --- a/packageB/train/practice/startPracticing.vue +++ b/packageB/train/practice/startPracticing.vue @@ -68,7 +68,7 @@ 下一题 - 提交答案 + 提交答案 diff --git a/packageB/train/video/videoDetail.vue b/packageB/train/video/videoDetail.vue index 24c799e..2b42d83 100644 --- a/packageB/train/video/videoDetail.vue +++ b/packageB/train/video/videoDetail.vue @@ -191,7 +191,7 @@ function getData() { 'Content-Type': "application/x-www-form-urlencoded" } $api.myRequest('/train/public/trainVideo/model', params,'post',9100,header).then((resData) => { - videoInfo.value=resData + videoInfo.value=resData.data videoInfo.value.currentUrl=trainVideoImgUrl+videoInfo.value.trainClassList[0].url videoInfo.value.percentage=((videoInfo.value.process/(videoInfo.value.hour*60))*100).toFixed(2) videoInfo.value.uploadTime=videoInfo.value.uploadTime.split(' ')[0] diff --git a/packageRc/components/ImageUpload.vue b/packageRc/components/ImageUpload.vue index 3b4a6fc..262d326 100644 --- a/packageRc/components/ImageUpload.vue +++ b/packageRc/components/ImageUpload.vue @@ -1,9 +1,10 @@ - - + + 上传文件 + + {{ item.file.name }} + 删除 + @@ -11,7 +12,9 @@ // import { // uploadImg // } from '@/api/company' - import config from '@/config' + // import config from '@/config' +import config from '@/utilsRc/config.js' +import { getToken } from "@/utilsRc/auth"; //import { // getToken //} from '@/utils/auth' @@ -23,7 +26,7 @@ }, allowedFormats: { type: Array, - default: () => [], // 允许的文件格式 + default: () => ['.png', '.jpg', '.jpeg', '.doc', '.docx', '.pdf', '.xls', '.xlsx'], // 允许的文件格式 }, maxImageSize: { type: Object, @@ -74,6 +77,106 @@ }, }, methods: { + deleteFile(index){ + this.internalFileList.splice(index, 1); + }, + chooseAndUploadFile() { + wx.chooseMessageFile({ + count: this.maxCount, + extension: this.allowedFormats, + // ['.png', '.jpg', '.jpeg', '.doc', '.docx', '.pdf', '.xls', '.xlsx' ], + success: (res) => { + console.log('选择文件成功:', res); + if(this.maxCount - this.internalFileList.length < res.tempFiles.length){ + uni.showToast({ + title: '最多只能上传' + this.maxCount + '个文件', + icon: 'none' + }); + return; + } + + let path = ""; + const twoMBInBytes = 2 * 1024 * 1024; // 2MB转换为字节数 + res.tempFiles.forEach((file) => { + + if (file.size > twoMBInBytes) { + uni.showToast({ + title: "图片大小不能超过2MB", + icon: "none", + }); + return; + } + if (res.tempFiles && res.tempFiles.length > 0) { + path = file.path; + if (this.allowedFormats.indexOf('.'+path.split(".")[1])!=-1) { + uni.showLoading(); + const tempFilePath = file; + uni.uploadFile({ + url: config.baseUrl+'/system/oss/upload', //图片上传地址 + filePath: tempFilePath.path, + name: 'file', + formData: {}, + header: { + // 'Authorization': 'Bearer eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJsb2dpblR5cGUiOiJsb2dpbiIsImxvZ2luSWQiOiJzeXNfdXNlcjoxIiwicm5TdHIiOiJQSlUyVlJCc1E1aXRMMWgxdjNkcVh2eER1c2VVc0hvRiIsInVzZXJJZCI6MX0.z4Z2XqgXyU0GQU-i7Bsa5T-zCKApTxj1YQ73rk7bAVo' + 'Authorization': 'Bearer ' + getToken(), + }, + success: (res) => { + var data = JSON.parse(res.data); + console.log(data, 'sdfjiosdjfoi') + if(data.code==200) { + this.internalFileList.push({ + url: data.data.url, + file: file + }) + this.$emit('update', this.internalFileList); + // this.serviceForm.fileUrl = this.internalFileList.map(item => item.url).join(',') + this.$forceUpdate() + uni.hideLoading(); + } else { + uni.hideLoading(); + uni.showToast({ + title: res.msg || '上传失败', + icon: 'none', + duration: 2000 + }); + } + }, + fail: (error) => { + uni.showToast({ + title: '上传失败', + icon: 'none' + }); + console.error(error); + } + }) + } else { + uni.showToast({ + icon: "none", + duration: 1500, + title: `只能选择${this.allowedFormats.join('、')}格式文件`, + }); + } + } + }) + + + + // // 添加新选择的图片到列表 + // res.tempFiles.forEach((item, index) => { + // this.fileList.push({ + // url: item.path, + // file: res.tempFiles[index] + // }); + // }); + // 更新 serviceForm.fileUrl + // this.updateFileUrls(); + }, + fail: (err) => { + console.error('选择图片失败:', err); + } + }); + + }, // 新增图片 async handleAfterRead(event) { let lists = [].concat(event.file); @@ -141,11 +244,25 @@ }; - diff --git a/packageRc/pages/daiban/addbangfu.vue b/packageRc/pages/daiban/addbangfu.vue index 12ab9c9..70d4320 100644 --- a/packageRc/pages/daiban/addbangfu.vue +++ b/packageRc/pages/daiban/addbangfu.vue @@ -67,13 +67,7 @@ :localdata="jingbrList1" @change="handleAgentChange" > - - + @@ -190,10 +184,10 @@ diff --git a/packageRc/pages/jobList/jobList.vue b/packageRc/pages/jobList/jobList.vue new file mode 100644 index 0000000..6703ff2 --- /dev/null +++ b/packageRc/pages/jobList/jobList.vue @@ -0,0 +1,2030 @@ + + + + + + + + + + + + + + + + + + + + + {{ companyInfo.name || "企业名称" }} + + {{ companyInfo.industry || "互联网" }} + · + {{ companyInfo.scale || "100-999人" }} + + + + + + + + + + 职位名称、薪资要求等 + + + + + + + + + + + + + + + + + 全部 + + + {{ item }} + + + + + + 添加 + + + + + + {{ item.text }} + + + + 筛选 + + + + + + + + + + + + + + + + + + + + {{ job.jobTitle }} + + + + + + + + + + {{ config.appInfo.areaName }} + + + + + + + + {{ job.postingDate || "发布日期" }} + + + + + + {{ vacanciesTo(job.vacancies) }} + + + + + + + {{ job.companyName }} + + + + + + + + + 在找「{{ job.jobCategory }}」工作吗? + {{ job.tip }} + + + 不是 + 是的 + + + + + + + + + + + + + + + + + + + + {{ job.jobTitle }} + + + + + + + + + + {{ config.appInfo.areaName }} + + + + + + + + {{ job.postingDate || "发布日期" }} + + + + + + {{ vacanciesTo(job.vacancies) }} + + + + + + + {{ job.companyName }} + + + + + + + + + 在找「{{ job.jobCategory }}」工作吗? + {{ job.tip }} + + + 不是 + 是的 + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/packageRc/pages/needs/components/entrepreneurshipService.vue b/packageRc/pages/needs/components/entrepreneurshipService.vue index 6edde00..4b6118a 100644 --- a/packageRc/pages/needs/components/entrepreneurshipService.vue +++ b/packageRc/pages/needs/components/entrepreneurshipService.vue @@ -1,7 +1,7 @@ @@ -13,12 +13,12 @@ color="#A6A6A6"> - + - {{ formData.personName || '请选择' }} @@ -36,16 +36,16 @@ 否 --> - 是 - 否 @@ -54,26 +54,43 @@ - - - - 是 否 - + --> + + + + 是 + + + + 否 + + {{ formData.ywcypxxq }} + @@ -83,13 +100,30 @@ - + + + + + 是 + + + + 否 + + {{ formData.ywzjxq }} + - + @@ -10,23 +10,20 @@ 求职需求信息 编辑 + style="font-weight: normal;display: flex;" @click="edit=true">编辑 - + - - + + {{ formData.personName || '请选择' }} - {{ formData.personName || '请选择' }} - {{ formData.jobWorkTypeName || '请选择工种' }} - @@ -48,24 +44,22 @@ - - - - + class="ellipsis_1 input-area" @focus="$refs.placePicker.openDialog()"/> - @@ -691,6 +685,25 @@ cursor: not-allowed; } +.input-area{ + padding: 0 24rpx; + height: 64rpx; + display: flex; + align-items: center; + border: 1px solid #e4e4e4; + border-radius: 8rpx; + box-sizing: border-box; + // &input{ + + // } +} +textarea{ + box-sizing: border-box; + border: 1px solid #e4e4e4; + border-radius: 8rpx; + font-size: 26rpx; + padding: 12rpx; +} @@ -699,12 +712,14 @@ display: flex; align-items: center; justify-content: space-between; - width: 100%; - padding: 28rpx 36rpx; + // width: 100%; + padding: 0 24rpx; + height: 64rpx; + display: flex; + align-items: center; background: #ffffff; border: 2rpx solid #e5e5e5; border-radius: 12rpx; - min-height: 88rpx; box-sizing: border-box; transition: all 0.3s ease; } diff --git a/packageRc/pages/needs/components/otherService.vue b/packageRc/pages/needs/components/otherService.vue index f3a5142..4486542 100644 --- a/packageRc/pages/needs/components/otherService.vue +++ b/packageRc/pages/needs/components/otherService.vue @@ -1,7 +1,7 @@ @@ -14,11 +14,11 @@ color="#A6A6A6"> - + - {{ formData.personName || '请选择' }} @@ -26,7 +26,7 @@ - + @@ -338,6 +338,44 @@ color: rgb(192, 196, 204); } +.input-area{ + padding: 0 24rpx; + height: 64rpx; + display: flex; + align-items: center; + border: 1px solid #e4e4e4; + border-radius: 8rpx; + box-sizing: border-box; + // &input{ + + // } +} +textarea{ + box-sizing: border-box; + border: 1px solid #e4e4e4; + border-radius: 8rpx; + font-size: 26rpx; + padding: 12rpx; +} + + + + +.picker-view { + display: flex; + align-items: center; + justify-content: space-between; + // width: 100%; + padding: 0 24rpx; + height: 64rpx; + display: flex; + align-items: center; + background: #ffffff; + border: 2rpx solid #e5e5e5; + border-radius: 12rpx; + box-sizing: border-box; + transition: all 0.3s ease; +} .disabledLine { background: rgb(245, 247, 250); cursor: not-allowed; diff --git a/packageRc/pages/needs/components/trainService.vue b/packageRc/pages/needs/components/trainService.vue index b8b1277..3caead4 100644 --- a/packageRc/pages/needs/components/trainService.vue +++ b/packageRc/pages/needs/components/trainService.vue @@ -1,7 +1,7 @@ @@ -14,11 +14,11 @@ color="#A6A6A6"> - + - {{ formData.personName || '请选择' }} @@ -62,7 +62,7 @@ - + @@ -568,33 +568,42 @@ border-radius: 4px; } - .picker-view { - display: flex; - align-items: center; - justify-content: space-between; - width: 100%; - padding: 28rpx 36rpx; - background: #ffffff; - border: 2rpx solid #e5e5e5; - border-radius: 12rpx; - min-height: 88rpx; - box-sizing: border-box; - transition: all 0.3s ease; - } +.input-area{ + padding: 0 24rpx; + height: 64rpx; + display: flex; + align-items: center; + border: 1px solid #e4e4e4; + border-radius: 8rpx; + box-sizing: border-box; + // &input{ + + // } +} +textarea{ + box-sizing: border-box; + border: 1px solid #e4e4e4; + border-radius: 8rpx; + font-size: 26rpx; + padding: 12rpx; +} - .picker-view:active { - background: #f8f9fa; - border-color: #007aff; - } - .picker-view text { - color: #333333; - font-size: 28rpx; - flex: 1; - } - .picker-view .u-icon { - margin-left: 16rpx; - color: #999999; - } + +.picker-view { + display: flex; + align-items: center; + justify-content: space-between; + // width: 100%; + padding: 0 24rpx; + height: 64rpx; + display: flex; + align-items: center; + background: #ffffff; + border: 2rpx solid #e5e5e5; + border-radius: 12rpx; + box-sizing: border-box; + transition: all 0.3s ease; +} diff --git a/packageRc/pages/needs/dealDone.vue b/packageRc/pages/needs/dealDone.vue new file mode 100644 index 0000000..1c925c5 --- /dev/null +++ b/packageRc/pages/needs/dealDone.vue @@ -0,0 +1,287 @@ + + + + + + + + + + + + + + + + + + + {{ getpersonStatusLabel(formData.personStatus) || "请选择" }} + + + + + + + + + + + + + + + 取消 + 重置 + 办结 + + + + + + + \ No newline at end of file diff --git a/packageRc/pages/needs/needsList.vue b/packageRc/pages/needs/needsList.vue index 8760146..90309c5 100644 --- a/packageRc/pages/needs/needsList.vue +++ b/packageRc/pages/needs/needsList.vue @@ -3,7 +3,7 @@ - + 共 {{ total }} 条 - {{ getDictLabel(item.currentStatus, currentStatusList) }} - + 需求工种:{{ item.jobWorkTypeName }} - + 需求名称:{{ item.serviceRequirementTitle }} + v-if="queryParams.demandType == 2||queryParams.demandType == 4||queryParams.demandType == 5"> 需求名称:{{ item.demandTitle }} - + 推荐 @@ -73,7 +73,7 @@ :customStyle="{border: 'none'}" @click="requirementHandling(item)">办理 - + 培训 @@ -103,30 +103,35 @@ - - - - {{ formData.actualSolveDate||'请选择' }} - - + + @@ -135,7 +140,7 @@ @cancel="showTime=false"> --> - + > --> @@ -180,10 +185,12 @@ delOtherService, finishOtherService } from '@/apiRc/needs/otherService' + import DealDone from './dealDone.vue' export default { components: { PopupList, - ImageUpload + ImageUpload, + DealDone, }, data() { return { @@ -194,7 +201,7 @@ queryParams: { pageNum: 1, pageSize: 10, - needsType: 1 + demandType: 1 }, total: 0, showMorePage: true, @@ -227,19 +234,23 @@ onLoad({ dictValue }) { - this.queryParams.needsType = dictValue || 1 + this.queryParams.demandType = dictValue || 1 this.getCheckData() }, onShow() { this.search(); }, methods: { + // 日期选择变化处理 + onDateChange(e) { + this.formData.actualSolveDate = e.detail.value; + }, closeopenDeal() { this.$refs.openDeal.close() }, // 新增需求 goAddNeeds() { - this.$tab.navigateTo(`/pages/needs/needDetail?activeType=${this.queryParams.needsType}&showTab=1`) + uni.navigateTo(`/packageRc/pages/needs/needDetail?activeType=${this.queryParams.demandType}&showTab=1`) }, confirmDate(e) { @@ -255,36 +266,36 @@ // 需求推荐/培训 requirementTraining(item, index) { if (index == 1) { - uni.navigateTo( - `/pages/services/serviceDetail?personName=${item.personName}&personId=${item.personId}&jobDemandInfoId=${item.id}&jobWorkType=${item.jobWorkType}&type=3&showTab=1` - ) + uni.navigateTo({ + url: `/packageRc/pages/service/serviceDetail?personName=${item.personName}&personId=${item.personId}&jobDemandInfoId=${item.id}&jobWorkType=${item.jobWorkType}&type=3&showTab=1` + }) } else { - uni.navigateTo( - `/pages/services/serviceDetail?personName=${item.personName}&personId=${item.personId}&skillTrainingId=${item.id}&personStatus=${item.personStatus}&type=4&showTab=1` - ) + uni.navigateTo({ + url: `/packageRc/pages/service/serviceDetail?personName=${item.personName}&personId=${item.personId}&skillTrainingId=${item.id}&personStatus=${item.personStatus}&type=4&showTab=1` + }) } }, clickDelete(item) { this.loading = true; - if (this.queryParams.needsType == 1) { + if (this.queryParams.demandType == 1) { delJobService(item.id).then((res) => { this.deleteFinish(res) }); - } else if (this.queryParams.needsType == 2) { + } else if (this.queryParams.demandType == 2) { delAssistService(item.id).then((res) => { this.deleteFinish(res) }); - } else if (this.queryParams.needsType == 3) { + } else if (this.queryParams.demandType == 3) { delEntrepreneurshipService(item.id).then((res) => { this.deleteFinish(res) }); - } else if (this.queryParams.needsType == 4) { + } else if (this.queryParams.demandType == 4) { delTrainService(item.id).then((res) => { this.deleteFinish(res) }); - } else if (this.queryParams.needsType == 5) { + } else if (this.queryParams.demandType == 5) { delOtherService(item.id).then((res) => { this.deleteFinish(res) }); @@ -298,7 +309,7 @@ }, goNeedsDetail(item) { uni.navigateTo({ - url: `/pages/needs/needDetail?id=${item.id}&type=${this.queryParams.needsType}&showTab=1` + url: `/packageRc/pages/needs/needDetail?id=${item.id}&type=${this.queryParams.demandType}&showTab=1` }) }, getDictLabel(value, list) { @@ -321,12 +332,12 @@ console.log(res.data) }) this.checkData = [ - // { - // name: "需求类型", - // type: "needsType", - // data: [{dictLabel: '求职需求', dictValue: '1'},{dictLabel: '援助需求', dictValue: '2'},{dictLabel: '创业需求', dictValue: '3'},{dictLabel: '培训需求', dictValue: '4'},{dictLabel: '其他需求', dictValue: '5'}], - // activeIndex: 0, - // }, + { + name: "需求类型", + type: "demandType", + data: [{dictLabel: '求职需求', dictValue: '1'},{dictLabel: '创业需求', dictValue: '3'},{dictLabel: '培训需求', dictValue: '4'},{dictLabel: '其他需求', dictValue: '5'}], + activeIndex: 0, + }, { name: "需求状态", type: "currentStatus", @@ -375,9 +386,9 @@ 5: 'other' // 其他需求 }; // 获取当前的需求类型字符串 - const demandType = demandTypeMap[this.queryParams.needsType] || 'other'; + const demandType = demandTypeMap[this.queryParams.demandType] || 'other'; + uni.navigateTo({url: `/packageRc/pages/service/serviceTraceability?id=${item.id}&demandType=${demandType}`}); // 使用映射后的字符串构建URL并导航 - this.$tab.navigateTo(`/pages/services/serviceTraceability?id=${item.id}&demandType=${demandType}`); }, // 触底加载 getBottomList() { @@ -403,27 +414,27 @@ // 获取列表 async getList() { this.loading = true; - if (this.queryParams.needsType == 1) { + // if (this.queryParams.demandType == 1) { listJobService(this.queryParams).then((res) => { this.gettedData(res) }); - } else if (this.queryParams.needsType == 2) { - listAssistService(this.queryParams).then((res) => { - this.gettedData(res) - }); - } else if (this.queryParams.needsType == 3) { - listEntrepreneurshipService(this.queryParams).then((res) => { - this.gettedData(res) - }); - } else if (this.queryParams.needsType == 4) { - listTrainService(this.queryParams).then((res) => { - this.gettedData(res) - }); - } else if (this.queryParams.needsType == 5) { - listOtherService(this.queryParams).then((res) => { - this.gettedData(res) - }); - } + // } else if (this.queryParams.demandType == 2) { + // listAssistService(this.queryParams).then((res) => { + // this.gettedData(res) + // }); + // } else if (this.queryParams.demandType == 3) { + // listEntrepreneurshipService(this.queryParams).then((res) => { + // this.gettedData(res) + // }); + // } else if (this.queryParams.demandType == 4) { + // listTrainService(this.queryParams).then((res) => { + // this.gettedData(res) + // }); + // } else if (this.queryParams.demandType == 5) { + // listOtherService(this.queryParams).then((res) => { + // this.gettedData(res) + // }); + // } }, gettedData(res) { if (res.code == 200) { @@ -444,11 +455,19 @@ // 需求办结 requirementHandling(item) { - this.$refs.openDeal.open() - this.formData = { + // this.$refs.openDeal.open() + // this.formData = { + // id: item.id, + // currentStatus: '3' + // } + console.log(item, 'asdfjoiasiodfjoi') + + this.$refs.dealDone.init({ id: item.id, - currentStatus: '3' - } + currentStatus: "3", + userId: item.userId, + // personStatus: item.personStatus || (this.dict.personStatusList[0] && this.dict.personStatusList[0].dictValue), + }); }, // 需求推荐 @@ -460,6 +479,7 @@ // 办结按钮 async finishJobRecommend() { + uni.showLoading(); try { // 检查必填项 if (!this.formData.actualSolveDate) { @@ -468,9 +488,7 @@ if (!this.formData.solveDesc) { throw new Error('解决说明不能为空'); } - // 显示全局加载 - this.$showLoading(); - // 根据 queryParams.needsType 获取对应的 URL + // 根据 queryParams.demandType 获取对应的 URL const obj = { 1: '/demand/personJobDemandInfo/JdJobDemandDone', 2: '/demand/personAssistDemandInfo/assistDone', @@ -479,7 +497,7 @@ 5: '/demand/personOtherDemandInfo/otherDemandDone', }; - const url = obj[this.queryParams.needsType]; + const url = '/manage/personDemand/demandDone';//obj[this.queryParams.demandType]; if (!url) { throw new Error('无效的需求类型'); } @@ -491,18 +509,17 @@ // 检查响应码是否为200 if (code === 200) { // 显示成功的提示信息 - this.$u.toast(msg); + uni.showToast({title: msg, icon: 'none'}); // this.openDeal = false; - this.$refs.openDeal.close() + this.$refs.openDeal.close() this.search(); } } catch (error) { // 处理错误并显示提示信息 - this.$u.toast('请检查必填项填写'); - console.error('完成需求时发生错误:', error); + uni.showToast({title: '请检查必填项填写', icon: 'none'}); } finally { // 确保加载页总是会被隐藏 - this.$hideLoading(); + uni.hideLoading(); } }, // async finishJobRecommend() { @@ -514,21 +531,22 @@ // 4: '/demand/personTrainDemandInfo/JdTrainDemandDone', // 5: '/demand/personOtherDemandInfo/otherDemandDone', // } - // if (!this.formData.actualSolveDate) return this.$u.toast('解决时间不能为空'); - // if (!this.formData.solveDesc) return this.$u.toast('解决说明不能为空'); + // if (!this.formData.actualSolveDate) return uni.showToast({title: '解决时间不能为空', icon: 'none'}); + // if (!this.formData.solveDesc) return uni.showToast({title: '解决说明不能为空', icon: 'none'}); // const { // code, // data, // msg - // } = await requirementCompletion(obj[this.queryParams.needsType], this.formData) + // } = await requirementCompletion(obj[this.queryParams.demandType], this.formData) // if (code == 200) { - // this.$u.toast(msg) + // uni.showToast({title: ms, icon: 'none'}g) // this.openDeal = false // this.search() // } // }, changeFile(e) { + console.log(e, 34234234234234) // 清空当前的 fileUrl 数组 this.formData.fileUrl = []; // 如果 e 有长度(即用户选择了文件) @@ -539,7 +557,7 @@ this.formData.fileUrl.push(url); } } - this.formData.fileUrl = this.$arrayToString(this.formData.fileUrl) + this.formData.fileUrl = this.formData.fileUrl.join(','); }, } } @@ -569,11 +587,15 @@ .search-icon { width: 40rpx; + height: 40rpx; } } .job-item { position: relative; + margin-bottom: 24rpx; + background: #fff; + border-radius: 16rpx; .item_btn{ height: 100rpx; border-top: 1px solid #e3e8ee; @@ -616,8 +638,6 @@ } .top-container { - background: #fff; - border-radius: 16rpx; padding: 32rpx; // margin-bottom: 24rpx; @@ -774,10 +794,54 @@ width: 100%; } } - .d_flex{ + + .df_flex{ display: flex; view{ flex-grow: 1; + text-align: center; + color: #4c6efb; } - } +} +.df_flex_1{ + flex: 1; +} +.df__direction_column { + flex-direction: column; +} +.df_align_center{ + align-items: center; +} +.df_justify_center{ + justify-content: center; +} +.df_content_between{ + justify-content: space-between; +} +.df_shrink_0{ + flex-shrink: 0; +} + +/* 日期选择器样式 */ +.date-picker-wrapper { + display: flex; + justify-content: space-between; + align-items: center; + width: 100%; + box-sizing: border-box; + padding: 0 24rpx; + height: 64rpx; + border: 1px solid #ddd; + border-radius: 4px; + background-color: #fff; +} + +// .date-picker-wrapper.noValue { +// background-color: #f9f9f9; +// } + +.date-value { + color: #333; + width: 100% +} diff --git a/packageRc/pages/personalList/personalList.vue b/packageRc/pages/personalList/personalList.vue index 16bf2e8..4c4ba2d 100644 --- a/packageRc/pages/personalList/personalList.vue +++ b/packageRc/pages/personalList/personalList.vue @@ -41,9 +41,9 @@ + style="position: relative; color: #000;display: flex;align-items: center;justify-content: space-between;"> - 共{{ total }}条信息 + 共{{ total }}条信息 @@ -143,7 +143,7 @@ - + 取消 @@ -258,7 +258,7 @@ - + diff --git a/packageRc/pages/policy/policyDetail.vue b/packageRc/pages/policy/policyDetail.vue new file mode 100644 index 0000000..4f2deaf --- /dev/null +++ b/packageRc/pages/policy/policyDetail.vue @@ -0,0 +1,481 @@ + + + + + + + + + + + + {{ policyDetail.zcmc }} + + + + 政策:{{ policyDetail.zcLevel }} + + + 发文单位:{{ policyDetail.sourceUnit }} + 受理单位:{{ policyDetail.acceptingUnit }} + 发布时间:{{ policyDetail.publishTime || '--' }} + 浏览次数:{{ policyDetail.viewNum }} + + + + + + + 政策对象 + + + -- + + + + 政策说明 + + + -- + + + + 申报条件 + + + -- + + + + 政策内容 + + + -- + + + + 政策申报时间 + + {{ policyDetail.validity || "--" }} + + + + + + 政策文件 + + + -- + + + + + 补贴标准 + + + -- + + + + + 经办渠道 + + + -- + + + + + 申报条件 + + + -- + + + + + + + + 政策内容 + + + -- + + + + + + + 发文单位 + + {{ policyDetail.sourceUnit || "--" }} + + + + 发文时间 + + {{ policyDetail.publishTime || "--" }} + + + + 受理单位 + + {{ policyDetail.acceptingUnit || "--" }} + + + + 咨询电话 + + + -- + + + + + + 申报指南 + + + -- + + + + + 申请材料 + + + -- + + + + + + + + + + + + diff --git a/packageRc/pages/policy/policyList.vue b/packageRc/pages/policy/policyList.vue new file mode 100644 index 0000000..f4073c2 --- /dev/null +++ b/packageRc/pages/policy/policyList.vue @@ -0,0 +1,539 @@ + + + + + + + + + + + 共 {{ total }} 条 + + + + + 推荐 + + + {{item.zcmc}} + + {{item.zclx}} + {{item.zcLevel}} + {{item.sourceUnit}} + + + 发布日期:{{item.createTime}} + 浏览数{{item.viewNum}} + + + + + + 加载中~ + + 加载更多 + + 没有更多数据了~ + + + + + + + + diff --git a/packageRc/pages/service/serviceTraceability.vue b/packageRc/pages/service/serviceTraceability.vue new file mode 100644 index 0000000..3e00548 --- /dev/null +++ b/packageRc/pages/service/serviceTraceability.vue @@ -0,0 +1,285 @@ + + + + + + + + 经办人: + {{ job.agentUserName || '-' }} + + + 经办时间: + {{ job.practicalSolutionTime }} + + + 经办部门: + {{ job.agentDeptName }} + + + 说明: + {{ job.blqksm || '--'}} + + + + + + + + + + diff --git a/packageRc/static/cyzc.png b/packageRc/static/cyzc.png new file mode 100644 index 0000000..dd4ccfd Binary files /dev/null and b/packageRc/static/cyzc.png differ diff --git a/pages.json b/pages.json index fcfd47c..dcb8ae3 100644 --- a/pages.json +++ b/pages.json @@ -368,17 +368,38 @@ { "path": "train/mockExam/examList", "style": { - "navigationBarTitleText": "模拟考试", + "navigationBarTitleText": "考试列表", "navigationBarTitleTextSize": "30rpx" } }, + { + "path": "train/mockExam/startExam", + "style": { + "navigationBarTitleText": "模拟考试", + "navigationBarTitleTextSize": "30rpx" + } + }, { "path": "train/mockExam/viewGrades", "style": { "navigationBarTitleText": "查看成绩", "navigationBarTitleTextSize": "30rpx" } - } + }, + { + "path": "priority/helpFilter", + "style": { + "navigationBarTitleText": "筛选和帮扶", + "navigationBarTitleTextSize": "30rpx" + } + }, + { + "path": "priority/helpFollow", + "style": { + "navigationBarTitleText": "跟进", + "navigationBarTitleTextSize": "30rpx" + } + } ] }, { @@ -393,7 +414,13 @@ { "path": "pages/personalList/personalList", "style": { - "navigationBarTitleText": "添加帮扶" + "navigationBarTitleText": "毕业生追踪" + } + }, + { + "path": "pages/jobList/jobList", + "style": { + "navigationBarTitleText": "岗位列表" } }, { @@ -423,6 +450,11 @@ "style": { "navigationBarTitleText": "服务" } + } , { + "path": "pages/service/serviceTraceability", + "style": { + "navigationBarTitleText": "服务追溯" + } } , { "path": "pages/needs/needDetail", "style": { @@ -443,6 +475,16 @@ "style": { "navigationBarTitleText": "需求" } + } , { + "path": "pages/policy/policyList", + "style": { + "navigationBarTitleText": "政策专区" + } + } , { + "path": "pages/policy/policyDetail", + "style": { + "navigationBarTitleText": "政策详解" + } } ] }, diff --git a/pages/index/components/index-one.vue b/pages/index/components/index-one.vue index 28212ea..bbb7683 100644 --- a/pages/index/components/index-one.vue +++ b/pages/index/components/index-one.vue @@ -130,6 +130,12 @@ 测试页面 + + + + + 帮扶 + @@ -742,6 +748,9 @@ const handleLiveClick = () => { const navToTestPage = () => { navTo('/pages/test/homepage-test'); }; +const navToPage = () =>{ + navTo('/packageB/priority/helpFilter'); +} async function loadData() { try { @@ -1038,14 +1047,14 @@ import { getToken } from '@/utilsRc/auth.js'; // 跳转到高校毕业页面 function goRc(){ if (checkLogin()) { + navTo('/packageRc/pages/index/index'); let token = getToken(); - if( token != null ){ + if( token != null && token != '' && token != undefined ){ if(storeRc.state.user.type == 'person'){ navTo('/packageRc/pages/index/index'); }else{ navTo('/packageRc/pages/daiban/daiban'); } - console.log(storeRc.state.user.roles, storeRc.state.user.type, 'state') }else{ let userInfo = uni.getStorageSync('userInfo') storeRc.dispatch('LoginByUserInfo', userInfo).then(res => { diff --git a/uni_modules/uni-icons/changelog.md b/uni_modules/uni-icons/changelog.md index 0261131..62e7682 100644 --- a/uni_modules/uni-icons/changelog.md +++ b/uni_modules/uni-icons/changelog.md @@ -1,5 +1,7 @@ -## 2.0.10(2024-06-07) -- 优化 uni-app x 中,size 属性的类型 +## 2.0.12(2025-08-26) +- 优化 uni-app x 下 size 类型问题 +## 2.0.11(2025-08-18) +- 修复 图标点击事件返回 ## 2.0.9(2024-01-12) fix: 修复图标大小默认值错误的问题 ## 2.0.8(2023-12-14) diff --git a/uni_modules/uni-icons/components/uni-icons/uni-icons.uvue b/uni_modules/uni-icons/components/uni-icons/uni-icons.uvue index ce307c1..d2ef35a 100644 --- a/uni_modules/uni-icons/components/uni-icons/uni-icons.uvue +++ b/uni_modules/uni-icons/components/uni-icons/uni-icons.uvue @@ -1,91 +1,91 @@ - - {{unicode}} - + + {{unicode}} + diff --git a/uni_modules/uni-icons/components/uni-icons/uni-icons.vue b/uni_modules/uni-icons/components/uni-icons/uni-icons.vue index 9634a9c..a8a7332 100644 --- a/uni_modules/uni-icons/components/uni-icons/uni-icons.vue +++ b/uni_modules/uni-icons/components/uni-icons/uni-icons.vue @@ -85,8 +85,8 @@ } }, methods: { - _onClick() { - this.$emit('click') + _onClick(e) { + this.$emit('click', e) } } } @@ -107,4 +107,4 @@ text-decoration: none; text-align: center; } - + \ No newline at end of file diff --git a/uni_modules/uni-icons/package.json b/uni_modules/uni-icons/package.json index 6b681b4..60e45f0 100644 --- a/uni_modules/uni-icons/package.json +++ b/uni_modules/uni-icons/package.json @@ -1,7 +1,7 @@ { "id": "uni-icons", "displayName": "uni-icons 图标", - "version": "2.0.10", + "version": "2.0.12", "description": "图标组件,用于展示移动端常见的图标,可自定义颜色、大小。", "keywords": [ "uni-ui", @@ -11,12 +11,14 @@ ], "repository": "https://github.com/dcloudio/uni-ui", "engines": { - "HBuilderX": "^3.2.14" + "HBuilderX": "^3.2.14", + "uni-app": "^4.08", + "uni-app-x": "^4.61" }, "directories": { "example": "../../temps/example_temps" }, -"dcloudext": { + "dcloudext": { "sale": { "regular": { "price": "0.00" @@ -34,56 +36,76 @@ "permissions": "无" }, "npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui", - "type": "component-vue" + "type": "component-vue", + "darkmode": "x", + "i18n": "x", + "widescreen": "x" }, "uni_modules": { - "dependencies": ["uni-scss"], + "dependencies": [ + "uni-scss" + ], "encrypt": [], "platforms": { "cloud": { - "tcb": "y", - "aliyun": "y", - "alipay": "n" + "tcb": "x", + "aliyun": "x", + "alipay": "x" }, "client": { - "App": { - "app-vue": "y", - "app-nvue": "y", - "app-uvue": "y" + "uni-app": { + "vue": { + "vue2": "√", + "vue3": "√" + }, + "web": { + "safari": "√", + "chrome": "√" + }, + "app": { + "vue": "√", + "nvue": "-", + "android": { + "extVersion": "", + "minVersion": "29" + }, + "ios": "√", + "harmony": "√" + }, + "mp": { + "weixin": "√", + "alipay": "√", + "toutiao": "√", + "baidu": "√", + "kuaishou": "-", + "jd": "-", + "harmony": "-", + "qq": "√", + "lark": "-" + }, + "quickapp": { + "huawei": "√", + "union": "√" + } }, - "H5-mobile": { - "Safari": "y", - "Android Browser": "y", - "微信浏览器(Android)": "y", - "QQ浏览器(Android)": "y" - }, - "H5-pc": { - "Chrome": "y", - "IE": "y", - "Edge": "y", - "Firefox": "y", - "Safari": "y" - }, - "小程序": { - "微信": "y", - "阿里": "y", - "百度": "y", - "字节跳动": "y", - "QQ": "y", - "钉钉": "y", - "快手": "y", - "飞书": "y", - "京东": "y" - }, - "快应用": { - "华为": "y", - "联盟": "y" - }, - "Vue": { - "vue2": "y", - "vue3": "y" + "uni-app-x": { + "web": { + "safari": "√", + "chrome": "√" + }, + "app": { + "android": { + "extVersion": "", + "minVersion": "29" + }, + "ios": "√", + "harmony": "√" + }, + "mp": { + "weixin": "√" + } } } } } -} +} \ No newline at end of file diff --git a/uni_modules/uni-steps/changelog.md b/uni_modules/uni-steps/changelog.md new file mode 100644 index 0000000..04367d8 --- /dev/null +++ b/uni_modules/uni-steps/changelog.md @@ -0,0 +1,18 @@ +## 1.1.2(2024-03-28) +- 修复 uni-steps为竖排列时,文本长度过长引起点错乱的bug +## 1.1.1(2021-11-22) +- 修复 vue3中某些scss变量无法找到的问题 +## 1.1.0(2021-11-19) +- 优化 组件UI,并提供设计资源,详见:[https://uniapp.dcloud.io/component/uniui/resource](https://uniapp.dcloud.io/component/uniui/resource) +- 文档迁移,详见:[https://uniapp.dcloud.io/component/uniui/uni-steps](https://uniapp.dcloud.io/component/uniui/uni-steps) +## 1.0.8(2021-05-12) +- 新增 项目示例地址 +## 1.0.7(2021-05-06) +- 修复 uni-steps 横向布局时,多行文字高度不合理的 bug +## 1.0.6(2021-04-21) +- 优化 添加依赖 uni-icons, 导入后自动下载依赖 +## 1.0.5(2021-02-05) +- 优化 组件引用关系,通过uni_modules引用组件 + +## 1.0.4(2021-02-05) +- 调整为uni_modules目录规范 diff --git a/uni_modules/uni-steps/components/uni-steps/uni-steps.vue b/uni_modules/uni-steps/components/uni-steps/uni-steps.vue new file mode 100644 index 0000000..81017fc --- /dev/null +++ b/uni_modules/uni-steps/components/uni-steps/uni-steps.vue @@ -0,0 +1,280 @@ + + + + + + {{item.title}} + {{item.desc}} + + + + + + + + + + + + + + + + + + + + diff --git a/uni_modules/uni-steps/package.json b/uni_modules/uni-steps/package.json new file mode 100644 index 0000000..4145ce9 --- /dev/null +++ b/uni_modules/uni-steps/package.json @@ -0,0 +1,87 @@ +{ + "id": "uni-steps", + "displayName": "uni-steps 步骤条", + "version": "1.1.2", + "description": "步骤条组件,提供横向和纵向两种布局格式。", + "keywords": [ + "uni-ui", + "uniui", + "步骤条", + "时间轴" +], + "repository": "https://github.com/dcloudio/uni-ui", + "engines": { + "HBuilderX": "" + }, + "directories": { + "example": "../../temps/example_temps" + }, +"dcloudext": { + "sale": { + "regular": { + "price": "0.00" + }, + "sourcecode": { + "price": "0.00" + } + }, + "contact": { + "qq": "" + }, + "declaration": { + "ads": "无", + "data": "无", + "permissions": "无" + }, + "npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui", + "type": "component-vue" + }, + "uni_modules": { + "dependencies": [ + "uni-scss", + "uni-icons" + ], + "encrypt": [], + "platforms": { + "cloud": { + "tcb": "y", + "aliyun": "y", + "alipay": "n" + }, + "client": { + "App": { + "app-vue": "y", + "app-nvue": "y" + }, + "H5-mobile": { + "Safari": "y", + "Android Browser": "y", + "微信浏览器(Android)": "y", + "QQ浏览器(Android)": "y" + }, + "H5-pc": { + "Chrome": "y", + "IE": "y", + "Edge": "y", + "Firefox": "y", + "Safari": "y" + }, + "小程序": { + "微信": "y", + "阿里": "y", + "百度": "y", + "字节跳动": "y", + "QQ": "y" + }, + "快应用": { + "华为": "u", + "联盟": "u" + }, + "Vue": { + "vue2": "y", + "vue3": "y" + } + } + } + } +} \ No newline at end of file diff --git a/uni_modules/uni-steps/readme.md b/uni_modules/uni-steps/readme.md new file mode 100644 index 0000000..da7a4bf --- /dev/null +++ b/uni_modules/uni-steps/readme.md @@ -0,0 +1,13 @@ + + +## Steps 步骤条 +> **组件名:uni-steps** +> 代码块: `uSteps` + + +步骤条,常用于显示进度 + +### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-steps) +#### 如使用过程中有任何问题,或者您对uni-ui有一些好的建议,欢迎加入 uni-ui 交流群:871950839 + + diff --git a/unpackage/dist/dev/mp-weixin/project.config.json b/unpackage/dist/dev/mp-weixin/project.config.json index d63cc50..259a170 100644 --- a/unpackage/dist/dev/mp-weixin/project.config.json +++ b/unpackage/dist/dev/mp-weixin/project.config.json @@ -1,8 +1,7 @@ { "description": "项目配置文件。", "packOptions": { - "ignore": [], - "include": [] + "ignore": [] }, "setting": { "urlCheck": false, @@ -10,21 +9,28 @@ "postcss": true, "minified": true, "newFeature": true, - "bigPackageSizeSupport": true, - "babelSetting": { - "ignore": [], - "disablePlugins": [], - "outputPath": "" - }, - "condition": false + "bigPackageSizeSupport": true }, "compileType": "miniprogram", - "libVersion": "3.10.3", + "libVersion": "3.5.7", "appid": "wx9d1cbc11c8c40ba7", "projectname": "qingdao-employment-service", - "condition": {}, - "editorSetting": { - "tabIndent": "insertSpaces", - "tabSize": 2 + "condition": { + "search": { + "current": -1, + "list": [] + }, + "conversation": { + "current": -1, + "list": [] + }, + "game": { + "current": -1, + "list": [] + }, + "miniprogram": { + "current": -1, + "list": [] + } } } \ No newline at end of file diff --git a/utilsRc/request.js b/utilsRc/request.js index 89b1861..346431d 100644 --- a/utilsRc/request.js +++ b/utilsRc/request.js @@ -20,7 +20,7 @@ const request = config => { if (getToken() && !isToken) { config.header['Authorization'] = 'Bearer ' + getToken() } - config.header['Authorization'] = 'Bearer ' + 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJsb2dpblR5cGUiOiJsb2dpbiIsImxvZ2luSWQiOiJzeXNfdXNlcjoxIiwicm5TdHIiOiJQSlUyVlJCc1E1aXRMMWgxdjNkcVh2eER1c2VVc0hvRiIsInVzZXJJZCI6MX0.z4Z2XqgXyU0GQU-i7Bsa5T-zCKApTxj1YQ73rk7bAVo' + config.header['Authorization'] = 'Bearer ' + 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJsb2dpblR5cGUiOiJsb2dpbiIsImxvZ2luSWQiOiJzeXNfdXNlcjoxIiwicm5TdHIiOiJGUVl3YmRUalAzQ1BMNGFVc0RxeGJmdjAyT3JMZllDVSIsInVzZXJJZCI6MX0.kSOXY2QJQPbfjE0Yx2R3S8yQciA33OZBS9xJtr7cQ1A' // get请求映射params参数 if (config.params) { let url = config.url + '?' + tansParams(config.params)