Skip to content

李宁 / Activity

Go to a project
Commit 5984aafb by 李宁
Options

1

1 parent 56a93bf8
Inline Side-by-side
Showing 3 changed files with 64 additions and 4 deletions
huaian/css/demo.css
...@@ -631,11 +631,17 @@ html,body{ ...@@ -631,11 +631,17 @@ html,body{
margin-top: .2rem; margin-top: .2rem;
line-height: .52rem; line-height: .52rem;
} }
.mpCon .small{
font-size: .28rem;
}
.mpCon .twoImg{ .mpCon .twoImg{
width: 4rem; width: 4rem;
display: block; display: block;
margin: .16rem auto .32rem auto; margin: .16rem auto .32rem auto;
} }
.mpCon .pImg{
width: 100%;
}
.mpCon .butt{ .mpCon .butt{
border-radius: .08rem; border-radius: .08rem;
background: #568FFE; background: #568FFE;
......
huaian/demo.html
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
<link rel="stylesheet" href="https://xpo.oss-cn-beijing.aliyuncs.com/huaian/css/vant.css"/> <link rel="stylesheet" href="https://xpo.oss-cn-beijing.aliyuncs.com/huaian/css/vant.css"/>
<link rel="stylesheet" href="css/demo.css?120000"> <link rel="stylesheet" href="css/demo.css?1289381230">
</head> </head>
<body> <body>
...@@ -264,6 +264,32 @@ ...@@ -264,6 +264,32 @@
</div> </div>
</div> </div>
<div class="outAlert" id="jdhSnSbErrorAlert">
<div class="mpCon">
<img class="topBg" src="https://xpo.oss-cn-beijing.aliyuncs.com/huaian/bBg.png" alt="">
<div class="til">温馨提示</div>
<div class="bts small">1、请将摄像头近距离正面聚焦在 STBID/SN 码上，确保整串字符完整清晰。</div>
<img class="twoImg pImg" src="https://xpo.oss-cn-beijing.aliyuncs.com/huaian/jdhSnSbError.png" alt="">
<div class="bts small">2、使用页面右上方镜头包功能尝试切换摄像头再进行识别。</div>
<img class="twoImg pImg" src="https://xpo.oss-cn-beijing.aliyuncs.com/huaian/cameraSwitchGuide.png" alt="">
<div class="butt" id="hideJdhSnSbErrorAlert">我知道了</div>
</div>
</div>
<div class="outAlert" id="cgmSnSbErrorAlert">
<div class="mpCon">
<img class="topBg" src="https://xpo.oss-cn-beijing.aliyuncs.com/huaian/bBg.png" alt="">
<div class="til">温馨提示</div>
<div class="bts small">1、请将摄像头近距离正面聚焦在 CMEI码上，确保整串字符完整清晰。</div>
<img class="twoImg pImg" src="https://xpo.oss-cn-beijing.aliyuncs.com/huaian/cgmSnSbError.png" alt="">
<div class="bts small">2、使用页面右上方镜头包功能尝试切换摄像头再进行识别。</div>
<img class="twoImg pImg" src="https://xpo.oss-cn-beijing.aliyuncs.com/huaian/cameraSwitchGuide.png" alt="">
<div class="butt" id="hideCgmSnSbErrorAlert">我知道了</div>
</div>
</div>
<!-- <script type="text/javascript" charset="utf-8" src="js/vconsole.min.js"></script> <!-- <script type="text/javascript" charset="utf-8" src="js/vconsole.min.js"></script>
<script> <script>
var vConsole = new VConsole(); var vConsole = new VConsole();
...@@ -278,7 +304,7 @@ ...@@ -278,7 +304,7 @@
<script src="js/vue.min.js"></script> <script src="js/vue.min.js"></script>
<script src="js/vant.min.js"></script> <script src="js/vant.min.js"></script>
<script src="js/demo.js?12312312332"></script> <script src="js/demo.js?12121212"></script>
</script> </script>
</body> </body>
......
huaian/js/demo.js
...@@ -175,6 +175,7 @@ var ifListener = false ...@@ -175,6 +175,7 @@ var ifListener = false
var ifClickHide = false var ifClickHide = false
var countDownStr = '' var countDownStr = ''
var snConfirmFlag = false var snConfirmFlag = false
var jdhAndCgmClickHide = false
function getProcess(){ function getProcess(){
if(!window.location.href.includes('demo.html')){ if(!window.location.href.includes('demo.html')){
...@@ -203,6 +204,15 @@ function getProcess(){ ...@@ -203,6 +204,15 @@ function getProcess(){
}else{ }else{
$('#waitting').hide() $('#waitting').hide()
} }
if(res.voiceCode && res.voiceCode.includes('SN')){
if(res.voiceCode.startsWith('jdh') && res.tryNum>=1 && !jdhAndCgmClickHide && !res.contentSN){
$("#jdhSnSbErrorAlert").show()
}
if(res.voiceCode.startsWith('cgm') && res.tryNum>=1 && !jdhAndCgmClickHide && !res.contentSN){
$("#cgmSnSbErrorAlert").show()
}
}
if(!res.voiceCode || ((res.voiceCode+''+res.tryNum)==(stepId+''+tryNum))){ if(!res.voiceCode || ((res.voiceCode+''+res.tryNum)==(stepId+''+tryNum))){
if(res.contentSN && !snConfirmFlag && !ifClickHide){ if(res.contentSN && !snConfirmFlag && !ifClickHide){
...@@ -242,7 +252,14 @@ function getProcess(){ ...@@ -242,7 +252,14 @@ function getProcess(){
if(res.voiceCode.includes('SN') || res.voiceCode.startsWith('complain')){ if(res.voiceCode.includes('SN') || res.voiceCode.startsWith('complain')){
let param = getSnInfo(res.voiceCode) let param = getSnInfo(res.voiceCode)
if(!sessionStorage.getItem(param.cacheId) || res.voiceCode.startsWith('zgm') || res.voiceCode.startsWith('jdh')){ let lsFlag = false
if(res.voiceCode.startsWith('jdh') || res.voiceCode.startsWith('cgm')){
lsFlag = res.tryNum<1?true:false
}else if(!sessionStorage.getItem(param.cacheId) || res.voiceCode.startsWith('zgm')){
lsFlag = true
}
if(lsFlag){
$("#snExampleText").html(param.pageText) $("#snExampleText").html(param.pageText)
$("#snExampleImg").attr('src', param.imgUrl) $("#snExampleImg").attr('src', param.imgUrl)
...@@ -535,6 +552,7 @@ $('#snAgain').click(()=>{ ...@@ -535,6 +552,7 @@ $('#snAgain').click(()=>{
$('#snAlertDiv2').hide() $('#snAlertDiv2').hide()
$('#snErrorTs2').html('') $('#snErrorTs2').html('')
snConfirmFlag = false snConfirmFlag = false
jdhAndCgmClickHide = true
ifClickHide = true ifClickHide = true
setTimeout(()=>{ setTimeout(()=>{
...@@ -567,7 +585,9 @@ $('.clickButt').click((e)=>{ ...@@ -567,7 +585,9 @@ $('.clickButt').click((e)=>{
voiceCode: stepId, voiceCode: stepId,
button_name: key button_name: key
} }
}).then(res=>{}) }).then(res=>{
jdhAndCgmClickHide = false
})
}) })
//账号和设备串号的弹窗逻辑 //账号和设备串号的弹窗逻辑
...@@ -819,6 +839,14 @@ $("#hidesnExampleAlert").click(()=>{ ...@@ -819,6 +839,14 @@ $("#hidesnExampleAlert").click(()=>{
sessionStorage.setItem(getSnInfo().cacheId,'true') sessionStorage.setItem(getSnInfo().cacheId,'true')
$("#snExampleAlert").hide() $("#snExampleAlert").hide()
}) })
$("#hideJdhSnSbErrorAlert").click(()=>{
$("#jdhSnSbErrorAlert").hide()
jdhAndCgmClickHide = true
})
$("#hideCgmSnSbErrorAlert").click(()=>{
$("#cgmSnSbErrorAlert").hide()
jdhAndCgmClickHide = true
})
$("#lookExample").click(()=>{ $("#lookExample").click(()=>{
if(stepId.includes('SN') || stepId.startsWith('complain')){ if(stepId.includes('SN') || stepId.startsWith('complain')){
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!