diff --git a/App.vue b/App.vue index 9348e3a..66babae 100644 --- a/App.vue +++ b/App.vue @@ -42,7 +42,7 @@ export default { let that = this; console.log("show 项目init：", options, decodeURIComponent(options.query.scene)); let requestComeFrom = this.G.globalConstantData.requestComeFrom; - uni.setStorageSync("requestComeFrom", (requestComeFrom && (requestComeFrom == "assistant_miniapp" || requestComeFrom == "supply_chain_miniapp")) ? 'isToB' : 'isToC'); + uni.setStorageSync("requestComeFrom", requestComeFrom && (requestComeFrom == "assistant_miniapp" || requestComeFrom == "supply_chain_miniapp") ? "isToB" : "isToC"); // 清除扫码获取的id信息 uni.removeStorageSync("scene"); @@ -96,6 +96,36 @@ export default { // console.log("app.vue 检查IM连接状态"); that.checkAndReconnectIM(); } + const updateManager = uni.getUpdateManager(); + updateManager.onCheckForUpdate(function (res) { + console.log("检测是否有新版本：", res.hasUpdate); + }); + updateManager.onUpdateReady(function (res) { + uni.showModal({ + title: "更新提示", + content: "新版本已经准备好，需重启应用", + showCancel: false, + success(res) { + if (res.confirm) { + console.log("新版本已经准备好，需重启应用"); + updateManager.applyUpdate(); + } + }, + }); + }); + updateManager.onUpdateFailed(function (res) { + uni.showModal({ + title: "更新提示", + content: "新版本下载异常，需重启应用", + showCancel: false, + success(res) { + if (res.confirm) { + console.log("新版本下载异常，需重启应用"); + updateManager.applyUpdate(); + } + }, + }); + }); }, onHide: function () { // 应用进入后台时不清除定时器，保持心跳 diff --git a/components/customTabbar.vue b/components/customTabbar.vue index 8a8672c..ba461c5 100644 --- a/components/customTabbar.vue +++ b/components/customTabbar.vue @@ -98,22 +98,31 @@ export default { text: "首页", iconSize: 48, }, - { - iconPath: "icon-fadanhao-31 g_c_9", - selectedIconPath: "icon-fadanhao-31 g_c_main", - pagePath: "/pages/home/order", - text: "发单号", - iconSize: 48, - }, + // { + // iconPath: "icon-fadanhao-31 g_c_9", + // selectedIconPath: "icon-fadanhao-31 g_c_main", + // pagePath: "/pages/home/order", + // text: "发单号", + // iconSize: 48, + // }, { iconPath: "icon-message g_c_9", selectedIconPath: "icon-message g_c_main", pagePath: "/pages/message/index", text: "消息", - iconSize: 78, + iconSize: 48, iconType: "custom", count: 0, }, + // 图标大小需要到u-icon中修改 + { + iconPath: "icon-kuaisubaoming g_c_main", + selectedIconPath: "icon-kuaisubaoming g_c_main", + pagePath: "/pages/addJob/index", + iconSize: 78, + iconType: "custom", + iconPadding: "2px", + }, { iconPath: "icon-order_active g_c_9", selectedIconPath: "icon-order_active g_c_main", @@ -141,6 +150,12 @@ export default { let that = this; console.log(index); this.isShow = false; + if (index === 2) { + uni.navigateTo({ + url: "/root/home/quickApplication", + }); + return false; + } return true; }, uploadPage() { diff --git a/components/panel/formSlot.vue b/components/panel/formSlot.vue index 7feba02..7339d77 100644 --- a/components/panel/formSlot.vue +++ b/components/panel/formSlot.vue @@ -124,7 +124,7 @@
- +
@@ -385,6 +385,7 @@ export default { }, // 身份证号 handleIDcard(e, $item, $index) { + console.log('123123132',e); this.$emit("changeIDcard", e); }, // 家庭住址 diff --git a/main.js b/main.js index 4881722..c99c465 100644 --- a/main.js +++ b/main.js @@ -206,7 +206,7 @@ export function createApp () { }, $sourceType); }, /* 上传图片 - */ + */ uploadImgByAlbum (callback = () => { }, type = 'default', $num = 1, $sourceType = ['album']) { var that = this; G.uploadImage($num, (imgRes) => { diff --git a/pages/home/index.vue b/pages/home/index.vue index 0e9b1e6..66757e7 100644 --- a/pages/home/index.vue +++ b/pages/home/index.vue @@ -107,9 +107,9 @@
-
+ @@ -171,11 +171,11 @@ export default { uni.$on("updateJobList", () => { that.updateJobInfo(); }); - if (uni.getStorageSync("SHOW_INVITE_ALL")) { - if (uni.getStorageSync("SHOW_INVITE_ALL") == 1 && uni.getStorageSync("SHOW_INVITE") == 1) { - that.getInviteList(); - } - } + // if (uni.getStorageSync("SHOW_INVITE_ALL")) { + // if (uni.getStorageSync("SHOW_INVITE_ALL") == 1 && uni.getStorageSync("SHOW_INVITE") == 1) { + // that.getInviteList(); + // } + // } console.log('uni.getStorageSync("apply-supplierAccount")', uni.getStorageSync("apply-supplierAccount")); that.updateJobInfo(); } @@ -196,6 +196,7 @@ export default { uni.setStorageSync("TABBAR_HEIGHT", res.height); }) .exec(); + }, data() { return { @@ -259,7 +260,7 @@ export default { size: 50, list: [], isFinish: -1, - sortTag: 2, + sortTag: 0, }, keyword: "", tabInfo: { @@ -419,12 +420,14 @@ export default { .select("#tttop") .boundingClientRect((data) => { console.log("data", data); - if (data.top <= 0) { - that.toTop = true; - that.showToTop = true; - } else { - that.toTop = false; - that.showToTop = false; + if(data){ + if (data.top <= 0) { + that.toTop = true; + that.showToTop = true; + } else { + that.toTop = false; + that.showToTop = false; + } } // domTopInfo.value[id] = data.top; // scrollTop.value = data.top - 200; @@ -443,9 +446,7 @@ export default { reachBottom() { let that = this; console.log("onReachBottom", that.query.isFinish); - this.G.isLogin(); - if (this.G.isLogin()) { - console.log("that.query.size", that.query.size); + if(uni.getStorageSync("apply-token")){ if (that.query.isFinish == -1 || that.query.isFinish == that.query.size) { that.query.page++; that.getList("concat"); @@ -778,7 +779,7 @@ export default { let that = this; that.attentionConfig.num++; - this.getInviteList(); + // this.getInviteList(); }, /** diff --git a/pages/person/index.vue b/pages/person/index.vue index 434d406..423d2db 100644 --- a/pages/person/index.vue +++ b/pages/person/index.vue @@ -54,7 +54,7 @@ - + 在招 {{ item.recruitmentJobNum ? item.recruitmentJobNum : "0" }} diff --git a/root/chat/index.vue b/root/chat/index.vue index ec20788..02916eb 100644 --- a/root/chat/index.vue +++ b/root/chat/index.vue @@ -2078,12 +2078,17 @@ }, animate($type = "heavy") { - uni.vibrateShort({ - type: $type, - fail(err){ - console.log('震动失败：',err) - } - }); + const systemInfo = uni.getSystemInfoSync(); + if(systemInfo.platform === 'ios'){ + + }else{ + uni.vibrateShort({ + type: $type, + fail(err) { + console.log("震动失败：", err); + }, + }); + } }, clearMsg() { this.sendMsg = ""; diff --git a/root/components/applyFlow.vue b/root/components/applyFlow.vue index ea9e2af..dcd5ee0 100644 --- a/root/components/applyFlow.vue +++ b/root/components/applyFlow.vue @@ -4,12 +4,12 @@
-
创建团队/企业
-
团队名称/企业简称：
+
创建公司账号
+
您的公司简称：
-
创建团队后可关注发单号，浏览职位及工单报名。
+
报名助手需以公司身份使用，创建公司后可关注发单号，浏览职位及工单报名。
取消
@@ -255,7 +255,9 @@ export default { // 不是代理询问是否创建或加入团队 applyFlowWidthoutAgencyConfirm() { let that = this; - this.confirmWithoutAgency = true; + // this.confirmWithoutAgency = true; + this.submitConfirm = true; + return; that.G.handleConfirm({ cancelText: "创建团队", diff --git a/root/detail/fellow.vue b/root/detail/fellow.vue index c4dec9c..2ba9217 100644 --- a/root/detail/fellow.vue +++ b/root/detail/fellow.vue @@ -374,7 +374,7 @@ export default { }, handleClickIDcard(e) { this.info.idCard = e; - if (this.info.idCard.length == 15 || this.info.idCard.length == 18) { + if (this.info.idCard && (this.info.idCard.length == 15 || this.info.idCard.length == 18)) { let info = this.G.getInfoByIDcard(this.info.idCard); this.info.age = info.age; this.info.sex = info.sex ? (info.sex == "男" ? 1 : 2) : ""; diff --git a/root/detail/job.vue b/root/detail/job.vue index b4ff3a1..5e96fa2 100644 --- a/root/detail/job.vue +++ b/root/detail/job.vue @@ -510,7 +510,7 @@
客服
-->
-
+
@@ -611,6 +611,7 @@ export default { onReady() { this.G.setNavStyle(); }, + onShareAppMessage() { // return this.G.shareFun("/root/detail/job?id=" + this.jobDetail.id, // "", this.jobDetail.jobName + " " + this.jobDetail.priceStr + " " + "好厂好工作 火热招聘中"); @@ -643,6 +644,18 @@ export default { this.currentTime = dateUtil.formatDateYMD(new Date().toLocaleDateString()) + " 06:00"; this.dateTimeArray = obj.dateTimeArray; this.dateTime = obj.dateTime; + // uni.showShareMenu({ + // withShareTicket: true, + // menus: ["shareAppMessage", "shareTimeline"], + // }); + // // 分享朋友圈注释 + // onShare1Timeline() { + // return { + // title: "分享标题", + // imageUrl: "https://matripe-cms.oss-cn-beijing.aliyuncs.com/pugongying/goxj2-qpwbo.png", + // query: { info: `{info:'test'}` }, + // }; + // }, }, data() { return { @@ -1381,7 +1394,7 @@ export default { if (that.goImLoading) { return false; } - + that.goImLoading = true; that.F.wyyxGet(that.api.job_get_cus + "?jobId=" + that.jobDetail.id, {}, (cusData) => { that.F.wyyxPost( @@ -1404,7 +1417,8 @@ export default { }); that.jobDetail.info = newList.join("丨"); that.F.wyyxPost( - that.api.wyyx_sendCard, { + that.api.wyyx_sendCard, + { conversationType: 1, // senderUserId: uni.getStorageSync("apply-uid"), // 发送者id 即当前登录用户id // receiverUserId: cusData, // 接收方用户id @@ -1414,8 +1428,7 @@ export default { jobDetail: { title: that.jobDetail.jobName, info: that.jobDetail.info, - label: that.jobDetail.jobRequestLabelNames.length > 0 ? that - .jobDetail.jobRequestLabelNames : "", + label: that.jobDetail.jobRequestLabelNames.length > 0 ? that.jobDetail.jobRequestLabelNames : "", salaryClassifyValue: that.jobDetail.priceStr, serviceFee: that.jobDetail.fuWuFei, monthPay: that.jobDetail.monthPay, diff --git a/root/detail/userShare.vue b/root/detail/userShare.vue index e94f750..195179c 100644 --- a/root/detail/userShare.vue +++ b/root/detail/userShare.vue @@ -10,7 +10,7 @@ 'background-image': info.supplierAccountCoverUrl ? `url(${info.supplierAccountCoverUrl})` : 'url(https://matripe-cms.oss-cn-beijing.aliyuncs.com/dailibaoming/v3/mbg.jpg)', 'background-size': '100% 100%', width: 'calc(100vw + ' + backgroundScale + 'px)', - height: 'calc(' + (100 / 1.2).toFixed(2) + 'vw + ' + moveDistance + 'px)', + height: 'calc(' + (100 / 1.4).toFixed(2) + 'vw + ' + moveDistance + 'px)', 'transform-origin': '50% 0%', transform: `scale(${1 + backgroundScale * 0.008})`, }" @@ -18,7 +18,7 @@ - + +
+
+ +
@@ -150,6 +153,12 @@ export default { onReady() { this.G.setNavStyle(); }, + mounted() { + let systemInfo = uni.getSystemInfoSync(); + let height = systemInfo.platform == "ios" ? 44 : 48; + + this.stickyHeight = systemInfo.statusBarHeight + height; + }, // onShareAppMessage(){ // return this.G.shareFun(); // }, @@ -157,6 +166,7 @@ export default { return { numSlot: [], showPage: false, + stickyHeight: 0, // sticky距离顶部高度 fromShare: false, btnLoading: false, background: { @@ -247,11 +257,11 @@ export default { }; }, onPageScroll(e) { - if (e.scrollTop > 120) { - this.navColor = `rgb(255,255,255,${e.scrollTop / 200})`; - } else { - this.navColor = `rgb(255,255,255,0)`; - } + // if (e.scrollTop > 120) { + // this.navColor = `rgb(255,255,255,${e.scrollTop / 200})`; + // } else { + // this.navColor = `rgb(255,255,255,0)`; + // } }, onLoad(options) { let that = this; @@ -336,11 +346,18 @@ export default { } }, methods: { + scroll(e) { + if (e.detail.scrollTop > 120) { + this.navColor = `rgb(255,255,255,${e.detail.scrollTop / 200})`; + } else { + this.navColor = `rgb(255,255,255,0)`; + } + }, // 触摸开始事件 onTouchStart(e) { - if(this.isTouching){ - return false - } + if (this.isTouching) { + return false; + } this.isTouching = true; this.mtScroll = 0; this.backgroundScale = 0; @@ -433,6 +450,11 @@ export default { }); } }, + searchJob() { + this.query.list = []; + this.query.page = 1; + this.getDefault(); + }, /** * 获取登录人的团队信息 */ @@ -599,6 +621,7 @@ export default { pageNum: that.query.page, pageSize: that.query.size, agencyId: that.info.id, + keys: that.keyword, }; console.log("that.tabInfo.active", that.tabInfo.active); if (that.tabInfo.active == 1) { @@ -694,7 +717,7 @@ export default { console.log("resresresresresres++++++++++++++", that.agencyInfo); console.log("resresresresresres++++++++++++++", that.isSelf); that.info = res; - that.speed = res.jobList.length; + // that.speed = res.jobList.length; that.showPage = true; @@ -702,10 +725,10 @@ export default { that.isSelf = true; } that.numSlot = [ - { - name: "总职位", - num: that.info.jobNum, - }, + // { + // name: "总职位", + // num: that.info.jobNum, + // }, { name: "在招", num: that.info.recruitmentJobNum, @@ -772,8 +795,9 @@ export default { let that = this; this.G.isLogin(); if (this.G.isLogin()) { - if (that.userInfo.agencyId) { + if (that.userInfo.agencyId && that.userInfo.fullName) { // that.submitConfirm = true; + // that.$refs.applyFlow.applyFlowWidthoutAgencyConfirm(); that.$refs.applyFlow.applyFlowConfirm(); } else { that.$refs.applyFlow.applyFlowWidthoutAgencyConfirm(); @@ -785,6 +809,7 @@ export default { let that = this; console.log("eeeeeee", e); that.tabInfo.active = e; + that.speed = -1; that.query.list = []; that.query.page = 1; that.getDefault(); @@ -839,4 +864,10 @@ export default { .scroll-area { height: 100vh; } +.sticky { + position: sticky; + // top: 95px; + left: 0; + z-index: 100; +} diff --git a/root/home/components/AiApply.vue b/root/home/components/AiApply.vue index 2208581..c44513c 100644 --- a/root/home/components/AiApply.vue +++ b/root/home/components/AiApply.vue @@ -1,261 +1,262 @@ - - \ No newline at end of file + diff --git a/root/home/editTownsman.vue b/root/home/editTownsman.vue index 98dbf67..d156f89 100644 --- a/root/home/editTownsman.vue +++ b/root/home/editTownsman.vue @@ -1,9 +1,10 @@ diff --git a/root/home/quickApplication.vue b/root/home/quickApplication.vue index c613eb3..5e1ccf2 100644 --- a/root/home/quickApplication.vue +++ b/root/home/quickApplication.vue @@ -1,6 +1,6 @@