Merge branch 'master' of http://git.singsingenglish.com/new-sing/wechat

src/base/scroll/scroll.vue

@@ -5,8 +5,8 @@
 </template>
 
 <script type="text/ecmascript-6">
-  import BScroll from 'better-scroll'
-  export default {
+import BScroll from "better-scroll";
+export default {
   props: {
     probeType: {
       type: Number,
@@ -55,49 +55,49 @@
   },
   mounted() {
     setTimeout(() => {
-        this._initScroll()
-      }, 20)
+      this._initScroll();
+    }, 20);
   },
   methods: {
     _initScroll() {
       if (!this.$refs.wrapper) {
-          return
+        return;
       }
       this.scroll = new BScroll(this.$refs.wrapper, {
         probeType: this.probeType,
         click: this.click,
-          bounce:this.bounce,
-          scrollX:this.scrollX,
-          scrollY:this.scrollY
-        })
+        bounce: this.bounce,
+        scrollX: this.scrollX,
+        scrollY: this.scrollY
+      });
 
       if (this.listenScroll) {
-          let me = this
-          this.scroll.on('scroll', (pos) => {
-            me.$emit('scroll', pos)
-          })
+        let me = this;
+        this.scroll.on("scroll", pos => {
+          me.$emit("scroll", pos);
+        });
       }
 
       if (this.pullup) {
-          this.scroll.on('scrollEnd', () => {
-            if (this.scroll.y <= (this.scroll.maxScrollY + 10)) {
+        this.scroll.on("scrollEnd", () => {
+          if (this.scroll.y <= this.scroll.maxScrollY + 10) {
             // 滚动到底部
-              this.$emit('pullup')
+            this.$emit("pullup");
           }
-          })
+        });
       }
       if (this.pulldown) {
-          this.scroll.on('touchend', (pos) => {
+        this.scroll.on("touchend", pos => {
           // 下拉动作
           if (pos.y > 50) {
-              this.$emit('pulldown')
+            this.$emit("pulldown");
           }
-          })
+        });
       }
       if (this.beforeScroll) {
-          this.scroll.on('beforeScrollStart', () => {
-            this.$emit('beforeScroll')
-          })
+        this.scroll.on("beforeScrollStart", () => {
+          this.$emit("beforeScroll");
+        });
       }
       // if (this.pos) {
       //   // this.$emit('beforeScroll')
@@ -105,34 +105,33 @@
       // }
     },
     disable() {
-        this.scroll && this.scroll.disable()
+      this.scroll && this.scroll.disable();
     },
     enable() {
-        this.scroll && this.scroll.enable()
+      this.scroll && this.scroll.enable();
     },
     refresh() {
-        this.scroll && this.scroll.refresh()
+      this.scroll && this.scroll.refresh();
     },
-      scrollTo(x,y,time) {
-        this.scroll && this.scroll.scrollTo(x,y,time)
+    scrollTo(x, y, time) {
+      this.scroll && this.scroll.scrollTo(x, y, time);
     },
-      scrollToElement(el,time){
-        this.scroll && this.scroll.scrollToElement(el,time)
+    scrollToElement(el, time) {
+      this.scroll && this.scroll.scrollToElement(el, time);
     },
     scrollToElement() {
-        this.scroll && this.scroll.scrollToElement.apply(this.scroll, arguments)
+      this.scroll && this.scroll.scrollToElement.apply(this.scroll, arguments);
     }
   },
   watch: {
     data() {
       setTimeout(() => {
-          this.refresh()
-        }, this.refreshDelay)
-      }
+        this.refresh();
+      }, this.refreshDelay);
     }
   }
+};
 </script>
 
 <style scoped >
-
 </style>

src/components/star/starRank.vue

@@ -44,12 +44,14 @@
           ref="scrollItem"
           class="scrollItem"
           :data="starList"
-          :bounce="false">
+          :bounce="false"
+        >
           <div class="container">
             <div class="stageBox" v-if="starInfo.code!=2001">
               <div
                 class="result"
-                v-if="starInfo.code!=2003&&starInfo.code!=2004&&starInfo.activity_result&&starInfo.activity_result.result!=15&&starInfo.activity_result.result!=16">
+                v-if="starInfo.code!=2003&&starInfo.code!=2004&&starInfo.activity_result&&starInfo.activity_result.result!=15&&starInfo.activity_result.result!=16"
+              >
                 <div class="float">结果公示</div>
                 <div v-if="starInfo.activity_result.result==11">
                   <h2>恭喜两个阶段全勤挑战成功</h2>
@@ -93,7 +95,8 @@
               </div>
               <div
                 v-if="starInfo.code!=2003&&starInfo.activity_result&&(starInfo.activity_result.result==15||starInfo.activity_result.result==16)"
-                class="result fal">
+                class="result fal"
+              >
                 <div class="float">结果公示</div>
                 <div v-if="starInfo.activity_result.result==15">
                   <div class="fal_title">很抱歉第一阶段全勤挑战失败</div>
@@ -338,7 +341,6 @@ export default {
               top +
               "px";
           }
-          console.log(top);
         }, 200);
         // if(this.$refs.unStart){
         //   floatBox
@@ -358,7 +360,7 @@ export default {
       } else if (index == 2) {
         this.swiper.slideNext();
       }
-      console.log(document.querySelector('.scrollItem'))
+      console.log(document.querySelector(".scrollItem"));
       // if(index==1){
       //   console.log(11)
       //   setTimeout(() => {
@@ -393,7 +395,9 @@ export default {
   z-index: 100;
   // padding-bottom: 10 * @toVw;
 }
-.scrollItem{height: 100vh;}
+.scrollItem {
+  height: 100vh;
+}
 .head {
   height: 147 * @toVw;
   .bg {