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

css/GT_activities.css

-html,body{
-    height:100%;
+html,
+body {
+    height: 100%;
     margin: 0;
     padding: 0;
-
 }
 
-p{
-    display:block;
-    -webkit-margin-before:0;
-    -webkit-margin-after:0;
-
+p {
+    display: block;
+    -webkit-margin-before: 0;
+    -webkit-margin-after: 0;
 }
 
-#box{
+#box {
     width: 100%;
     height: 100%;
     background-image: url(../images/bg2@3x.png);
@@ -21,21 +20,24 @@ p{
     padding-top: 0.7rem;
     position: relative;
 }
-.wx_bg{
-    width:100%;
-    height:100%;
-    background: rgba(00,00,00,0.6);
+
+.wx_bg {
+    width: 100%;
+    height: 100%;
+    background: rgba(00, 00, 00, 0.6);
     position: fixed;
-    top:0;
-    z-index:999;
+    top: 0;
+    z-index: 999;
     text-align: center;
     display: none;
 }
-.wx_bg img{
-    width:2.5rem;
-    margin-top:50%;
+
+.wx_bg img {
+    width: 2.5rem;
+    margin-top: 50%;
 }
-.box_title{
+
+.box_title {
     width: 80%;
     margin-left: 10%;
     height: 2.38rem;
@@ -43,15 +45,17 @@ p{
     border-radius: 0.08rem;
     position: relative;
 }
-.box_title .G_img{
+
+.box_title .G_img {
     width: 0.56rem;
     height: 0.57rem;
     position: absolute;
     left: 1.23rem;
     top: -0.235rem;
 }
-.box_title h5{
-    font-size: 0.28rem;
+
+.box_title h5 {
+    font-size: 0.26rem;
     color: #C72220;
     margin-block-start: 0;
     margin-block-end: 0;
@@ -59,35 +63,38 @@ p{
     padding-top: 0.35rem;
     /*font-weight: bold;*/
 }
-.box_title .box_limit{
+
+.box_title .box_limit {
     width: 2.6rem;
     margin: 0.2rem auto;
     display: flex;
     flex-direction: row;
     justify-content: space-between;
 }
-.box_text{
+
+.box_text {
     font-size: 0.2rem;
     color: #111111;
     float: left;
 }
-.box_d{
+
+.box_d {
     width: 0.45rem;
     height: 0.7rem;
     background: #C72220;
     float: left;
     margin: 0 0.05rem;
     border-radius: 0.05rem;
-
 }
-.box_d p{
+
+.box_d p {
     font-size: 0.54rem;
     color: white;
     text-align: center;
     line-height: 0.7rem;
 }
 
-.box_content{
+.box_content {
     width: 100%;
     height: 5.2rem;
     background-image: url(../images/bg1@3x.png);
@@ -97,32 +104,35 @@ p{
     left: 0;
     top: 1.48rem;
 }
-.box_content .box_content_t{
+
+.box_content .box_content_t {
     display: flex;
     flex-direction: row;
     justify-content: center;
     align-items: center;
     margin-top: 0.1rem;
 }
-.t_name{
+
+.t_name {
     font-size: 0.16rem;
     color: white;
-
 }
-.time_view{
+
+.time_view {
     width: 0.37rem;
     height: 0.31rem;
     border-radius: 0.07rem;
     background: #FAB001;
-
 }
-.time_view p{
+
+.time_view p {
     font-size: 0.25rem;
     color: #E03234;
     text-align: center;
     line-height: 0.31rem;
 }
-.img_bg_M{
+
+.img_bg_M {
     width: 100%;
     height: 2.14rem;
     background-image: url(../images/M_200.png);
@@ -131,17 +141,37 @@ p{
     position: relative;
 }
 
+
 /*.img_bg_p1{*/
+
+
 /*    font-size: 0.3rem;*/
+
+
 /*    color: #E03234;*/
+
+
 /*    padding-top: 0.2rem;*/
+
+
 /*}*/
+
+
 /*.img_bg_p2{*/
+
+
 /*    font-size: 0.14rem;*/
+
+
 /*    color: #E03234;*/
+
+
 /*    height: 0.2rem;*/
+
+
 /*}*/
-.img_btn{
+
+.img_btn {
     width: 1.4rem;
     height: 0.38rem;
     /*background: #FAB001;*/
@@ -155,27 +185,30 @@ p{
     background-repeat: no-repeat;
 }
 
-.img_btn p{
+.img_btn p {
     font-size: 0.16rem;
     color: #E03234;
 }
-.explain_box{
+
+.explain_box {
     background: #C72220;
     padding: 0.15rem;
 }
-.explain{
+
+.explain {
     width: 100%;
     background: #E03234;
     overflow: auto;
 }
-.explain p{
+
+.explain p {
     font-size: 0.12rem;
     color: #FFFFFF;
     margin: 0.15rem;
     line-height: 0.2rem;
 }
 
-.img_bg_M .received_img{
+.img_bg_M .received_img {
     position: absolute;
     right: 0.14rem;
     top: 0.67rem;
@@ -183,7 +216,8 @@ p{
     height: 0.65rem;
     display: none;
 }
-.box_title_2{
+
+.box_title_2 {
     width: 90%;
     display: flex;
     flex-direction: row;
@@ -191,12 +225,13 @@ p{
     justify-content: center;
     margin-left: 5%;
 }
-.box_title_2 p{
+
+.box_title_2 p {
     font-size: 0.26rem;
     color: #FFFFFF;
 }
 
-#notice{
+#notice {
     width: 100%;
     height: 100%;
     position: absolute;
@@ -207,7 +242,8 @@ p{
     z-index: 100;
     display: none;
 }
-.notice_img{
+
+.notice_img {
     width: 2.66rem;
     height: 3.18rem;
     position: absolute;
@@ -222,20 +258,22 @@ p{
     opacity: 1;
     display: none;
 }
-.notice_img img{
+
+.notice_img img {
     width: 1.99rem;
     height: 0.63rem;
     margin-left: 0.3rem;
-
 }
 
-.notice_name{
+.notice_name {
     font-size: 0.16rem;
     color: #FFFFFF;
     text-align: center;
     margin-top: 0;
 }
-.notice_content,.notice_content2{
+
+.notice_content,
+.notice_content2 {
     font-size: 0.10rem;
     color: #FFFFFF;
     text-align: center;
@@ -243,7 +281,8 @@ p{
     margin-left: 3%;
     line-height: 0.2rem;
 }
-.c_close{
+
+.c_close {
     width: 1.2rem;
     height: 0.35rem;
     border-radius: 0.06rem;
@@ -253,12 +292,13 @@ p{
     justify-content: center;
     margin: 0.4rem auto;
 }
-.c_close p{
+
+.c_close p {
     font-size: 0.16rem;
     color: #9B0612;
 }
 
-.use_oupon{
+.use_oupon {
     width: 3.14rem;
     height: 0.4rem;
     margin-top: 0.16rem;
@@ -268,84 +308,93 @@ p{
     align-items: center;
     justify-content: space-between;
 }
-.use_news{
+
+.use_news {
     display: flex;
     flex-direction: row;
     align-items: center;
 }
-.use_news img{
+
+.use_news img {
     width: 0.4rem;
     height: 0.4rem;
     /*border-radius: 0.2rem;*/
     overflow: hidden;
 }
-.use_news div{
+
+.use_news div {
     height: 0.4rem;
     margin-left: 0.1rem;
     display: flex;
     flex-direction: column;
     justify-content: space-around;
-
 }
-.use_news div p:nth-child(1){
+
+.use_news div p:nth-child(1) {
     font-size: 0.12rem;
     color: #111111;
 }
-.use_news div p:nth-child(2){
+
+.use_news div p:nth-child(2) {
     font-size: 0.1rem;
     color: #888888;
     width: 1.8rem;
     overflow: hidden;
 }
-.click_use{
+
+.click_use {
     width: 0.8rem;
     height: 0.25rem;
-    border:solid 1px #E03234
+    border: solid 1px #E03234
 }
-.click_use p{
+
+.click_use p {
     font-size: 0.11rem;
     color: #E03234;
     text-align: center;
     line-height: 0.25rem;
 }
-.deta_replace{
+
+.deta_replace {
     width: 2rem;
     height: 0.7rem;
     display: none;
     flex-direction: row;
     justify-content: space-between;
 }
-.replace_box{
+
+.replace_box {
     width: 0.46rem;
     height: 100%;
     display: inline-block;
     position: relative;
-
 }
 
-.replace_top{
+.replace_top {
     width: 0.46rem;
-    height:50% ;
+    height: 50%;
     background: #C72220;
     border-bottom: 1px solid #FFFFFF;
     box-sizing: border-box;
     border-radius: 10px 10px 0 0;
 }
-.replace_bottom{
-    height:50% ;
+
+.replace_bottom {
+    height: 50%;
     background: #C72220;
     box-sizing: border-box;
     border-radius: 0 0 10px 10px;
 }
-.replace_text{
+
+.replace_text {
     width: 0.46rem;
     height: 100%;
     position: absolute;
     top: 0;
     left: 0;
-
 }
-.replace_text p{
+
+.replace_text p {
     color: #FFFFFF;
     font-family: "Helvetica Neue", Helvetica, sans-serif;
     font-size: 0.54rem;
@@ -354,13 +403,13 @@ p{
     text-align: center;
 }
 
-.app_share{
+.app_share {
     width: 100%;
     height: 0.35rem;
     display: none;
-
 }
-.app_sharebox{
+
+.app_sharebox {
     width: 90%;
     margin-left: 5%;
     height: 0.35rem;
@@ -368,51 +417,58 @@ p{
     flex-direction: row;
     align-items: center;
 }
-.app_sharebox p{
+
+.app_sharebox p {
     font-size: 0.14rem;
     color: white;
     margin-right: 0.1rem;
 }
-.app_sharebox img{
+
+.app_sharebox img {
     width: 0.2rem;
     height: 0.2rem;
     margin-left: 0.15rem;
 }
-.Noticewarp{
+
+.Noticewarp {
     overflow: hidden;
     height: 0.3rem;
     line-height: 0.3rem;
     width: 100%;
     position: absolute;
-    top:2.7rem;
-    z-index:999;
+    top: 2.7rem;
+    z-index: 999;
 }
+
 .Noticewarp .scroll {
     width: 200%;
     float: left;
     position: relative;
 }
+
 .Noticewarp a {
     color: #fff;
     width: auto;
     float: left;
-    padding:0 0.2rem 0 0.05rem;
-    height:0.3rem;
+    padding: 0 0.2rem 0 0.05rem;
+    height: 0.3rem;
     text-decoration: none;
-    margin-right:0.1rem;
-    border-radius:1rem;
-    background: rgba(0,0,0,0.5);
-    font-size:0.1rem;
+    margin-right: 0.1rem;
+    border-radius: 1rem;
+    background: rgba(0, 0, 0, 0.5);
+    font-size: 0.1rem;
     display: inline-block;
 }
-.scroll a img{
-    width:0.25rem;
-    height:0.25rem;
+
+.scroll a img {
+    width: 0.25rem;
+    height: 0.25rem;
     vertical-align: middle;
     position: relative;
-    top:-0.02rem;
-    border-radius:50%;
+    top: -0.02rem;
+    border-radius: 50%;
 }
-.Noticewarp a:last-child{
-    margin-right:0;
+
+.Noticewarp a:last-child {
+    margin-right: 0;
 }
\ No newline at end of file

html/GT_activities.html

@@ -223,7 +223,7 @@
                         }
                         var str = ''
                         for (var i = 0; i < dataList.length; i++) {
-                            if(!dataList[i].customerPhoto){
+                            if (!dataList[i].customerPhoto) {
                                 dataList[i].customerPhoto = '../images/tx_bg.png'
                             }
                             str += `<a href="javascript:void(0);">
@@ -314,7 +314,7 @@
 
         }
 
-        if(login == true){
+        if (login == true) {
 
 
         }
@@ -379,8 +379,8 @@
                         platform: platform,
                         login: login,
                         count: res.data.count, //判断是否可以抢购 0为不可以
-                            activityStartDate:activityStartDate,
-                            activityEndDate:activityEndDate,
+                        activityStartDate: activityStartDate,
+                        activityEndDate: activityEndDate,
                     }); //刚进入页面不执行动画
 
 
@@ -488,8 +488,8 @@
                     let RushbuyTime = {
                         RushbuyTime: expirationDate,
                         title: title,
-                            userName:res.data.contact,
-                            shopName:res.data.customerName,
+                        userName: res.data.contact,
+                        shopName: res.data.customerName,
                     }
                     localStorage.RushbuyTime = JSON.stringify(RushbuyTime)
                     $('.img_bg_p2').html('有效期截止：' + expirationDate)
@@ -742,8 +742,8 @@
                                 platform: platform,
                                 login: login,
                                 count: res.data.count, //判断是否可以抢购 0为不可以
-                             activityStartDate:activityStartDate,
-                             activityEndDate:activityEndDate,
+                                activityStartDate: activityStartDate,
+                                activityEndDate: activityEndDate,
                             }); //刚进入页面不执行动画
 
 
@@ -851,8 +851,8 @@
                             let RushbuyTime = {
                                 RushbuyTime: expirationDate,
                                 title: title,
-                             userName:res.data.contact,
-                             shopName:res.data.customerName,
+                                userName: res.data.contact,
+                                shopName: res.data.customerName,
                             }
                             localStorage.RushbuyTime = JSON.stringify(RushbuyTime)
                             $('.img_bg_p2').html('有效期截止：' + expirationDate)