Merge branch 'gaoqucodecheck' of...

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

src/_shanghu_home.html

@@ -30,14 +30,14 @@
 						<van-col span="6">未整改:{{merInformation.hiddenNoReCount}}</van-col>
 					</van-row>
 					<van-row>
-						<van-col span="24">{{merInformation.businessAddress}}-6</van-col>
+						<van-col span="24">{{merInformation.businessAddress}}</van-col>
 					</van-row>
 
 				</div>
 
 			</div>
 			<!-- 功能 -->
-			<button type="info" class="func_btn" @click="navTo('check_info')"><span>+</span>安全检查</button>
+			<button type="info" v-show="UserPermission" class="func_btn" @click="navTo('check_info')"><span>+</span>安全检查</button>
 
 			<!-- Tab栏 -->
 			<van-tabs v-model:active="activeTab" @click="clickTab" title-active-color="#1989fa" line-height="2px"

src/_shanghu_home.js

@@ -57,7 +57,8 @@ window.addEventListener("load", function () {
 
 				},
 				jcLisk: [{ // 新增检查列表数据
-				}]
+				}],
+				UserPermission: false, // 用户是否具有安全检查权限
 			}
 		},
 		created() {
@@ -126,7 +127,7 @@ window.addEventListener("load", function () {
 				if (type === 'YH_XQ') {
 					params = {
 						...params,
-						flag: item.rectificationStatusName,
+						flag: item.rectificationStatus,
 					}
 				} else {
 					params = {
@@ -134,7 +135,7 @@ window.addEventListener("load", function () {
 						flag: 'JC_XQ',
 					}
 				}
-				let url = gemhoUtil.setParameter('_check_info.html', param)
+				let url = gemhoUtil.setParameter('_check_info.html', params)
 				gemhoUtil.navigatePage(url, '跳转中...')
 			},
 			//获取商户统计信息
@@ -312,7 +313,58 @@ window.addEventListener("load", function () {
 						}
 					)
 				}, 0)
+			},
+			//获取用户是否有安全检查的权限
+			getUserPermission() {
+				setTimeout(() => {
+					http2.post(
+						{
+							serviceId: API_KEY_MAP['page']['id'],
+							interfacePublicKey: API_KEY_MAP['page']['publicKey'],
+							interfacePrivateKey: API_KEY_MAP['page']['privateKey'],
+							reqParams: {
+								sign: 13,
+								merId: this.merId,
+								pageNum: this.page++, // 每次请求增加下一页
+								pageSize: this.size,
+								sort: 'lawId,desc',
+							},
+						},
+						(res) => {
+							if (!res) {
+								// 中台返回为undefined 重新请求
+								vant.Toast.clear()
+								this.page = this.page - 1 // 重新请求后，分页数恢复上一次请求的值
+								setTimeout(() => {
+									// this.getList()
+								}, 0)
+								return
 							}
+							if (res) {
+								var result = JSON.parse(res)
+								if (result.code !== 200 && result.data == null) {
+									return
+								}
+								this.UserPermission = result.rows.length > 0 ? true : false
+								if (this.page * this.size >= this.total) {
+									this.finished = true // 下滑不在刷新数据
+								}
+							}
+							this.loading = false
+							setTimeout(() => {
+								this.$nextTick(() => {
+									vant.Toast.clear()
+								})
+							}, 0)
+							this.$nextTick(() => {
+								// 滚动条跳转位置
+								window.scrollTo(0, gemhoUtil.getCookie('scrollPosition'))
+							})
+						}
+					)
+				}, 0)
+			}
+
 		}
 	});
 

src/_yh-check.html

@@ -57,7 +57,7 @@
 								</van-tag>
 								<span
 									style="color: #737373; font-size: 0.28rem;margin-left: -1.6rem;">检查时间：{{ item.checkDate }}</span>
-								<van-icon name="arrow" class="navToBtn" @click="viewDetail(item.id)" />
+								<van-icon name="arrow" class="navToBtn" @click="viewDetail(item)" />
 							</div>
 				
 							<!-- 第三行：商家和箭头 -->

src/_yh-check.js

@@ -49,11 +49,10 @@ window.addEventListener('load', function () {
         }
         return types[status] || ''
       },
-      viewDetail(id) {
-        console.log('查看详情:', id)
+      viewDetail(item) {
         let param = {
-          id: id,
-          flag: 'YH_XQ',
+          id: item.id,
+          flag: item.rectificationStatus,
           pageName: '_yh_check',
         }
         let url = gemhoUtil.setParameter('_check_info.html', param)