Skip to content

G
GaoQuYingJiH5-ASD
Commit 8dc9bb9d authored by xinzhedeai's avatar xinzhedeai
Browse files
Options

Merge branch 'gaoqucodecheck' into remind 消费者->商户->提醒 merge 

# Conflicts:
#	home.js
#	sdk/axios_http.js
#	sdk/axios_http3.js
#	src/_yh_check.html
parents 05fc4f27 39e9cf2b
Expand all Show whitespace changes
Inline Side-by-side
Showing with 542 additions and 428 deletions
home.html
View file @ 8dc9bb9d
......@@ -207,7 +207,7 @@
v-cloak
>
<div class="stats-header">
<div class="stats-title">数据统计</div>
<div class="stats-title" @click="openDebug">数据统计</div>
<!-- <van-cell-group> -->
<div
@click="showPopup('showPopup4completionDate')"
......
home.js
View file @ 8dc9bb9d
......@@ -134,7 +134,14 @@ window.onload = function () {
this.remindStatistic = result.data
}
}
)
)},
openDebug(){ // 双击开启debugg模式，再次双击则关闭
console.log('开启关闭debug')
if(localStorage.getItem('debug')=='Y'){
localStorage.setItem('debug', 'N')
}else{
localStorage.setItem('debug', 'Y')
}
},
scanCode(toData) {
if (toData === false) {
......@@ -147,14 +154,14 @@ window.onload = function () {
merId: strUrl.searchParams.get('merId'),
accessType: strUrl.searchParams.get('accessType')
};
// location.href = 'shanghu_home.html'
// let param = {
// accessType: 'saoma',
// merId: data,
// }
if (param.merId == null || param.merId == '') {
alert('请扫描正确的商家二维码')
return
} else {
let url = gemhoUtil.setParameter(`./src/_shanghu_home.html`, param)
gemhoUtil.navigatePage(url, '跳转中...')
//成功回调
}
},
fail: function (data) {
//错误返回
......
sdk/axios_http.js
View file @ 8dc9bb9d
/** axios封装
* 请求拦截、相应拦截、错误统一处理
*/
const BASE_URL = 'http://192.168.2.37:8080'
// 环境的切换
axios.defaults.baseURL = 'http://192.168.2.37:8080'
axios.defaults.baseURL = BASE_URL
axios.defaults.timeout = 50000
// post请求头
// axios.defaults.headers.post['Content-Type'] = 'application/x-www-form-urlencoded;charset=UTF-8'
......@@ -30,6 +31,12 @@ axios.defaults.headers.common['Authorization'] =
// wgy账号token
// axios.defaults.headers.common['Authorization'] =
// 'Bearer eyJhbGciOiJIUzUxMiJ9.eyJzdWIiOiLlrZnmgJ3lv40iLCJsb2dpbl91c2VyX2tleSI6ImU0Y2Q2YzQ2LWEyMTAtNGIyMi1hZjAxLTliNjFiMWUyMzcxZiJ9.6IYwYIgsCV2RnnxOrtphRJIcko05AVlqyYGba3KuYE9NzKJlXcgOI-1C0tjXUg2YkJDl1YVDzLKntXEwoUSjCw'
// axios.defaults.headers.common['Authorization'] =
// 'Bearer eyJhbGciOiJIUzUxMiJ9.eyJzdWIiOiIxNTcyMTAzMTg4NiIsImxvZ2luX3VzZXJfa2V5IjoiNGJjY2JjYzUtNmY0Yy00ZDhlLWJiYzEtZjYzMzVlZDBlZTgwIn0.j3jEfHzeu3kklm60kKCirwwyKaWD51ABicOzxEnuFOfGe63FFqYOQ122ojAhukbInnKj4try3DjrST6wNDVjVQ'
// admin账号token
axios.defaults.headers.common['Authorization'] =
'Bearer eyJhbGciOiJIUzUxMiJ9.eyJzdWIiOiJhZG1pbiIsImxvZ2luX3VzZXJfa2V5IjoiOTEyODc0N2ItNGE4NC00MWRjLTg0ZGUtZTY1ODNkMzBiNDcwIn0.w_JRlifng-sUQqvGnuRFH5-wiL-1tfwI1cF7E97gjaOZ37bvRQld3120Myf9MYqLtVHUVX_vhlcBj7Kmg9exZw'
// 请求拦截器
......
sdk/axios_http3.js
View file @ 8dc9bb9d
......@@ -5,7 +5,6 @@
if (window.env == 'dev') {
axios.defaults.baseURL = 'http://192.168.2.37:8080'
// 消费者token
......@@ -15,15 +14,13 @@ if (window.env == 'dev') {
axios.defaults.headers.common['Authorization'] =
'Bearer eyJhbGciOiJIUzUxMiJ9.eyJzdWIiOiLlvKDlrZ3lvakiLCJsb2dpbl91c2VyX2tleSI6IjNjMmRiMWFiLWIyZGMtNDBjYi04YjM5LWRiNTJmM2VmYzNkYyJ9.sfZyPP-COShNCjwxKR26zGDsPHXss97gu7JEpaMapIZyMQEsxzMigVickcqdhaqDwTRcfr0IxAj64vnrriS9Cw'
// 凯丽
// axios.defaults.headers.common['Authorization'] =
// 'Bearer eyJhbGciOiJlUzUxMiJ9.eyJzdWlioilxNZ92MZAzMDl00SlslmxyZ2luX3VzZXJfa2V5ljoiMEONTM1NzktNTJiMSO0N2QwLTkzNmEtMmViNWFhYzMzMTI1In0.EG_EwS7xS1jgi29Ly7WXOJBCW4DcAyOtLD4he06sV8b4i70kknNQqVAx063NpcDa5kmTFdZ6zEfPHYPfVR4dEO'
// admin账号token
// axios.defaults.headers.common['Authorization'] =
// 'Bearer eyJhbGciOiJIUzUxMiJ9.eyJzdWIiOiJhZG1pbiIsImxvZ2luX3VzZXJfa2V5IjoiNTljMWVhMTMtODNmYy00OWI2LWI5YzMtM2VkNzliODFhZjg4In0.XHl0IpagNwLJBqW_s2n6Kzhs9eY-TrMUBfAO8oeikYRUH72eshEXwMsTyTWgVnX_okY4tuB4U124AeF6EO_qiQ'
axios.defaults.headers.common['Authorization'] =
'Bearer eyJhbGciOiJIUzUxMiJ9.eyJzdWIiOiJhZG1pbiIsImxvZ2luX3VzZXJfa2V5IjoiOTEyODc0N2ItNGE4NC00MWRjLTg0ZGUtZTY1ODNkMzBiNDcwIn0.w_JRlifng-sUQqvGnuRFH5-wiL-1tfwI1cF7E97gjaOZ37bvRQld3120Myf9MYqLtVHUVX_vhlcBj7Kmg9exZw'
}else{
axios.defaults.baseURL = 'https://gqyjpt.weihai.cn/prod-api'
......
sdk/includeHead.js
View file @ 8dc9bb9d
......@@ -23,10 +23,13 @@ document.write(`
<script type="text/javascript" src="${contextPath}/sdk/jssdk2/sm2/build/SM.js"></script>
`)
// 移动端 debugger 调试
document.write(
if (localStorage.getItem('debug')=='Y') {
document.write(
'<script type="text/javascript" src="//cdn.bootcdn.net/ajax/libs/eruda/2.4.1/eruda.js"></script>\
<script>eruda.init();</script>'
)
)
}
// 自动识别环境（需在文件最顶部添加）
window.env = window.location.hostname === 'web1.isdapp.shandong.gov.cn' ? 'pro' : 'dev';
......
src/_shanghu_detail-edit.css
View file @ 8dc9bb9d
html,
body {
html,
body {
background-color: #fff;
overflow-x: hidden;
}
}
.wrapper {
.wrapper {
/* padding: 0.2rem; */
}
}
/* 添加以下样式 */
.van-cell {
/* 添加以下样式 */
.van-cell {
padding: 12px 16px;
}
}
.van-field__label {
.van-field__label {
font-weight: bold;
color: #000;
font-size: .28rem;
}
color: #222 !important;
font-size: 0.28rem;
}
.van-field__control {
.van-field__control {
color: #737373;
}
}
.container {
.container {
text-align: center;
margin-top: .3rem;
}
margin-top: 0.3rem;
}
.qr-card {
.qr-card {
margin-bottom: 10px;
}
}
.save-btn {
.save-btn {
width: 48%;
background: #1890ff;
color: #fff;
......@@ -42,56 +41,56 @@
border-radius: 3px;
font-size: 16px;
cursor: pointer;
margin-bottom: .4rem;
}
margin-bottom: 0.4rem;
}
.hideEle {
.hideEle {
/* visibility: hidden; */
display: none;
}
.textStyleWrapper{
}
.textStyleWrapper {
display: flex;
align-items: center;
padding-top: 0.12rem;
padding-bottom: 0.12rem;
}
.textStyleLabel{
}
.textStyleLabel {
display: inline-block;
width: 1.72rem;
min-width: 1.72rem;
padding: .2rem;
padding-left: .3rem;
padding: 0.2rem;
padding-left: 0.3rem;
color: #9b9fab;
font-size: .28rem;
font-size: 0.28rem;
font-weight: bold;
}
}
.textStyleText{
.textStyleText {
display: inline-block;
/* width: 1.72rem; */
padding: .2rem;
padding: 0.2rem;
padding-left: 0;
color: #c8c9cc;
font-size: .28rem;
}
font-size: 0.28rem;
}
/* 基础重置样式 */
* {
/* 基础重置样式 */
* {
margin: 0;
padding: 0;
box-sizing: border-box;
-webkit-tap-highlight-color: transparent;
/* 去除移动端点击高亮 */
}
}
body {
body {
font-family: 'PingFang SC', 'Microsoft YaHei', sans-serif;
font-size: 16px;
background-color: #f8f9fa;
}
}
/* 表单容器 */
.form-container {
/* 表单容器 */
.form-container {
max-width: 750px;
/* 移动端最大宽度 */
margin: 20px auto;
......@@ -99,10 +98,10 @@
background-color: #fff;
border-radius: 8px;
box-shadow: 0 2px 8px rgba(0, 0, 0, 0.05);
}
}
/* 表单单项 */
.form-item {
/* 表单单项 */
.form-item {
position: relative;
display: flex;
align-items: center;
......@@ -110,37 +109,37 @@
height: 50px;
padding: 0 12px;
border-bottom: 1px solid #f0f2f5;
}
}
/* 最后一项去除下边框 */
.form-item:last-child {
/* 最后一项去除下边框 */
.form-item:last-child {
border-bottom: none;
}
}
/* 表单标题 */
.form-label {
/* 表单标题 */
.form-label {
flex-shrink: 0;
/* 防止标题被压缩 */
width: 1.7rem;
/* 标题固定宽度，可根据需求调整 */
color: #333;
font-size: .28rem;
color: #222;
font-size: 0.28rem;
font-weight: bold;
text-align: left;
/* 标题左对齐 */
}
}
/* 输入框容器 */
.form-input-wrap {
/* 输入框容器 */
.form-input-wrap {
flex: 1;
/* 占据剩余空间 */
height: 100%;
display: flex;
align-items: center;
}
}
/* 输入框样式 */
.form-input {
/* 输入框样式 */
.form-input {
width: 100%;
height: 32px;
/* 输入框高度小于容器，留出垂直空间 */
......@@ -148,20 +147,20 @@
outline: none;
font-size: 15px;
color: #666;
}
}
/* 输入框placeholder样式 */
.form-input::placeholder {
/* 输入框placeholder样式 */
.form-input::placeholder {
color: #999;
font-size: 14px;
}
}
/* 输入框聚焦效果 */
.form-input:focus {
/* 输入框聚焦效果 */
.form-input:focus {
color: #262626;
}
}
.imager-item-title {
.imager-item-title {
height: 50px;
line-height: 50px;
padding: 0 12px;
......@@ -169,25 +168,27 @@
border-bottom: 1px solid #f0f2f5;
margin-bottom: 10px;
font-weight: 400;
}
/* vant tab底部栏颜色 */
.van-tabs__line{
background-color: #1081E3;
}
.selector{
}
.imager-item-title span {
color: #222;
}
/* vant tab底部栏颜色 */
.van-tabs__line {
background-color: #1081e3;
}
.selector {
width: 5rem;
height: 0.6rem;
font-size: 0.3rem;
border: 1px solid #D7D7D7;
border: 1px solid #d7d7d7;
background-color: #fff;
}
input:disabled{
}
input:disabled {
background-color: #fff;
}
select:disabled{
border:none;
}
select:disabled {
border: none;
/* 移除默认箭头 */
-webkit-appearance: none;
-moz-appearance: none;
......@@ -198,18 +199,22 @@
/* 可选：统一背景色 */
background-color: white;
}
}
.van-cell--required {
overflow: visible
}
.van-cell--required {
overflow: visible;
}
.van-cell--required:before {
.van-cell--required:before {
position: absolute;
left: -0.01rem;
top: 50%;
transform: translateY(-50%);
font-size: .28rem;
content: "*";
}
font-size: 0.28rem;
content: '*';
}
select:disabled {
color: #333 !important;
opacity: 1;
}
\ No newline at end of file
src/_shanghu_detail-edit.html
View file @ 8dc9bb9d
......@@ -27,6 +27,9 @@
color: #333 !important; /* 保持与正常状态相同的颜色 */
-webkit-text-fill-color: #333 !important; /* 兼容iOS Safari */
}
.van-uploader__preview-delete{
cursor: pointer;
}
</style>
</head>
<body>
......@@ -70,7 +73,7 @@
<div class="form-input-wrap">
<input
type="text"
v-model="formData.owner"
v-model="formData.merchantName"
class="form-input"
:disabled="flag=='XQ'"
/>
......@@ -95,7 +98,6 @@
<input
type="text"
v-model="formData.businessAddress"
v-model="formData.merchantPhone"
class="form-input"
:disabled="flag=='XQ'"
/>
......@@ -189,13 +191,8 @@
v-if="flag=='XQ'"
>
<span class="form-label">行业主管</span>
<div class="form-input-wrap">
<input
type="text"
v-model="formData.industryType"
class="form-input"
:disabled="flag=='XQ'"
/>
<div class="form-input-wrap" style="color: #333;font-size: .3rem;">
{{ formData.industryDeptName }}
</div>
</div>
......@@ -219,72 +216,89 @@
</div>
<div>
<h5 class="imager-item-title">
<span>商家平面图</span>
<span class="form-label">商家平面图</span>
<span></span>
</h5>
<div v-if="flag=='XG'">
<!-- 详情模式 -->
<div class="img-wrapper" style="display: flex;gap:.16rem;">
<div style="position: relative;" v-for="(imgItem, index) in formData.floorPlanPhotos">
<img
:src="previewUrl + imgItem"
style="width: 1.6rem; height: 1.6rem;"
@click="showImage(formData.floorPlanPhotos, index)"
/>
<div v-if="flag=='XG'" class="van-uploader__preview-delete" @click="handleDeleteFloorPlan(index, 'floorPlan')"><i class="van-icon van-icon-cross van-uploader__preview-delete-icon"></i></div>
</div>
<div v-if="formData.floorPlanPhotos.length<4 && flag=='XG' ">
<van-uploader
v-model="formData.floorPlanPhotosH5"
:max-count="1"
:after-read="handleFileUpload"
:before-read="beforeRead"
:after-read="(file) => afterRead(file, 'floorPlan')"
class="uploader-wrapper"
/>
:deletable="false"
:preview-image="false"
>
<img src="../image/code/upload.png" style="width:1.6rem;height: 1.6rem;" alt="" srcset="">
</van-uploader>
</div>
<div v-if="flag=='XQ'">
<img
v-for="(imgItem, subIndex) in formData.floorPlanPhotos"
:src="imgItem"
alt=""
style="width: 1.2rem; height: 1.2rem; margin-right: 0.2rem"
@click="showImage(formData.floorPlanPhotos,subIndex)"
/>
</div>
</div>
<div>
<h5 class="imager-item-title">
<span>营业执照</span>
<span class="form-label">营业执照</span>
<span></span>
</h5>
<div v-if="flag=='XG'">
<!-- 详情模式 -->
<div class="img-wrapper" style="display: flex;gap:.16rem;">
<div style="position: relative;" v-for="(imgItem, index) in formData.businessLicensePhotos">
<img
:src="previewUrl + imgItem"
style="width: 1.6rem; height: 1.6rem;"
@click="showImage(formData.businessLicensePhotos, index)"
/>
<div v-if="flag=='XG'" class="van-uploader__preview-delete" @click="handleDeleteFloorPlan(index, 'license')"><i class="van-icon van-icon-cross van-uploader__preview-delete-icon"></i></div>
</div>
<div v-if="formData.businessLicensePhotos.length<1 && flag=='XG' ">
<van-uploader
v-model="formData.businessLicensePhotosH5"
:max-count="1"
:after-read="handleFileUpload"
:before-read="beforeRead"
:after-read="(file) => afterRead(file, 'license')"
class="uploader-wrapper"
/>
:deletable="false"
:preview-image="false"
>
<img src="../image/code/upload.png" style="width:1.6rem;height: 1.6rem;" alt="" srcset="">
</van-uploader>
</div>
<div v-if="flag=='XQ'">
<img
v-for="(imgItem, subIndex) in formData.businessLicensePhotos"
:src="imgItem"
alt=""
style="width: 1.2rem; height: 1.2rem; margin-right: 0.2rem"
@click="showImage(formData.businessLicensePhotos,subIndex)"
/>
</div>
</div>
<div>
<h5 class="imager-item-title">
<span>门头图</span>
<span class="form-label">门头图</span>
<span></span>
</h5>
<div v-if="flag=='XG'">
<!-- 详情模式 -->
<div class="img-wrapper" style="display: flex;gap:.16rem;">
<div style="position: relative;" v-for="(imgItem, index) in formData.storefrontPhotos">
<img
:src="previewUrl + imgItem"
style="width: 1.6rem; height: 1.6rem;"
@click="showImage(formData.storefrontPhotos, index)"
/>
<div v-if="flag=='XG'" class="van-uploader__preview-delete" @click="handleDeleteFloorPlan(index, 'storeFront')"><i class="van-icon van-icon-cross van-uploader__preview-delete-icon"></i></div>
</div>
<div v-if="formData.storefrontPhotos.length<1 && flag=='XG' ">
<van-uploader
v-model="formData.storefrontPhotosH5"
:max-count="4"
:after-read="handleFileUpload"
:before-read="beforeRead"
:after-read="(file) => afterRead(file, 'storeFront')"
class="uploader-wrapper"
/>
:deletable="false"
:preview-image="false"
>
<img src="../image/code/upload.png" style="width:1.6rem;height: 1.6rem;" alt="" srcset="">
</van-uploader>
</div>
<div v-if="flag=='XQ'">
<img
v-for="(imgItem, subIndex) in formData.storefrontPhotos"
:src="imgItem"
alt=""
style="width: 1.2rem; height: 1.2rem; margin-right: 0.2rem"
@click="showImage(formData.storefrontPhotos,subIndex)"
/>
</div>
</div>
......@@ -301,7 +315,7 @@
class="imager-item-title"
style="border: none"
>
<span>安全二维码</span>
<span class="form-label">安全二维码</span>
<span></span>
</h5>
<div>
......
src/_shanghu_detail-edit.js
View file @ 8dc9bb9d
This diff is collapsed.
src/_shanghu_detail.css
View file @ 8dc9bb9d
html,
body {
html,
body {
background-color: #fff;
}
}
.wrapper {
.wrapper {
/* padding: 0.2rem; */
}
}
/* 添加以下样式 */
.van-cell {
/* 添加以下样式 */
.van-cell {
padding: 12px 16px;
}
}
.van-field__label {
.van-field__label {
font-weight: bold;
color: #000;
font-size: .28rem;
}
color: #222 !important;
font-size: 0.28rem;
}
.van-field__control {
.van-field__control {
color: #737373;
}
}
.container {
.container {
text-align: center;
margin-top: .3rem;
}
margin-top: 0.3rem;
}
.qr-card {
.qr-card {
margin-bottom: 10px;
}
}
.save-btn {
.save-btn {
background: #1890ff;
color: #fff;
border: none;
......@@ -40,34 +39,34 @@
border-radius: 3px;
font-size: 16px;
cursor: pointer;
margin-bottom: .4rem;
}
margin-bottom: 0.4rem;
}
.hideEle {
.hideEle {
/* visibility: hidden; */
display: none;
}
.textStyleWrapper{
}
.textStyleWrapper {
display: flex;
padding-top: 0.12rem;
padding-bottom: 0.12rem;
}
.textStyleLabel{
}
.textStyleLabel {
display: inline-block;
width: 1.72rem;
min-width: 1.72rem;
padding: .2rem;
padding-left: .3rem;
color: #9b9fab;
font-size: .28rem;
padding: 0.2rem;
padding-left: 0.3rem;
color: #222;
font-size: 0.28rem;
font-weight: bold;
}
}
.textStyleText{
.textStyleText {
display: inline-block;
/* width: 1.72rem; */
padding: .2rem;
padding: 0.2rem;
padding-left: 0;
color: #c8c9cc;
font-size: .28rem;
}
\ No newline at end of file
color: #333;
font-size: 0.28rem;
}
src/_shanghu_detail.html
View file @ 8dc9bb9d
......@@ -7,6 +7,14 @@
content="width=device-width, initial-scale=1.0, user-scalable=no, minimum-scale=1.0, maximum-scale=1.0, viewprot-fit:cover">
<title>高区“码”上</title>
<script type="text/javascript" src="../sdk/includeHead.js"></script>
<style>
/* 添加禁用状态文字颜色保持 */
input:disabled,
input[disabled] {
color: #333 !important; /* 保持与正常状态相同的颜色 */
-webkit-text-fill-color: #333 !important; /* 兼容iOS Safari */
}
</style>
</head>
<div id="app">
<div class="wrapper" v-cloak>
......@@ -27,7 +35,7 @@
</div>
</van-cell-group>
<van-cell-group>
<van-field label="电话" v-model="formData.merchantPhone" type="number" :disabled="flag=='XQ'" />
<van-field label="电话" style="color: #222" v-model="formData.merchantPhone" type="number" :disabled="flag=='XQ'" />
</van-cell-group>
<van-cell-group>
<!-- <van-field label="地址" v-model="formData.businessAddress" :disabled="flag=='XQ'" /> -->
......@@ -38,7 +46,7 @@
</van-cell-group>
<van-cell-group>
<van-field label="场所类型" v-model="formData.smallPlaceTypeName" :disabled="flag=='XQ'" />
<van-field label="场所类型" style="color: #222" v-model="formData.smallPlaceTypeName" :disabled="flag=='XQ'" />
</van-cell-group>
<!-- <van-cell-group>
<van-field label="场所类型" v-model="formData.type" placeholder="请选择场所类型" readonly clickable
......@@ -51,7 +59,7 @@
</van-popup>
-->
<van-cell-group>
<van-field label="安全二维码" :disabled="true" />
<van-field label="安全二维码" style="color: #222" :disabled="true" />
</van-cell-group>
</van-cell-group>
......
src/_shanghu_home.html
View file @ 8dc9bb9d
......@@ -23,7 +23,7 @@
<div class="detail">
<van-row>
<van-col span="24">场所类型: {{merInformation.smallPlaceTypeName}}</van-col>
<div class="detail_link" @click="navTo('shanghu_detail')">详情<van-icon name="arrow" /></div>
<div class="detail_link" @click="navTo('shanghu_detail-edit')">详情<van-icon name="arrow" /></div>
</van-row>
<van-row type="flex" justify="space-around"
style="width:100%; margin-top: .3rem; margin-bottom: .3rem;">
......
src/_yh_check.html
View file @ 8dc9bb9d
......@@ -44,7 +44,8 @@
<!-- 隐患列表 -->
<van-list v-model:loading="loading" :offset="10" :finished="finished" finished-text="没有更多了" @load="getList" :immediate-check="false">
<van-cell v-for="item in hazardList" :key="item.id" class="list-item">
<van-cell v-for="item in hazardList" :key="item.id" class="list-item" @click="viewDetail(item)">
<div style="width: 100%;">
<!-- 第一行：隐患描述 -->
<div style="
......
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