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

src/components/ActivityCenter/TurnaroundDraw.vue

@@ -139,7 +139,7 @@
 .info_rule{
   position: absolute;
   left: 173px;
-  bottom: -95px;
+  bottom: -110px;
 }
 .info_rule p {
   font-size: 14px;
@@ -149,6 +149,9 @@
   font-size: 12px;
   color: white;
 }
+.info_rule div p{
+  margin: 3px 0;
+}
 .pointer{
   cursor: pointer;
 }
@@ -282,6 +285,7 @@ export default {
       text1: '很遗憾',
       text2: '未中奖',
       dataObj: '',
+      zhuandong: false,
     };
   },
   mounted() {
@@ -306,7 +310,6 @@ export default {
       "#5fcbd5"
     ];
     this.getChouJiang();
-    this.startmarquee('30', 20, 0, 'RollBox')
   },
   methods: {
     getChouJiang: function () {
@@ -363,6 +366,9 @@ export default {
       this.apiJavaPost('/api/b2b/lottery/getTaskLotteryWinningList',{lotteryId: this.lotteryId, pageIndex: 1 ,pageSize: 20},res=>{
           if(res.data.resultCode==1){
               this.TaskLotteryWinningList = res.data.data.pageData
+              if(this.TaskLotteryWinningList.length>6) {
+                this.startmarquee('30', 20, 0, 'RollBox')
+              }
           }else{
               this.Error(res.data.message);
           }