From 1bb473993aaae1adc1a9dd368463ffb0f550b5b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=88=B1=7E=E6=B5=B7=7E=E7=88=B1=E6=B5=B7=E7=88=B1?= =?UTF-8?q?=E6=B5=B7=7E=E5=8F=B3?= <1828712314@qq.com> Date: Mon, 24 Feb 2025 16:24:33 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dpackage.json?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- App.vue | 12 +- components/cs-bottom-wrapper/index.vue | 4 +- config.js | 6 +- pages.json | 48 ++- static/scss/global.scss | 1 + sub/invite/addEnterprise.vue | 392 +++++++++++++++++++++++++ sub/invite/enterpriseIntroduce.vue | 79 +++++ sub/invite/enterpriseTags.vue | 177 +++++++++++ sub/invite/index.vue | 55 ++++ sub/invite/prove.vue | 369 +++++++++++++++++++++++ sub/owner/invite.vue | 4 +- sub/task/enforce.vue | 20 +- 12 files changed, 1142 insertions(+), 25 deletions(-) create mode 100644 sub/invite/addEnterprise.vue create mode 100644 sub/invite/enterpriseIntroduce.vue create mode 100644 sub/invite/enterpriseTags.vue create mode 100644 sub/invite/index.vue create mode 100644 sub/invite/prove.vue diff --git a/App.vue b/App.vue index b99c9a4..a4debdc 100644 --- a/App.vue +++ b/App.vue @@ -99,12 +99,12 @@ export default { }, handlerNavigateTo(user) { // 邀请企业 - if (this.invateId) { - uni.navigateTo({ - url: `/sub/enterprise/edit?invateId=${this.invateId}` - }) - return - } + // if (this.invateId) { + // uni.navigateTo({ + // url: `/sub/enterprise/edit?invateId=${this.invateId}` + // }) + // return + // } // 审核中 if (user.audit == 1) { diff --git a/components/cs-bottom-wrapper/index.vue b/components/cs-bottom-wrapper/index.vue index 7461156..5ecdfeb 100644 --- a/components/cs-bottom-wrapper/index.vue +++ b/components/cs-bottom-wrapper/index.vue @@ -26,8 +26,10 @@ export default { left: 0; width: 100%; background-color: #fff; + z-index: 99; + border-top: 1px solid #f1f1f4; .safe { - height: 25px; + height: 20px; } } diff --git a/config.js b/config.js index 075a612..2c2a87c 100644 --- a/config.js +++ b/config.js @@ -1,8 +1,8 @@ // 应用全局配置 module.exports = { - baseUrl: 'http://188.188.3.166:48080', - //baseUrl: 'https://hb.jzce.com', - //baseUrl: 'http://188.188.3.232:48080', + // baseUrl: 'http://188.188.3.166:48080', + // baseUrl: 'https://hb.jzce.com', + baseUrl: 'http://188.188.3.232:48080', baseApi: '/admin-api', imgUrl: 'https://hb.jzce.com', // 应用信息 diff --git a/pages.json b/pages.json index 0888034..c97e3a6 100644 --- a/pages.json +++ b/pages.json @@ -82,7 +82,7 @@ "style": { "navigationBarTitleText": "政策法规", "usingComponents": { - "van-search":"/wxcomponents/vant/search/index" + "van-search": "/wxcomponents/vant/search/index" }, "componentPlaceholder": { "u-modal": "view" @@ -93,8 +93,8 @@ "path": "owner/policy-detail", "style": { "navigationBarTitleText": "政策法规", - "usingComponents": {}, - "componentPlaceholder": {} + "usingComponents": {}, + "componentPlaceholder": {} } }, { @@ -105,7 +105,8 @@ }, { "path": "common/waiting", "style": { - "navigationBarTitleText": "" + "navigationBarTitleText": "", + "navigationStyle": "custom" } }, { "path": "enterprise/detail", @@ -189,6 +190,44 @@ "onReachBottonDistance": 50, "enablePullDownRefresh": true } + }, + { + "path": "invite/index", + "style": { + "navigationBarTitleText": "我的企业", + "componentPlaceholder": { + "u-modal": "view", + "uni-easyinput": "view" + } + } + }, + { + "path": "invite/addEnterprise", + "style": { + "navigationBarTitleText": "新增企业", + "componentPlaceholder": {} + } + }, + { + "path": "invite/enterpriseIntroduce", + "style": { + "navigationBarTitleText": "企业简介", + "componentPlaceholder": { + "uni-easyinput": "view" + } + } + }, + { + "path": "invite/enterpriseTags", + "style": { + "navigationBarTitleText": "环保标签" + } + }, + { + "path": "invite/prove", + "style": { + "navigationBarTitleText": "" + } } ] }], @@ -215,5 +254,6 @@ "navigationBarTitleText": "智慧生态", "navigationBarBackgroundColor": "#FFF", "backgroundColor": "#FFF" + } } \ No newline at end of file diff --git a/static/scss/global.scss b/static/scss/global.scss index 68a9905..583ae37 100644 --- a/static/scss/global.scss +++ b/static/scss/global.scss @@ -2,6 +2,7 @@ page { background-color: #f9f9f9; position: relative; color: #071437; + overflow: hidden; } button { diff --git a/sub/invite/addEnterprise.vue b/sub/invite/addEnterprise.vue new file mode 100644 index 0000000..f5c9ec0 --- /dev/null +++ b/sub/invite/addEnterprise.vue @@ -0,0 +1,392 @@ + + + + + diff --git a/sub/invite/enterpriseIntroduce.vue b/sub/invite/enterpriseIntroduce.vue new file mode 100644 index 0000000..e4504ad --- /dev/null +++ b/sub/invite/enterpriseIntroduce.vue @@ -0,0 +1,79 @@ + + + + + diff --git a/sub/invite/enterpriseTags.vue b/sub/invite/enterpriseTags.vue new file mode 100644 index 0000000..f0b1085 --- /dev/null +++ b/sub/invite/enterpriseTags.vue @@ -0,0 +1,177 @@ + + + + + diff --git a/sub/invite/index.vue b/sub/invite/index.vue new file mode 100644 index 0000000..0038a1a --- /dev/null +++ b/sub/invite/index.vue @@ -0,0 +1,55 @@ + + + + + diff --git a/sub/invite/prove.vue b/sub/invite/prove.vue new file mode 100644 index 0000000..20132c8 --- /dev/null +++ b/sub/invite/prove.vue @@ -0,0 +1,369 @@ + + + + + diff --git a/sub/owner/invite.vue b/sub/owner/invite.vue index 897bb8e..1eaed96 100644 --- a/sub/owner/invite.vue +++ b/sub/owner/invite.vue @@ -24,7 +24,7 @@ export default { onShareAppMessage() { return { title: '邀请企业入驻', - path: `/pages/login?invateId=${this.$store.getters.userId}`, + path: `/sub/invite/index?inviteId=${this.$store.getters.userId}`, imageUrl: 'http://82.156.141.150:9001/api/v1/download-shared-object/aHR0cDovL2xvY2FsaG9zdDo5MDAwL2h1YW5iYW8vbWluaWFwcC9pbnZhdGUucG5nP1gtQW16LUFsZ29yaXRobT1BV1M0LUhNQUMtU0hBMjU2JlgtQW16LUNyZWRlbnRpYWw9QUQxODY1RVA2NEczMEdEUUhDVTglMkYyMDI1MDIxOCUyRnVzLWVhc3QtMSUyRnMzJTJGYXdzNF9yZXF1ZXN0JlgtQW16LURhdGU9MjAyNTAyMThUMDcyMDI0WiZYLUFtei1FeHBpcmVzPTQzMTk5JlgtQW16LVNlY3VyaXR5LVRva2VuPWV5SmhiR2NpT2lKSVV6VXhNaUlzSW5SNWNDSTZJa3BYVkNKOS5leUpoWTJObGMzTkxaWGtpT2lKQlJERTROalZGVURZMFJ6TXdSMFJSU0VOVk9DSXNJbVY0Y0NJNk1UY3pPVGt3TmpJME55d2ljR0Z5Wlc1MElqb2lZV1J0YVc0aWZRLmp6djBhdEY5QVBYXzVjYWg4c18yeXhVV3oxek9BekFzSVdzemVrUmZwcXlHd0RPWkptazlUSGJRUnBDdVNmLVMyU0otWTI1cldUd2hpNUlrY0xBSThRJlgtQW16LVNpZ25lZEhlYWRlcnM9aG9zdCZ2ZXJzaW9uSWQ9bnVsbCZYLUFtei1TaWduYXR1cmU9MjcxZTkzOTE1MDkwYzUzYmRjYTg0MjQ1MTJhYjk3ZWQxZWMyN2QzM2MwM2U3NGUwYmRhNTBmYjQyNWI0N2MyOQ' } @@ -32,7 +32,7 @@ export default { onShareTimeline() { return { title: '邀请企业入驻', // 标题 - path: `/pages/login?invateId=${this.$store.getters.userId}`, + path: `/sub/invite/index?inviteId=${this.$store.getters.userId}`, imageUrl: 'http://82.156.141.150:9001/api/v1/download-shared-object/aHR0cDovL2xvY2FsaG9zdDo5MDAwL2h1YW5iYW8vbWluaWFwcC9pbnZhdGUucG5nP1gtQW16LUFsZ29yaXRobT1BV1M0LUhNQUMtU0hBMjU2JlgtQW16LUNyZWRlbnRpYWw9QUQxODY1RVA2NEczMEdEUUhDVTglMkYyMDI1MDIxOCUyRnVzLWVhc3QtMSUyRnMzJTJGYXdzNF9yZXF1ZXN0JlgtQW16LURhdGU9MjAyNTAyMThUMDcyMDI0WiZYLUFtei1FeHBpcmVzPTQzMTk5JlgtQW16LVNlY3VyaXR5LVRva2VuPWV5SmhiR2NpT2lKSVV6VXhNaUlzSW5SNWNDSTZJa3BYVkNKOS5leUpoWTJObGMzTkxaWGtpT2lKQlJERTROalZGVURZMFJ6TXdSMFJSU0VOVk9DSXNJbVY0Y0NJNk1UY3pPVGt3TmpJME55d2ljR0Z5Wlc1MElqb2lZV1J0YVc0aWZRLmp6djBhdEY5QVBYXzVjYWg4c18yeXhVV3oxek9BekFzSVdzemVrUmZwcXlHd0RPWkptazlUSGJRUnBDdVNmLVMyU0otWTI1cldUd2hpNUlrY0xBSThRJlgtQW16LVNpZ25lZEhlYWRlcnM9aG9zdCZ2ZXJzaW9uSWQ9bnVsbCZYLUFtei1TaWduYXR1cmU9MjcxZTkzOTE1MDkwYzUzYmRjYTg0MjQ1MTJhYjk3ZWQxZWMyN2QzM2MwM2U3NGUwYmRhNTBmYjQyNWI0N2MyOQ' } diff --git a/sub/task/enforce.vue b/sub/task/enforce.vue index 5309f33..17ddaa9 100644 --- a/sub/task/enforce.vue +++ b/sub/task/enforce.vue @@ -122,25 +122,27 @@ export default { * @param {Object} e */ async addPhoto(e) { - this.form.photo = e.file.map(p => { - return { + e.file.forEach(p => { + this.form.photo.push({ ...p, status: 'uploading', message: '上传中' - } + }) }) // 使用promise.all()方法上传到后端做统一接收 await Promise.all( this.form.photo.map(async (p, i) => { - const res = await uploadFile({ name: `file`, filePath: p.url }) - return { - ...res.data, - status: 'success', - message: '' + if (p.status == 'uploading') { + const res = await uploadFile({ name: `file`, filePath: p.url }) + return { + ...res.data, + status: 'success', + message: '' + } } + return p }) ).then(res => { - // 一次传三张 this.form.photo = res }) }, From 68c9b17c66d2104d96987efc6f2570c6f6904819 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=88=B1=7E=E6=B5=B7=7E=E7=88=B1=E6=B5=B7=E7=88=B1?= =?UTF-8?q?=E6=B5=B7=7E=E5=8F=B3?= <1828712314@qq.com> Date: Mon, 24 Feb 2025 16:25:25 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dpackage.json?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packjson.json | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 packjson.json diff --git a/packjson.json b/packjson.json new file mode 100644 index 0000000..99cbb21 --- /dev/null +++ b/packjson.json @@ -0,0 +1,9 @@ +{ + "dependencies": { + "crypto-js": "^4.0.0" + }, + "devDependencies": { + "sass": "^1.83.4", + "sass-loader": "^16.0.4" + } +} From a5811139d5c70ff5dab891a3fed20e41b729ef35 Mon Sep 17 00:00:00 2001 From: dx <1242347652@qq.com> Date: Tue, 25 Feb 2025 11:36:03 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E6=89=A7=E6=B3=95=E8=AE=B0=E5=BD=95=20?= =?UTF-8?q?=E6=8C=89=E7=8A=B6=E6=80=81=E6=9F=A5=E8=AF=A2=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sub/task/detail.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sub/task/detail.vue b/sub/task/detail.vue index f6d7b1d..412ae69 100644 --- a/sub/task/detail.vue +++ b/sub/task/detail.vue @@ -113,7 +113,7 @@ :options="getDropdownOption('Inspections_status')" @change=" v => { - querySelect(v, 'Inspections_status') + querySelect(v, 'inspectionsStatus') } " /> @@ -247,7 +247,7 @@ export default { // 查询条件 queryParams: { departmentId: '', - Inspections_status: '', + inspectionsStatus: '', pageSize: 8, pageNo: 1, userId: '' From 4db8c784eb272ea445fcbb20cf5964ae16220605 Mon Sep 17 00:00:00 2001 From: dx <1242347652@qq.com> Date: Tue, 25 Feb 2025 12:00:07 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E6=89=A7=E6=B3=95=E8=AE=B0=E5=BD=95=20?= =?UTF-8?q?=E6=8C=89=E7=8A=B6=E6=80=81=E6=9F=A5=E8=AF=A2=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packjson.json | 9 --------- 1 file changed, 9 deletions(-) delete mode 100644 packjson.json diff --git a/packjson.json b/packjson.json deleted file mode 100644 index 99cbb21..0000000 --- a/packjson.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "dependencies": { - "crypto-js": "^4.0.0" - }, - "devDependencies": { - "sass": "^1.83.4", - "sass-loader": "^16.0.4" - } -}