From 48af06a379df8a944ae98f230b085429434ffff6 Mon Sep 17 00:00:00 2001 From: "1263428893@qq.com" Date: Wed, 12 Feb 2025 00:53:39 +0800 Subject: [PATCH 01/16] 1 --- App.vue | 37 +++++++++ common/api.js | 18 ++++- common/config.js | 4 +- manifest.json | 2 +- pages/auth/index.vue | 32 ++++++-- pages/home/component/enterprise.vue | 4 +- pages/home/component/master.vue | 4 +- pages/home/index.vue | 23 ++++-- pages/order/component/enterprise.vue | 81 ++++++++++++++----- pages/order/component/master.vue | 72 +++++++++++++---- pages/order/index.vue | 27 +++++-- pages/user/index.vue | 16 +++- .../business-settled/component/enterprise.vue | 7 +- pages_subpack/order-detail/index.vue | 19 ++++- pages_subpack/payment/index.vue | 92 +++++++++++++++++----- pages_subpack/system/index.vue | 72 +++++++++++++++-- pages_subpack/wallet/component/recharge.vue | 39 +++++++-- pages_subpack/wallet/component/withdrawal.vue | 14 +++- pages_subpack/work-detail/index.vue | 10 ++- 19 files changed, 467 insertions(+), 106 deletions(-) diff --git a/App.vue b/App.vue index 8d5de12..8fc0564 100644 --- a/App.vue +++ b/App.vue @@ -1,12 +1,49 @@ diff --git a/common/api.js b/common/api.js index 43ba72b..ba9c60f 100644 --- a/common/api.js +++ b/common/api.js @@ -42,7 +42,21 @@ export const payRecharge = (params) => http.post('/employ-api/pay/payRecharge', // 提现 export const withdrawal = (params) => http.post('/employ-api/pay/withdrawal', params) -// 招聘方订单分页列表查询 -export const bossOrderList = (params) => http.post('/employ-api/order/bossOrderList', params) + // 发起聘请,等待师傅确认 export const orderTask = (params) => http.post('/employ-api/order/addTask', params) + + +export const orderDetail = (params) => http.get('/employ-api/order/queryById', {params:params}) + +// 订单支付 +export const payOrder = (params) => http.post('/employ-api/pay/order', params) + +// 招聘方订单分页列表查询 +export const bossOrderList = (params) => http.get('/employ-api/order/bossOrderList', {params:params}) + +// 求职方订单分页列表查询 +export const workOrderList = (params) => http.get('/employ-api/order/workOrderList', {params:params}) +// 获取平台隐私政策,协议等 +export const getSysText = (params) => http.post('/employ-api/index/getSysText', params) + diff --git a/common/config.js b/common/config.js index 5db0976..8b9944f 100644 --- a/common/config.js +++ b/common/config.js @@ -1,6 +1,4 @@ module.exports = { - // baseUrl: 'https://employadmin.augcl.com/employ-api', - // baseUrl: 'http://3fl8266127.qicp.vip/' - + // baseUrl: 'http://3fl8266127.qicp.vip' baseUrl:"https://employadmin.hhlm1688.com" } diff --git a/manifest.json b/manifest.json index ae55e7f..83308c1 100644 --- a/manifest.json +++ b/manifest.json @@ -102,7 +102,7 @@ "desc" : "将获取你的具体位置信息,用于帮助用户浏览所在位置的" } }, - "requiredPrivateInfos" : [ "getLocation", "chooseLocation" ], + "requiredPrivateInfos" : [ "getLocation", "chooseLocation" ], "setting" : { "urlCheck" : false, "es6" : false, diff --git a/pages/auth/index.vue b/pages/auth/index.vue index b138512..114825a 100644 --- a/pages/auth/index.vue +++ b/pages/auth/index.vue @@ -3,7 +3,7 @@ - 用工平台小程序 + 智选猎头 @@ -34,11 +34,12 @@ 服务协议和隐私权政策 - 请您务必审慎阅读、充分理解用户协议和隐私政策各条款,包括但不限于用户注意事项、用户行为规范以及为了向你提供服务而收集、使用、存储你个人信息的情况等。你可阅读 + + @@ -54,16 +55,37 @@ diff --git a/pages/user/index.vue b/pages/user/index.vue index fb540e7..79907a4 100644 --- a/pages/user/index.vue +++ b/pages/user/index.vue @@ -51,8 +51,9 @@ + - + @@ -93,11 +94,13 @@ + + \ No newline at end of file diff --git a/pages_subpack/order-detail/index.vue b/pages_subpack/order-detail/index.vue index a2b44a6..7cc99b8 100644 --- a/pages_subpack/order-detail/index.vue +++ b/pages_subpack/order-detail/index.vue @@ -99,37 +99,38 @@ - 商品详情 + 工作详情 - + - 泰山工装石膏板搬运 - 所属行业:水泥搬运 - 所属工种:中午搬运 + {{obj.title}} + 所属行业:{{obj.industryName}} + + 工作时间:{{obj.workTime}} 薪资 - 6000元 + {{obj.rateMoney}}元 - 姓名:李满和 - 联系方式:13189698114 - + 姓名:{{obj.userName}} + 联系方式:{{obj.phone}} + 复制 - 工作地址:湖南省长沙市雨花区高升路与时代阳光大道西交叉口东北方向140米御天国际商汇中心5栋6023 - + 工作地址:{{obj.workerAddress}} + 复制 @@ -145,7 +146,7 @@ 工作时间 - 3h + {{obj.workTime}} @@ -154,7 +155,7 @@ 工作内容 - + @@ -207,7 +208,8 @@ 3、具备一定的设计提案能力,能完整的呈现设计思路与创意,能清晰的表达设计逻辑与思考;
4、热爱设计,平面基本功扎实,拥有优良的审美与创意想法,对版式、色彩把控能力强;对工作富有责任心,具备团队沟通与协作能力;
5、精通 PS、AI、CDR 等平面设计软件,能独立完成日常平面设计工作内容,熟练使用 PPT/Keynote,能完成提案内容的材料美化工作。
-

` +

`, + obj:{} } }, onLoad(options) { @@ -221,11 +223,25 @@ orderId:that.orderId } orderDetail(params).then(response=>{ - + that.obj = response.result }).catch(error=>{ }) }, + copyText(event){ + uni.setClipboardData({ + data: event, + success: () => { + uni.showToast({ + title: "复制成功", + icon: "none", + }); + }, + fail: (err) => { + console.error("复制失败", err); + }, + }) + }, onCancel(){ uni.navigateBack({ delta:1 diff --git a/pages_subpack/payment/index.vue b/pages_subpack/payment/index.vue index f5d57da..53765b3 100644 --- a/pages_subpack/payment/index.vue +++ b/pages_subpack/payment/index.vue @@ -54,7 +54,10 @@ 温馨提示,下单前请仔细查看下单需知 - + + + + 《用户使用协议》 @@ -69,14 +72,14 @@
- + 用户使用协议 - + 确认 @@ -94,7 +97,7 @@ return{ show:false, id:"", - checked:false, + checked:[], myMoney:"",//账户余额 items:{}, amount:"9.9", @@ -123,6 +126,9 @@ }) }, + checkboxChange(n) { + console.log('change', n); + }, getOrderDetail(){ orderDetail({orderId:this.id}).then(response=>{ console.info('orderDetail',response) @@ -133,7 +139,13 @@ }, onPay(){ let that = this - // if(that.checked==false) return; + console.info(that.checked) + if(that.checked.length==0){ + return uni.showToast({ + icon: "none", + title: "请勾选隐私协议" + }) + } console.info(that.payRadio) if(that.payRadio==1){ diff --git a/pages_subpack/person/index.vue b/pages_subpack/person/index.vue new file mode 100644 index 0000000..3341bb7 --- /dev/null +++ b/pages_subpack/person/index.vue @@ -0,0 +1,224 @@ + + + + \ No newline at end of file diff --git a/pages_subpack/master-settled/index.vue b/pages_subpack/resume/index.vue similarity index 97% rename from pages_subpack/master-settled/index.vue rename to pages_subpack/resume/index.vue index ceb1231..5324c8e 100644 --- a/pages_subpack/master-settled/index.vue +++ b/pages_subpack/resume/index.vue @@ -57,14 +57,13 @@ - - 申请审核 + + 保存 - 联系我们 - + --> From 56ab69cb739bd7f9553bc0ef667f08f28caee8ac Mon Sep 17 00:00:00 2001 From: "1263428893@qq.com" Date: Fri, 14 Feb 2025 23:08:13 +0800 Subject: [PATCH 03/16] =?UTF-8?q?1=EF=BC=8C=E6=96=B0=E5=A2=9E=E5=88=86?= =?UTF-8?q?=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- common/api.js | 2 + pages.json | 9 ++++ pages/home/index.vue | 17 ++++++- pages/order/component/enterprise.vue | 36 +++++++++++---- pages/order/component/master.vue | 20 +++++++- pages/user/index.vue | 20 ++++---- pages_subpack/category/index.vue | 90 ++++++++++++++++++++++++++++++++++++ pages_subpack/order-detail/index.vue | 11 ++++- 8 files changed, 180 insertions(+), 25 deletions(-) create mode 100644 pages_subpack/category/index.vue diff --git a/common/api.js b/common/api.js index 36bec20..cf620e4 100644 --- a/common/api.js +++ b/common/api.js @@ -63,3 +63,5 @@ export const getSysText = (params) => http.post('/employ-api/index/getSysText', export const bindPhone = (params) => http.post('/employ-api/user/bindPhone', params) // 修改头像和昵称,传nickName和headimgurl export const updateUserInfo = (params) => http.post('/employ-api/user/updateUserInfo', params) +// 公告详情 +export const getNotice = (params) => http.get('/employ-api/index/getNotice', {params:params}) \ No newline at end of file diff --git a/pages.json b/pages.json index 15d658a..c4458d4 100644 --- a/pages.json +++ b/pages.json @@ -211,6 +211,15 @@ "navigationBarBackgroundColor": "#FF7A31", "navigationBarTextStyle": "white" } + }, + { + "path": "category/index", + "style": { + "navigationBarTitleText": "分类", + "navigationStyle":"default", + "navigationBarBackgroundColor": "#FF7A31", + "navigationBarTextStyle": "white" + } } ] } diff --git a/pages/home/index.vue b/pages/home/index.vue index 8adcb11..5e2e35b 100644 --- a/pages/home/index.vue +++ b/pages/home/index.vue @@ -25,7 +25,7 @@ - + {{item.name}} @@ -71,7 +71,8 @@ taskList, rolelist, industryList, - getSysText + getSysText, + getNotice } from "@/common/api.js" import enterpriseBox from "./component/enterprise.vue" import masterBox from "./component/master.vue" @@ -116,6 +117,7 @@ this.onIndustryList() this.getLocation() this.onSysText() + this.onNotice() }, onPullDownRefresh() { let that = this @@ -129,6 +131,15 @@ that.onRolelist() }, methods:{ + onNotice(){ + // let that = this + // let params={} + // getNotice(params).then(response=>{ + // console.info(response) + // }).catch(error=>{ + + // }) + }, onSysText(){ let that = this let params={} @@ -147,6 +158,8 @@ console.log('位置',res); console.log('当前位置的经度:' + res.longitude); console.log('当前位置的纬度:' + res.latitude); + uni.setStorageSync("longitude",res.longitude) + uni.setStorageSync("latitude",res.latitude) const qqmapsdk = new QQMapWX({ key: 'TT7BZ-Z3LW4-KOAUB-KWHOA-SBJJ6-Y5B6R' // 必填 }); diff --git a/pages/order/component/enterprise.vue b/pages/order/component/enterprise.vue index 6734c2a..c030e23 100644 --- a/pages/order/component/enterprise.vue +++ b/pages/order/component/enterprise.vue @@ -19,34 +19,35 @@ - - 工装石膏板搬运 + + {{items.companyName}} 已完成 - + - + - 泰山工装石膏板搬运 - 所属行业:水泥搬运 - 所属工种:中午搬运 + {{items.title}} + 所属行业:{{items.industryName}} + 工作时间:{{items.workTime}} 总价格: - 6000 + {{items.amount}} - + 联系客服 + @@ -122,6 +123,7 @@ pageSize:that.pageSize } bossOrderList(params).then(response=>{ + console.info("bossOrder",response.result.records,that.pageNo) if(that.pageNo==1){ that.list = response.result.records }else{ @@ -136,6 +138,22 @@ this.current = event.index this.orderStatus = this.nav[event.index].index this.onOrder() + }, + onOrderDetail(event){ + uni.navigateTo({ + url:"/pages_subpack/order-detail/index?orderId="+event.id + }) + }, + callPhone(event){ + uni.makePhoneCall({ + phoneNumber: event.phone, + success: () => { + console.log("拨打成功"); + }, + fail: (err) => { + console.error("拨打失败", err); + }, + }) } } } diff --git a/pages/order/component/master.vue b/pages/order/component/master.vue index 7c6b637..553d7f1 100644 --- a/pages/order/component/master.vue +++ b/pages/order/component/master.vue @@ -17,7 +17,7 @@ @click="tabClick"> - + 工装石膏板搬运 @@ -47,6 +47,7 @@ + @@ -132,10 +133,25 @@ }) }, tabClick(event){ - console.info(event) this.current = event.index this.orderStatus = this.nav[event.index].index this.onOrder() + }, + onOrderDetail(event){ + uni.navigateTo({ + url:"/pages_subpack/order-detail/index?orderId="+event.id + }) + }, + callPhone(event){ + uni.makePhoneCall({ + phoneNumber: event.phone, + success: () => { + console.log("拨打成功"); + }, + fail: (err) => { + console.error("拨打失败", err); + }, + }) } } } diff --git a/pages/user/index.vue b/pages/user/index.vue index ec33b8f..ad7685a 100644 --- a/pages/user/index.vue +++ b/pages/user/index.vue @@ -222,17 +222,15 @@ }) }, onCustomerService(){ - uni.showModal({ - title: '联系客服', - content: '确定拨打客服电话?', - success: function (res) { - if (res.confirm) { - console.log('用户点击确定'); - } else if (res.cancel) { - console.log('用户点击取消'); - } - } - }); + uni.makePhoneCall({ + phoneNumber: '13185644852', + success: () => { + console.log("拨打成功"); + }, + fail: (err) => { + console.error("拨打失败", err); + }, + }) } } } diff --git a/pages_subpack/category/index.vue b/pages_subpack/category/index.vue new file mode 100644 index 0000000..a594275 --- /dev/null +++ b/pages_subpack/category/index.vue @@ -0,0 +1,90 @@ + + + + + \ No newline at end of file diff --git a/pages_subpack/order-detail/index.vue b/pages_subpack/order-detail/index.vue index 7cc99b8..a6969c2 100644 --- a/pages_subpack/order-detail/index.vue +++ b/pages_subpack/order-detail/index.vue @@ -175,7 +175,7 @@ export default{ data(){ return{ - stepsIndex:4, + stepsIndex:1, stepsList:[ { title:"接单", @@ -249,6 +249,15 @@ }, onService(){ console.info(`联系客服`) + uni.makePhoneCall({ + phoneNumber: this.obj.phone, + success: () => { + console.log("拨打成功"); + }, + fail: (err) => { + console.error("拨打失败", err); + }, + }) }, onsubmit(){ console.info(`确认`) From bea52580f599aea256f6025562c2e07e7d508608 Mon Sep 17 00:00:00 2001 From: "1263428893@qq.com" Date: Fri, 14 Feb 2025 23:34:22 +0800 Subject: [PATCH 04/16] 1 --- pages/home/index.vue | 7 +++- pages_subpack/category/index.vue | 6 ++- pages_subpack/enterprise/index.vue | 58 +++++++++++++++++---------- pages_subpack/order-detail/index.vue | 2 +- pages_subpack/person/index.vue | 56 +++++++++++++++++--------- pages_subpack/wallet/component/recharge.vue | 3 ++ pages_subpack/wallet/component/withdrawal.vue | 5 ++- 7 files changed, 93 insertions(+), 44 deletions(-) diff --git a/pages/home/index.vue b/pages/home/index.vue index 5e2e35b..adba39b 100644 --- a/pages/home/index.vue +++ b/pages/home/index.vue @@ -12,7 +12,7 @@ 企业/个人端 --> - + @@ -242,6 +242,11 @@ url:"/pages_subpack/release/index?status="+event }) }, + onCategory(){ + uni.navigateTo({ + url:"/pages_subpack/category/index" + }) + } } } diff --git a/pages_subpack/category/index.vue b/pages_subpack/category/index.vue index a594275..9d63494 100644 --- a/pages_subpack/category/index.vue +++ b/pages_subpack/category/index.vue @@ -1,5 +1,8 @@