Authored by 王洪广

Merge branch 'feature/wechatloading' into release/4.5

... ... @@ -9,7 +9,7 @@ var loading = require('../plugin/loading'),
tip = require('../plugin/tip'),
Hammer = require('yoho.hammer');
// 点击微信显示加载
var $loadingToast = $(".loadingToast");
var $loadingToast = $(".loading-toast");
var theOrderCode = document.getElementById('ordercode').value;
var wxPayEl = document.getElementById('weixin'),
... ...
... ... @@ -67,7 +67,7 @@
}
}
/* 加载中 */
.loadingToast {
.loading-toast {
position: fixed;
z-index: 3;
width: 3.8em;
... ... @@ -80,27 +80,27 @@
border-radius: 5px;
color: #FFFFFF;
}
.loadingToast:after{
.loading-toast:after{
content:'';
position: absolute;
left:50%;
top:50%;
margin-left: -.5rem;
margin-top: -.5rem;
width: 1rem;
height:1rem;
background: url("data:image/png;charset=utf-8;base64,iVBORw0KGgoAAAANSUhEUgAAACQAAAAkBAMAAAATLoWrAAAAAG5wVGOkIJ/OAAAABGdBTUEAALGPC/xhBQAAAAFzUkdCAK7OHOkAAAAbUExURQAAAP///////////////////////////////+tNPsIAAAAJdFJOUwD+ELHdi00wbfD3fpAAAADbSURBVCjPY2CgDLBnBBtHFCCLsIWGGgNBE5Ka1tBgoIiJcwJcqKI1NF2BqcLExQOuraMDbAybiUsAVKisA6pB1cUVwmBKS4epb3GBSLKnwW1ndXEC0+rlcHuYoBaUFyGckygClilHcjWLIMgwJiUFhBCHYABYCNlnggboQkyCDiBSATkABAUwQglTCKIRBUCMRwGsggHoQhCnooBEQQzTHUXRhZgFhdCFAlGMUgZhQWR97I4gR6G4qlGQKdURRZGyIBggm2QIFgliQFPliubwRkHM1OSImcKU4SwAH1UgWePsA0wAAAAASUVORK5CYII=");
background-size:1rem;
-webkit-animation: rotate .7s infinite;
-webkit-animation-timing-function: linear;
margin-left: -20px;
margin-top: -20px;
width: 40px;
height: 40px;
background: resolve("loading-wechat.png");
background-size:40px;
animation: rotate .7s infinite;
animation-timing-function: linear;
}
}
@-webkit-keyframes rotate {
@keyframes rotate {
0% {
-webkit-transform: rotate(0deg)
transform: rotate(0deg)
}
100% {
-webkit-transform: rotate(360deg)
transform: rotate(360deg)
}
}
\ No newline at end of file
... ...
... ... @@ -31,7 +31,7 @@
{{/if}}
{{/ payAppInfo}}
</div>
<div class="loadingToast hide"></div>
<div class="loading-toast hide"></div>
</div>
<script>_ozprm="orderid={{orderCode}}&ordertotal={{orderTotal}}";</script>
<script type="text/javascript" src ="//static.yohobuy.com/m/v1/js/AG_Tracking.js"></script>
... ...