未扫码也要先进入企业画像

src/views/enforce/enterpriseScanPreview.vue

@@ -16,7 +16,8 @@
             <div class="white-body">
                 <div class="tabs">
                     <ul>
-          <li v-for='(item,index) in data.list' @click='check(index)' :class="{ active: index === data.TabId }">
+                        <li v-for='(item,index) in data.list' @click='check(index)'
+                            :class="{ active: index === data.TabId }">
                             <span v-if="index === 0"> {{item.title}}</span>
                             <span v-else-if="index === 1 && data.warningInfo.warningLevel ==0" class="warn-tab"> {{item.title}}</span>
                             <span v-else-if="index === 1 && data.warningInfo.warningLevel==1" class="warn-tab level1"> {{item.title}}</span>
@@ -30,7 +31,8 @@
                     <enterpriseBaseInfo :enterpriseNumber="data.enterpriseNumber"></enterpriseBaseInfo>
                 </div>
                 <div v-if="data.TabId == 1">
-          <enterpriseWarningInfo :enterpriseNumber="data.searchParam.enterpriseNumber"></enterpriseWarningInfo>
+                    <enterpriseWarningInfo
+                            :enterpriseNumber="data.searchParam.enterpriseNumber"></enterpriseWarningInfo>
                 </div>
 
             </div>
@@ -40,28 +42,29 @@
 </template>
 
 <script setup name="Home">
-import {getEnterpriseMerchantAuthorization} from '@/api/Home';
+    import {getEnterpriseMerchantAuthorization} from '@/api/Home';
-import {queryEarlyWarning} from '../../api/enforce';
+    import {queryEarlyWarning} from '../../api/enforce';
-import {getEnterpriseInformation} from '../../api/enterprise'
+    import {getEnterpriseInformation} from '../../api/enterprise'
-import enterpriseBaseInfo from './enterpriseBaseInfo.vue'
+    import enterpriseBaseInfo from './enterpriseBaseInfo.vue'
-import enterpriseWarningInfo from './enterpriseWarningInfo.vue'
+    import enterpriseWarningInfo from './enterpriseWarningInfo.vue'
 
