Merge remote-tracking branch 'origin/master'

src/components/footer-enforcement-nav/index.vue

@@ -19,9 +19,9 @@
 				to="/enforce/enforcementPlan"
 				>计划</van-tabbar-item
 			>
-			<van-tabbar-item name="My" replace icon="manager-o" to="">{{
+			<!-- <van-tabbar-item name="My" replace icon="manager-o" to="">{{
 				$t("common.lang_my")
-			}}</van-tabbar-item>
+			}}</van-tabbar-item> -->
 		</van-tabbar>
 	</div>
 </template>

src/views/enterprise/enterpriseInspectionList.vue

@@ -170,6 +170,10 @@
         isLodding.value = false;
     });
     const queryList = () => {
+      if(searchParam.enterpriseNumber == '' && searchParam.enterpriseNumber== null){
+        console.log("该用户没有关联企业！");
+        return;
+      }
         queryEnforcementList(searchParam, success => {
             console.log(success)
             for (var i = 0; i < success.data.length; i++) {

src/views/enterprise/registrationList.vue

@@ -180,6 +180,10 @@
         });
     }
     const queryList = () => {
+      if(searchParam.enterpriseNumber == '' && searchParam.enterpriseNumber== null){
+        console.log("该用户没有关联企业！");
+        return;
+      }
         queryRegistrationList(searchParam, success => {
             console.log(success)
             data.dataList = success.data;