Commit 1da982be authored by xinzhedeai's avatar xinzhedeai

fix: 特种作业、检查单详情、隐患详情 苹果机下添加返回按钮

parent 957bca6d
...@@ -186,6 +186,7 @@ window.onload = function() { ...@@ -186,6 +186,7 @@ window.onload = function() {
roleName: result.data.roleDeptNameVo?.roleName, roleName: result.data.roleDeptNameVo?.roleName,
merId: result.data.merchantInfoNumVo?.id, // merId: result.data.merchantInfoNumVo?.id, //
} }
gemhoUtil.setCookie('merId', this.userInfo.merId || '')
gemhoUtil.setCookie('userType', this.userInfo.userType) gemhoUtil.setCookie('userType', this.userInfo.userType)
if (gemhoUtil.isShop()) { // 2025年5月14日新增消费者逻辑 if (gemhoUtil.isShop()) { // 2025年5月14日新增消费者逻辑
this.showOrg = false //是否显示组织 this.showOrg = false //是否显示组织
...@@ -200,6 +201,7 @@ window.onload = function() { ...@@ -200,6 +201,7 @@ window.onload = function() {
console.log('菜单', result.data.modules) console.log('菜单', result.data.modules)
// 生成最终菜单列表 // 生成最终菜单列表
this.menuList = result.data.modules this.menuList = result.data.modules
resolve(); resolve();
} }
}) })
......
...@@ -61,9 +61,10 @@ if (window.env == 'dev') { ...@@ -61,9 +61,10 @@ if (window.env == 'dev') {
// 消费者 // 消费者
// 'Bearer eyJhbGciOiJIUzUxMiJ9.eyJzdWIiOiLmtojotLnogIUiLCJsb2dpbl91c2VyX2tleSI6ImExNWIwMDNjLWRlYWItNGU2MC04ODg4LTJiODNjMzVkNDUzNSJ9.l6gHzFX-U5rKGJ7zoDA4jMBIxkhVgCjWr5ynFg1DR6xspM9Ls6raTxyEo2Kr61UbG2UD6P2kN63vF_U8nX8afg' // 'Bearer eyJhbGciOiJIUzUxMiJ9.eyJzdWIiOiLmtojotLnogIUiLCJsb2dpbl91c2VyX2tleSI6ImExNWIwMDNjLWRlYWItNGU2MC04ODg4LTJiODNjMzVkNDUzNSJ9.l6gHzFX-U5rKGJ7zoDA4jMBIxkhVgCjWr5ynFg1DR6xspM9Ls6raTxyEo2Kr61UbG2UD6P2kN63vF_U8nX8afg'
// 商户 // 商户
// 'Bearer eyJhbGciOiJIUzUxMiJ9.eyJzdWIiOiIxNTcyMTAzMTg4NiIsImxvZ2luX3VzZXJfa2V5IjoiNGJjY2JjYzUtNmY0Yy00ZDhlLWJiYzEtZjYzMzVlZDBlZTgwIn0.j3jEfHzeu3kklm60kKCirwwyKaWD51ABicOzxEnuFOfGe63FFqYOQ122ojAhukbInnKj4try3DjrST6wNDVjVQ' // 'Bearer eyJhbGciOiJIUzUxMiJ9.eyJzdWIiOiIxMzU2MzIxNDU2MCIsImxvZ2luX3VzZXJfa2V5IjoiN2Q0NTk1MmMtMjcwOS00YjVjLTljMzUtMGU0YmU3MmRmZTZiIn0.XfGJSpbN1hGppugFOYUVnmdWAJ7nDy9fM8BKBKq6C4yHG5jiC2eSdMSjD1g16D_2sCgutTY5naOwOCX9uaOAfQ'
// 管理员 线上 // 管理员 线上
// 'Bearer eyJhbGciOiJIUzUxMiJ9.eyJzdWIiOiJhZG1pbiIsImxvZ2luX3VzZXJfa2V5IjoiYzAzNmUxMmEtNDJhZC00NWJjLWIxZDEtMTJjYjAwMmMyMDU2In0.d4F0vHq6oGkiC262QtMk9t11ZyYnrRumyBCyJLgmli0ZrUgD_GyQhJa-UWrQ60EVetcAvGqGAARzvkN8ffYSJA' // 'Bearer eyJhbGciOiJIUzUxMiJ9.eyJzdWIiOiJhZG1pbiIsImxvZ2luX3VzZXJfa2V5IjoiYzAzNmUxMmEtNDJhZC00NWJjLWIxZDEtMTJjYjAwMmMyMDU2In0.d4F0vHq6oGkiC262QtMk9t11ZyYnrRumyBCyJLgmli0ZrUgD_GyQhJa-UWrQ60EVetcAvGqGAARzvkN8ffYSJA'
// 管理员 本地
'Bearer eyJhbGciOiJIUzUxMiJ9.eyJzdWIiOiJhZG1pbiIsImxvZ2luX3VzZXJfa2V5IjoiNGM5OTg5MmMtMDUyYi00NWI1LTgxNGYtNmZhZGViYjExOGU0In0.afqF0DRVMJF9lVrJtZYVQ0mb_AFSO0cLjeQw_g-hHaihsphrtWRM2Ot7qyS6cVXywS1AsxNTBxi2kSfMsA0fuw' 'Bearer eyJhbGciOiJIUzUxMiJ9.eyJzdWIiOiJhZG1pbiIsImxvZ2luX3VzZXJfa2V5IjoiNGM5OTg5MmMtMDUyYi00NWI1LTgxNGYtNmZhZGViYjExOGU0In0.afqF0DRVMJF9lVrJtZYVQ0mb_AFSO0cLjeQw_g-hHaihsphrtWRM2Ot7qyS6cVXywS1AsxNTBxi2kSfMsA0fuw'
// 街道 // 街道
// 'Bearer eyJhbGciOiJIUzUxMiJ9.eyJzdWIiOiJqaWVkYW8iLCJsb2dpbl91c2VyX2tleSI6ImNjNjRkMmZhLWQzNmItNGRkZi05MjcxLTliYTA0ZDJkYzM4NiJ9.G2BAs3XnlqR6QgDRWDfXkOpdLYhFdqEaTxvE8GxLAgU8vcsHPEKdhQ4VvOwsiNAtIaUpMDXirOb-FrHVNvZo4g' // 'Bearer eyJhbGciOiJIUzUxMiJ9.eyJzdWIiOiJqaWVkYW8iLCJsb2dpbl91c2VyX2tleSI6ImNjNjRkMmZhLWQzNmItNGRkZi05MjcxLTliYTA0ZDJkYzM4NiJ9.G2BAs3XnlqR6QgDRWDfXkOpdLYhFdqEaTxvE8GxLAgU8vcsHPEKdhQ4VvOwsiNAtIaUpMDXirOb-FrHVNvZo4g'
......
...@@ -565,3 +565,18 @@ body { ...@@ -565,3 +565,18 @@ body {
margin-bottom: 0.15rem; margin-bottom: 0.15rem;
flex-wrap: wrap; flex-wrap: wrap;
} }
/* 在现有样式中添加以下CSS */
.float-read-btn {
position: fixed; /* 固定定位 */
right: 0.3rem; /* 右侧距离 */
bottom: 2.3rem; /* 底部距离 */
z-index: 999; /* 层级保证不被遮挡 */
cursor: pointer; /* 手型光标 */
}
.float-read-btn .btn-text {
font-size: 0.28rem; /* 文字大小 */
color: #FFFFFF; /* 文字颜色 */
line-height: 1.2; /* 行高 */
}
\ No newline at end of file
...@@ -415,6 +415,9 @@ ...@@ -415,6 +415,9 @@
</div> </div>
</div> </div>
</div> </div>
<div class="float-read-btn" @click="goback4ios" v-if="iosFlag">
<img src="../image/code/back.png" style="width: .9rem;" />
</div>
</div> </div>
</body> </body>
......
...@@ -104,7 +104,8 @@ window.onload = function () { ...@@ -104,7 +104,8 @@ window.onload = function () {
}, },
recordList: [], recordList: [],
checkDeptName: '' // 检查单位 checkDeptName: '' ,// 检查单位
iosFlag: gemhoUtil.isIOSStrict()
}, },
mounted() { mounted() {
/** /**
...@@ -213,6 +214,15 @@ window.onload = function () { ...@@ -213,6 +214,15 @@ window.onload = function () {
// } // }
// }) // })
// }, // },
goback4ios() { // 全部标记为已读
let params = {
merId: gemhoUtil.getCookie('merId') || '',
}
// 这里添加跳转逻辑
var pageUrl = `${this.pageName}.html`
let url = gemhoUtil.setParameter(pageUrl, params)
gemhoUtil.navigatePage(url, '跳转中...')
},
showImage4camera(list, index) { showImage4camera(list, index) {
const images = list.map((item) => { const images = list.map((item) => {
return this.previewUrl + item return this.previewUrl + item
......
...@@ -380,4 +380,20 @@ iframe{ ...@@ -380,4 +380,20 @@ iframe{
overflow-y: auto; /* 关键:自动显示滚动条 */ overflow-y: auto; /* 关键:自动显示滚动条 */
overflow-x: hidden; overflow-x: hidden;
/* padding: 0.3rem */ /* padding: 0.3rem */
}
/* 在现有样式中添加以下CSS */
.float-read-btn {
position: fixed; /* 固定定位 */
right: 0.3rem; /* 右侧距离 */
bottom: 0.3rem; /* 底部距离 */
z-index: 999; /* 层级保证不被遮挡 */
cursor: pointer; /* 手型光标 */
}
.float-read-btn .btn-text {
font-size: 0.28rem; /* 文字大小 */
color: #FFFFFF; /* 文字颜色 */
line-height: 1.2; /* 行高 */
} }
\ No newline at end of file
...@@ -151,6 +151,9 @@ ...@@ -151,6 +151,9 @@
</van-popup> </van-popup>
</div> </div>
<div class="float-read-btn" @click="goback4ios" v-if="iosFlag">
<img src="../image/code/back.png" style="width: .9rem;" />
</div>
</body> </body>
</html> </html>
\ No newline at end of file
...@@ -38,6 +38,7 @@ window.addEventListener("load", function () { ...@@ -38,6 +38,7 @@ window.addEventListener("load", function () {
}, },
id: '', id: '',
errorReqCount: 0, errorReqCount: 0,
iosFlag: gemhoUtil.isIOSStrict()
} }
}, },
created() { created() {
...@@ -55,7 +56,15 @@ window.addEventListener("load", function () { ...@@ -55,7 +56,15 @@ window.addEventListener("load", function () {
this.getDict4tab1() this.getDict4tab1()
}, },
methods: { methods: {
goback4ios() { // 全部标记为已读
let params = {
merId: gemhoUtil.getCookie('merId') || '',
}
// 这里添加跳转逻辑
var pageUrl = '_tezhongzuoye.html' // 安全培训详情页面
let url = gemhoUtil.setParameter(pageUrl, params)
gemhoUtil.navigatePage(url, '跳转中...')
},
getShopInfo() { getShopInfo() {
vant.Toast.loading({ vant.Toast.loading({
message: '正在加载...', message: '正在加载...',
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment