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

css/huikui.css

@@ -13,6 +13,11 @@
     background-color: #fff8f5;
     position: relative;
 }
+.page.page10{
+    background:url('../images/huikui/page10_bg.png');
+    background-repeat: no-repeat;
+    background-size: 100% 100%;
+}
 .page .tit,.page .content,.page .tit2{
     padding-left: 12.4%;
 }
@@ -390,4 +395,47 @@
     -ms-transform: translateX(-9920px);
     -o-transform: translateX(-9920px);
     transform: translateX(-9920px);
+  }
+  .rule_box{
+    width: 80%;
+    height: 3rem;
+    background:url('../images/huikui/page10_rule.png');
+    font-size:.12rem;
+    background-repeat: no-repeat;
+    background-size: 100% 100%;
+    margin: 0 auto;
+    margin-top: 1rem;
+    position: absolute;
+    left: 50%;
+    transform: translate(-50%);
+  }
+  .rule_box .rule_box_tit{
+    width: 70%;
+    height: .5rem;
+    background:url('../images/huikui/page10_tit.png');
+    background-repeat: no-repeat;
+    background-size: 100% 100%;
+    position: absolute;
+    left: 50%;
+    transform: translate(-50%, -50%)
+  }
+  .rule_box .rule_box_tit img{
+    position: absolute;
+    left: 3%;
+    bottom: 46%;
+    width: .5rem;
+  }
+  .rule_box .rule_box_tit P{
+    text-align: center;
+    line-height: .5rem;
+    font-size: .2rem;
+    font-family: 'PingFangR';
+  }
+  .rule_box2{
+    width: 94%;
+    margin: 0 auto;
+    margin-top: .3rem;
+  }
+  .rule_box2 img{
+    width: 100%;
   }
\ No newline at end of file

html/SignIn/SignIn.html

@@ -238,7 +238,7 @@
 					init();
 				})
 				proxy.on("barrage",data=>{
-					let barrage = JSON.parse(data)
+					let barrage = data
 					console.log()
 					createDM({img: barrage.p, name: barrage.n, text: barrage.m})
                 })

html/billPage.html

@@ -199,6 +199,26 @@
                         <p class="jieshi red">本活动最终解释权在法律允许范围内归本公司所有。</p>
                     </div>
                 </div>
+                <div class="page page9 page10" id="page10">
+                    <div class="tit animated fadeInLeft">
+                        <img src="../images/huikui/page9_tit.png" alt="">
+                    </div>
+                    <div class="content">
+                        <p>印象之旅<span class="red">2020</span>年</p>
+                        <p>年底<span class="red">大红包</span>玩法来了</p>
+                        <p>殷殷之心,拳拳可见 </p>
+                        <p>印象之旅感动与世界同步</p>
+                    </div>
+                    <!-- <div class="rule_box">
+                        <div class="rule_box_tit">
+                            <img src="../images/huikui/page10_xr.png" alt="">
+                            <p class="red">大红包规则</p>
+                        </div>
+                    </div> -->
+                    <div class="rule_box2">
+                        <img src="../images/huikui/page10_rimg.png" alt="">
+                    </div>
+                </div>
             </div>
             <div class="fan fan-down animated bounceInUp"  id="fan-down">
                 <img src="../images/huikui/arr1.png" alt="">
@@ -254,8 +274,9 @@
             getData();
             // 获取数据
             function getData(){
+                // locationName.indexOf('oytour') !== -1 ? userInfo.customerId : 7989
                 var msg = {
-                    customerId: locationName.indexOf('oytour') !== -1 ? userInfo.customerId : 7989,
+                    customerId: 1450,
                 }
                 $.ajax({
                     type: "POST",
@@ -279,6 +300,13 @@
                             $('#day').animateNumber({ number: day });
                             $("#CreateBy").text(res.data.CreateBy.split('（')[0])
                             $("#rili-tit").text( year + '年' + month + '月')
+                            if (dataObj.yearTotalPrice > 0) {
+                                $("#page9").show()
+                                $("#page10").hide()
+                            } else {
+                                $("#page9").hide()
+                                $("#page10").show()
+                            }
                             if (dataObj.FirstOrderCreateStr == '') {
                                 $(".dingdany").hide()
                                 $(".dingdann").show()

js/mian.js

@@ -2,8 +2,8 @@ let locationName = window.location.hostname;
 
 function getApiUrl() {
     let url = {
-        // urlPost: "https://reborn.oytour.com/api/common/post",
-        urlPost: locationName.indexOf('oytour') !== -1 ? "https://reborn.oytour.com/api/common/post" : "http://192.168.2.65:8025/api/common/post",
+        urlPost: "https://reborn.oytour.com/api/common/post",
+        // urlPost: locationName.indexOf('oytour') !== -1 ? "https://reborn.oytour.com/api/common/post" : "http://192.168.2.65:8025/api/common/post",
         //urlJava: locationName.indexOf('oytour') !== -1 ? "https://efficient.oytour.com/" : "http://192.168.2.215:9000/"
         urlJava: "https://efficient.oytour.com/"
     }