修改了入围奖样式

src/components/Description.vue

@@ -85,7 +85,7 @@
                             <span>人气奖</span>
                             <span>10名</span>
                         </div>
-                        <div class="prize lightBlue">2张万达影院电影票</div>
+                        <div class="prize lightBlue">万达影院电影票2张</div>
                     </div>
                 </div>
                 <!-- <div class="text3">

src/pages/index/Shouye.vue

@@ -90,8 +90,8 @@
                 </div>
             </div>
             <!-- 入围奖 -->
-            <div class="contentBox ruweipaihang ruweijiang" v-if="tabActive === 4">
-                <div class="subContent" id="ruweijiangBox" ref="ruweijiangBox">
+            <div class="contentBox ruweipaihang ruweijiang" ref='ruweiBox' v-if="tabActive === 4">
+                <!-- <div class="subContent" id="ruweijiangBox" ref="ruweijiangBox">
                     <vue-waterfall-easy
                         ref="lastContent"
                         v-if="ruwei"
@@ -104,7 +104,8 @@
                         </div>
                         <div slot="waterfall-over">没有更多了~</div>
                     </vue-waterfall-easy>
-                </div>
+                </div>-->
+                <ruwei></ruwei>
             </div>
         </div>
         <div class="joinus" v-show="tabActive !== 3">
@@ -134,6 +135,8 @@ import store from '../../modules/store';
 import wx from 'weixin-js-sdk';
 import TypeBox from '../../components/TypeBox';
 
+import ruwei from './ruwei.vue';
+
 import api from '@/modules/js/api.js';
 
 export default {
@@ -211,7 +214,7 @@ export default {
         this.getUserInfo();
         this.fucengButton = localStorage.getItem("fucengButton") ? 'close' : 'open';
 
-        // this.getRuweiList();
+        this.getRuweiList();
 
         // this.hiddenBar();
     },
@@ -417,15 +420,6 @@ export default {
                 });
         },
         getPrizeList() {
-            // axios
-            //     .get(
-            //         '/contest/award/list?activity_id=' +
-            //             this.$store.state.activeInfo.id
-            //     )
-            //     .then(res => {
-            //         this.huojiang = res.data.data.data;
-            //         this.huojingTitle = res.data.data.title;
-            //     });
 
             axios.get('/contest/award/list/time').then(res => {
                 // console.log('prizeList');
@@ -475,9 +469,9 @@ export default {
                         this.lastAllLoaded = true;
                         this.ruweidot = { backgroundColor: 'transparent' };
 
-                        Toast({
+                        // Toast({
                         //     message: '没有更多'
-                        });
+                        // });
 
                         return
                     }
@@ -794,7 +788,8 @@ export default {
         vueWaterfallEasy,
         PrizeBox,
         TypeBox,
-        Fuceng
+        Fuceng,
+        ruwei
     },
     beforeRouteLeave(to, from, next) {
         try {
@@ -824,7 +819,8 @@ export default {
         }
 
         try {
-            var ruweiY = $('.ruweijiang .vue-waterfall-easy-scroll').scrollTop();
+            // var ruweiY = $('.ruweijiang .vue-waterfall-easy-scroll').scrollTop();
+            var ruweiY = this.$refs.ruweiBox.scrollTop;
             store.commit('changeRuweiBoxScrollY', ruweiY);
         } catch (error) {
 
@@ -854,7 +850,8 @@ export default {
 
         try {
             var ys = this.$store.state.ruweiBoxScroll;
-            var ruweiY = $('.ruweijiang .vue-waterfall-easy-scroll').scrollTop(ys);
+            // var ruweiY = $('.ruweijiang .vue-waterfall-easy-scroll').scrollTop(ys);
+            this.$refs.ruweiBox.scrollTop = ys;
         } catch (error) {
 
         }