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

html/openRedPacket.html

@@ -100,7 +100,7 @@
         }
         .open_money span{color: #FB412C}
         .open_money span:nth-child(1){font-size: 0.16rem ;margin-top: 0.15rem}
-        .open_money span:nth-child(2){font-size: 0.4rem}
+        .open_money span:nth-child(2){font-size: 0.32rem}
         .open_money span:nth-child(3){font-size: 0.16rem;margin-top: 0.35rem}
 
         .readXieyi{
@@ -217,7 +217,7 @@
                 <div class="open_redP">
                     <div class="open_money">
                         <span>￥</span>
-                        <span>99999</span>
+                        <span class="money">0</span>
                         <span>元</span>
                     </div>
                 </div>
@@ -266,12 +266,19 @@
 <script type="text/javascript" src="../js/mian.js"></script>
 <script type="text/javascript" src="../js/layer/layer.js"></script>
 <script>
-    let userInfo = {}
-    userInfo = {
-        token: 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpYXQiOjE1NzY1NzIwMzkuMCwiZXhwIjoxNTc5MTY0MDM5LjAsInVzZXJJbmZvIjp7InVpZCI6IjcwNTQiLCJyZXF1ZXN0RnJvbSI6M319.uBvrEFp3YHg0qOHEYv2kmRdIIAYlBibDMx067Vo4Nv0',
-        secretKey: '0d3d144d53af47d5af918e213cb66dbe'
+    let userInfo,dataObj
+
+    if(localStorage.userInfo && localStorage.dataObj){
+         userInfo = JSON.parse(localStorage.userInfo)
+         dataObj = JSON.parse(localStorage.dataObj)
+    }else {
+        window.location.href = '../login.html?page=billPage';
+
     }
-    localStorage.userInfo = JSON.stringify(userInfo)
+
+    $('.money').html(dataObj.yearTotalPrice);
+
+
     var isChecke = true; //是否阅读
     $('.readXieyi').click(function() {
         isChecke = !isChecke
@@ -313,7 +320,7 @@
 
     function getData(){
         let msg = {
-            customerId: '7244'
+            customerId:userInfo.customerId
         }
         $.ajax({
             type: "POST",