Merge branch 'gaoqucodecheck' of...

Merge branch 'gaoqucodecheck' of http://h.gemho.cn:7099/zhaojunbao/gaoquyingjih5-asd into gaoqucodecheck

home.js

@@ -44,7 +44,7 @@ window.onload = function () {
           deptId: '1', // 登录用户部门id
           deptName: '部门1', // 登录用户部门name
           role: 'dudao',
-          roleName: '督导',
+          roleName: '',
         },
         // 登录用户type
         defaultMenuList: [

sdk/axios_http.js

@@ -10,7 +10,7 @@ axios.defaults.headers.post['Content-Type'] = 'application/json'
 // axios.defaults.headers.common['Authorization'] = gemhoUtil.getCookie('token')
 // 商户token
 axios.defaults.headers.common['Authorization'] =
-  'Bearer eyJhbGciOiJIUzUxMiJ9.eyJzdWIiOiLlvKDlrZ3lvakiLCJsb2dpbl91c2VyX2tleSI6IjNjMmRiMWFiLWIyZGMtNDBjYi04YjM5LWRiNTJmM2VmYzNkYyJ9.sfZyPP-COShNCjwxKR26zGDsPHXss97gu7JEpaMapIZyMQEsxzMigVickcqdhaqDwTRcfr0IxAj64vnrriS9Cw'
+  'Bearer eyJhbGciOiJIUzUxMiJ9.eyJzdWIiOiLlvKDlrZ3lvakiLCJsb2dpbl91c2VyX2tleSI6ImYzZDMwY2Q4LWY5ODAtNGE0NC1iNzE1LTZiMTJlNGQyZTQ1OCJ9.HjtdJuJS7NjTw4GMaAtDtOeA2EnF75pXVQefzwkdrxQdxyHB6L8h0XhKSB5A_YMsznQMd4DZrGZ5TPEmc1fueg'
 
 // admin账号token
 // axios.defaults.headers.common['Authorization'] =

src/_checkrecord.html

@@ -59,7 +59,7 @@
 
 						<!-- 第二行：状态和时间 -->
 						<div style="display: flex; justify-content: start; gap: .34rem; margin: 8px 0;">
-							<span style="color: #737373; font-size: 0.28rem;">检查时间：{{ item.checkTime }}</span>
+							<span style="color: #737373; font-size: 0.28rem;">检查时间：{{ item.checkDate }}</span>
 						</div>
 						<!-- 第三行：商家和箭头 -->
 						<div style="display: flex; justify-content: start; gap: .4rem; align-items: center;">

src/_shanghu_list.js

@@ -23,13 +23,13 @@ window.addEventListener('load', function () {
     methods: {
       onSearch() {
         console.log('xxxx', this.merName)
-		this.getList()
-		
+        this.getList()
+
       },
       viewDetail(itme) {
         let param = {
           merId: itme.id,
-          merName: itme.merName,
+          unitName: itme.unitName,
           smallPlaceTypeName: itme.smallPlaceTypeName,
           pageName: '_shanghu_list',
         }
@@ -45,15 +45,15 @@ window.addEventListener('load', function () {
         setTimeout(() => {
           http2.post(
             {
-              serviceId: API_KEY_MAP['page']['id'],
-              interfacePublicKey: API_KEY_MAP['page']['publicKey'],
-              interfacePrivateKey: API_KEY_MAP['page']['privateKey'],
+              serviceId: API_KEY_MAP['no-page']['id'],
+              interfacePublicKey: API_KEY_MAP['no-page']['publicKey'],
+              interfacePrivateKey: API_KEY_MAP['no-page']['privateKey'],
               reqParams: {
                 sign: 10,
                 pageNum: this.page++, // 每次请求增加下一页
                 pageSize: this.size,
                 sort: 'lawId,desc',
-				merName: this.merName || '',
+                merName: this.merName || '',
               },
             },
             (res) => {

src/_yh-check.html

@@ -29,10 +29,10 @@
 				<van-tabs v-model:active="activeTab" title-active-color="#1989fa" line-height="2px"
 					style="margin-bottom: 15px;">
 					<van-tab title="全部" name=""></van-tab>
-					<van-tab title="待审核"  name="2"></van-tab>
-					<van-tab title="待整改"  name="0"></van-tab>
-					<van-tab title="已整改"  name="1"></van-tab>
-					<van-tab title="整改逾期"  name="3"></van-tab>
+					<van-tab title="待审核" ></van-tab>
+					<van-tab title="待整改" ></van-tab>
+					<van-tab title="已整改"  ></van-tab>
+					<van-tab title="整改逾期"  ></van-tab>
 				</van-tabs>
 
 				<!-- 隐患列表 -->

src/_yh-check.js

@@ -11,7 +11,7 @@ window.addEventListener('load', function () {
           // 更多示例数据...
         ],
         activeTab: '',
-        merId: null,
+        merId: '',
       }
     },
     computed: {
@@ -25,7 +25,12 @@ window.addEventListener('load', function () {
       },
     },
     created() {
-      this.merId = gemhoUtil.getParameter('merId')
+      let merId = gemhoUtil.getParameter('merId')
+      if (merId !== undefined && merId !== null) {
+        this.merId = merId
+      } else {
+        this.merId = ''
+      }
       this.init()
     },
     methods: {
@@ -83,7 +88,7 @@ window.addEventListener('load', function () {
               interfacePrivateKey: API_KEY_MAP['page']['privateKey'],
               reqParams: {
                 sign: 3,
-                merId: this.merId ? this.merId : '',
+                // merId: this.merId ? this.merId : '',
                 status: this.activeTab,
                 pageNum: this.page++, // 每次请求增加下一页
                 pageSize: this.size,