From 55d0e1d6a58e4d5e11bb6ef640361ce0c0de1e7d Mon Sep 17 00:00:00 2001 From: chenrui <1950717904@qq.com> Date: Wed, 5 Jun 2024 16:16:35 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E5=9B=BE=E7=89=87=E5=8E=8B?= =?UTF-8?q?=E7=BC=A9=20=E6=89=AB=E7=A0=81=E4=BC=81=E4=B8=9A=E4=B8=8D?= =?UTF-8?q?=E5=AD=98=E5=9C=A8=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package-lock.json | 45 +++++++++++++++++++++++++++++ package.json | 1 + src/api/enterprise.js | 10 +++++++ src/router/enforce.js | 6 ++++ src/util/fileUpload.js | 10 +++---- src/views/enforce/scanPage_szy.vue | 20 ++++++++++--- src/views/enforce/sign.vue | 46 ++++++++++++++++++++++++++++++ src/views/enforceHome.vue | 7 +++-- src/views/notExist.vue | 5 ++++ 9 files changed, 139 insertions(+), 11 deletions(-) create mode 100644 src/views/notExist.vue diff --git a/package-lock.json b/package-lock.json index b0e89ec..c0d52b8 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10,6 +10,7 @@ "dependencies": { "@zxing/library": "^0.20.0", "axios": "^1.6.7", + "compressorjs": "^1.2.1", "core-js": "^3.36.0", "crypto-js": "^4.2.0", "date-fns": "^3.6.0", @@ -4107,6 +4108,11 @@ "integrity": "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==", "peer": true }, + "node_modules/blueimp-canvas-to-blob": { + "version": "3.29.0", + "resolved": "https://registry.npmjs.org/blueimp-canvas-to-blob/-/blueimp-canvas-to-blob-3.29.0.tgz", + "integrity": "sha512-0pcSSGxC0QxT+yVkivxIqW0Y4VlO2XSDPofBAqoJ1qJxgH9eiUDLv50Rixij2cDuEfx4M6DpD9UGZpRhT5Q8qg==" + }, "node_modules/bn.js": { "version": "5.2.1", "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-5.2.1.tgz", @@ -4658,6 +4664,15 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/compressorjs": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/compressorjs/-/compressorjs-1.2.1.tgz", + "integrity": "sha512-+geIjeRnPhQ+LLvvA7wxBQE5ddeLU7pJ3FsKFWirDw6veY3s9iLxAQEw7lXGHnhCJvBujEQWuNnGzZcvCvdkLQ==", + "dependencies": { + "blueimp-canvas-to-blob": "^3.29.0", + "is-blob": "^2.1.0" + } + }, "node_modules/concat-map": { "version": "0.0.1", "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", @@ -6544,6 +6559,17 @@ "node": ">=8" } }, + "node_modules/is-blob": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/is-blob/-/is-blob-2.1.0.tgz", + "integrity": "sha512-SZ/fTft5eUhQM6oF/ZaASFDEdbFVe89Imltn9uZr03wdKMcWNVYSMjQPFtg05QuNkt5l5c135ElvXEQG0rk4tw==", + "engines": { + "node": ">=6" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, "node_modules/is-buffer": { "version": "1.1.6", "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz", @@ -14909,6 +14935,11 @@ "integrity": "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==", "peer": true }, + "blueimp-canvas-to-blob": { + "version": "3.29.0", + "resolved": "https://registry.npmjs.org/blueimp-canvas-to-blob/-/blueimp-canvas-to-blob-3.29.0.tgz", + "integrity": "sha512-0pcSSGxC0QxT+yVkivxIqW0Y4VlO2XSDPofBAqoJ1qJxgH9eiUDLv50Rixij2cDuEfx4M6DpD9UGZpRhT5Q8qg==" + }, "bn.js": { "version": "5.2.1", "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-5.2.1.tgz", @@ -15351,6 +15382,15 @@ "integrity": "sha512-T0+barUSQRTUQASh8bx02dl+DhF54GtIDY13Y3m9oWTklKbb3Wv974meRpeZ3lp1JpLVECWWNHC4vaG2XHXouQ==", "peer": true }, + "compressorjs": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/compressorjs/-/compressorjs-1.2.1.tgz", + "integrity": "sha512-+geIjeRnPhQ+LLvvA7wxBQE5ddeLU7pJ3FsKFWirDw6veY3s9iLxAQEw7lXGHnhCJvBujEQWuNnGzZcvCvdkLQ==", + "requires": { + "blueimp-canvas-to-blob": "^3.29.0", + "is-blob": "^2.1.0" + } + }, "concat-map": { "version": "0.0.1", "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", @@ -16843,6 +16883,11 @@ "binary-extensions": "^2.0.0" } }, + "is-blob": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/is-blob/-/is-blob-2.1.0.tgz", + "integrity": "sha512-SZ/fTft5eUhQM6oF/ZaASFDEdbFVe89Imltn9uZr03wdKMcWNVYSMjQPFtg05QuNkt5l5c135ElvXEQG0rk4tw==" + }, "is-buffer": { "version": "1.1.6", "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz", diff --git a/package.json b/package.json index f3ade1e..aa24dd7 100644 --- a/package.json +++ b/package.json @@ -17,6 +17,7 @@ "dependencies": { "@zxing/library": "^0.20.0", "axios": "^1.6.7", + "compressorjs": "^1.2.1", "core-js": "^3.36.0", "crypto-js": "^4.2.0", "date-fns": "^3.6.0", diff --git a/src/api/enterprise.js b/src/api/enterprise.js index 2eebae6..125fa17 100644 --- a/src/api/enterprise.js +++ b/src/api/enterprise.js @@ -71,3 +71,13 @@ export const queryQZAJList = (enterpriseNumber, success, error) =>_get("/app/xzj * @returns */ export const queryCFAJList = (enterpriseNumber, success, error) =>_get("/app/xzjcjbxx/queryCFAJList/" + enterpriseNumber,null,success, error) +/** + * 查询企业是否存在 + * @param {*} enterpriseNumber 企业统一信用代码 + * @param {*} success + * @param {*} error + * @returns + */ +export const checkIsExists = (enterpriseNumber, success, error) =>_get("/app/enterpriseInformation/checkIsExists/" + enterpriseNumber,null,success, error) + + diff --git a/src/router/enforce.js b/src/router/enforce.js index d75ae57..2e94b3d 100644 --- a/src/router/enforce.js +++ b/src/router/enforce.js @@ -41,6 +41,12 @@ const routes = [ name: "pdfView", component: () => import("@/views/common/pdfvVew.vue"), }, + // 企业不存在提示页面 + { + path: "/notExist", + name: "notExist", + component: () => import("@/views/notExist.vue"), + }, ]; export { routes }; diff --git a/src/util/fileUpload.js b/src/util/fileUpload.js index 08e4b5f..b0a34bb 100644 --- a/src/util/fileUpload.js +++ b/src/util/fileUpload.js @@ -3,13 +3,13 @@ import { baseUrl } from "../config/env"; import axios from 'axios'; const uploadFile = (files,callback) => { - files.status = "uploading"; - files.message = "上传中..."; - files.status = "uploading"; - files.message = "上传中..."; + // files.status = "uploading"; + // files.message = "上传中..."; + // files.status = "uploading"; + // files.message = "上传中..."; // 需要使用 FormData 进行文件上传 let form = new FormData(); - form.append("file", files.file); + form.append("file", files); axios({ method: "post", url: baseUrl+ "/common/upload", diff --git a/src/views/enforce/scanPage_szy.vue b/src/views/enforce/scanPage_szy.vue index 2bc0414..22af336 100644 --- a/src/views/enforce/scanPage_szy.vue +++ b/src/views/enforce/scanPage_szy.vue @@ -17,6 +17,7 @@ import Vconsole from "vconsole"; import { BrowserMultiFormatReader } from "@zxing/library"; import {szyptGetToken} from '../../api/Home'; +import {checkIsExists} from '@/api/enterprise'; import wx from 'weixin-js-sdk'; export default { name: "QrCodeSearch", @@ -81,11 +82,22 @@ export default { // 页面跳转 console.log("=========== 扫码返回 ===========") console.log(res) - this.$router.push({ - path:"/enterpriseScanPreview", - query:{ - enterpriseNumber: res.resultStr + checkIsExists(res,success=>{ + console.log(success.data) + if(success.data){ + this.$router.push({ + path:"/enterpriseScanPreview", + query:{ + enterpriseNumber: res.resultStr + } + }) + }else{ + this.$router.push({ + path:"/notExist", + }) } + },error =>{ + }) }, cancel: (res) => { diff --git a/src/views/enforce/sign.vue b/src/views/enforce/sign.vue index 026f23a..358ef44 100644 --- a/src/views/enforce/sign.vue +++ b/src/views/enforce/sign.vue @@ -114,6 +114,7 @@
(不多于9张)
+