diff --git a/.gitignore b/.gitignore index b163ca8..a70bc78 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /unpackage +/node_modules 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..d51f1b9 100644 --- a/common/api.js +++ b/common/api.js @@ -9,40 +9,128 @@ export const fetchMenu = (params, config = {}) => http.post('/ebapi/public_api/i * 登录的接口 */ // 微信登录接口 -export const appletLogin = (params) => http.get('/employ-api/user/login', {params:params}) +export const appletLogin = (params) => http.get('/employ-api/employ/login/login', {params:params}) // 招聘方填写信息 export const roleBoss = (params) => http.post('/employ-api/user/roleBoss', params) // 求职者填写信息 -export const role = (params) => http.post('/employ-api/user/role', params) +export const role = (params) => http.post('/employ-api/employ/resume/addResume', params) // 首页行业菜单 -export const industryList = (params) => http.get('/employ-api/index/industryList', {params:params}) +export const industryList = (params) => http.get('/employ-api/employ/category/queryCategoryList', {params:params}) // 获取banner列表 -export const bannerList = (params) => http.post('/employ-api/index/bannerList', params) +export const bannerList = (params) => http.get('/employ-api/employ/banner/queryBannerList', {params:params}) // 招聘大厅列表查询 -export const taskList = (params) => http.get('/employ-api/index/taskList', {params:params}) +export const taskList = (params) => http.get('/employ-api/employ/job/queryJobList', {params:params}) // 求职大厅列表查询 -export const rolelist = (params) => http.get('/employ-api/index/rolelist1', {params:params}) +export const rolelist = (params) => http.get('/employ-api/employ/resume/queryResumeList', {params:params}) // 公司发布任务 -export const addTask = (params) => http.post('/employ-api/user/addTask', params) +export const addTask = (params) => http.post('/employ-api/employ/order/addOrder', params) + + + + +//订单信息-简历信息-立即聘用 +export const addOrderWork = (params) => http.post('/employ-api/employ/order/addOrderWork', params) +//订单信息-求职信息-立即接单 +export const addOrderJob = (params) => http.post('/employ-api/employ/order/addOrderJob', params) +//订单信息-查询订单详情 +export const orderDetail = (params) => http.get('/employ-api/employ/order/queryOrderById', {params:params}) +// 订单支付 +export const payOrder = (params) => http.post('/employ-api/employ/order/payOrder', params) +//订单列表 +export const bossOrderList = (params) => http.get('/employ-api/employ/order/queryOrderList', {params:params}) + + // 根据行业id查询工种 -export const industryById = (params) => http.get('/employ-api/index/getIndustryById', {params:params}) +export const industryById = (params) => http.get('/employ-api/employ/category/queryCategoryList', {params:params}) // tb_user_role-通过id查询 -export const getTaskById = (params) => http.get('/employ-api/user/getTaskById', {params:params}) +export const getTaskById = (params) => http.get('/employ-api/employ/job/queryJobById', {params:params}) +//简历详情 +export const queryResumeById = (params) => http.get('/employ-api/employ/resume/queryResumeById', {params:params}) +//修改简历信息 +export const updateResume = (params) => http.post('/employ-api/employ/resume/updateResume', params) +//新增简历 +export const addResume = (params) => http.post('/employ-api/employ/resume/addResume', params) + + + + //求职信息-查询求职信息列表 +export const querySeekList = (params) => http.get('/employ-api/employ/seek/querySeekList', {params:params}) +export const querySeekById = (params) => http.get('/employ-api/employ/seek/querySeekById', {params:params}) +export const addSeek = (params) => http.post('/employ-api/employ/seek/addSeek', params) +export const updateSeek = (params) => http.post('/employ-api/employ/seek/updateSeek', params) + + + + + + // 我的头像昵称，平台客户电话等信息 -export const userInfo = (params) => http.post('/employ-api/index/index', params) +export const userInfo = (params) => http.get('/employ-api/employ/user/getUserCenterData', {params:params}) // 帮助与反馈 export const addSuggest = (params) => http.post('/employ-api/index/addSuggest', params) // 余额日志 -export const payLog = (params) => http.post('/employ-api/pay/log', params) +export const payLog = (params) => http.get('/employ-api/employ/amount/amountLog', params) // 充值支付 -export const payRecharge = (params) => http.post('/employ-api/pay/payRecharge', params) +export const payRecharge = (params) => http.get('/employ-api/employ/amount/recharge',{params:params}) // 提现 -export const withdrawal = (params) => http.post('/employ-api/pay/withdrawal', params) +export const withdrawal = (params) => http.get('/employ-api/employ/amount/CashOut',{params: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 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.get('/employ-api/employ/config/queryConfigList', {params:params}) +// 小程序-绑定手机号 +export const bindPhone = (params) => http.get('/employ-api/employ/login/bindPhone', {params:params}) +// 修改头像和昵称，传nickName和headimgurl +export const updateUserInfo = (params) => http.post('/employ-api/employ/user/updateUser', params) +// 公告详情 +export const getNotice = (params) => http.get('/employ-api/employ/news/queryNewsById', {params:params}) +// 求职者修改信息 传id修改 +export const updateRole = (params) => http.post('/employ-api/user/updateRole', params) +// 招聘方修改信息 传id修改 +export const updateRoleBoss = (params) => http.post('/employ-api/user/updateRoleBoss', params) +// 公告列表 +export const noticeList = (params) => http.get('/employ-api/employ/news/queryNewsList', {params:params}) +// 小程序-获取sessionKey +export const getSessionKey = (params) => http.get('/employ-api/user/getSessionKey', {params:params}) + +// 求职者修改信息 传id修改 +export const addTask2 = (params) => http.post('/employ-api/employ/resume/addResume', params) + +// 配置信息-获取配置信息列表 +export const queryConfigList = (params) => http.get('/employ-api/employ/config/queryConfigList', {params:params}) + +// 个人信息 +export const userInfoDetail = (params) => http.get('/employ-api/employ/user/queryUser', {params:params}) +// 实名认证-企业实名认证 +export const addAuthenticationCompany = (params) => http.post('/employ-api/employ/authentication/addAuthenticationCompany', params) +// 实名认证-查询企业实名认证信息 +export const getAuthenticationCompany = (params) => http.get('/employ-api/employ/authentication/getAuthenticationCompany', {params:params}) +// 实名认证-个人实名认证 +export const addAuthenticationPerson = (params) => http.post('/employ-api/employ/authentication/addAuthenticationPerson', params) +// 实名认证-查询个人实名认证信息 +export const getAuthenticationPerson = (params) => http.get('/employ-api/employ/authentication/getAuthenticationPerson', {params:params}) + + + +// 首页-分类信息列表 +export const queryCategoryList = (params) => http.get('/employ-api/employ/category/queryCategoryList', params) + +// 我的钱包-累计提现 +export const CountCashOut = (params) => http.get('/employ-api/employ/amount/CountCashOut', params) +// 我的钱包-我的余额 +export const queryBalance = (params) => http.get('/employ-api/employ/amount/queryBalance', params) diff --git a/common/config.js b/common/config.js index 5db0976..d02195f 100644 --- a/common/config.js +++ b/common/config.js @@ -1,6 +1,8 @@ module.exports = { - // baseUrl: 'https://employadmin.augcl.com/employ-api', - // baseUrl: 'http://3fl8266127.qicp.vip/' + // baseUrl: 'http://3fl8266127.qicp.vip' + // baseUrl:"https://employadmin.hhlm1688.com" + baseUrl:"http://h5.xzaiyp.top", //测试环境 - baseUrl:"https://employadmin.hhlm1688.com" + // https://employadmin.hhlm1688.com/employ-api } + diff --git a/node_modules/fastq/README.md b/node_modules/fastq/README.md index af5feee..1644111 100644 --- a/node_modules/fastq/README.md +++ b/node_modules/fastq/README.md @@ -233,6 +233,12 @@ each time a task is completed, `err` will be not null if the task has thrown an Property that returns the number of concurrent tasks that could be executed in parallel. It can be altered at runtime. +------------------------------------------------------- + +### queue.paused + +Property (Read-Only) that returns `true` when the queue is in a paused state. + ------------------------------------------------------- ### queue.drain diff --git a/node_modules/fastq/index.d.ts b/node_modules/fastq/index.d.ts index 327f399..4581a28 100644 --- a/node_modules/fastq/index.d.ts +++ b/node_modules/fastq/index.d.ts @@ -20,6 +20,7 @@ declare namespace fastq { killAndDrain(): any error(handler: errorHandler): void concurrency: number + readonly paused: boolean drain(): any empty: () => void saturated: () => void diff --git a/node_modules/fastq/package.json b/node_modules/fastq/package.json index 78b0c56..0673897 100644 --- a/node_modules/fastq/package.json +++ b/node_modules/fastq/package.json @@ -1,6 +1,10 @@ { "name": "fastq", +<<<<<<< HEAD "version": "1.18.0", +======= + "version": "1.19.0", +>>>>>>> f6c7301605cb7d02d0ad6c2c7d8246dabc5bc9e5 "description": "Fast, in memory work queue", "main": "queue.js", "scripts": { diff --git a/node_modules/fastq/test/test.js b/node_modules/fastq/test/test.js index ceed7a7..79f0f6c 100644 --- a/node_modules/fastq/test/test.js +++ b/node_modules/fastq/test/test.js @@ -640,3 +640,14 @@ test('pause/resume should trigger drain event', function (t) { queue.resume() }) + +test('paused flag', function (t) { + t.plan(2) + + var queue = buildQueue(function (arg, cb) { + cb(null) + }, 1) + t.equal(queue.paused, false) + queue.pause() + t.equal(queue.paused, true) +}) diff --git a/node_modules/flatted/index.js b/node_modules/flatted/index.js index faa281c..f40414a 100644 --- a/node_modules/flatted/index.js +++ b/node_modules/flatted/index.js @@ -32,7 +32,7 @@ self.Flatted = (function (exports) { var Primitives = function Primitives(_, value) { return _typeof(value) === primitive ? new Primitive(value) : value; }; - var revive = function revive(input, parsed, output, $) { + var _revive = function revive(input, parsed, output, $) { var lazy = []; for (var ke = keys(output), length = ke.length, y = 0; y < length; y++) { var k = ke[y]; @@ -53,7 +53,7 @@ self.Flatted = (function (exports) { var _lazy$i = lazy[i], _k = _lazy$i.k, a = _lazy$i.a; - output[_k] = $.call(output, _k, revive.apply(null, a)); + output[_k] = $.call(output, _k, _revive.apply(null, a)); } return output; }; @@ -73,7 +73,7 @@ self.Flatted = (function (exports) { var input = $parse(text, Primitives).map(primitives); var value = input[0]; var $ = reviver || noop; - var tmp = _typeof(value) === object && value ? revive(input, new Set(), value, $) : value; + var tmp = _typeof(value) === object && value ? _revive(input, new Set(), value, $) : value; return $.call({ '': tmp }, '', tmp); diff --git a/node_modules/flatted/min.js b/node_modules/flatted/min.js index e43fa18..ad049a4 100644 --- a/node_modules/flatted/min.js +++ b/node_modules/flatted/min.js @@ -1 +1 @@ -self.Flatted=function(n){"use strict";function t(n){return t="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(n){return typeof n}:function(n){return n&&"function"==typeof Symbol&&n.constructor===Symbol&&n!==Symbol.prototype?"symbol":typeof n},t(n)}var r=JSON.parse,e=JSON.stringify,o=Object.keys,u=String,f="string",i={},c="object",a=function(n,t){return t},l=function(n){return n instanceof u?u(n):n},s=function(n,r){return t(r)===f?new u(r):r},y=function n(r,e,f,a){for(var l=[],s=o(f),y=s.length,p=0;p>>>>>> f6c7301605cb7d02d0ad6c2c7d8246dabc5bc9e5 "description": "A super light and fast circular JSON parser.", "unpkg": "min.js", "main": "./cjs/index.js", @@ -22,6 +26,7 @@ "type": "git", "url": "git+https://github.com/WebReflection/flatted.git" }, +<<<<<<< HEAD "keywords": [ "circular", "JSON", @@ -29,6 +34,28 @@ "parser", "minimal" ], +======= + "files": [ + "LICENSE", + "README.md", + "cjs/", + "es.js", + "esm.js", + "esm/", + "index.js", + "min.js", + "php/flatted.php", + "python/flatted.py", + "types/" + ], + "keywords": [ + "circular", + "JSON", + "fast", + "parser", + "minimal" + ], +>>>>>>> f6c7301605cb7d02d0ad6c2c7d8246dabc5bc9e5 "author": "Andrea Giammarchi", "license": "ISC", "bugs": { @@ -36,19 +63,19 @@ }, "homepage": "https://github.com/WebReflection/flatted#readme", "devDependencies": { - "@babel/core": "^7.23.9", - "@babel/preset-env": "^7.23.9", + "@babel/core": "^7.26.9", + "@babel/preset-env": "^7.26.9", "@rollup/plugin-babel": "^6.0.4", "@rollup/plugin-terser": "^0.4.4", - "@ungap/structured-clone": "^1.2.0", + "@ungap/structured-clone": "^1.3.0", "ascjs": "^6.0.3", - "c8": "^9.1.0", + "c8": "^10.1.3", "circular-json": "^0.5.9", "circular-json-es6": "^2.0.2", "jsan": "^3.1.14", - "rollup": "^4.12.0", - "terser": "^5.27.2", - "typescript": "^5.3.3" + "rollup": "^4.34.8", + "terser": "^5.39.0", + "typescript": "^5.7.3" }, "module": "./esm/index.js", "type": "module", diff --git a/node_modules/flatted/python/flatted.py b/node_modules/flatted/python/flatted.py index 56bb08e..a7e57fc 100644 --- a/node_modules/flatted/python/flatted.py +++ b/node_modules/flatted/python/flatted.py @@ -1,6 +1,6 @@ # ISC License # -# Copyright (c) 2018-2021, Andrea Giammarchi, @WebReflection +# Copyright (c) 2018-2025, Andrea Giammarchi, @WebReflection # # Permission to use, copy, modify, and/or distribute this software for any # purpose with or without fee is hereby granted, provided that the above @@ -41,7 +41,7 @@ def _object_keys(value): return keys def _is_array(value): - return isinstance(value, list) or isinstance(value, tuple) + return isinstance(value, (list, tuple)) def _is_object(value): return isinstance(value, dict) @@ -65,10 +65,10 @@ def _loop(keys, input, known, output): return output def _ref(key, value, input, known, output): - if _is_array(value) and not value in known: + if _is_array(value) and value not in known: known.append(value) value = _loop(_array_keys(value), input, known, value) - elif _is_object(value) and not value in known: + elif _is_object(value) and value not in known: known.append(value) value = _loop(_object_keys(value), input, known, value) diff --git a/node_modules/flatted/python/test.py b/node_modules/flatted/python/test.py deleted file mode 100644 index 740739e..0000000 --- a/node_modules/flatted/python/test.py +++ /dev/null @@ -1,63 +0,0 @@ -from flatted import stringify as _stringify, parse - -def stringify(value): - return _stringify(value, separators=(',', ':')) - -assert stringify([None, None]) == '[[null,null]]' - -a = [] -o = {} - -assert stringify(a) == '[[]]' -assert stringify(o) == '[{}]' - -a.append(a) -o['o'] = o - -assert stringify(a) == '[["0"]]' -assert stringify(o) == '[{"o":"0"}]' - -b = parse(stringify(a)) -assert isinstance(b, list) and b[0] == b - -a.append(1) -a.append('two') -a.append(True) -o['one'] = 1 -o['two'] = 'two' -o['three'] = True - -assert stringify(a) == '[["0",1,"1",true],"two"]' -assert stringify(o) == '[{"o":"0","one":1,"two":"1","three":true},"two"]' - -a.append(o) -o['a'] = a - -assert stringify(a) == '[["0",1,"1",true,"2"],"two",{"o":"2","one":1,"two":"1","three":true,"a":"0"}]' -assert stringify(o) == '[{"o":"0","one":1,"two":"1","three":true,"a":"2"},"two",["2",1,"1",true,"0"]]' - -a.append({'test': 'OK'}) -a.append([1, 2, 3]) - -o['test'] = {'test': 'OK'} -o['array'] = [1, 2, 3] - -assert stringify(a) == '[["0",1,"1",true,"2","3","4"],"two",{"o":"2","one":1,"two":"1","three":true,"a":"0","test":"3","array":"4"},{"test":"5"},[1,2,3],"OK"]' -assert stringify(o) == '[{"o":"0","one":1,"two":"1","three":true,"a":"2","test":"3","array":"4"},"two",["2",1,"1",true,"0","3","4"],{"test":"5"},[1,2,3],"OK"]' - -a2 = parse(stringify(a)); -o2 = parse(stringify(o)); - -assert a2[0] == a2 -assert o2['o'] == o2 - -assert a2[1] == 1 and a2[2] == 'two' and a2[3] == True and isinstance(a2[4], dict) -assert a2[4] == a2[4]['o'] and a2 == a2[4]['o']['a'] - -str = parse('[{"prop":"1","a":"2","b":"3"},{"value":123},["4","5"],{"e":"6","t":"7","p":4},{},{"b":"8"},"f",{"a":"9"},["10"],"sup",{"a":1,"d":2,"c":"7","z":"11","h":1},{"g":2,"a":"7","b":"12","f":6},{"r":4,"u":"7","c":5}]') -assert str['b']['t']['a'] == 'sup' and str['a'][1]['b'][0]['c'] == str['b']['t'] - -oo = parse('[{"a":"1","b":"0","c":"2"},{"aa":"3"},{"ca":"4","cb":"5","cc":"6","cd":"7","ce":"8","cf":"9"},{"aaa":"10"},{"caa":"4"},{"cba":"5"},{"cca":"2"},{"cda":"4"},"value2","value3","value1"]'); -assert oo['a']['aa']['aaa'] == 'value1' and oo == oo['b'] and oo['c']['ca']['caa'] == oo['c']['ca'] - -print('OK') diff --git a/node_modules/get-intrinsic/.eslintrc b/node_modules/get-intrinsic/.eslintrc index 8376636..235fb79 100644 --- a/node_modules/get-intrinsic/.eslintrc +++ b/node_modules/get-intrinsic/.eslintrc @@ -11,6 +11,10 @@ "es2022": true, }, + "globals": { + "Float16Array": false, + }, + "rules": { "array-bracket-newline": 0, "complexity": 0, diff --git a/node_modules/get-intrinsic/CHANGELOG.md b/node_modules/get-intrinsic/CHANGELOG.md index 5b4d214..bd6c1c7 100644 --- a/node_modules/get-intrinsic/CHANGELOG.md +++ b/node_modules/get-intrinsic/CHANGELOG.md @@ -5,6 +5,17 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +<<<<<<< HEAD +======= +## [v1.3.0](https://github.com/ljharb/get-intrinsic/compare/v1.2.7...v1.3.0) - 2025-02-22 + +### Commits + +- [Dev Deps] update `es-abstract`, `es-value-fixtures`, `for-each`, `object-inspect` [`9b61553`](https://github.com/ljharb/get-intrinsic/commit/9b61553c587f1c1edbd435597e88c7d387da97dd) +- [Deps] update `call-bind-apply-helpers`, `es-object-atoms`, `get-proto` [`a341fee`](https://github.com/ljharb/get-intrinsic/commit/a341fee0f39a403b0f0069e82c97642d5eb11043) +- [New] add `Float16Array` [`de22116`](https://github.com/ljharb/get-intrinsic/commit/de22116b492fb989a0341bceb6e573abfaed73dc) + +>>>>>>> f6c7301605cb7d02d0ad6c2c7d8246dabc5bc9e5 ## [v1.2.7](https://github.com/ljharb/get-intrinsic/compare/v1.2.6...v1.2.7) - 2025-01-02 ### Commits diff --git a/node_modules/get-intrinsic/index.js b/node_modules/get-intrinsic/index.js index 7f618f5..bd1d94b 100644 --- a/node_modules/get-intrinsic/index.js +++ b/node_modules/get-intrinsic/index.js @@ -90,6 +90,7 @@ var INTRINSICS = { '%Error%': $Error, '%eval%': eval, // eslint-disable-line no-eval '%EvalError%': $EvalError, + '%Float16Array%': typeof Float16Array === 'undefined' ? undefined : Float16Array, '%Float32Array%': typeof Float32Array === 'undefined' ? undefined : Float32Array, '%Float64Array%': typeof Float64Array === 'undefined' ? undefined : Float64Array, '%FinalizationRegistry%': typeof FinalizationRegistry === 'undefined' ? undefined : FinalizationRegistry, diff --git a/node_modules/get-intrinsic/package.json b/node_modules/get-intrinsic/package.json index f941bfe..ceacc73 100644 --- a/node_modules/get-intrinsic/package.json +++ b/node_modules/get-intrinsic/package.json @@ -1,6 +1,10 @@ { "name": "get-intrinsic", +<<<<<<< HEAD "version": "1.2.7", +======= + "version": "1.3.0", +>>>>>>> f6c7301605cb7d02d0ad6c2c7d8246dabc5bc9e5 "description": "Get and robustly cache all JS language-level intrinsics at first require time", "main": "index.js", "exports": { @@ -44,12 +48,21 @@ }, "homepage": "https://github.com/ljharb/get-intrinsic#readme", "dependencies": { +<<<<<<< HEAD "call-bind-apply-helpers": "^1.0.1", "es-define-property": "^1.0.1", "es-errors": "^1.3.0", "es-object-atoms": "^1.0.0", "function-bind": "^1.1.2", "get-proto": "^1.0.0", +======= + "call-bind-apply-helpers": "^1.0.2", + "es-define-property": "^1.0.1", + "es-errors": "^1.3.0", + "es-object-atoms": "^1.1.1", + "function-bind": "^1.1.2", + "get-proto": "^1.0.1", +>>>>>>> f6c7301605cb7d02d0ad6c2c7d8246dabc5bc9e5 "gopd": "^1.2.0", "has-symbols": "^1.1.0", "hasown": "^2.0.2", @@ -60,18 +73,30 @@ "auto-changelog": "^2.5.0", "call-bound": "^1.0.3", "encoding": "^0.1.13", +<<<<<<< HEAD "es-abstract": "^1.23.8", "es-value-fixtures": "^1.5.0", "eslint": "=8.8.0", "evalmd": "^0.0.19", "for-each": "^0.3.3", +======= + "es-abstract": "^1.23.9", + "es-value-fixtures": "^1.7.1", + "eslint": "=8.8.0", + "evalmd": "^0.0.19", + "for-each": "^0.3.5", +>>>>>>> f6c7301605cb7d02d0ad6c2c7d8246dabc5bc9e5 "make-async-function": "^1.0.0", "make-async-generator-function": "^1.0.0", "make-generator-function": "^2.0.0", "mock-property": "^1.1.0", "npmignore": "^0.3.1", "nyc": "^10.3.2", +<<<<<<< HEAD "object-inspect": "^1.13.3", +======= + "object-inspect": "^1.13.4", +>>>>>>> f6c7301605cb7d02d0ad6c2c7d8246dabc5bc9e5 "safe-publish-latest": "^2.0.0", "tape": "^5.9.0" }, diff --git a/node_modules/import-fresh/index.js b/node_modules/import-fresh/index.js index 0a4c5d5..1bed876 100644 --- a/node_modules/import-fresh/index.js +++ b/node_modules/import-fresh/index.js @@ -29,5 +29,6 @@ module.exports = moduleId => { const parent = require.cache[parentPath]; // If `filePath` and `parentPath` are the same, cache will already be deleted so we won't get a memory leak in next step - return parent === undefined ? require(filePath) : parent.require(filePath); // In case cache doesn't have parent, fall back to normal require + // In case cache doesn't have parent, fall back to normal require + return parent === undefined || parent.require === undefined ? require(filePath) : parent.require(filePath); }; diff --git a/node_modules/import-fresh/package.json b/node_modules/import-fresh/package.json index 0c09362..49e3b82 100644 --- a/node_modules/import-fresh/package.json +++ b/node_modules/import-fresh/package.json @@ -1,6 +1,10 @@ { "name": "import-fresh", +<<<<<<< HEAD "version": "3.3.0", +======= + "version": "3.3.1", +>>>>>>> f6c7301605cb7d02d0ad6c2c7d8246dabc5bc9e5 "description": "Import a module while bypassing the cache", "license": "MIT", "repository": "sindresorhus/import-fresh", @@ -10,6 +14,14 @@ "email": "sindresorhus@gmail.com", "url": "https://sindresorhus.com" }, +<<<<<<< HEAD +======= + "exports": { + "types": "./index.d.ts", + "default": "./index.js" + }, + "sideEffects": false, +>>>>>>> f6c7301605cb7d02d0ad6c2c7d8246dabc5bc9e5 "engines": { "node": ">=6" }, diff --git a/node_modules/import-fresh/readme.md b/node_modules/import-fresh/readme.md index bd14c79..a868bc6 100644 --- a/node_modules/import-fresh/readme.md +++ b/node_modules/import-fresh/readme.md @@ -4,10 +4,22 @@ Useful for testing purposes when you need to freshly import a module. -## Install +## ESM + +For ESM, you can use this snippet: + +```js +const importFresh = moduleName => import(`${moduleName}?${Date.now()}`); +const {default: foo} = await importFresh('foo'); ``` -$ npm install import-fresh + +**This snippet causes a memory leak, so only use it for short-lived tests.** + +## Install + +```sh +npm install import-fresh ``` ## Usage @@ -34,12 +46,6 @@ importFresh('./foo')(); //=> 1 ``` -## import-fresh for enterprise - -Available as part of the Tidelift Subscription. - -The maintainers of import-fresh and thousands of other packages are working with Tidelift to deliver commercial support and maintenance for the open source dependencies you use to build your applications. Save time, reduce risk, and improve code health, while paying the maintainers of the exact dependencies you use. [Learn more.](https://tidelift.com/subscription/pkg/npm-import-fresh?utm_source=npm-import-fresh&utm_medium=referral&utm_campaign=enterprise&utm_term=repo) - ## Related - [clear-module](https://github.com/sindresorhus/clear-module) - Clear a module from the import cache diff --git a/node_modules/object-inspect/CHANGELOG.md b/node_modules/object-inspect/CHANGELOG.md index d6aeca6..34f845e 100644 --- a/node_modules/object-inspect/CHANGELOG.md +++ b/node_modules/object-inspect/CHANGELOG.md @@ -5,6 +5,17 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +<<<<<<< HEAD +======= +## [v1.13.4](https://github.com/inspect-js/object-inspect/compare/v1.13.3...v1.13.4) - 2025-02-04 + +### Commits + +- [Fix] avoid being fooled by a `Symbol.toStringTag` [`fa5870d`](https://github.com/inspect-js/object-inspect/commit/fa5870da468a525d2f20193700f70752f506cbf7) +- [Tests] fix tests in node v6.0 - v6.4 [`2abfe1b`](https://github.com/inspect-js/object-inspect/commit/2abfe1bc3c69f9293c07c5cd65a9d7d87a628b84) +- [Dev Deps] update `es-value-fixtures`, `for-each`, `has-symbols` [`3edfb01`](https://github.com/inspect-js/object-inspect/commit/3edfb01cc8cce220fba0dfdfe2dc8bc955758cdd) + +>>>>>>> f6c7301605cb7d02d0ad6c2c7d8246dabc5bc9e5 ## [v1.13.3](https://github.com/inspect-js/object-inspect/compare/v1.13.2...v1.13.3) - 2024-11-09 ### Commits diff --git a/node_modules/object-inspect/index.js b/node_modules/object-inspect/index.js index 5240a4d..a4b2d4c 100644 --- a/node_modules/object-inspect/index.js +++ b/node_modules/object-inspect/index.js @@ -287,13 +287,16 @@ function quote(s) { return $replace.call(String(s), /"/g, '"'); } -function isArray(obj) { return toStr(obj) === '[object Array]' && (!toStringTag || !(typeof obj === 'object' && toStringTag in obj)); } -function isDate(obj) { return toStr(obj) === '[object Date]' && (!toStringTag || !(typeof obj === 'object' && toStringTag in obj)); } -function isRegExp(obj) { return toStr(obj) === '[object RegExp]' && (!toStringTag || !(typeof obj === 'object' && toStringTag in obj)); } -function isError(obj) { return toStr(obj) === '[object Error]' && (!toStringTag || !(typeof obj === 'object' && toStringTag in obj)); } -function isString(obj) { return toStr(obj) === '[object String]' && (!toStringTag || !(typeof obj === 'object' && toStringTag in obj)); } -function isNumber(obj) { return toStr(obj) === '[object Number]' && (!toStringTag || !(typeof obj === 'object' && toStringTag in obj)); } -function isBoolean(obj) { return toStr(obj) === '[object Boolean]' && (!toStringTag || !(typeof obj === 'object' && toStringTag in obj)); } +function canTrustToString(obj) { + return !toStringTag || !(typeof obj === 'object' && (toStringTag in obj || typeof obj[toStringTag] !== 'undefined')); +} +function isArray(obj) { return toStr(obj) === '[object Array]' && canTrustToString(obj); } +function isDate(obj) { return toStr(obj) === '[object Date]' && canTrustToString(obj); } +function isRegExp(obj) { return toStr(obj) === '[object RegExp]' && canTrustToString(obj); } +function isError(obj) { return toStr(obj) === '[object Error]' && canTrustToString(obj); } +function isString(obj) { return toStr(obj) === '[object String]' && canTrustToString(obj); } +function isNumber(obj) { return toStr(obj) === '[object Number]' && canTrustToString(obj); } +function isBoolean(obj) { return toStr(obj) === '[object Boolean]' && canTrustToString(obj); } // Symbol and BigInt do have Symbol.toStringTag by spec, so that can't be used to eliminate false positives function isSymbol(obj) { diff --git a/node_modules/object-inspect/package.json b/node_modules/object-inspect/package.json index 22ebbc0..36bbc23 100644 --- a/node_modules/object-inspect/package.json +++ b/node_modules/object-inspect/package.json @@ -1,6 +1,10 @@ { "name": "object-inspect", +<<<<<<< HEAD "version": "1.13.3", +======= + "version": "1.13.4", +>>>>>>> f6c7301605cb7d02d0ad6c2c7d8246dabc5bc9e5 "description": "string representations of objects in node and the browser", "main": "index.js", "sideEffects": false, @@ -10,13 +14,17 @@ "auto-changelog": "^2.5.0", "core-js": "^2.6.12", "error-cause": "^1.0.8", +<<<<<<< HEAD "es-value-fixtures": "^1.5.0", +======= + "es-value-fixtures": "^1.7.1", +>>>>>>> f6c7301605cb7d02d0ad6c2c7d8246dabc5bc9e5 "eslint": "=8.8.0", - "for-each": "^0.3.3", + "for-each": "^0.3.4", "functions-have-names": "^1.2.3", "glob": "=10.3.7", "globalthis": "^1.0.4", - "has-symbols": "^1.0.3", + "has-symbols": "^1.1.0", "has-tostringtag": "^1.0.2", "in-publish": "^2.0.1", "jackspeak": "=2.1.1", @@ -26,6 +34,7 @@ "nyc": "^10.3.2", "safe-publish-latest": "^2.0.0", "safer-buffer": "^2.1.2", + "semver": "^6.3.1", "string.prototype.repeat": "^1.0.0", "tape": "^5.9.0" }, diff --git a/node_modules/object-inspect/test/values.js b/node_modules/object-inspect/test/values.js index 4832b9f..15986cd 100644 --- a/node_modules/object-inspect/test/values.js +++ b/node_modules/object-inspect/test/values.js @@ -5,6 +5,8 @@ var test = require('tape'); var mockProperty = require('mock-property'); var hasSymbols = require('has-symbols/shams')(); var hasToStringTag = require('has-tostringtag/shams')(); +var forEach = require('for-each'); +var semver = require('semver'); test('values', function (t) { t.plan(1); @@ -209,3 +211,51 @@ test('RegExps', function (t) { t.end(); }); + +test('Proxies', { skip: typeof Proxy !== 'function' || !hasToStringTag }, function (t) { + var target = { proxy: true }; + var fake = new Proxy(target, { has: function () { return false; } }); + + // needed to work around a weird difference in node v6.0 - v6.4 where non-present properties are not logged + var isNode60 = semver.satisfies(process.version, '6.0 - 6.4'); + + forEach([ + 'Boolean', + 'Number', + 'String', + 'Symbol', + 'Date' + ], function (tag) { + target[Symbol.toStringTag] = tag; + + t.equal( + inspect(fake), + '{ ' + (isNode60 ? '' : 'proxy: true, ') + '[Symbol(Symbol.toStringTag)]: \'' + tag + '\' }', + 'Proxy for + ' + tag + ' shows as the target, which has no slots' + ); + }); + + t.end(); +}); + +test('fakers', { skip: !hasToStringTag }, function (t) { + var target = { proxy: false }; + + forEach([ + 'Boolean', + 'Number', + 'String', + 'Symbol', + 'Date' + ], function (tag) { + target[Symbol.toStringTag] = tag; + + t.equal( + inspect(target), + '{ proxy: false, [Symbol(Symbol.toStringTag)]: \'' + tag + '\' }', + 'Object pretending to be ' + tag + ' does not trick us' + ); + }); + + t.end(); +}); diff --git a/pages.json b/pages.json index 880e545..865c4c6 100644 --- a/pages.json +++ b/pages.json @@ -123,9 +123,27 @@ } }, { - "path": "master-settled/index", + "path": "enterprise/index", "style": { - "navigationBarTitleText": "师傅入驻", + "navigationBarTitleText": "企业", + "navigationStyle":"default", + "navigationBarBackgroundColor": "#FF7A31", + "navigationBarTextStyle": "white" + } + }, + { + "path": "person/index", + "style": { + "navigationBarTitleText": "个人", + "navigationStyle":"default", + "navigationBarBackgroundColor": "#FF7A31", + "navigationBarTextStyle": "white" + } + }, + { + "path": "resume/index", + "style": { + "navigationBarTitleText": "我的简历", "navigationStyle":"default", "navigationBarBackgroundColor": "#FF7A31", "navigationBarTextStyle": "white" @@ -140,6 +158,15 @@ "navigationBarTextStyle": "white" } }, + { + "path": "job-order-detail/index", + "style": { + "navigationBarTitleText": "聘用订单详情", + "navigationStyle":"default", + "navigationBarBackgroundColor": "#FF7A31", + "navigationBarTextStyle": "white" + } + }, { "path": "record/index", "style": { @@ -170,7 +197,7 @@ { "path": "order-detail/index", "style": { - "navigationBarTitleText": "订单详情", + "navigationBarTitleText": "招聘订单详情", "navigationStyle":"default", "navigationBarBackgroundColor": "#FF7A31", "navigationBarTextStyle": "white" @@ -193,6 +220,26 @@ "navigationBarBackgroundColor": "#FF7A31", "navigationBarTextStyle": "white" } + }, + { + "path": "category/index", + "style": { + "navigationBarTitleText": "分类", + "navigationStyle":"default", + "navigationBarBackgroundColor": "#FF7A31", + "navigationBarTextStyle": "white", + "enablePullDownRefresh": true, + "onReachBottomDistance": 100 + } + }, + { + "path": "notice/index", + "style": { + "navigationBarTitleText": "公告详情", + "navigationStyle":"default", + "navigationBarBackgroundColor": "#FF7A31", + "navigationBarTextStyle": "white" + } } ] } diff --git a/pages/auth/index.vue b/pages/auth/index.vue index b138512..41ebc37 100644 --- a/pages/auth/index.vue +++ b/pages/auth/index.vue @@ -3,25 +3,25 @@ - 用工平台小程序 + 智选猎头 - - + + 取消登录 + - + - 《隐私政策》 - 《服务条款》 + 《隐私政策》 + 《服务条款》 @@ -34,17 +34,18 @@ 服务协议和隐私权政策 - 请您务必审慎阅读、充分理解用户协议和隐私政策各条款，包括但不限于用户注意事项、用户行为规范以及为了向你提供服务而收集、使用、存储你个人信息的情况等。你可阅读 + + 不同意 - + 同意 @@ -54,16 +55,52 @@ diff --git a/pages/user/index.vue b/pages/user/index.vue index fb540e7..77ad90c 100644 --- a/pages/user/index.vue +++ b/pages/user/index.vue @@ -2,18 +2,26 @@ - + - {{nickName}} - + {{user.nickName}} + 修改资料 手机号: - {{phone}} + {{user.phone}} + + + 企业认证-未通过 + 企业认证-已通过 + 企业认证-审核中 + 个人认证-未通过 + 个人认证-已通过 + 个人认证-审核中 @@ -31,7 +39,7 @@ 我的余额 - ￥{{myMoney}} + ￥{{amount}} @@ -51,8 +59,9 @@ + - + @@ -62,27 +71,45 @@ + + + + + 企业入驻 + + + + + + 个人入驻 + + + + + + 我的简历 + - + 联系客服 - + 系统设置 - + 帮助与反馈 - + 关于本程序 @@ -93,11 +120,18 @@ + + \ No newline at end of file diff --git a/pages_subpack/employ-progress/index.vue b/pages_subpack/employ-progress/index.vue index 288ad82..f23a0ba 100644 --- a/pages_subpack/employ-progress/index.vue +++ b/pages_subpack/employ-progress/index.vue @@ -28,13 +28,18 @@ export default{ data(){ return{ - + id:null } }, + onLoad(options) { + console.info("求职者订单详情："+options.id) + this.id = options.id + }, methods:{ onOrderDetail(){ + let that = this; uni.navigateTo({ - url:"/pages_subpack/order-detail/index" + url:"/pages_subpack/job-order-detail/index?orderId="+that.id }) }, onCancel(){ diff --git a/pages_subpack/enterprise/index.vue b/pages_subpack/enterprise/index.vue new file mode 100644 index 0000000..d8e4499 --- /dev/null +++ b/pages_subpack/enterprise/index.vue @@ -0,0 +1,329 @@ + + + + \ No newline at end of file diff --git a/pages_subpack/job-order-detail/index.vue b/pages_subpack/job-order-detail/index.vue new file mode 100644 index 0000000..8412413 --- /dev/null +++ b/pages_subpack/job-order-detail/index.vue @@ -0,0 +1,292 @@ + + + + + \ No newline at end of file diff --git a/pages_subpack/master-detail/index.vue b/pages_subpack/master-detail/index.vue index e260020..d7632bc 100644 --- a/pages_subpack/master-detail/index.vue +++ b/pages_subpack/master-detail/index.vue @@ -3,20 +3,20 @@ - + - 装配电工 + {{items.categoryOne}} - 李志 - 性别:男 - 年龄:32岁 - 所属工种:水泥搬运工 + {{items.employResume.name}} + 性别:{{items.employResume.sex==1?"男":"女"}} + 年龄:{{items.employResume.age}} + 所属工种:{{items.categoryTwo}} - 6000-11000元 + {{items.salaryMin}}-{{items.salaryMax}}元 @@ -25,7 +25,7 @@ 联系电话 - 13189698114 + {{items.employResume.phone}} @@ -33,7 +33,7 @@ 结算方式 - 直接支付日薪 + {{items.payType}} @@ -41,7 +41,7 @@ 出行方式 - 地铁(4元) + {{items.selectGo}} @@ -49,7 +49,7 @@ 出发地址 - 深圳罗湖区深圳市百货广场大厦罗湖区百货广场大厦栋... + {{items.address}} @@ -59,7 +59,7 @@ 个人介绍 - + @@ -73,14 +73,22 @@ + + + \ No newline at end of file diff --git a/pages_subpack/order-detail/index.vue b/pages_subpack/order-detail/index.vue index 76512ab..c97c259 100644 --- a/pages_subpack/order-detail/index.vue +++ b/pages_subpack/order-detail/index.vue @@ -4,7 +4,7 @@ @@ -95,41 +95,44 @@ + - 商品详情 + 招聘工作详情 - + - 泰山工装石膏板搬运 - 所属行业:水泥搬运 - 所属工种:中午搬运 + 工作职位:{{obj.title}} + 所属行业:{{obj.categoryOne}} + + 所属工种:{{obj.categoryTwo}} 薪资 - 6000元 + {{obj.jobMoney}}元 - 姓名:李满和 - 联系方式:13189698114 - + 招聘公司名称:{{obj.workName}} + 招聘联系人:{{obj.employAuthenticationPerson.workName}} + 联系方式:{{obj.employAuthenticationPerson.phone}} + 复制 - 工作地址:湖南省长沙市雨花区高升路与时代阳光大道西交叉口东北方向140米御天国际商汇中心5栋6023 - + 工作地址:{{obj.workAddress}} + 复制 @@ -141,11 +144,12 @@ 支付方式 - 试用以后支付 + 提前支付 + 试用后支付 工作时间 - 3h + {{obj.startTime}} - {{obj.endTime}} @@ -154,7 +158,7 @@ 工作内容 - + @@ -168,10 +172,13 @@ + + \ No newline at end of file diff --git a/pages_subpack/record/index.vue b/pages_subpack/record/index.vue index 09bc6d1..8e08842 100644 --- a/pages_subpack/record/index.vue +++ b/pages_subpack/record/index.vue @@ -52,14 +52,15 @@ - {{items.desc}} + {{items.title}} {{items.createTime}} - - {{items.money}} + + {{items.type==0?'-':'+'}} + ￥{{items.amount}} @@ -73,7 +74,9 @@