Merge branch 'feature/raffle' into 'release/5.4'

适配宽度

使活动页高度，至少为窗口高度

See merge request !170

@@ -35,8 +35,6 @@ const activity = (params) => {
         
         
         let bgUrl = '';
         let bgUrl = '';
 
 
-        let prizesList = result[0].data.prizes;
-
         let newPrizes = [];
         let newPrizes = [];
 
 
         let same = false;
         let same = false;
@@ -56,6 +54,8 @@ const activity = (params) => {
                 });
                 });
 
 
                 // 合并名称相同奖项
                 // 合并名称相同奖项
+                let prizesList = result[0].data.prizes;
+
                 prizesList.forEach((val, index) => {
                 prizesList.forEach((val, index) => {
                     if (newPrizes == '') {
                     if (newPrizes == '') {
                         newPrizes[0] = {
                         newPrizes[0] = {

@@ -331,6 +331,9 @@ $(window).scroll(function() {
 getOrders();
 getOrders();
 
 
 $(function() {
 $(function() {
+    // 适配背景图
+    var winH = $(document).height();
+    $(".wx-act-c").height(winH + "px");
     if ($('.dia-tip').length > 0) {
     if ($('.dia-tip').length > 0) {
         if(window.cookie('bindUrl') == 'http://m.yohobuy.com/passport/bind/success?type=bind') {
         if(window.cookie('bindUrl') == 'http://m.yohobuy.com/passport/bind/success?type=bind') {
             userId = $('.dia-tip').val();
             userId = $('.dia-tip').val();

@@ -4,7 +4,7 @@
     width: 100%;
     width: 100%;
     overflow: hidden;
     overflow: hidden;
     position: relative;
     position: relative;
-    background-size: 100%;
+    background-size: 100% auto;
     background-repeat: no-repeat;
     background-repeat: no-repeat;
 
 
     .logo {
     .logo {
@@ -95,7 +95,7 @@
         .rule-list-c {
         .rule-list-c {
             height: 198px;
             height: 198px;
             overflow-y: scroll;
             overflow-y: scroll;
-            padding: 0 30px;
+            padding-left: 10px;
 
 
             li {
             li {
                 color: #fff;
                 color: #fff;