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

html/annualMeeting/AnnuaLmeetingHome.html

@@ -310,6 +310,7 @@
         var html_l="";
         var html_c="";
         var html_r="";
+        let marginH=0
         $.each(rightList, function(i,v) {
             if(i==0){
                 html_l+='<div class="right_box" style="margin-top:0 ">\n' +
@@ -332,7 +333,10 @@
         });
         $(".c_right").append(html_l);
         $.each(data, function(i,v) {
-            html_c+=' <div class="c_xian">\n' +
+            if(i+1 == data.length ){
+                marginH = 0.6+'rem'
+            }
+            html_c+=' <div class="c_xian" style="margin-bottom:'+marginH+'">\n' +
                 '                        <div class="yuan"></div>\n' +
                 '                        <div class="yuan_x"></div>\n' +
                 '                    </div>'
@@ -340,7 +344,8 @@
         $(".c_center").append(html_c);
 
         $.each(leftList, function(i,v) {
-            html_r+='<div class="letf_box" style="margin-top: 0.75rem">\n' +
+
+            html_r+='<div class="letf_box" style="margin-top: 0.75rem;">\n' +
                 '                        <div class="time">\n' +
                 '                            <p>'+leftList[i].StartTime+'</p>\n' +
                 '                        </div>\n' +

html/annualMeeting/Money.html

@@ -364,6 +364,10 @@
         document.addEventListener("WeixinJSBridgeReady", function () {
             music.load();
         }, false);
+        $('#back_ico').click(function () {
+            //返回首页
+            window.history.back()
+        })
     });
 </script>
 </html>

html/annualMeeting/css/Amhome.css

@@ -143,7 +143,7 @@ p{
     width: 90%;
     height: 58%;
     margin-left: 5%;
-    margin-top: 34%;
+    margin-top: 28%;
     display: flex;
     flex-direction: column;
     align-items: center;
@@ -203,6 +203,7 @@ p{
     color: #893630;
     font-size: 0.12rem;
     margin-left: 0.1rem;
+    width: 90%;
 }
 .c_describe p:nth-child(1){
     padding-top: 0.05rem;