From 2cff0a6bc76210a2dbf1f1df265eb38b4b32cc55 Mon Sep 17 00:00:00 2001
From: chenrui <1950717904@qq.com>
Date: Tue, 12 Mar 2024 16:40:56 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=A7=E6=B3=95=E7=9B=91=E7=9D=A3=E7=A0=81-?=
 =?UTF-8?q?=E6=89=A7=E6=B3=95=E7=AB=AF=E4=BA=8C=E7=BB=B4=E7=A0=81=E6=89=AB?=
 =?UTF-8?q?=E6=8F=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json                              |   3 +
 src/assets/images/scan.png                | Bin 0 -> 1306 bytes
 src/router/home.js                        |  11 +-
 src/views/enforce/scanPage.vue            | 119 ++++++++++
 src/views/enforce/scanQrCode.vue          | 256 ++++++++++++++++++++++
 src/views/enforceHome.vue                 |  17 +-
 src/views/enterprise/registrationList.vue |   5 +-
 7 files changed, 385 insertions(+), 26 deletions(-)
 create mode 100644 src/assets/images/scan.png
 create mode 100644 src/views/enforce/scanPage.vue

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 0000000000000000000000000000000000000000..9668783ab67db0386a38d3afd1fc8162bd595ac5
GIT binary patch
literal 1306
zcmchX`7_)H7{=f4va!}iHqNEHRU?|(kPsT#3cijwT8juN64%C273)}ybNT8>RU=uM
zBxs32CWyoxYZJ#fB8)R^M#L({wKkDe#Ue6P|AJ1ZGyUOxKQqq{?>zH7GjEo=tK&hU
zHW2_0Iy>2W>=XNY2nY6emsL>zJ`j$Fqb*bqQ6&KKubk~|JQMui-wW~(8LMUJvxBxB
zyPSzf4GJ@&RRoIbM>cdsO|@UKI$fM@EAJSJM!sJwPy1LjB~8u6)2J)!4=0d-#-yxx
zTyZQx9)pU>^uC1%1v1>VaDSTe9`<DgdR`3;1y3ou@MohO0qdhxTuSBB0;xUsIBavK
zaCm*iw~ZgUBN+1)k4biRLk2gZ*z8nu=Gt!&gNCrq-J5Tn7HbnFs<yqQh|k*AL=dI4
z@v4KL=H-+~ku1@H#~bxoe9&z5VvD~>OQQ=sz$$X7Wpk4$jJrS%MT|*y#J!<s2{)hh
zAx;`sbu%tL$_oYlq>R^11TiZ+`Q2PQsXeWTE7@LW>#I~fl8~2L-7?>CEULH91>*L7
zW>V&?%cr|Kf`#W9MECI50TYRb!jP>Orbu-7&s9xxqn%HNlBLTbT#`4EusUT;ReJe*
z)D6{|W<WpGk*BzLknSz2OY+>FvQeZqv2Y7;u$f(H3+~-n*AIgr%u^kQ(OoZPL%Zeu
zN-}uH%(CP`s^xVJihohn)Pv~Z3c5Ua6$&T_mh9lA3l+1^y9qF9T1iAu^`plfV5aDt
z7Xd0y$C&)9(+v#R>a7%9P;g1pimPIoX-cvG<{=-PqKK9$C*ZD@{`I<49;S$K_Gmu!
ziKK>$0j~^zG8(TFMVgi|OO9A+9J2$pPyC8HzQv=N?Pp3Bmh0c@8jEM%Hde`%+0F3v
zA~p(@30NUpWBeOXqxcTp!lSO{O3V5{BpHc&ai5hJ;AJX+|0$OfjN}Lhamk7p&aR(P
z551Dm^j3K^y<~yv1M_hW?f#!bY+G?LI($lpQND)@Tsysr{67i*b9sw&BzmYdlPry4
zRH8J&0VrzO+_~M+Ozt$IJG`D#CUyPM!)UUo&Nh*X_*{qPUw6%}P<xswb0P_AO!s9;
zMBDCY!9?pOk11>^o$^M;yD6&I#8!UUt2Em4B(8|h8=Ij1V30%Qwh6nE)8doFX=8~i
zQ3Yj^HlcV+TNNJKOmB)mm0SAIP;*E(|H}dYNrpMeZeS$LmB+BCdD9X@6&}x7a`R-%
z4#S%AbSQYtDiB6}X8O~Enc8%PVv937gS<%}NU=3$3TsTQ)gO1-RKdU-SwkV>Dr7d>
zBvD<2>z4;<C1rNSoN9}d6WI1m>%mBwa&2E^^;r!L3WlMPS~u{h7Q^V&1MnW0IH|3K
zos9Lp@-<SM-xy-10U`5G#_!+)O(OcgGlah0@Hzv0J8LX=#2fD160*({vF^u4_v_#b
ez4Gp|k4kFCSglNyV!8k9!1=7JeYI`ikADFK=rfD}

literal 0
HcmV?d00001

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 @@
+<template>
+  <div class="scan-page">
+    <!-- 返回导航栏 -->
+    <!-- left-text="取消" -->
+    <van-nav-bar title="扫描二维码/条形码"  left-arrow 
+      fixed class="scan-index-bar" @click-left="clickIndexLeft()"
+    ></van-nav-bar>
+    <!-- 扫码区域 -->
+    <video ref="video" id="video" class="scan-video" autoplay></video>
+    <!-- 提示语 -->
+    <div v-show="tipShow" class="scan-tip">{{ tipMsg }}</div>
+  </div>
+</template>
+ 
+<script>
+import { BrowserMultiFormatReader } from '@zxing/library';
+import { Toast, Dialog, Notify } from 'vant';
+ 
+  export default {
+    name: 'ScanCodePage',  // 扫码页面
+    data() {
+      return {
+        codeReader: null,
+        tipShow: false,  // 是否展示提示
+        tipMsg: '',  // 提示文本内容
+        scanText: '',  // 扫码结果文本内容
+      }
+    },
+    created() {
+      this.openScan();
+    },
+    watch: {
+      '$route'(to, from) {
+        if(to.path == '/ScanCodePage'){  // 当处于该页面时
+          this.openScan();
+        }
+      }
+    },
+    destroyed(){
+      this.codeReader.reset();
+      this.codeReader = null;
+    },
+    methods: {
+      async openScan() {  // 初始化摄像头
+        this.codeReader = await new BrowserMultiFormatReader();
+        this.codeReader.getVideoInputDevices().then(videoDevices => {
+          this.tipMsg = '正在调用摄像头...';
+          this.tipShow = true;
+          console.log('get-videoDevices', videoDevices);
+
+          // 默认获取摄像头列表里的最后一个设备id，通过几部测试机发现一般前置摄像头位于列表里的前面几位，所以一般获取最后一个的是后置摄像头
+          let firstDeviceId = videoDevices[videoDevices.length - 1].deviceId; 
+          // 一般获取了手机的摄像头列表里不止一个，有的手机摄像头高级多层，会有变焦摄像头等情况，需要做处理
+          if (videoDevices.length > 1) {
+            // 一般通过判断摄像头列表项里的 label 字段，'camera2 0, facing back' 字符串含有 'back' 和 '0'，大部分机型是这样，如果有些机型没有，那就还是默认获取最后一个
+            firstDeviceId = videoDevices.find(el => { return el.label.indexOf('back') > -1 && el.label.indexOf('0') > -1 }) ? 
+              videoDevices.find(el => { return el.label.indexOf('back') > -1 && el.label.indexOf('0') > -1 }).deviceId : 
+              videoDevices[videoDevices.length - 1].deviceId;
+          }
+          console.log('get-firstDeviceId', firstDeviceId);
+
+          this.decodeFromInputVideoFunc(firstDeviceId);
+        }).catch(err => {
+          this.tipShow = false;
+          console.error(err);
+        });
+      },
+      decodeFromInputVideoFunc(firstDeviceId) {  // 使用摄像头扫描
+        this.codeReader.reset(); // 重置
+        this.codeReader.decodeFromInputVideoDeviceContinuously(firstDeviceId, 'video', (result, err) => {
+          this.tipMsg = '正在尝试识别...';
+          if (result) {
+            console.log('扫码结果', result);
+            this.scanText = result.text;
+            if (this.scanText) {
+              this.tipShow = false;
+              Dialog.confirm({  // 获取到扫码结果进行弹窗提示，这部分接下去的代码根据需要，读者自行编写了
+                title: '扫码结果',
+                message: this.scanText,
+              }).then(() => {  // 点击确认
+
+              }).catch(() => {  // 点击取消
+
+              });
+            }
+          }
+        });
+      },
+      clickIndexLeft(){  // 返回上一页
+        // this.$destroy();
+        this.$router.go(-1);
+        // window.location.href = document.referrer;
+      }
+    }
+  }
+</script>
+ 
+<style lang="scss">
+.scan-index-bar{
+  background-image: linear-gradient( -45deg, #42a5ff ,#59cfff);
+  .van-nav-bar__title, .van-nav-bar__arrow, .van-nav-bar__text{
+    color: #fff !important;
+  }
+}
+.scan-page{
+  min-height: 100vh;
+  background-color: #363636;
+  overflow-y: hidden;
+  .scan-video{
+    height: 85vh;
+  }
+  .scan-tip{
+    width: 100vw;
+    text-align: center;
+    color: white;
+    font-size: 5vw;
+  }
+}
+</style>
\ 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 @@
+<template>
+	<div class="home app_content">
+		<!-- 导航栏 -->
+		<div class="header_body">
+			<!-- <header-nav :leftArrow="false" titelText="扫码入企"></header-nav> -->
+      <header-nav
+				:slefBack="true"
+				@goBack="goBack"
+				:titelText="`扫码入企`"
+			>
+			</header-nav>
+		</div>
+
+		<!-- 中间 -->
+		<div class="warp_body">
+			<!-- <refresh-list v-model:freshMap="freshMap" @refresh="onRefresh" @onLoad="onLoad"> -->
+				<div class="carousel_box">
+					<div class="box-scan-one">
+              <span class="box-scan-text">扫一扫企业二维码</span>
+            </div>
+            <div class="box-scan-two">
+              <span class="box-scan-text">即可查看企业信息</span>
+            </div>
+				</div>
+				<div class="boutique_box">
+					<!-- <van-cell :border="false" title="精品" /> -->
+					<div class="boutique_body">
+						<!-- <goodsCard :goodsList="boutique" :cardAttr="boutiqueAttr"></goodsCard> -->
+            <div class="box-qr-code" @click="toScanPageView">
+              <img src="../../assets/images/scan.png" />
+              <span class="box-qr-code-text">执法监督码</span>
+            </div>
+					</div>
+				</div>
+				<!-- <div class="recommend_box">
+					<van-cell :border="false" title="推荐" />
+					<div class="recommend_body">
+						<goodsCard :goodsList="recommend"></goodsCard>
+					</div>
+				</div> -->
+			<!-- </refresh-list> -->
+		</div>
+
+		<!-- 底部 -->
+		<!-- <div class="footer_body">
+			<footer-nav></footer-nav>
+		</div> -->
+	</div>
+</template>
+
+<script setup name="Home">
+import {getEnterpriseMerchantAuthorization} from '@/api/Home';
+const { useCommon } = $globalStore;
+const router = useRouter();
+let carouselList = reactive([]); // 轮播列表
+let boutique = reactive([]); // 精品数据
+let recommend = reactive([]); // 推荐
+let freshMap = reactive({
+	refreshLoad: false, // 是否刷新
+	listLoading: false, // 是否加载中
+	listFinished: false, // 是否加载完成标识
+});
+const data = reactive({});
+const boutiqueAttr = reactive({
+	columnNum: 4,
+	itemClass: "boutique_item",
+	goodsCradclass: "boutique-crad",
+}); // 商品卡片展示
+
+//获取轮播
+const getCarousel = async () => {
+	// const res = await useHome.getCarousel();
+	// if (res?.code === 20000) {
+	// 	carouselList = res?.data;
+	// }
+};
+
+//精品
+const boutiqueGoods = async () => {
+	// const res = await useHome.boutiqueGoods();
+	// if (res?.code === 20000) {
+	// 	boutique = res?.data;
+	// }
+};
+
+const toScanPageView = async() =>{
+  router.push({ 
+          path: "/enforce/scanPage",
+          query: {} 
+        });
+};
+
+const toRegistrationListView = async() =>{
+    router.push({ 
+          path: "/enterprise/registrationList",
+    });
+}
+const toComplaintView = async() =>{
+    router.push({ 
+          path: "/enterprise/complaint",
+    });
+}
+
+//下拉刷新
+const onRefresh = () => {
+	freshMap.listFinished = false;
+	freshMap.listLoading = true;
+	freshMap.refreshLoad = true;
+	// Promise.all([getCarousel(), boutiqueGoods(), recommendGoods()]).then(() => {
+	// 	freshMap.refreshLoad = false;
+	// });
+};
+
+// 触底加载
+const onLoad = () => {
+	// recommendGoods(true);
+};
+
+onMounted(() => {
+  getEnterpriseMerchantAuthorization({merchantTel: useCommon.phonenumber},success =>{
+        if(!(success.data == null && success.data.length == 0)){
+          useCommon.SET_USER_ENTERPRISE_NUMBER(success.data[0].enterpriseNumber);
+        } 
+      },error =>{
+   })
+})
+// 返回
+const goBack = () => {
+	router.go(-1);
+};
+</script>
+
+<style lang="less" scoped>
+.home {
+	display: flex;
+	flex-direction: column;
+	height: 100%;
+	overflow: hidden;
+	background-color: #f4f4f4;
+
+	.warp_body {
+    background-color: rgb(163, 156, 156);
+    background-size: cover;
+    position: relative;
+		.carousel_box {
+			height: 150px;
+			width: 100%;
+			padding-bottom: 10px;
+      position: relative;
+      .box-scan-one{
+        position: absolute;
+        top: 30%;
+        left: 15%;
+        font-size: 14px;
+        background-color: beige;
+        height: 100px;
+        width: 30%;
+        .box-scan-text{
+          margin-top: 70%;
+          display: block;
+          font-size: 12px;
+          width: 100%;
+          text-align: center
+        }
+      }
+      .box-scan-two{
+        position: absolute;
+        top: 30%;
+        right: 15%;
+        font-size: 14px;
+        background-color: beige;
+        height: 100px;
+        width: 30%;
+        .box-scan-text{
+          margin-top: 70%;
+          display: block;
+          font-size: 12px;
+          width: 100%;
+          text-align: center
+        }
+      }
+		}
+    
+	}
+
+	.boutique_box {
+      position: absolute;
+      width: 100%;
+      bottom: 30%;
+		.boutique_body {
+			padding: 0px 0px 10px 0px;
+      display: flex;
+      justify-content: center;
+		};
+    .box-qr-code{
+      width: 47%;
+      text-align: right;
+      height: 4.66667rem;
+      background-color: var(--van-primary-color);
+      border-radius: 0.26667rem;
+      // background-size: cover;
+      border-radius: 50%;
+      // background-image: url("@/assets/images/scan.png");
+      .box-qr-code-text{
+        margin-right: 25%;
+        margin-top: 70%;
+        display: block;
+        font-size: 0.45333rem;
+      }
+      img{
+        position: absolute;
+        top: 0%;
+        left: 34%;
+      }
+    }
+    .box-info{
+      width: 52%;
+      text-align: right;
+      height: 3.66667rem;
+      background-color: #ff976a;
+      border-radius: 10px;
+      background: url("@/assets/images/item_check.png");
+      background-size: cover;
+      
+      .box-info-text{
+        margin-right: 3%;
+        margin-top: 2%;
+        display: block;
+        font-size: 17px
+      }
+    }
+    .box-complaint{
+      width: 36%;
+      text-align: right;
+      height: 3.66667rem;
+      background-color: #ff976a;
+      border-radius: 10px;
+      margin-left: 2%;
+      background: url("@/assets/images/item_complain.png");
+      background-size: cover;
+      .box-complaint-text{
+        margin-right: 5%;
+        margin-top: 3%;
+        display: block;
+        font-size: 17px
+      }
+    }
+	}
+
+	.recommend_box {
+		.recommend_body {
+			width: 100%;
+		}
+	}
+}
+</style>
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 @@
 					<!-- <van-cell :border="false" title="精品" /> -->
 					<div class="boutique_body">
 						<!-- <goodsCard :goodsList="boutique" :cardAttr="boutiqueAttr"></goodsCard> -->
-            <div class="box-qr-code" @click="toRegisterView">
+            <div class="box-qr-code" @click="toScanCodeView">
               <span class="box-qr-code-text">扫码入企</span>
             </div>
 					</div>
@@ -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 @@
 			<header-nav
 				:slefBack="true"
 				@goBack="goBack"
-				:titelText="`执法信息`"
+				:titelText="`历史检查信息`"
 			>
 			</header-nav>
 		</div>
     <van-search
     v-model="searchParam.searchText"
     show-action
-    placeholder="请输入执法人员/执法部门"
+    placeholder="请输入关键字查询"
     @search="onSearch"
     >
       <template #action>
@@ -90,7 +90,6 @@
 </template>
 
 <script setup name="registrationList">
-import { showToast } from "vant"; 
 import {queryRegistrationList} from '../../api/enterprise';
 import { setGoodsNum } from "@/util/util";
 const { useCommon, useShopCard } = $globalStore;