Merge branch 'master' of http://www.jiyou-tech.com:3000/chenming/496_dongfengqichen_wxsmall

496_dongfengqichen/pages/luckyStar/luckyStar.js

     },this)
   },
   noMoreData: function (duration,left){
+    console.log(1);
     this.aniFun(duration, left);
     setTimeout(() => {
       this.aniFun(0, '100%');
-      this.noMoreData(duration, left);
+      setTimeout(() => {
+        this.noMoreData(duration, left);
+      },50);
     }, duration)
   },
   aniFun(duration,left){

496_dongfengqichen/pages/luckyStar/luckyStar.wxml

       </view>
       <view class="tipContentGroup">
         <view class="textFrame">
-            <text space="emsp" class="tipContent" animation="{{ani}}">{{gameAwardList}}</text>
+          <text space="emsp" animation="{{ani}}" class="tipContent">{{gameAwardList}}</text>
         </view>
         <view class="scrollMask"></view>
       </view>