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

@@ -8,10 +8,10 @@
         <!-- 中间 -->
         <div class="warp_body">
             <div class="logobox"></div>
-      <div class="streamer" @click="" >
+            <div class="streamer" @click="">
                 <i></i>
                 <span class="marquee" :key="freshMap.key">
-          <span class="scroll-text"   v-for="(item, index) in carouselList" >{{ item.planName }}</span>
+          <span class="scroll-text" v-for="(item, index) in carouselList">{{ item.planName }}</span>
         </span>
 
             </div>
@@ -58,123 +58,130 @@
     import Vconsolefrom from 'vconsole';
     import {getEnterpriseMerchantAuthorization, getSzyptLoginAuth} from '../api/Home';
     import {queryEnforcementInspectionProgramListNoPermission} from "@/api/enforce";
-const { useCommon } = $globalStore;
+
-const router = useRouter();
+    const {useCommon} = $globalStore;
-const route = useRoute();
+    const router = useRouter();
-var carouselList = reactive([]); // 轮播列表
+    const route = useRoute();
-let boutique = reactive([]); // 精品数据
+    var carouselList = reactive([]); // 轮播列表
-let recommend = reactive([]); // 推荐
+    let boutique = reactive([]); // 精品数据
-let freshMap = reactive({
+    let recommend = reactive([]); // 推荐
+    let freshMap = reactive({
         refreshLoad: false, // 是否刷新
         listLoading: false, // 是否加载中
         listFinished: false, // 是否加载完成标识
         key: 0,
-});
+    });
-
+    const data = reactive({});
-const data = reactive({});
+    const adviceList = reactive([]);
-const adviceList = reactive([]);
+    const boutiqueAttr = reactive({
-const boutiqueAttr = reactive({
         columnNum: 4,
         itemClass: "boutique_item",
         goodsCradclass: "boutique-crad",
-}); // 商品卡片展示
+    }); // 商品卡片展示
 
-//获取轮播
+    //获取轮播
-const getCarousel = async () => {
+    const getCarousel = async () => {
         // const res = await useHome.getCarousel();
         // if (res?.code === 20000) {
         // 	carouselList = res?.data;
         // }
-};
+    };
 
-//精品
+    //精品
-const boutiqueGoods = async () => {
+    const boutiqueGoods = async () => {
         // const res = await useHome.boutiqueGoods();
         // if (res?.code === 20000) {
         // 	boutique = res?.data;
         // }
-};
+    };
 
-/**扫码入企 */
+    /**扫码入企 */
-const toScanCodeView = async() =>{
+    const toScanCodeView = async () => {
-    router.push({ path: "/enforce/scanQrCode" });
+        router.push({path: "/enforce/scanQrCode"});
-};
+    };
 
-const toRegistrationListView = async() =>{
+    const toRegistrationListView = async () => {
         router.push({
             path: "/historyCheck",
         });
-}
+    }
-const toComplaintView = async() =>{
+    const toComplaintView = async () => {
         router.push({
             path: "/enterprise/complaint",
         });
-}
+    }
-const toAnalyseView = async() =>{
+    const toAnalyseView = async () => {
         router.push({
             path: "/analyse",
         });
-}
+    }
-const toNoticeView = async() =>{
+    const toNoticeView = async () => {
         router.push({
             path: "/enforce/enforceNotice",
         });
-}
+    }
-const queryList = () =>{
+    const queryList = () => {
-  queryEnforcementInspectionProgramListNoPermission({},success =>{
+        queryEnforcementInspectionProgramListNoPermission({}, success => {
             console.log(success)
-    if(success.data.length > 4 ){
+            if (success.data.length > 4) {
                 for (let i = 0; i <= 3; i++) {
                     carouselList.push(success.data[i]);
                 }
-    }else{
+            } else {
                 carouselList = success.data;
             }
-    freshMap.key = 1
             console.log(carouselList)
-  },error =>{
+        }, error => {
 
         })
-}
+    }
 
-//下拉刷新
+    //下拉刷新
-const onRefresh = () => {
+    const onRefresh = () => {
         freshMap.listFinished = false;
         freshMap.listLoading = true;
         freshMap.refreshLoad = true;
         // Promise.all([getCarousel(), boutiqueGoods(), recommendGoods()]).then(() => {
         // 	freshMap.refreshLoad = false;
         // });
-};
+    };
 
-// 触底加载
+    // 触底加载
-const onLoad = () => {
+    const onLoad = () => {
         // recommendGoods(true);
-};
+    };
 
-onMounted(() => {
+    onMounted(() => {
         new Vconsolefrom();
         let fullUrl = window.location.href;
-	let code = fullUrl.substring(fullUrl.indexOf('code=')+5, fullUrl.indexOf('&state='));
+        let code = fullUrl.substring(fullUrl.indexOf('code=') + 5, fullUrl.indexOf('&state='));
         // getSzyptLoginAuth(route?.query?.code,success =>{
-	getSzyptLoginAuth(code,success =>{
+        getSzyptLoginAuth(code, success => {
             console.log(success.data)
             useCommon.SET_USER_ID(success.data.userId);
-	},error =>{
+
+            // 如果不是执法用户 则跳转
+            if (!success.data.lawOfficer) {
+                router.push(
+                    {
+                        path: "/noAccess"
+                    });
+            }
+        }, error => {
 
         })
-  getEnterpriseMerchantAuthorization({merchantTel: useCommon.phonenumber},success =>{
+        getEnterpriseMerchantAuthorization({merchantTel: useCommon.phonenumber}, success => {
-        if(!(success.data == null && success.data.length == 0)){
+            if (!(success.data == null && success.data.length == 0)) {
                 useCommon.SET_USER_ENTERPRISE_NUMBER(success.data[0].enterpriseNumber);
             }
-      },error =>{
+        }, error => {
         })
         queryList();
-});
+    });
 </script>
 
 <style lang="less" scoped>
-.home {
+    .home {
         display: flex;
         flex-direction: column;
         height: 100%;
@@ -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,12 +207,15 @@ onMounted(() => {
             position: absolute;
             width: 100%;
             bottom: 1%;
+
             .boutique_body {
                 padding: 0px 0px 10px 0px;
                 display: flex;
                 justify-content: center;
-		};
+            }
-    .box-qr-code{
+        ;
+
+            .box-qr-code {
                 width: 90%;
                 text-align: right;
                 height: 3.66667rem;
@@ -212,13 +223,15 @@ onMounted(() => {
                 border-radius: 10px;
                 background: url("../assets/images/item_scan.png");
                 background-size: cover;
-      .box-qr-code-text{
+
+                .box-qr-code-text {
                     margin: 0.35rem 0.5rem 0 0;
                     display: block;
                     font-size: 17px
                 }
             }
-    .box-info{
+
+            .box-info {
                 width: 52%;
                 text-align: right;
                 height: 3.66667rem;
@@ -227,13 +240,14 @@ onMounted(() => {
                 background: url("../assets/images/item_checkc.png");
                 background-size: cover;
 
-      .box-info-text{
+                .box-info-text {
                     margin: 0.35rem 0.5rem 0 0;
                     display: block;
                     font-size: 17px
                 }
             }
-    .box-complaint{
+
+            .box-complaint {
                 width: 36%;
                 text-align: right;
                 height: 3.66667rem;
@@ -242,7 +256,8 @@ onMounted(() => {
                 margin-left: 2%;
                 background: url("../assets/images/item_count.png");
                 background-size: cover;
-      .box-complaint-text{
+
+                .box-complaint-text {
                     margin: 0.35rem 0.5rem 0 0;
                     display: block;
                     font-size: 17px
@@ -255,10 +270,10 @@ onMounted(() => {
                 width: 100%;
             }
         }
-}
+    }
 
 
-.streamer, .noticbox {
+    .streamer, .noticbox {
         display: flex;
         position: absolute;
         top: calc(1% + 10vh);
@@ -274,9 +289,9 @@ onMounted(() => {
         line-height: 1.0rem;
         white-space: nowrap;
         box-sizing: content-box;
-}
+    }
 
-.noticbox {
+    .noticbox {
         top: 33%;
         right: 0;
         padding: 0 0.2rem;
@@ -285,9 +300,9 @@ onMounted(() => {
         background-color: rgba(249, 238, 219, .7);
         border-radius: 0.5rem 0 0 0.5rem;
         color: #000;
-}
+    }
 
-.streamer > i, .noticbox > i {
+    .streamer > i, .noticbox > i {
         display: inline-block;
         position: relative;
         top: 0.18rem;
@@ -296,36 +311,42 @@ onMounted(() => {
         height: 0.6rem;
         background: url("../assets/images/icon_notice.png") no-repeat;
         background-size: auto 100%;
-}
+    }
 
-.noticbox > i {
+    .noticbox > i {
         top: 0.1rem;
         margin: 0 0.2rem 0 0;
         width: 0.8rem;
         height: 0.8rem;
         background: url("../assets/images/icon_notice3.png") no-repeat;
         background-size: auto 100%;
-}
+    }
 
-.streamer .marquee {
+    .streamer .marquee {
         display: inline-block;
         width: calc(100% - 1rem); /* 或者你想要的宽度 */
         overflow: hidden;
         white-space: nowrap;
-}
+    }
 
-::v-deep .scroll-text {
+    ::v-deep .scroll-text {
         display: inline-block;
         padding-left: 100%; /* 初始时隐藏在右侧 */
         animation: marquee 5s linear infinite; /* 设置动画 */
-}
+    }
 
-@keyframes marquee {
+    @keyframes marquee {
-  0% { transform: translateX(0); } /* 动画开始时 */
+        0% {
-  100% { transform: translateX(-100%); } /* 动画结束时，文字完全移动到左侧并重新开始 */
+            transform: translateX(0);
-}
+        }
+        /* 动画开始时 */
+        100% {
+            transform: translateX(-100%);
+        }
+        /* 动画结束时，文字完全移动到左侧并重新开始 */
+    }
 
-.noticbox span.new {
+    .noticbox span.new {
         display: block;
         position: absolute;
         top: 0.1rem;
@@ -334,9 +355,9 @@ onMounted(() => {
         height: 0.2rem;
         background: #ff1414;
         border-radius: 50%;
-}
+    }
 
-.logobox {
+    .logobox {
         position: relative;
         top: 4%;
         left: 5%;
@@ -345,5 +366,5 @@ onMounted(() => {
         height: 10vh;
         background: url("../assets/images/logo.png") no-repeat;
         background-size: 100% auto;
-}
+    }
 </style>

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%' }">