全部提交先

src/common/globalRouter.js

@@ -23,9 +23,9 @@ routes = $globalRouterModules(routes); // 加载模块路由
 
 const $globalRouter = createRouter({
   // 企业端u
-  history: createWebHashHistory(),
+  // history: createWebHashHistory(),
   // 执法端
-  // history: createWebHistory(),
+  history: createWebHistory(),
   routes,
 });
 

src/views/enforceHome.vue

@@ -1,5 +1,5 @@
 <template>
-  <!--<Loading class="loading-div" type="spinner" v-show="isLoading" color="#1989fa"/>-->
+  <Loading class="loading-div" type="spinner" v-show="isLoading" color="#1989fa"/>
   <div class="home app_content" v-if="!isLoading">
     <!-- <div class="home app_content"> -->
     <!-- 导航栏 -->
@@ -293,11 +293,12 @@ onMounted(() => {
   getSzyptLoginAuth(
     code,
     (success) => {
+      console.log("登录成功: ", success.data);
       useCommon.SET_USER_ID(success.data.userId);
       useCommon.SET_TOKEN(success.data.token);
       useCommon.SET_HAS_LAW(success.data.lawOfficer);
       useCommon.SET_ORG_ID(success.data.bureauDept.deptId);
-      useCommon.SET_HAS_LAW(true);
+      // useCommon.SET_HAS_LAW(true);
       // if (useCommon.firstLoad) {
       isLoading.value = false;
       // }

src/views/enterprise/companyFilter.vue

@@ -8,7 +8,7 @@
         <!-- 弹窗的内容 -->
         <div class="popup-content">
           <div class="subsearch">
-            <input class="searchbox" v-model="searchParam.enterpriseName" placeholder="请输入关键字" />
+            <input class="searchbox" v-model="searchParam.searchValue" placeholder="请输入企业名称/统一信用代码" />
             <van-icon class="ibtn-reset" name="clear" @click="cancel()" title="重置" />
             <button class='btn-search' @click="search()">搜索</button>
           </div>
@@ -51,8 +51,8 @@
         data() {
             return {
                 searchParam: {
-                    //搜索框
-                    enterpriseName: '',
+                    //搜索框（支持企业名称、统一信用代码）
+                    searchValue: '',
                     // 分页
                     pageNum: 1,
                     pageSize: 6,
@@ -69,7 +69,7 @@
         created() {
         },
         watch: {
-            'searchParam.enterpriseName': {
+            'searchParam.searchValue': {
                 handler: function (newValue, oldValue) {
                     // 当person对象的age属性变化时，这个函数会被调用
                     console.log(`age changed from ${oldValue} to ${newValue}`);
@@ -112,7 +112,7 @@
                 this.onRefresh();
             },
             cancel() {
-                this.searchParam.enterpriseName = '';
+                this.searchParam.searchValue = '';
                 this.search()
             },
             selectData(item) {

src/views/enterprise/registrationEdit.vue

@@ -657,10 +657,10 @@ import {showFailToast, showSuccessToast} from 'vant';
                 submitData.lawEnforcement = success.data.dept.deptName;
                 submitData.lawEnforcementId = success.data.dept.deptId;
                 //局级部门
-                // submitData.bureauDeptName = success.data.bureauDept.deptName;
-                // submitData.bureauDeptId = success.data.bureauDept.deptId;
-                submitData.bureauDeptName = '司法局';
-                submitData.bureauDeptId = '20210922212955057-A601-27251E588';
+                submitData.bureauDeptName = success.data.bureauDept.deptName;
+                submitData.bureauDeptId = success.data.bureauDept.deptId;
+                // submitData.bureauDeptName = '司法局';
+                // submitData.bureauDeptId = '20210922212955057-A601-27251E588';
             }
         },error=>{