From cc4cc631b6e81ef7f6f446a112f5eba844325b18 Mon Sep 17 00:00:00 2001 From: wangxia <779219182@qq.com> Date: Tue, 12 Aug 2025 14:06:17 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=B3=E6=B3=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- App.vue | 32 ++++++++++++------------ api/user.js | 6 +++++ pages/person/index.vue | 47 ++++++++++++++++++++--------------- root/bind/myMain.vue | 16 ++++++------ root/components/applyFlow.vue | 52 +++++++++++++++++++++++++++++++++++++-- root/home/shareJob.vue | 57 +++++++++++++++++++++---------------------- root/person/applyManage.vue | 4 +++ root/person/loginIndex.vue | 15 +++++++++--- 8 files changed, 152 insertions(+), 77 deletions(-) diff --git a/App.vue b/App.vue index fd89ed0..eb85fd9 100644 --- a/App.vue +++ b/App.vue @@ -61,21 +61,21 @@ export default { uni.$on("isGlogin", function (data) { console.log("app.vue 接收", data); if (uni.getStorageSync("apply-uid")) { - that.initWyyx() + that.initWyyx(); } }); if (uni.getStorageSync("apply-token")) { console.log("app.vue 是否调用"); - that.initWyyx() + that.initWyyx(); } }, onHide: function () { - if (this.globalData.timer) { - clearInterval(this.globalData.timer); - this.globalData.timer = null; - console.log("定时任务已清除"); - } - }, + if (this.globalData.timer) { + clearInterval(this.globalData.timer); + this.globalData.timer = null; + console.log("定时任务已清除"); + } + }, methods: { initWyyx() { let that = this; @@ -281,15 +281,17 @@ export default { uni.setTabBarBadge({ index: 2, text: String(res.approvePassHasNotRed), + fail(err) { + console.log("err", err); + }, }); } else { - try { - uni.removeTabBarBadge({ - index: 2, - }); - } catch (error) { - console.log("当前页面不是 TabBar 页面，无法移除 badge"); - } + uni.removeTabBarBadge({ + index: 2, + fail(err) { + console.log("err", err); + }, + }); } }); } diff --git a/api/user.js b/api/user.js index 9602cf9..81c6d22 100644 --- a/api/user.js +++ b/api/user.js @@ -33,7 +33,13 @@ let userInfo = {// 用户信息模块 order_addApply: "/yishoudan/agency/group/user/apply/addApply",// 申请加入团队 order_checkHasApply: "/yishoudan/agency/group/user/apply/checkHasApply",// 是否申请过加入团队 order_getNewApplyNum: "/yishoudan/agency/group/user/apply/getNewApplyNum",// 获取申请加入的成员数量 + + order_getNewApplyNumNotViewed: "/yishoudan/agency/group/user/apply/getNewApplyNumNotViewed",// 获取新申请的数量(未读) + + order_updateApplyNumHasViewed: "/yishoudan/agency/group/user/apply/updateApplyNumHasViewed",// 将申请列表标记为已读 + order_getUserApplyList: "/yishoudan/agency/group/user/apply/userApplyList",// 获取申请加入的成员列表 + order_userApplyApprove: "/yishoudan/agency/group/user/apply/approve",// 申请加入审批 } diff --git a/pages/person/index.vue b/pages/person/index.vue index 81fe902..cafe789 100644 --- a/pages/person/index.vue +++ b/pages/person/index.vue @@ -22,15 +22,13 @@ - + {{ agencyInfo.agencyName || agencyInfo.fullName || "-" }} - + - + {{ waitNus }} @@ -56,7 +54,7 @@ - +
--> - + + + {{ applyNum }} + { + console.log(res, "getNewApplyNum"); + that.applyNum = res; + }); + }, + getWait() { let that = this; - that.G.Get(that.api.person_applyNum,{},(res)=>{ + that.G.Get(that.api.person_applyNum, {}, (res) => { that.waitNus = res; - }) + }); }, setUserInfo() { let that = this; @@ -778,13 +787,13 @@ export default { }); that.readed = false; } else { - try { - uni.removeTabBarBadge({ - index: 2, - }); - } catch (error) { - console.log("当前页面不是 TabBar 页面，无法移除 badge"); - } + try { + uni.removeTabBarBadge({ + index: 2, + }); + } catch (error) { + console.log("当前页面不是 TabBar 页面，无法移除 badge"); + } that.readed = true; } }); diff --git a/root/bind/myMain.vue b/root/bind/myMain.vue index c2a11e2..193f9b3 100644 --- a/root/bind/myMain.vue +++ b/root/bind/myMain.vue @@ -502,19 +502,19 @@ export default { let numBase3 = numBase2 + (ctx.measureText(info.recruitmentJobNum.toString()).width + ctx.measureText("在招数").width + 150); that.G.roundRect(ctx, img, (mycenter - 300) / 2, 140, 300, 300, 150); // logo that.G.fillTextLineBreak(ctx, info.fullName, (mycenter - info.fullName.length * 80) / 2, 600, info.fullName.length * 80, 200, "#333", 80, 600, "left"); // 企业名称 - that.G.fillTextLineBreak(ctx, info.agencyDesp, numBase - 55, 870, mycenter - 240, 86, "#666", 56, 500, "center"); // slogan + that.G.fillTextLineBreak(ctx, info.agencyDesp, numBase - 35, 870, mycenter - 260, 86, "#666", 56, 500, "center"); // slogan // that.G.fillTextLineBreak(ctx, "今日更新职位" + info.jobUpdateNum, 140, 400, ("今日更新职位" + info.jobUpdateNum).length * 56, 56, "#999", 56, 500, "left"); // 今日更新职位 const textSegments = [ - { content: info.jobNum.toString(), color: "#000", fontWeight: 500, fontSize: 80, space: 20 }, - { content: "总职位", color: "#666", fontWeight: 500, fontSize: 56, space: 80 }, - { content: info.recruitmentJobNum.toString(), color: "#000", fontWeight: 500, fontSize: 80, space: 20 }, - { content: "在招数", color: "#666", fontWeight: 500, fontSize: 56, space: 80 }, - { content: info.downNum.toString(), color: "#000", fontWeight: 500, fontSize: 80, space: 20 }, + { content: info.jobNum.toString(), color: "#000", fontWeight: 500, fontSize: 80, space: 10 }, + { content: "总职位", color: "#666", fontWeight: 500, fontSize: 56, space: 70 }, + { content: info.recruitmentJobNum.toString(), color: "#000", fontWeight: 500, fontSize: 80, space: 10 }, + { content: "在招数", color: "#666", fontWeight: 500, fontSize: 56, space: 70 }, + { content: info.downNum.toString(), color: "#000", fontWeight: 500, fontSize: 80, space: 10 }, { content: "粉丝", color: "#666", fontWeight: 500, fontSize: 56, space: 40 }, ]; - that.G.drawCenteredText(ctx, mycenter, 745, textSegments); - imgres(canvas); + that.G.drawCenteredText(ctx, mycenter + 20, 745, textSegments); + imgres(canvas); }; }, fail(err) {}, diff --git a/root/components/applyFlow.vue b/root/components/applyFlow.vue index 85642da..6c94eb3 100644 --- a/root/components/applyFlow.vue +++ b/root/components/applyFlow.vue @@ -17,12 +17,54 @@ + + +
+
+ +
报名助手需以企业身份使用，请确认本人所在公司是否已创建团队：
+
+
已有团队？
+
+ 直接搜索加入 +
+
+
+
还没团队？
+
+ 立即创建团队 +
+
+
+ +
+
+
+
加入团队/企业
-
团队创建人手机号
+
团队创建人手机号
@@ -33,7 +75,7 @@
当前选择团队: {{ chooseTeam.fullName || chooseTeam.agencyName }}
-
昵称
+
昵称
@@ -92,6 +134,8 @@ export default { return { joinTeamDrawerShow: false, joinTeamConfirm: false, + confirmWithoutAgency: false, + submitConfirm: false, btnLoading: false, teamList: [], @@ -174,6 +218,8 @@ export default { // 是代理直接关注确认框 applyFlowConfirm() { let that = this; + this.confirmWithoutAgency = true; + return; that.G.handleConfirm({ confirmText: "确认", title: "是否确认关注该发单号？", @@ -188,6 +234,8 @@ export default { // 不是代理询问是否创建或加入团队 applyFlowWidthoutAgencyConfirm() { let that = this; + this.confirmWithoutAgency = true; + return; that.G.handleConfirm({ cancelText: "创建团队", confirmText: "加入团队", diff --git a/root/home/shareJob.vue b/root/home/shareJob.vue index 58f2ad2..a86a174 100644 --- a/root/home/shareJob.vue +++ b/root/home/shareJob.vue @@ -111,7 +111,7 @@