From d75b332a964c4079639e27e82b9ac40aef706ff7 Mon Sep 17 00:00:00 2001 From: zsk <710162063@qq.com> Date: Fri, 21 Mar 2025 18:35:48 +0800 Subject: [PATCH 1/8] =?UTF-8?q?=E5=9B=BE=E7=89=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/panel/{defaultImage.vue => image.vue} | 0 main.js | 2 +- root/detail/applyTob.vue | 8 ++++---- 3 files changed, 5 insertions(+), 5 deletions(-) rename components/panel/{defaultImage.vue => image.vue} (100%) diff --git a/components/panel/defaultImage.vue b/components/panel/image.vue similarity index 100% rename from components/panel/defaultImage.vue rename to components/panel/image.vue diff --git a/main.js b/main.js index 72069d7..adaafe1 100644 --- a/main.js +++ b/main.js @@ -14,7 +14,7 @@ import gListBill from './components/list/bill.vue'; import gListYiJob from './components/list/yiJob.vue'; import gListApply from './components/list/apply.vue'; import gPanelServer from './components/panel/server.vue'; -import gPanelImage from './components/panel/defaultImage.vue'; +import gPanelImage from './components/panel/image.vue'; import gPanelFormItem from './components/panel/formItem.vue'; import gPanelFormSlot from './components/panel/formSlot.vue'; import gPanelCardNum from './components/panel/numCard.vue'; diff --git a/root/detail/applyTob.vue b/root/detail/applyTob.vue index c07868f..1f482c3 100644 --- a/root/detail/applyTob.vue +++ b/root/detail/applyTob.vue @@ -17,7 +17,7 @@ - + @@ -65,21 +65,21 @@ - {{ orderDetail.address ? orderDetail.address : "-" }} + {{ orderDetail.address ? orderDetail.address : "-" }} - {{ orderDetail.idCard ? orderDetail.idCard : "-" }} + {{ orderDetail.idCard ? orderDetail.idCard : "-" }} - {{ orderDetail.tel ? orderDetail.tel : "-" }} + {{ orderDetail.tel ? orderDetail.tel : "-" }} From 936fb1911ec4b4f2627a36a02fb48ea4d0a013dd Mon Sep 17 00:00:00 2001 From: zsk <710162063@qq.com> Date: Fri, 21 Mar 2025 18:44:48 +0800 Subject: [PATCH 2/8] 2 --- components/panel/image.vue | 2 ++ 1 file changed, 2 insertions(+) diff --git a/components/panel/image.vue b/components/panel/image.vue index 841d428..a44723c 100644 --- a/components/panel/image.vue +++ b/components/panel/image.vue @@ -8,6 +8,8 @@ > = 0.6.0" + } }, - "css-line-break": { + "node_modules/css-line-break": { "version": "2.1.0", "resolved": "https://registry.npmmirror.com/css-line-break/-/css-line-break-2.1.0.tgz", "integrity": "sha512-FHcKFCZcAha3LwfVBhCQbW2nCNbkZXn7KVUJcsT5/P8YmfsVja0FMPJr0B903j/E69HUphKiV9iQArX8SDYA4w==", - "requires": { + "dependencies": { "utrie": "^1.0.2" } }, - "file-saver": { + "node_modules/file-saver": { "version": "2.0.5", "resolved": "https://registry.npmmirror.com/file-saver/-/file-saver-2.0.5.tgz", "integrity": "sha512-P9bmyZ3h/PRG+Nzga+rbdI4OEpNDzAVyy74uVO9ATgzLK6VtAsYybF/+TOCvrc0MO793d6+42lLyZTw7/ArVzA==" }, - "html2canvas": { + "node_modules/html2canvas": { "version": "1.4.1", "resolved": "https://registry.npmmirror.com/html2canvas/-/html2canvas-1.4.1.tgz", "integrity": "sha512-fPU6BHNpsyIhr8yyMpTLLxAbkaK8ArIBcmZIRiBLiDhjeqvXolaEmDGmELFuX9I4xDcaKKcJl+TKZLqruBbmWA==", - "requires": { + "dependencies": { "css-line-break": "^2.1.0", "text-segmentation": "^1.0.3" + }, + "engines": { + "node": ">=8.0.0" } }, - "moment": { + "node_modules/moment": { "version": "2.30.1", "resolved": "https://registry.npmmirror.com/moment/-/moment-2.30.1.tgz", - "integrity": "sha512-uEmtNhbDOrWPFS+hdjFCBfy9f2YoyzRpwcl+DqpC6taX21FzsTLQVbMV/W7PzNSX6x/bhC1zA3c2UQ5NzH6how==" + "integrity": "sha512-uEmtNhbDOrWPFS+hdjFCBfy9f2YoyzRpwcl+DqpC6taX21FzsTLQVbMV/W7PzNSX6x/bhC1zA3c2UQ5NzH6how==", + "engines": { + "node": "*" + } }, - "text-segmentation": { + "node_modules/text-segmentation": { "version": "1.0.3", "resolved": "https://registry.npmmirror.com/text-segmentation/-/text-segmentation-1.0.3.tgz", "integrity": "sha512-iOiPUo/BGnZ6+54OsWxZidGCsdU8YbE4PSpdPinp7DeMtUJNJBoJ/ouUSTJjHkh1KntHaltHl/gDs2FC4i5+Nw==", - "requires": { + "dependencies": { "utrie": "^1.0.2" } }, - "utrie": { + "node_modules/utrie": { "version": "1.0.2", "resolved": "https://registry.npmmirror.com/utrie/-/utrie-1.0.2.tgz", "integrity": "sha512-1MLa5ouZiOmQzUbjbu9VmjLzn1QLXBhwpUa7kdLUQK+KQ5KA9I1vk5U4YHe/X2Ch7PYnJfWuWT+VbuxbGwljhw==", - "requires": { + "dependencies": { "base64-arraybuffer": "^1.0.2" } } diff --git a/pages/message/index.vue b/pages/message/index.vue index 519ba91..c19507f 100644 --- a/pages/message/index.vue +++ b/pages/message/index.vue @@ -8,7 +8,7 @@ - + 11 + - - + + + + + + + + + + + - - + - @@ -141,7 +149,7 @@ - --> + From c4afa90ac415a942e17b0b8ac80b708271b3cf4c Mon Sep 17 00:00:00 2001 From: zsk <710162063@qq.com> Date: Mon, 24 Mar 2025 11:13:21 +0800 Subject: [PATCH 6/8] =?UTF-8?q?=E5=B7=A5=E5=8D=95=E8=AF=A6=E6=83=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/panel/record.vue | 128 ++++++++++++++++++++++++++++++++++++++++---- manifest.json | 2 +- root/detail/applyTob.vue | 5 ++ root/detail/applyToc.vue | 3 -- static/css/base.scss | 3 +- 5 files changed, 127 insertions(+), 14 deletions(-) diff --git a/components/panel/record.vue b/components/panel/record.vue index ca78c21..589dd32 100644 --- a/components/panel/record.vue +++ b/components/panel/record.vue @@ -34,7 +34,8 @@ - {{ itm.creator }}，{{ itm.create_time }} + {{ itm.create_time }} + @@ -60,12 +61,73 @@ --> - {{ itm.creator }}，{{ itm.create_time }} + {{ itm.create_time }} + + + + + + 报名信息 + + + + 姓名： + {{ orderDetail.userName }}{{ orderDetail.setTitle }} + + + 电话： + + {{ orderDetail.tel ? orderDetail.tel : "-" }} + + + + 身份证号： + + {{ orderDetail.idCard ? orderDetail.idCard : "-" }} + + + + 家庭住址： + + {{ orderDetail.address ? orderDetail.address : "-" }} + + + + + + + 报名职位： + + {{ orderDetail.storeJobName ? orderDetail.storeJobName : "-" }} + + + + 员工薪资： + + {{ orderDetail.employeeSalary ? orderDetail.employeeSalary : "-" }} + + + + 代理政策： + + {{ orderDetail.policy ? orderDetail.policy : "-" }} + + + + + + 复制文本 + 知道了 + + + + + @@ -77,6 +139,10 @@ export default { return { dateUtil: timeUtil, isCreator: false, + infoModal: { + isShow: false, + }, + orderDetail: {}, }; }, props: { @@ -106,12 +172,46 @@ export default { }, methods: { goInfo(e) { + var that = this; console.log("跟进记录组件内点击", e); - this.$emit("clickInfo", { - info: e.policy, - time: e.create_time, - type: "view", - title: "查看服务费", + // console.log(JSON.parse(e.policy)); + // let that = this, + // params = {}; + // params = { + // info: e.info ? JSON.parse(e.policy) : "-", + // time: e.time, + // title: e.title, + // type: e.type, + // }; + that.orderDetail = JSON.parse(e.policy); + that.orderDetail.setTitle = that.G.titleToStr(that.orderDetail); + that.infoModal.isShow = true; + // this.$emit("clickInfo", { + // info: e.policy, + // time: e.create_time, + // type: "view", + // title: "查看服务费", + // }); + }, + handleCopy() { + let that = this; + var text = "姓名：" + that.orderDetail.userName + "/" + (that.orderDetail.sex == 1 ? "男" : "女") + "/" + that.orderDetail.age + "岁" + (that.orderDetail.nation == "族" ? "" : "/" + that.orderDetail.nation) + "\n电话：" + (that.orderDetail.tel == "" || that.orderDetail.tel == undefined || that.orderDetail.tel == null ? "-" : that.orderDetail.tel) + "\n身份证号：" + (that.orderDetail.idCard == "" ? "-" : that.orderDetail.idCard) + "\n家庭地址：" + (that.orderDetail.address == "" || that.orderDetail.address == undefined || that.orderDetail.address == null ? "-" : that.orderDetail.address) + "\n报名岗位：" + that.orderDetail.storeJobName + "\n员工薪资：" + (that.orderDetail.employeeSalary || "-") + (that.isCreator ? "\n代理政策：" + that.orderDetail.policy : ""); + uni.setClipboardData({ + data: text, + success(res) { + uni.getClipboardData({ + success(res) { + console.log(res.data); // data + uni.showToast({ + title: "复制成功", + icon: "success", + }); + setTimeout(()=>{ + that.infoModal.isShow = false; + },500) + }, + }); + }, }); }, }, @@ -147,7 +247,7 @@ export default { text-align: center; line-height: 20px; border-radius: 50%; - background: #1890ff; + background: #cccccc; color: #ffffff; } .des { @@ -159,7 +259,7 @@ export default { height: 50px; font-size: 16px; font-weight: bold; - color: #1890ff; + color: #333; } .item-group { &:last-child { @@ -199,4 +299,14 @@ export default { } } } + +.g-components-panel-record .item-group:first-child .iconfont{ + color: #ffffff; + background: #1890ff; +} +.g-components-panel-record .item-group:first-child .des{ + color: #1890ff; +} + + diff --git a/manifest.json b/manifest.json index ca0551b..901572c 100644 --- a/manifest.json +++ b/manifest.json @@ -1,5 +1,5 @@ { - "name" : "人海劳务", + "name" : "伯才工作", "appid" : "__UNI__860FDF3", "description" : "蒲公英uni版本", "versionName" : "1.0.0", diff --git a/root/detail/applyTob.vue b/root/detail/applyTob.vue index d3c2ba0..634dd0c 100644 --- a/root/detail/applyTob.vue +++ b/root/detail/applyTob.vue @@ -614,6 +614,11 @@ export default { that.orderDetail.serveRecords = {}; for (var key in res.records) { res.records[key].forEach((item, index) => { + + + item.desp = item.desp.replaceAll("预约接待时间", "预计到达时间"); + + if (item.desp.substr(item.desp.length - 3, 3) == "备注：") { item.desp = item.desp.replace(/备注：/g, ""); } diff --git a/root/detail/applyToc.vue b/root/detail/applyToc.vue index 29164ca..ebeb353 100644 --- a/root/detail/applyToc.vue +++ b/root/detail/applyToc.vue @@ -740,9 +740,6 @@ export default { that.orderDetail.policy = params.info; that.infoModal.isShow = true; - // uni.navigateTo({ - // url: "/root/detail/jobDesp?" + that.G.objToStr(params), - // }); }, goInfo($info, $title, $type, $dis) { uni.setStorageSync("APPLY_OBJ", this.orderDetail); diff --git a/static/css/base.scss b/static/css/base.scss index a3f6ed5..bffccbe 100644 --- a/static/css/base.scss +++ b/static/css/base.scss @@ -9,7 +9,8 @@ $filter_bg_color: #e3ecfd; $main_bg_color: #3578f6; -$main_color: #3578f6; +// $main_color: #3578f6 +$main_color: #1890ff; image { vertical-align: top; } From e04f836b02fe958c7656bca76c0208702d58fb1e Mon Sep 17 00:00:00 2001 From: zsk <710162063@qq.com> Date: Mon, 24 Mar 2025 11:17:17 +0800 Subject: [PATCH 7/8] border --- components/panel/record.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/panel/record.vue b/components/panel/record.vue index 589dd32..fc973d9 100644 --- a/components/panel/record.vue +++ b/components/panel/record.vue @@ -72,7 +72,7 @@ - 报名信息 + 报名信息 From 218426c03b18b566e2833bcd93cb368eb3c3bdc2 Mon Sep 17 00:00:00 2001 From: zsk <710162063@qq.com> Date: Mon, 24 Mar 2025 11:26:19 +0800 Subject: [PATCH 8/8] 6 --- components/panel/record.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/components/panel/record.vue b/components/panel/record.vue index fc973d9..d68ff69 100644 --- a/components/panel/record.vue +++ b/components/panel/record.vue @@ -72,9 +72,9 @@ - 报名信息 + 报名信息 - + 姓名： {{ orderDetail.userName }}{{ orderDetail.setTitle }}