diff --git a/package.json b/package.json index d839dd3..27c1a75 100644 --- a/package.json +++ b/package.json @@ -15,6 +15,7 @@ "docs:preview": "vitepress preview docs" }, "dependencies": { + "@zxing/library": "^0.20.0", "axios": "^1.6.7", "core-js": "^3.36.0", "jsonp": "^0.2.1", @@ -22,10 +23,12 @@ "mitt": "^3.0.1", "pinia": "^2.1.7", "pinia-plugin-persistedstate": "^3.2.1", + "sass": "^1.71.1", "vant": "^4.8.5", "vue": "^3.4.21", "vue-dompurify-html": "^5.0.1", "vue-i18n": "^9.9.1", + "vue-qrcode-reader": "^5.5.3", "vue-router": "^4.3.0" }, "devDependencies": { diff --git a/src/assets/images/scan.png b/src/assets/images/scan.png new file mode 100644 index 0000000..9668783 Binary files /dev/null and b/src/assets/images/scan.png differ diff --git a/src/router/home.js b/src/router/home.js index e512a12..41fa0e1 100644 --- a/src/router/home.js +++ b/src/router/home.js @@ -7,15 +7,6 @@ const routes = [ component: login, meta: {}, }, - //执法端首页 - { - path: "/enforceHome", - name: "enforceHome", - component: () => import("@/views/enforceHome.vue"), - meta: { - isKeepAlive: true, - }, - }, //企业端首页 { path: "/home", @@ -58,7 +49,7 @@ const routes = [ name: "complaint", component: () => import("@/views/enterprise/complaint.vue"), }, - // 在线投诉 + // 执法列表 { path: "/enterprise/enterpriseInspectionList", name: "enterpriseInspectionList", diff --git a/src/views/enforce/scanPage.vue b/src/views/enforce/scanPage.vue new file mode 100644 index 0000000..942a8fc --- /dev/null +++ b/src/views/enforce/scanPage.vue @@ -0,0 +1,119 @@ + + + + + \ No newline at end of file diff --git a/src/views/enforce/scanQrCode.vue b/src/views/enforce/scanQrCode.vue index e69de29..5c8ec85 100644 --- a/src/views/enforce/scanQrCode.vue +++ b/src/views/enforce/scanQrCode.vue @@ -0,0 +1,256 @@ + + + + + diff --git a/src/views/enforceHome.vue b/src/views/enforceHome.vue index 5423584..c57da8a 100644 --- a/src/views/enforceHome.vue +++ b/src/views/enforceHome.vue @@ -15,7 +15,7 @@
-
+
扫码入企
@@ -80,18 +80,9 @@ const boutiqueGoods = async () => { // } }; -const toRegisterView = async() =>{ - console.log(useCommon.phonenumber); - if(useCommon.enterpriseNumber == null && useCommon.enterpriseNumber == ""){ - router.push({ path: "/enterprise/register" }); - }else{ - router.push({ - path: "/enterprise/qrCode", - query: { - enterpriseNumber: useCommon.enterpriseNumber, - } - }); - } +/**扫码入企 */ +const toScanCodeView = async() =>{ + router.push({ path: "/enforce/scanQrCode" }); }; const toRegistrationListView = async() =>{ diff --git a/src/views/enterprise/registrationList.vue b/src/views/enterprise/registrationList.vue index ddf04d4..ae9c70f 100644 --- a/src/views/enterprise/registrationList.vue +++ b/src/views/enterprise/registrationList.vue @@ -6,14 +6,14 @@