627

69126f80 · chenyishuai@singsingenglish.com · deca76de · 69126f80 · deca76de · 69126f80
Commit 69126f80 authored Jun 27, 2019 by chenyishuai@singsingenglish.com
6 changed files
--- a/dev/index.html
+++ b/dev/index.html
@@ -10,4 +10,4 @@
          overflow: hidden;
          position: fixed;
          background: #f4f4f4;
-        }</style><link href=static/css/app.bf89c67cb6a818994fcc9e7a2f1754db.css rel=stylesheet></head><body><div id=app></div><script src=https://res.wx.qq.com/open/js/jweixin-1.3.2.js></script><script src=static/vconsole/vconsole.min.js></script><script></script><script type=text/javascript src=static/js/manifest.ab2aeb00416b1e394454.js></script><script type=text/javascript src=static/js/vendor.a5a943cd8fb34eed2a77.js></script><script type=text/javascript src=static/js/app.1fb8456c4f2c17f7ad56.js></script></body></html>
\ No newline at end of file
+        }</style><link href=static/css/app.bf89c67cb6a818994fcc9e7a2f1754db.css rel=stylesheet></head><body><div id=app></div><script src=https://res.wx.qq.com/open/js/jweixin-1.3.2.js></script><script src=static/vconsole/vconsole.min.js></script><script></script><script type=text/javascript src=static/js/manifest.06e17d32e198e02d7d9f.js></script><script type=text/javascript src=static/js/vendor.a5a943cd8fb34eed2a77.js></script><script type=text/javascript src=static/js/app.985d3a0052fbf422540c.js></script></body></html>
\ No newline at end of file
--- a/dev/static/js/24.8a340b2eb201d4ea6005.js
+++ b/dev/static/js/24.8a340b2eb201d4ea6005.js
--- a/dev/static/js/24.8e5e15722465e7da71bf.js
+++ b/dev/static/js/24.8e5e15722465e7da71bf.js
--- a/dev/static/js/app.1fb8456c4f2c17f7ad56.js
+++ b/dev/static/js/app.1fb8456c4f2c17f7ad56.js
--- a/dev/static/js/manifest.ab2aeb00416b1e394454.js
+++ b/dev/static/js/manifest.ab2aeb00416b1e394454.js
-!function(e){var f=window.webpackJsonp;window.webpackJsonp=function(c,r,t){for(var b,d,o,i=0,u=[];i<c.length;i++)d=c[i],a[d]&&u.push(a[d][0]),a[d]=0;for(b in r)Object.prototype.hasOwnProperty.call(r,b)&&(e[b]=r[b]);for(f&&f(c,r,t);u.length;)u.shift()();if(t)for(i=0;i<t.length;i++)o=n(n.s=t[i]);return o};var c={},a={46:0};function n(f){if(c[f])return c[f].exports;var a=c[f]={i:f,l:!1,exports:{}};return e[f].call(a.exports,a,a.exports,n),a.l=!0,a.exports}n.e=function(e){var f=a[e];if(0===f)return new Promise(function(e){e()});if(f)return f[2];var c=new Promise(function(c,n){f=a[e]=[c,n]});f[2]=c;var r=document.getElementsByTagName("head")[0],t=document.createElement("script");t.type="text/javascript",t.charset="utf-8",t.async=!0,t.timeout=12e4,n.nc&&t.setAttribute("nonce",n.nc),t.src=n.p+"static/js/"+e+"."+{0:"6abe927f66853d202f08",1:"2d406400ec3c8d3cf042",2:"c9e0de699f755ee4b23a",3:"2107f1b9e184ae98213a",4:"f2bf790adbbeb12829e1",5:"3b0b1393953737345836",6:"25de7942591869c92d4e",7:"d38ff3f7521ea990c842",8:"4c37bd70d65f96539867",9:"f556b559f60a57bd98c7",10:"de3e0e9cd5ee98d6c928",11:"b0902bd724ca4e957e5d",12:"569df6356ef277433bf8",13:"80d75851ebf723ba0b00",14:"49e2faaa5a02eff36984",15:"9d6cc6367f21cfbac19e",16:"98ce85ad5ab95594e0f7",17:"37acfb8d41847866afb0",18:"c5d36ed475bb21ff44cf",19:"54a8798e8eefb0b18908",20:"ea0e446648e88f1d76e4",21:"f62dfff013d1ecc467be",22:"0a1864b54026b8c72ef7",23:"52c139bed6992be26830",24:"8a340b2eb201d4ea6005",25:"62620e9bac18a036b452",26:"74f2b27848334b451d54",27:"31c1e69da4f897ae4765",28:"99da3828c1999d40671a",29:"fa14b41d7c77e07c8120",30:"8415ee1bca5daa87c09e",31:"267ce6de032f1064248f",32:"832df5bf4f39f1bb1834",33:"39cebaea98826b57334e",34:"2ef07273df25c5998fc7",35:"4cc5c8808f6ddc45f715",36:"521b496293b7bc33814e",37:"5561b87aa887f3a9c76d",38:"39491e7ffa5846071712",39:"2eebc8580c2465fe6f3e",40:"3d668485588329ab6b7d",41:"333a8bf40e2fefa8f501",42:"0f9cba645d90bf0157fd",43:"6d2a78fce59048b83178"}[e]+".js";var b=setTimeout(d,12e4);function d(){t.onerror=t.onload=null,clearTimeout(b);var f=a[e];0!==f&&(f&&f[1](new Error("Loading chunk "+e+" failed.")),a[e]=void 0)}return t.onerror=t.onload=d,r.appendChild(t),c},n.m=e,n.c=c,n.d=function(e,f,c){n.o(e,f)||Object.defineProperty(e,f,{configurable:!1,enumerable:!0,get:c})},n.n=function(e){var f=e&&e.__esModule?function(){return e.default}:function(){return e};return n.d(f,"a",f),f},n.o=function(e,f){return Object.prototype.hasOwnProperty.call(e,f)},n.p="",n.oe=function(e){throw console.error(e),e}}([]);
\ No newline at end of file
+!function(e){var f=window.webpackJsonp;window.webpackJsonp=function(c,r,t){for(var b,d,o,i=0,u=[];i<c.length;i++)d=c[i],a[d]&&u.push(a[d][0]),a[d]=0;for(b in r)Object.prototype.hasOwnProperty.call(r,b)&&(e[b]=r[b]);for(f&&f(c,r,t);u.length;)u.shift()();if(t)for(i=0;i<t.length;i++)o=n(n.s=t[i]);return o};var c={},a={46:0};function n(f){if(c[f])return c[f].exports;var a=c[f]={i:f,l:!1,exports:{}};return e[f].call(a.exports,a,a.exports,n),a.l=!0,a.exports}n.e=function(e){var f=a[e];if(0===f)return new Promise(function(e){e()});if(f)return f[2];var c=new Promise(function(c,n){f=a[e]=[c,n]});f[2]=c;var r=document.getElementsByTagName("head")[0],t=document.createElement("script");t.type="text/javascript",t.charset="utf-8",t.async=!0,t.timeout=12e4,n.nc&&t.setAttribute("nonce",n.nc),t.src=n.p+"static/js/"+e+"."+{0:"6abe927f66853d202f08",1:"2d406400ec3c8d3cf042",2:"c9e0de699f755ee4b23a",3:"2107f1b9e184ae98213a",4:"f2bf790adbbeb12829e1",5:"3b0b1393953737345836",6:"25de7942591869c92d4e",7:"d38ff3f7521ea990c842",8:"4c37bd70d65f96539867",9:"f556b559f60a57bd98c7",10:"de3e0e9cd5ee98d6c928",11:"b0902bd724ca4e957e5d",12:"569df6356ef277433bf8",13:"80d75851ebf723ba0b00",14:"49e2faaa5a02eff36984",15:"9d6cc6367f21cfbac19e",16:"98ce85ad5ab95594e0f7",17:"37acfb8d41847866afb0",18:"c5d36ed475bb21ff44cf",19:"54a8798e8eefb0b18908",20:"ea0e446648e88f1d76e4",21:"f62dfff013d1ecc467be",22:"0a1864b54026b8c72ef7",23:"52c139bed6992be26830",24:"8e5e15722465e7da71bf",25:"62620e9bac18a036b452",26:"74f2b27848334b451d54",27:"31c1e69da4f897ae4765",28:"99da3828c1999d40671a",29:"fa14b41d7c77e07c8120",30:"8415ee1bca5daa87c09e",31:"267ce6de032f1064248f",32:"832df5bf4f39f1bb1834",33:"39cebaea98826b57334e",34:"2ef07273df25c5998fc7",35:"4cc5c8808f6ddc45f715",36:"521b496293b7bc33814e",37:"5561b87aa887f3a9c76d",38:"39491e7ffa5846071712",39:"2eebc8580c2465fe6f3e",40:"3d668485588329ab6b7d",41:"333a8bf40e2fefa8f501",42:"0f9cba645d90bf0157fd",43:"6d2a78fce59048b83178"}[e]+".js";var b=setTimeout(d,12e4);function d(){t.onerror=t.onload=null,clearTimeout(b);var f=a[e];0!==f&&(f&&f[1](new Error("Loading chunk "+e+" failed.")),a[e]=void 0)}return t.onerror=t.onload=d,r.appendChild(t),c},n.m=e,n.c=c,n.d=function(e,f,c){n.o(e,f)||Object.defineProperty(e,f,{configurable:!1,enumerable:!0,get:c})},n.n=function(e){var f=e&&e.__esModule?function(){return e.default}:function(){return e};return n.d(f,"a",f),f},n.o=function(e,f){return Object.prototype.hasOwnProperty.call(e,f)},n.p="",n.oe=function(e){throw console.error(e),e}}([]);
\ No newline at end of file
--- a/src/components/star/starRank.vue
+++ b/src/components/star/starRank.vue
@@ -40,9 +40,9 @@
    <swiper class="scroll" :options="swiperOption" ref="mySwiper">
      <swiperSlide>
        <scroll
-          :style="{maxHeight: height +'px'}"
          v-if="starNum!=0"
          ref="scrollItem"
+          class="scrollItem"
          :data="starList"
          :bounce="false">
          <div class="container">
@@ -156,9 +156,9 @@
      </swiperSlide>
      <swiperSlide>
        <scroll
-          :style="{maxHeight: height +'px'}"
          v-if="starNum!=0"
          ref="scrollItem"
+          class="scrollItem"
          :data="starList"
          :pullup="pullup"
          :bounce="false"
@@ -358,8 +358,9 @@ export default {
      } else if (index == 2) {
        this.swiper.slideNext();
      }
-
-      // if(index==2){
+      console.log(document.querySelector('.scrollItem'))
+      // if(index==1){
+      //   console.log(11)
      //   setTimeout(() => {
      //     this.$refs.scrollItem._initScroll()
      //   }, 100);
@@ -392,6 +393,7 @@ export default {
  z-index: 100;
  // padding-bottom: 10 * @toVw;
 }
+.scrollItem{height: 100vh;}
 .head {
  height: 147 * @toVw;
  .bg {