Merge branch 'master' of http://gitlab.oytour.com/huaguohao/surprised

28890dbf · Mac · ed134c4e · 12e92d11 · 28890dbf · 28890dbf
Commit 28890dbf authored Dec 17, 2019 by Mac
13 changed files
--- a/css/huikui.css
+++ b/css/huikui.css
@@ -8,7 +8,7 @@
    font-size:.12rem;
    background-repeat: no-repeat;
    background-size: 100% 100%;
-    padding: 12.34% 0 0 0;
+    padding: 5% 0 0 0;
    box-sizing: border-box;
    background-color: #fff8f5;
    position: relative;
@@ -103,7 +103,7 @@
    font-size: .3rem;
 }
 .margint-20{
-    margin-top: .2rem;
+    /* margin-top: .1rem; */
 }
 .page2 .bottom-box{
    width: 100%;
@@ -261,8 +261,8 @@
    height: 200px;
    position: absolute;
    zoom: 0.1;
-    left: -60px;
-    top: -10px;
+    left: -55px;
+    top: -22px;
  }
  .wrapper{
    width: 100px;
@@ -300,8 +300,8 @@
  }
  @-webkit-keyframes circleProgressLoad_right{
    0%{
-      border-top:20px solid #ED1A1A;
-      border-right:20px solid #ED1A1A;
+      border-top:20px solid rgba(255, 255, 255, 0);
+      border-right:20px solid rgba(255, 255, 255, 0);
      -webkit-transform: rotate(45deg);
    }
    50%{
@@ -319,8 +319,8 @@
  }
  @-webkit-keyframes circleProgressLoad_left{
    0%{
-      border-bottom:20px solid #ED1A1A;
-      border-left:20px solid #ED1A1A;
+      border-bottom:20px solid rgba(255, 255, 255, 1);
+      border-left:20px solid rgba(255, 255, 255, 1);
      -webkit-transform: rotate(45deg);
    }
    50%{

--- a/html/billPage.html
+++ b/html/billPage.html
@@ -11,7 +11,7 @@
        <link rel="stylesheet" href="../css/animate.css">
        <link rel="stylesheet" href="../css/cssReset.css">
        <script type="text/javascript" src="../js/autosize2.js"></script>
-        <link rel="stylesheet" href="../css/huikui.css">
+        <link rel="stylesheet" href="../css/huikui.css?v='122222'">
        <script src="https://cdn.bootcss.com/echarts/4.4.0-rc.1/echarts.min.js"></script>
    </head>
    <body>
@@ -380,7 +380,7 @@
                    if (moveY < -50 || moveY > 50) {
                        $("#page" + (n+1) + ">div.tit").addClass('animated fadeInLeft')
                        $("#page" + (n+1) + " .year").text(dataObj.Year)
-                        $("#page" + (n+1) + " .num").animateNumber({ number: dataObj.VisiteCount });
+                        $("#page" + (n+1) + " .num").animateNumber({ number: dataObj.VisiteCount }, 2000);
                        $("#page" + (n+1) + " .baifangjihua").addClass('animated fadeIn')
                        if (FirstOrderCreateStr.length) {
                            $("#page" + (n+1) + " #year").text(FirstOrderCreateStr[0])
@@ -391,12 +391,12 @@
                        if(dataObj.TotalGuest == '0') {
                            $("#page" + (n+1) + " #renshu").text('-');
                        } else {
-                            $("#page" + (n+1) + " #renshu").animateNumber({ number: dataObj.TotalGuest });
+                            $("#page" + (n+1) + " #renshu").animateNumber({ number: dataObj.TotalGuest }, 2000);
                        }
                        if(dataObj.TotalPrice == '0') {
                            $("#page" + (n+1) + " #jiaoyie").text('-');
                        } else {
-                            $("#page" + (n+1) + " #jiaoyie").animateNumber({ number: dataObj.TotalPrice });
+                            $("#page" + (n+1) + " #jiaoyie").animateNumber({ number: dataObj.TotalPrice }, 2000);
                        }
                        $("#page" + (n+1) + " .year" + (n+1)).text(dataObj.Year)
                        $("#page" + (n+1) + " .year" + (n+1)).text(dataObj.Year)
@@ -407,14 +407,14 @@
                        } else {
                            $("#pingjiaY").show()
                            $("#pingjiaN").hide()
-                            $("#page" + (n+1) + " #fenshu").animateNumber({ number: dataObj.evaluateList.ScoreNum })
+                            $("#page" + (n+1) + " #fenshu").animateNumber({ number: dataObj.evaluateList.ScoreNum }, 2000)
                        }
-                        $("#page" + (n+1) + " #allYear").animateNumber({ number: 10})
-                        $("#page" + (n+1) + " #Country").animateNumber({ number: 3})
-                        $("#page" + (n+1) + " #City").animateNumber({ number: 16})
-                        $("#page" + (n+1) + " #Company").animateNumber({ number: 17})
-                        $("#page" + (n+1) + " #allTH").animateNumber({ number: 14100})
-                        $("#page" + (n+1) + " #dahongbao").animateNumber({ number: dataObj.yearTotalPrice})
+                        $("#page" + (n+1) + " #allYear").animateNumber({ number: 10}, 2000)
+                        $("#page" + (n+1) + " #Country").animateNumber({ number: 3}, 2000)
+                        $("#page" + (n+1) + " #City").animateNumber({ number: 16}, 2000)
+                        $("#page" + (n+1) + " #Company").animateNumber({ number: 17}, 2000)
+                        $("#page" + (n+1) + " #allTH").animateNumber({ number: 14100}, 2000)
+                        $("#page" + (n+1) + " #dahongbao").animateNumber({ number: dataObj.yearTotalPrice}, 2000)
                    }
                    if (n == 0) {
                        $("#fan-up").hide()

--- a/images/huikui/bg-img.jpg
+++ b/images/huikui/bg-img.jpg
--- a/images/huikui/bg-img.png
+++ b/images/huikui/bg-img.png
--- a/images/huikui/bg2-img.png
+++ b/images/huikui/bg2-img.png
--- a/images/huikui/page1_rili.png
+++ b/images/huikui/page1_rili.png
--- a/images/huikui/page2_ren.png
+++ b/images/huikui/page2_ren.png
--- a/images/huikui/page2_tanzi.png
+++ b/images/huikui/page2_tanzi.png
--- a/images/huikui/page3_shiz.png
+++ b/images/huikui/page3_shiz.png
--- a/images/huikui/page4_shiz.png
+++ b/images/huikui/page4_shiz.png
--- a/images/huikui/page7_map.png
+++ b/images/huikui/page7_map.png
--- a/images/huikui/page8_map.png
+++ b/images/huikui/page8_map.png
--- a/images/huikui/page9_img.png
+++ b/images/huikui/page9_img.png