Skip to content

李宁 / Activity

Go to a project
Commit 766d8ce9 by 李宁
Options

1

1 parent 49713984
Expand all
Inline Side-by-side
Showing 8 changed files with 28 additions and 36 deletions
huaian/css/demo.css
......@@ -298,19 +298,28 @@ html,body{
font-size: .36rem;
font-weight: bold;
text-align: center;
margin-bottom: .16rem;
margin-bottom: .32rem;
}
.alertDiv .inner .input{
border: none;
border-bottom: 1px solid #EEE;
border: 1px solid #D9D9D9;
color: #333;
font-size: .36rem;
padding: .32rem .12rem;
padding: .24rem .32rem;
width: 100%;
display: block;
box-sizing: border-box;
overflow: hidden;
resize: none;
border-radius: .08rem;
}
.alertDiv .inner .disabled{
background: #D9D9D9;
border: 1px solid #B2B2B2;
border-radius: .08rem;
color: #B3B3B3;
}
.alertDiv .inner .red{
border: 1px solid #F00;
}
.alertDiv .inner .input::placeholder{
color: #A5A5A5;
......@@ -319,11 +328,6 @@ html,body{
.alertDiv .inner .input:focus{
outline: none
}
.alertDiv .inner .ts{
color: #666;
font-size: .26rem;
margin-top: .16rem;
}
.alertDiv .inner .errorTs{
color: #F00;
font-size: .26rem;
......
huaian/demo.html
......@@ -7,7 +7,7 @@
<meta http-equiv="X-UA-Compatible" content="ie=edge">
<title>江苏移动</title>
<link rel="stylesheet" href="https://xpo.oss-cn-beijing.aliyuncs.com/huaian/css/vant.css"/>
<link rel="stylesheet" href="css/demo.css?8989898989">
<link rel="stylesheet" href="css/demo.css?22223000333">
</head>
<body>
......@@ -57,10 +57,6 @@
<div class="text">账号识别困难?点这里</div>
<div class="bclick" id="accountAlertShow">手动输入</div>
</div>
<!-- <div class="butt" id="inputSnTs">
<div class="text">串号识别困难?点这里</div>
<div class="bclick" id="snAlertShow">手动输入</div>
</div> -->
</div>
<div class="swDown" id="tipDiv">
......@@ -113,7 +109,7 @@
<div class="til">输入用户账号</div>
<input id="accountValue" class="input" type="text" placeholder="请输入用户账号">
<div class="bot">
<button class="cancel" onclick="inputCancel('account')">取消</button>
<button class="cancel" onclick="inputCancel()">取消</button>
<button class="submit" onclick="accountInputSubmit()">提交</button>
</div>
</div>
......@@ -121,25 +117,12 @@
<div class="alertDiv" id="snAlertDiv">
<div class="inner">
<div class="til">请输入设备串号</div>
<textarea id="snValue" class="input snInput" rows="1" type="text" placeholder="请输入设备串号"></textarea>
<div class="errorTs" id="snErrorTs"></div>
<div class="bot">
<button class="cancel" onclick="inputCancel('sn')">取消</button>
<button class="submit" onclick="snInputSubmit('')">提交</button>
</div>
</div>
</div>
<div class="alertDiv" id="snAlertDiv2">
<div class="inner">
<div class="til" id="snAlertTile">请确认设备串号</div>
<textarea id="snValue2" class="input snInput" rows="1" type="text" placeholder="请输入设备串号"></textarea>
<div class="ts" id="snTs">如识别错误你可重新进行拍摄或直接修改</div>
<div class="errorTs" id="snErrorTs2"></div>
<textarea id="snValue" class="input snInput" rows="1" type="text" placeholder="请输入设备串号"></textarea>
<div class="errorTs" id="snErrorTs">如识别错误你可重新进行拍摄或直接修改</div>
<div class="bot">
<button class="cancel snAgain">重新拍摄</button>
<button class="submit" onclick="snInputSubmit('2')">确认</button>
<button class="submit" onclick="snInputSubmit()">确认</button>
</div>
</div>
</div>
......@@ -240,7 +223,7 @@
<img src="https://xpo.oss-cn-beijing.aliyuncs.com/huaian/back.png" alt="" style="display: block;">
<img class="loadImg" id="loadImg1" src="https://xpo.oss-cn-beijing.aliyuncs.com/huaian/1.png" alt="">
</div>
<div style="line-height: 1;">加载中，请稍候...</div>
<div style="line-height: 1;" id="loadingText">加载中，请稍候...</div>
</div>
</div>
......@@ -333,7 +316,7 @@
<script src="js/util.js?12312313"></script>
<script src="js/vue.min.js"></script>
<script src="js/vant.min.js"></script>
<script src="js/demo.js?99"></script>
<script src="js/demo.js?3333"></script>
</script>
</body>
......
huaian/index.html
......@@ -259,6 +259,6 @@
<script src="https://xpo.oss-cn-beijing.aliyuncs.com/huaian/js/vue.min.js"></script>
<script src="https://xpo.oss-cn-beijing.aliyuncs.com/huaian/js/vant.min.js"></script>
<script src="https://xpo.oss-cn-beijing.aliyuncs.com/huaian/js/util.js?11111"></script>
<script src="js/index.js?1231231233210"></script>
<script src="js/index.js?23111232388"></script>
</body>
</html>
\ No newline at end of file
huaian/js/index.js
......@@ -386,6 +386,11 @@ const util = new window.publicMethod() ;
return
}
// if(location.href.includes('takePicture')){
// window.location.href = 'demo2.html?time='+ new Date().getTime()
// return
// }
window.location.href = 'demo.html?time='+ new Date().getTime()
},
addOrder(){
......
huaian/js/lang.js
window.noShootNum = 3
window.snInputNum = 3
\ No newline at end of file
window.noShootNum = 5
window.snInputNum = 1
\ No newline at end of file
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!