Skip to content

G
GaoQuYingJiH5-ASD
Commit 61bdd9b3 authored by xinzhedeai's avatar xinzhedeai
Browse files
Options

fix conifg

parents fa3586f1 cd142201
Show whitespace changes
Inline Side-by-side
Showing with 273 additions and 107 deletions
index.html
View file @ 61bdd9b3
...@@ -33,12 +33,7 @@ ...@@ -33,12 +33,7 @@
type="text/javascript" type="text/javascript"
src="sdk/jssdk2/index.js" src="sdk/jssdk2/index.js"
></script> --> ></script> -->
<script type="text/javascript">
gemhoUtil.setCookie(
'token',
'Bearer eyJhbGciOiJIUzUxMiJ9.eyJzdWIiOiJhZG1pbiIsImxvZ2luX3VzZXJfa2V5IjoiMTU4YjM0M2MtNTFmMS00ZDYzLTk0ZWUtNzcxZWRkYTAxMjFmIn0.ehBDVx2ldKNypKcQ4Vnzzii7Dy9El8gRBRQ1Fs_Lq0tkp-zCxSHoEesF5YsWD5weKSaYdAYj_3gXQk-P832QrA'
) // 存储1天后过期
</script>
<div <div
id="app" id="app"
class="page_wrapper" class="page_wrapper"
...@@ -46,7 +41,7 @@ ...@@ -46,7 +41,7 @@
<!-- 第二层：商户图标、名称、等级、场所类型和地址 --> <!-- 第二层：商户图标、名称、等级、场所类型和地址 -->
<div <div
class="second-layer second-layer-zf" class="second-layer second-layer-zf"
v-if="userInfo.userType!=='sj'" v-if="userInfo.userType!=='shop'"
> >
<img <img
class="merchant-icon" class="merchant-icon"
...@@ -68,7 +63,7 @@ ...@@ -68,7 +63,7 @@
<!-- 第二层：商户图标、名称、等级、场所类型和地址 --> <!-- 第二层：商户图标、名称、等级、场所类型和地址 -->
<div <div
class="second-layer-sj" class="second-layer-sj"
v-if="userInfo.userType=='sj'" v-if="userInfo.userType=='shop'"
> >
<div class="header"> <div class="header">
<span>商家信息</span> <span>商家信息</span>
......
index.js
View file @ 61bdd9b3
...@@ -64,7 +64,7 @@ window.onload = function () { ...@@ -64,7 +64,7 @@ window.onload = function () {
className: 'yinhuan', className: 'yinhuan',
title: '隐患审核', title: '隐患审核',
remark: '', remark: '',
navTo: 'yinhuanshenhe', navTo: 'yh-check',
}, },
{ {
className: 'yinhuan', className: 'yinhuan',
...@@ -96,6 +96,7 @@ window.onload = function () { ...@@ -96,6 +96,7 @@ window.onload = function () {
}, },
page: 1, // 页码 page: 1, // 页码
size: 10, // 每页显示的数量 size: 10, // 每页显示的数量
accessType: 'manage', // 访问类型 shop商家 saoma 扫码 manage 管理
} }
}, },
mounted() { mounted() {
...@@ -126,8 +127,16 @@ window.onload = function () { ...@@ -126,8 +127,16 @@ window.onload = function () {
this.userInfo.userType === 'shop' this.userInfo.userType === 'shop'
? (toData = 'checkrecord') ? (toData = 'checkrecord')
: (toData = 'shanghu_list') : (toData = 'shanghu_list')
let param = {
gemhoUtil.navigatePage(`src/_${toData}.html`) // id: itme.id,
// unitName: itme.unitName,
// smallPlaceTypeName: itme.smallPlaceTypeName,
// pageName: '_shanghu_list',
accessType: this.accessType,
}
let url = gemhoUtil.setParameter(`_${toData}.html`, param)
gemhoUtil.navigatePage(url, '跳转中...')
// gemhoUtil.navigatePage(`src/_${toData}.html`)
} }
}, },
navTo(url) { navTo(url) {
...@@ -170,9 +179,7 @@ window.onload = function () { ...@@ -170,9 +179,7 @@ window.onload = function () {
loadingType: 'spinner', loadingType: 'spinner',
}) })
setTimeout(() => { setTimeout(() => {
// http2.post( http2.post(
http.post(
'/gq/asd/common',
{ {
serviceId: API_KEY_MAP['no-page']['id'], serviceId: API_KEY_MAP['no-page']['id'],
interfacePublicKey: API_KEY_MAP['no-page']['publicKey'], interfacePublicKey: API_KEY_MAP['no-page']['publicKey'],
...@@ -251,9 +258,7 @@ window.onload = function () { ...@@ -251,9 +258,7 @@ window.onload = function () {
loadingType: 'spinner', loadingType: 'spinner',
}) })
setTimeout(() => { setTimeout(() => {
// http2.post( http2.post(
http.post(
'/gq/asd/common',
{ {
serviceId: API_KEY_MAP['no-page']['id'], serviceId: API_KEY_MAP['no-page']['id'],
interfacePublicKey: API_KEY_MAP['no-page']['publicKey'], interfacePublicKey: API_KEY_MAP['no-page']['publicKey'],
......
sdk/axios_http.js 0 → 100644
View file @ 61bdd9b3
/** axios封装
* 请求拦截、相应拦截、错误统一处理
*/
// 环境的切换
axios.defaults.baseURL = 'http://192.168.2.37:8080'
axios.defaults.timeout = 50000
// post请求头
// axios.defaults.headers.post['Content-Type'] = 'application/x-www-form-urlencoded;charset=UTF-8'
axios.defaults.headers.post['Content-Type'] = 'application/json'
// axios.defaults.headers.common['Authorization'] = gemhoUtil.getCookie('token')
axios.defaults.headers.common['Authorization'] =
'Bearer eyJhbGciOiJIUzUxMiJ9.eyJzdWIiOiLlvKDlrZ3lvakiLCJsb2dpbl91c2VyX2tleSI6IjNjMmRiMWFiLWIyZGMtNDBjYi04YjM5LWRiNTJmM2VmYzNkYyJ9.sfZyPP-COShNCjwxKR26zGDsPHXss97gu7JEpaMapIZyMQEsxzMigVickcqdhaqDwTRcfr0IxAj64vnrriS9Cw'
// 请求拦截器
axios.interceptors.request.use((config) => {
vant.Toast.loading({
message: '加载中...',
forbidClick: true,
loadingType: 'spinner',
})
return config
})
// 响应拦截器
axios.interceptors.response.use(
(res) => {
// 成功的响应数据 服务器的相关的数据返回来之后，响应拦截器能够检测到，可以做一些事
vant.Toast.clear()
return res
},
(error) => {
// 响应失败的时候的回调函数
return Promise.reject(new Error(error))
}
)
var http2 = {
get: function (url, params) {
return new Promise((resolve, reject) => {
axios
.get(url, {
params: params,
})
.then((res) => {
resolve(res.data)
})
.catch((err) => {
reject(err.data)
})
})
},
post: function (
{ serviceId, interfacePublicKey, interfacePrivateKey, reqParams },
fn
) {
return new Promise((resolve, reject) => {
axios
.post('/gq/asd/common', {
serviceId,
interfacePublicKey,
interfacePrivateKey,
reqParams,
})
.then((res) => {
// res.data = JSON.parse(res.data)
let response = res.data.data
if (response.statusCode >= 300 || response.status >= 300) {
vant.Dialog.alert({
title: '信息提示',
message: response.message,
})
// 保持与http2.post相同的错误处理逻辑
typeof fn === 'function' && fn(null)
reject(response)
return
}
typeof fn === 'function' && fn(response)
resolve(response)
})
.catch((err) => {
reject(err.response?.data || err.message)
})
})
},
postFile: function (url, params) {
return new Promise((resolve, reject) => {
axios({
url,
method: 'post',
data: params,
headers: {
'Content-Type': 'application/json', // 'multipart/form-data;',
Authorization: localStorage.getItem('Authorization'),
},
})
.then((res) => {
let response = res.data
if (response.statusCode >= 300 || response.status >= 300) {
// alert('系统发生错误')
vant.Dialog.alert({
title: '信息提示',
message: response.message,
})
return
}
resolve(res.data)
})
.catch((err) => {
reject(err.data)
})
})
},
}
sdk/includeHead.js
View file @ 61bdd9b3
/* var jsVersion = +new Date() // '?v=202106091751';
1：根据商铺id 查询安全检查记录
3：隐患列表
2：根据记录id 查询详情
4：隐患详情
5：查询安全检查模板数据
6：商家首页按月查询
9：用户角色可查看的模块
10：查询用户检查过的商户信息
11: 查询商户详情信息
*/
var jsVersion = +(new Date()) // '?v=202106091751';
var contextPath = '.' var contextPath = '.'
if(getPageN() === 'index'){ if (getPageN() === 'index') {
contextPath = '.' contextPath = '.'
}else{ } else {
contextPath = '..' contextPath = '..'
} }
// css // css
document.write('<link rel="icon" href="' + contextPath + '/image/favicon.ico">'); document.write('<link rel="icon" href="' + contextPath + '/image/favicon.ico">')
document.write('<link rel="stylesheet" type="text/css" href="' + contextPath + '/css/normalize.css" />'); document.write(
document.write('<link rel="stylesheet" type="text/css" href="' + contextPath + '/css/vant.css" />'); '<link rel="stylesheet" type="text/css" href="' +
document.write('<link rel="stylesheet" type="text/css" href="' + contextPath + '/css/common.css?rev=' + jsVersion + '" />'); contextPath +
'/css/normalize.css" />'
)
document.write(
'<link rel="stylesheet" type="text/css" href="' +
contextPath +
'/css/vant.css" />'
)
document.write(
'<link rel="stylesheet" type="text/css" href="' +
contextPath +
'/css/common.css?rev=' +
jsVersion +
'" />'
)
/** /**
* 爱山东 jssdk相关引用 * 爱山东 jssdk相关引用
*/ */
document.write('<script type="text/javascript" src="https://isdapp.shandong.gov.cn/jmopen/jssdk/index.js"></script>\ document.write(
<script type="text/javascript" src="' + contextPath + '/sdk/jssdk2/aes.js"></script>\ '<script type="text/javascript" src="https://isdapp.shandong.gov.cn/jmopen/jssdk/index.js"></script>\
<script type="text/javascript" src="' + contextPath + '/sdk/jssdk2/sm2/build/SM.js"></script>'); <script type="text/javascript" src="' +
contextPath +
'/sdk/jssdk2/aes.js"></script>\
<script type="text/javascript" src="' +
contextPath +
'/sdk/jssdk2/sm2/build/SM.js"></script>'
)
// 移动端 debugger 调试 // 移动端 debugger 调试
document.write('<script type="text/javascript" src="//cdn.bootcdn.net/ajax/libs/eruda/2.4.1/eruda.js"></script>\ document.write(
<script>eruda.init();</script>'); '<script type="text/javascript" src="//cdn.bootcdn.net/ajax/libs/eruda/2.4.1/eruda.js"></script>\
<script>eruda.init();</script>'
)
/** /**
* 项目业务相关 js * 项目业务相关 js
*/ */
// <script type="text/javascript" src="https://cdn.bootcdn.net/ajax/libs/vant/2.12.54/vant.min.js"></script>\ // <script type="text/javascript" src="https://cdn.bootcdn.net/ajax/libs/vant/2.12.54/vant.min.js"></script>\
// <script type="text/javascript" src="' + contextPath + '/sdk/vant.min.js"></script>\ // <script type="text/javascript" src="' + contextPath + '/sdk/vant.min.js"></script>\
// <script type="text/javascript" src="' + contextPath + '/sdk/axios.min.js"></script>\ // <script type="text/javascript" src="' + contextPath + '/sdk/axios.min.js"></script>\
document.write('<script type="text/javascript" src="' + contextPath + '/sdk/vue.min.js"></script>\ document.write(
<script type="text/javascript" src="' + contextPath + '/sdk/vant.min.js"></script>\ '<script type="text/javascript" src="' +
<script type="text/javascript" src="' + contextPath + '/sdk/flexible.js"></script>\ contextPath +
<script type="text/javascript" src="' + contextPath + '/sdk/util.js?rev=' + jsVersion + '"></script>\ '/sdk/vue.min.js"></script>\
<script type="text/javascript" src="' + contextPath + '/sdk/jssdk2/apiKeyMap.js?rev=' + jsVersion + '"></script>\ <script type="text/javascript" src="' +
<script type="text/javascript" src="' + contextPath + '/sdk/axios.min.js"></script>\ contextPath +
<script type="text/javascript" src="' + contextPath + '/sdk/axios_http.js"></script>'); '/sdk/vant.min.js"></script>\
// <script type="text/javascript" src="' + contextPath + '/sdk/http.js?rev=' + jsVersion + '"></script>'); <script type="text/javascript" src="' +
contextPath +
'/sdk/flexible.js"></script>\
<script type="text/javascript" src="' +
contextPath +
'/sdk/util.js?rev=' +
jsVersion +
'"></script>\
<script type="text/javascript" src="' +
contextPath +
'/sdk/jssdk2/apiKeyMap.js?rev=' +
jsVersion +
'"></script>\
<script type="text/javascript" src="' +
contextPath +
'/sdk/axios.min.js"></script>\
<script type="text/javascript" src="' +
contextPath +
'/sdk/axios_http.js"></script>'
)
// <script type="text/javascript" src="' + contextPath + '/sdk/http.js?rev=' + jsVersion + '"></script>');
if (getPageN()) { // 加载同名js if (getPageN()) {
document.write('<script type="text/javascript" src="./' + getPageN() + '.js?rev=' + jsVersion + '"></script>'); // 加载同名js
document.write('<link rel="stylesheet" type="text/css" href="./' + getPageN() + '.css?rev=' + jsVersion + '" />'); document.write(
'<script type="text/javascript" src="./' +
getPageN() +
'.js?rev=' +
jsVersion +
'"></script>'
)
document.write(
'<link rel="stylesheet" type="text/css" href="./' +
getPageN() +
'.css?rev=' +
jsVersion +
'" />'
)
} }
function getPageN(){ function getPageN() {
var pageN = window.location.pathname; var pageN = window.location.pathname
pageN = pageN.substring(pageN.lastIndexOf("/") + 1, pageN.indexOf(".")); pageN = pageN.substring(pageN.lastIndexOf('/') + 1, pageN.indexOf('.'))
return pageN return pageN
} }
src/_checkrecord.js
View file @ 61bdd9b3
...@@ -54,9 +54,7 @@ window.addEventListener('load', function () { ...@@ -54,9 +54,7 @@ window.addEventListener('load', function () {
loadingType: 'spinner', loadingType: 'spinner',
}) })
setTimeout(() => { setTimeout(() => {
// http2.post( http2.post(
http.post(
'/gq/asd/common',
{ {
serviceId: API_KEY_MAP['no-page']['id'], serviceId: API_KEY_MAP['no-page']['id'],
interfacePublicKey: API_KEY_MAP['no-page']['publicKey'], interfacePublicKey: API_KEY_MAP['no-page']['publicKey'],
...@@ -97,9 +95,7 @@ window.addEventListener('load', function () { ...@@ -97,9 +95,7 @@ window.addEventListener('load', function () {
loadingType: 'spinner', loadingType: 'spinner',
}) })
setTimeout(() => { setTimeout(() => {
// http2.post( http2.post(
http.post(
'/gq/asd/common',
{ {
serviceId: API_KEY_MAP['page']['id'], serviceId: API_KEY_MAP['page']['id'],
interfacePublicKey: API_KEY_MAP['page']['publicKey'], interfacePublicKey: API_KEY_MAP['page']['publicKey'],
......
src/_shanghu_list.js
View file @ 61bdd9b3
...@@ -41,9 +41,7 @@ window.addEventListener('load', function () { ...@@ -41,9 +41,7 @@ window.addEventListener('load', function () {
loadingType: 'spinner', loadingType: 'spinner',
}) })
setTimeout(() => { setTimeout(() => {
// http2.post( http2.post(
http.post(
'/gq/asd/common',
{ {
serviceId: API_KEY_MAP['page']['id'], serviceId: API_KEY_MAP['page']['id'],
interfacePublicKey: API_KEY_MAP['page']['publicKey'], interfacePublicKey: API_KEY_MAP['page']['publicKey'],
......
src/_yh-check.html
View file @ 61bdd9b3
...@@ -52,8 +52,8 @@ ...@@ -52,8 +52,8 @@
<!-- 第二行：状态和时间 --> <!-- 第二行：状态和时间 -->
<div style="display: flex; justify-content: start; gap: .34rem; margin: 8px 0;"> <div style="display: flex; justify-content: start; gap: .34rem; margin: 8px 0;">
<van-tag :type="statusTagType(item.status)"> <van-tag :type="statusTagType(item.rectificationStatusName)">
{{ item.status }} {{ item.rectificationStatusName }}
</van-tag> </van-tag>
<span <span
style="color: #737373; font-size: 0.28rem;margin-left: -1.6rem;">检查时间：{{ item.checkDate }}</span> style="color: #737373; font-size: 0.28rem;margin-left: -1.6rem;">检查时间：{{ item.checkDate }}</span>
...@@ -62,7 +62,7 @@ ...@@ -62,7 +62,7 @@
<!-- 第三行：商家和箭头 --> <!-- 第三行：商家和箭头 -->
<div style="display: flex; justify-content: space-between; align-items: center;"> <div style="display: flex; justify-content: space-between; align-items: center;">
<span style="color: #666; font-size: 0.28rem;">所属任务：{{ item.typeName }}</span> <span style="color: #666; font-size: 0.28rem;">商家名称：{{ item.merName }}</span>
</div> </div>
</div> </div>
</van-cell> </van-cell>
......
src/_yh-check.js
View file @ 61bdd9b3
...@@ -7,24 +7,7 @@ window.addEventListener('load', function () { ...@@ -7,24 +7,7 @@ window.addEventListener('load', function () {
return { return {
shanghuName: '', shanghuName: '',
// 新增子Tab数据 // 新增子Tab数据
subActiveTab: 0,
hazardList: [ hazardList: [
{
id: 1,
description: '消防通道被货物堵塞，存在严重安全隐患',
status: '待审核',
date: '2024-03-15',
shop: 'XX餐饮店',
type: 2,
},
{
id: 2,
description: '消防通道被货物堵塞，存在严重安全隐患',
status: '待整改',
date: '2024-03-15',
shop: 'XX餐饮店',
type: 2,
},
// 更多示例数据... // 更多示例数据...
], ],
activeTab: '', activeTab: '',
...@@ -34,9 +17,9 @@ window.addEventListener('load', function () { ...@@ -34,9 +17,9 @@ window.addEventListener('load', function () {
filteredHazards() { filteredHazards() {
const statusMap = ['全部', '待审核', '待整改', '已整改'] const statusMap = ['全部', '待审核', '待整改', '已整改']
return this.hazardList.filter((item) => return this.hazardList.filter((item) =>
this.subActiveTab === 0 this.activeTab === ''
? true ? true
: item.status === statusMap[this.subActiveTab] : item.rectificationStatusName === statusMap[this.activeTab]
) )
}, },
}, },
...@@ -79,11 +62,50 @@ window.addEventListener('load', function () { ...@@ -79,11 +62,50 @@ window.addEventListener('load', function () {
}, },
//获取隐患列表数据 //获取隐患列表数据
getHazardList() { getHazardList() {
http // http
.get('/gq/hiddenDanger/list?merId=1&status=' + this.activeTab) // .get('/gq/hiddenDanger/list?merId=1&status=' + this.activeTab)
.then((res) => { // .then((res) => {
console.log(res) // console.log(res)
// })
// 这里添加获取数据的逻辑
vant.Toast.loading({
message: '正在加载...',
forbidClick: true,
loadingType: 'spinner',
}) })
setTimeout(() => {
http2.post(
{
serviceId: API_KEY_MAP['page']['id'],
interfacePublicKey: API_KEY_MAP['page']['publicKey'],
interfacePrivateKey: API_KEY_MAP['page']['privateKey'],
reqParams: {
sign: 3,
status: this.activeTab,
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)
this.hazardList = result.rows
console.log(result)
}
}
)
}, 0)
}, },
}, },
}) })
......
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