-import { Tab, Tabs } from 'vant';
+    import {Tab, Tabs} from 'vant';
-const { useCommon } = $globalStore;
+
-const router = useRouter();
+    const {useCommon} = $globalStore;
-//路由参数
+    const router = useRouter();
-const route = useRoute();
+    //路由参数
-let freshMap = reactive({
+    const route = useRoute();
+    let freshMap = reactive({
         refreshLoad: false, // 是否刷新
         listLoading: false, // 是否加载中
         listFinished: false, // 是否加载完成标识
-});
+    });
-const data = reactive({
+    const data = reactive({
         // enterpriseNumber:"1cc6f476adff430fafb1adde3395509b$42341cb9e4d5b7cf964ff752b2a96d41",
-	enterpriseNumber:route?.query?.enterpriseNumber,
+        enterpriseNumber: route?.query?.enterpriseNumber,
-	warningInfo:{},
+        warningInfo: {},
-	searchParam:{},
+        searchParam: {},
-  status:0,
+        status: 0,
         TabId: 0,
         list: [
             {
@@ -72,101 +75,109 @@ const data = reactive({
                 title: '企业预警',
                 value: '1'
             },
-  ]
+        ],
-});
+        reason: route?.query?.reason,
-const boutiqueAttr = reactive({
+        checkCss: route?.query?.checkCss,
+        isNoScan: route?.query?.isNoScan,
+    });
+    const boutiqueAttr = reactive({
         columnNum: 4,
         itemClass: "boutique_item",
         goodsCradclass: "boutique-crad",
-}); // 商品卡片展示
+    }); // 商品卡片展示
 
-const check = (index) =>{
+    const check = (index) => {
-  console.log("点击切换tab",index);
+        console.log("点击切换tab", index);
         data.TabId = index;
-};
+    };
 
-// 返回首页
+    // 返回首页
-const toEnforceHomeView = () =>{
+    const toEnforceHomeView = () => {
         router.push({
             path: "/enforceHome",
         });
-};
+    };
 
-const toSign = () =>{
+    const toSign = () => {
         router.push({
             path: "/sign",
-          query:{
+            query: {
                 enterpriseNumber: data.enterpriseNumber,
-              isNoScan: false
+                // isNoScan: false,
+
+                reason: data.reason,
+                checkCss: data.checkCss,
+                isNoScan: data.isNoScan,
             }
         });
-};
+    };
 
-const toEnterpriseBaseInfo = async() =>{
+    const toEnterpriseBaseInfo = async () => {
         router.push({
             path: "/enterpriseBaseInfo",
-         query:{
+            query: {
                 enterpriseNumber: data.enterpriseNumber
             }
         });
-};
+    };
 
-const toEnterpriseWarningInfo = async() =>{
+    const toEnterpriseWarningInfo = async () => {
         router.push({
             path: "/enterpriseWarningInfo",
-          query:{
+            query: {
                 enterpriseNumber: data.enterpriseNumber
             }
         });
-};
+    };
 
-const toRegistrationListView = async() =>{
+    const toRegistrationListView = async () => {
         router.push({
             path: "/enterprise/registrationList",
         });
-}
+    }
-const toComplaintView = async() => {
+    const toComplaintView = async () => {
         router.push({
             path: "/enterprise/complaint",
         });
-}
+    }
 
-// 触底加载
+    // 触底加载
-const onLoad = () => {
+    const onLoad = () => {
         // recommendGoods(true);
-};
+    };
 
-onMounted(() => {
+    onMounted(() => {
-  getEnterpriseInformation(data.enterpriseNumber,success =>{
+        getEnterpriseInformation(data.enterpriseNumber, success => {
             if (null != success.data) {
                 console.log(success.data);
                 data.searchParam.enterpriseNumber = success.data.enterpriseNumber;
                 console.log(data.searchParam.enterpriseNumber);
                 //查询企业历史检查案件
-        queryEarlyWarning(data.searchParam,success =>{
+                queryEarlyWarning(data.searchParam, success => {
-            if(success.data.length > 0){
+                    if (success.data.length > 0) {
                         data.warningInfo = success.data[0];
                     }
-          },error =>{})
+                }, error => {
+                })
             }
-      },error=>{
+        }, 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 => {
+        })
     })
-})
+    // 返回
-// 返回
+    const goBack = () => {
-const goBack = () => {
         router.go(-1);
-};
+    };
 </script>
 
 <style lang="less" scoped>
-.home {
+    .home {
         display: flex;
         flex-direction: column;
         height: 100%;
@@ -185,23 +196,23 @@ const goBack = () => {
             background-color: #fff;
             border-radius: 0.27rem;
         }
-}
+    }
 
-.tohome {
+    .tohome {
         position: absolute;
         top: 1.25%;
         right: 5%;
         font-size: 0.5rem;
-}
+    }
 
-.tabs {
+    .tabs {
         padding: 3% 3% 0;
         width: 94%;
         height: 1.25rem;
         box-sizing: content-box;
-}
+    }
 
-.tabs ul {
+    .tabs ul {
         display: flex;
         width: 100%;
         height: 100%;
@@ -210,60 +221,60 @@ const goBack = () => {
         text-align: center;
         align-content: center;
         justify-items: center;
-}
+    }
 
-.tabs ul li {
+    .tabs ul li {
         float: left;
         width: 50%;
         height: 100%;
-}
+    }
 
-.tabs ul li span {
+    .tabs ul li span {
         display: block;
         width: 100%;
         height: 100%;
         color: #4aa1f9;
         background: url("../../assets/images/tab_bg1_1.png") no-repeat;
         background-size: 100% 100%;
-}
+    }
 
-.tabs ul li.active span {
+    .tabs ul li.active span {
         background: url("../../assets/images/tab_bg1.png") no-repeat;
         background-size: 100% 100%;
         color: #fff;
-}
+    }
 
-.tabs ul li span.warn-tab {
+    .tabs ul li span.warn-tab {
         margin-left: -2%;
         background: url("../../assets/images/tab_bg.png") no-repeat;
         background-size: 100% 100%;
-}
+    }
 
-.tabs ul li.active span.warn-tab {
+    .tabs ul li.active span.warn-tab {
         background: url("../../assets/images/tab_bg_1.png") no-repeat;
         background-size: 100% 100%;
         color: #fff;
-}
+    }
 
-.tabs ul li span.level1 {
+    .tabs ul li span.level1 {
         background: url("../../assets/images/tab_shine_red.gif") no-repeat !important;
         background-size: 100% 100% !important;
         color: #fff !important;
-}
+    }
 
-.tabs ul li span.level2 {
+    .tabs ul li span.level2 {
         background: url("../../assets/images/tab_shine_org.gif") no-repeat !important;
         background-size: 100% 100% !important;
         color: #fff !important;
-}
+    }
 
-.tabs ul li span.level3 {
+    .tabs ul li span.level3 {
         background: url("../../assets/images/tab_shine_yel.gif") no-repeat !important;
         background-size: 100% 100% !important;
         color: #fff !important;
-}
+    }
 
-.addinfo {
+    .addinfo {
         position: absolute;
         bottom: 3%;
         right: 2%;
@@ -279,6 +290,6 @@ const goBack = () => {
         vertical-align: middle;
         padding-top: 0.45rem;
         box-sizing: border-box;
-}
+    }
 
 </style>

src/views/enforce/noScan.vue

@@ -117,7 +117,8 @@
             },
             toDetail(item) {
                 this.$router.push({
-                    path: "/sign",
+                    // path: "/sign",
+                    path: "/enterpriseScanPreview",
                     query: {
                         reason: this.reason,
                         checkCss: this.checkCss,

src/views/enforce/scanQrCode.vue

@@ -140,7 +140,8 @@
                         router.push({
                             path: "/enterpriseScanPreview",
                             query: {
-                                enterpriseNumber: res.resultStr
+                                enterpriseNumber: res.resultStr,
+                                isNoScan: false
                             }
                         })
                     } else {

src/views/login.vue

@@ -44,8 +44,8 @@ const onSubmit = async (values) => {
   // userLogin(values,success=>{
   testLogin({"secretName": loginParam.secretName, "secretKey": values.secretKey},success=>{
     console.log(success);
-        router.push({ name: "Home" });
+        // router.push({ name: "Home" });
-        // router.push({ name: "enforceHome" });
+        router.push({ name: "enforceHome" });
         //设置全局变量
         useCommon.SET_USER_PHONENUMBER(success.data.phonenumber.toString());
         useCommon.SET_USER_ID(success.data.userId);