Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/router/enforce.js
#	src/views/enforceHome.vue

src/router/enforce.js

@@ -47,6 +47,12 @@ const routes = [
     name: "notExist",
     component: () => import("@/views/notExist.vue"),
   },
+  // 无权限页
+  {
+    path: "/noAccess",
+    name: "noAccess",
+    component: () => import("@/views/noAccess.vue"),
+  },
 ];
 
 export { routes };

src/views/enforce/sign.vue

@@ -151,7 +151,7 @@
         </div>
 
         <Popup :visible="data.popupVisible" :content="data.popupContent" @close="closePopup" @reciveData="reciveData" />
-        <PopupA :visible="data.popupVisible2" :content="data.popupContent2" @close="closePopup" @reciveData="reciveData2" />
+        <Popup :visible="data.popupVisible2" :content="data.popupContent2" @close="closePopup" @reciveData="reciveData2" />
 
 
         <van-popup v-model:show="data.showItem" position="bottom" :style="{ height: '30%' }">

src/views/enforceHome.vue

@@ -58,6 +58,7 @@
     import Vconsolefrom from 'vconsole';
     import {getEnterpriseMerchantAuthorization, getSzyptLoginAuth} from '../api/Home';
     import {queryEnforcementInspectionProgramListNoPermission} from "@/api/enforce";
+
     const {useCommon} = $globalStore;
     const router = useRouter();
     const route = useRoute();
@@ -70,7 +71,6 @@ let freshMap = reactive({
         listFinished: false, // 是否加载完成标识
         key: 0,
     });
-
     const data = reactive({});
     const adviceList = reactive([]);
     const boutiqueAttr = reactive({
@@ -130,7 +130,6 @@ const queryList = () =>{
             } else {
                 carouselList = success.data;
             }
-    freshMap.key = 1
             console.log(carouselList)
         }, error => {
 
@@ -160,6 +159,14 @@ onMounted(() => {
         getSzyptLoginAuth(code, success => {
             console.log(success.data)
             useCommon.SET_USER_ID(success.data.userId);
+
+            // 如果不是执法用户 则跳转
+            if (!success.data.lawOfficer) {
+                router.push(
+                    {
+                        path: "/noAccess"
+                    });
+            }
         }, error => {
 
         })
@@ -186,6 +193,7 @@ onMounted(() => {
             background: url("../assets/images/bg_el.jpg");
             background-size: cover;
             overflow-x: hidden;
+
             .carousel_box {
                 height: 150px;
                 width: 100%;
@@ -199,11 +207,14 @@ onMounted(() => {
             position: absolute;
             width: 100%;
             bottom: 1%;
+
             .boutique_body {
                 padding: 0px 0px 10px 0px;
                 display: flex;
                 justify-content: center;
-		};
+            }
+        ;
+
             .box-qr-code {
                 width: 90%;
                 text-align: right;
@@ -212,12 +223,14 @@ onMounted(() => {
                 border-radius: 10px;
                 background: url("../assets/images/item_scan.png");
                 background-size: cover;
+
                 .box-qr-code-text {
                     margin: 0.35rem 0.5rem 0 0;
                     display: block;
                     font-size: 17px
                 }
             }
+
             .box-info {
                 width: 52%;
                 text-align: right;
@@ -233,6 +246,7 @@ onMounted(() => {
                     font-size: 17px
                 }
             }
+
             .box-complaint {
                 width: 36%;
                 text-align: right;
@@ -242,6 +256,7 @@ onMounted(() => {
                 margin-left: 2%;
                 background: url("../assets/images/item_count.png");
                 background-size: cover;
+
                 .box-complaint-text {
                     margin: 0.35rem 0.5rem 0 0;
                     display: block;
@@ -321,8 +336,14 @@ onMounted(() => {
     }
 
     @keyframes marquee {
-  0% { transform: translateX(0); } /* 动画开始时 */
-  100% { transform: translateX(-100%); } /* 动画结束时，文字完全移动到左侧并重新开始 */
+        0% {
+            transform: translateX(0);
+        }
+        /* 动画开始时 */
+        100% {
+            transform: translateX(-100%);
+        }
+        /* 动画结束时，文字完全移动到左侧并重新开始 */
     }
 
     .noticbox span.new {

src/views/enterprise/registrationEdit.vue

@@ -134,7 +134,7 @@
         </div>
 
         <Popup :visible="data.popupVisible" :content="data.popupContent" @close="closePopup" @reciveData="reciveData" />
-        <PopupA :visible="data.popupVisible2" :content="data.popupContent2" @close="closePopup" @reciveData="reciveData2" />
+        <Popup :visible="data.popupVisible2" :content="data.popupContent2" @close="closePopup" @reciveData="reciveData2" />
 
 
         <van-popup v-model:show="data.showItem" position="bottom" :style="{ height: '30%' }">