Skip to content

H
h5-base
Commit f9d6b564 authored by chenyishuai@singsingenglish.com's avatar chenyishuai@singsingenglish.com
Browse files
Options

625

parent 2669df5b
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 31 additions and 10 deletions
dev/index.html
View file @ f9d6b564
......@@ -10,4 +10,4 @@
overflow: hidden;
position: fixed;
background: #f4f4f4;
}</style><link href=static/css/app.3c0ad5f24e07150c06bc3b21fbd29d4b.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.e142bc86d4bb248bff26.js></script><script type=text/javascript src=static/js/vendor.a5a943cd8fb34eed2a77.js></script><script type=text/javascript src=static/js/app.ce97be89683cd91247e9.js></script></body></html>
\ No newline at end of file
}</style><link href=static/css/app.3c0ad5f24e07150c06bc3b21fbd29d4b.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.831ebe615e290ffb412d.js></script><script type=text/javascript src=static/js/vendor.a5a943cd8fb34eed2a77.js></script><script type=text/javascript src=static/js/app.ce97be89683cd91247e9.js></script></body></html>
\ No newline at end of file
dev/static/js/manifest.e142bc86d4bb248bff26.js → dev/static/js/manifest.831ebe615e290ffb412d.js
View file @ f9d6b564
!function(e){var c=window.webpackJsonp;window.webpackJsonp=function(a,n,r){for(var t,d,o,i=0,u=[];i<a.length;i++)d=a[i],f[d]&&u.push(f[d][0]),f[d]=0;for(t in n)Object.prototype.hasOwnProperty.call(n,t)&&(e[t]=n[t]);for(c&&c(a,n,r);u.length;)u.shift()();if(r)for(i=0;i<r.length;i++)o=b(b.s=r[i]);return o};var a={},f={46:0};function b(c){if(a[c])return a[c].exports;var f=a[c]={i:c,l:!1,exports:{}};return e[c].call(f.exports,f,f.exports,b),f.l=!0,f.exports}b.e=function(e){var c=f[e];if(0===c)return new Promise(function(e){e()});if(c)return c[2];var a=new Promise(function(a,b){c=f[e]=[a,b]});c[2]=a;var n=document.getElementsByTagName("head")[0],r=document.createElement("script");r.type="text/javascript",r.charset="utf-8",r.async=!0,r.timeout=12e4,b.nc&&r.setAttribute("nonce",b.nc),r.src=b.p+"static/js/"+e+"."+{0:"6abe927f66853d202f08",1:"2d6c5d7bf10502505d84",2:"c9e0de699f755ee4b23a",3:"2107f1b9e184ae98213a",4:"f2bf790adbbeb12829e1",5:"3b0b1393953737345836",6:"25de7942591869c92d4e",7:"8fb9cb12b685b1628a99",8:"4c37bd70d65f96539867",9:"f556b559f60a57bd98c7",10:"557bc3874b533f9c39d3",11:"92efb865b84db68417b7",12:"03191418f5558dcf03c8",13:"bb677dc9e2d9aba1532f",14:"1eed8453bb8930f088ba",15:"3f1ba28cfdb73106ab72",16:"63a8eda77e6a90bde78c",17:"3b059c1297c2878cf360",18:"2a86dae3846ad0c55ede",19:"648c99c8e8fe2819fb13",20:"5bc5f503eb5c6ff0910d",21:"d24a865b728397e73fae",22:"060e3341da0fa1a38cd1",23:"81a6e57c470e55803cb3",24:"9fd47715beb050e00ea1",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 t=setTimeout(d,12e4);function d(){r.onerror=r.onload=null,clearTimeout(t);var c=f[e];0!==c&&(c&&c[1](new Error("Loading chunk "+e+" failed.")),f[e]=void 0)}return r.onerror=r.onload=d,n.appendChild(r),a},b.m=e,b.c=a,b.d=function(e,c,a){b.o(e,c)||Object.defineProperty(e,c,{configurable:!1,enumerable:!0,get:a})},b.n=function(e){var c=e&&e.__esModule?function(){return e.default}:function(){return e};return b.d(c,"a",c),c},b.o=function(e,c){return Object.prototype.hasOwnProperty.call(e,c)},b.p="",b.oe=function(e){throw console.error(e),e}}([]);
\ No newline at end of file
!function(e){var f=window.webpackJsonp;window.webpackJsonp=function(a,r,b){for(var t,d,o,i=0,u=[];i<a.length;i++)d=a[i],c[d]&&u.push(c[d][0]),c[d]=0;for(t in r)Object.prototype.hasOwnProperty.call(r,t)&&(e[t]=r[t]);for(f&&f(a,r,b);u.length;)u.shift()();if(b)for(i=0;i<b.length;i++)o=n(n.s=b[i]);return o};var a={},c={46:0};function n(f){if(a[f])return a[f].exports;var c=a[f]={i:f,l:!1,exports:{}};return e[f].call(c.exports,c,c.exports,n),c.l=!0,c.exports}n.e=function(e){var f=c[e];if(0===f)return new Promise(function(e){e()});if(f)return f[2];var a=new Promise(function(a,n){f=c[e]=[a,n]});f[2]=a;var r=document.getElementsByTagName("head")[0],b=document.createElement("script");b.type="text/javascript",b.charset="utf-8",b.async=!0,b.timeout=12e4,n.nc&&b.setAttribute("nonce",n.nc),b.src=n.p+"static/js/"+e+"."+{0:"6abe927f66853d202f08",1:"2d6c5d7bf10502505d84",2:"c9e0de699f755ee4b23a",3:"2107f1b9e184ae98213a",4:"f2bf790adbbeb12829e1",5:"3b0b1393953737345836",6:"25de7942591869c92d4e",7:"8fb9cb12b685b1628a99",8:"4c37bd70d65f96539867",9:"f556b559f60a57bd98c7",10:"60678f7fef44a972896d",11:"92efb865b84db68417b7",12:"03191418f5558dcf03c8",13:"bb677dc9e2d9aba1532f",14:"1eed8453bb8930f088ba",15:"3f1ba28cfdb73106ab72",16:"63a8eda77e6a90bde78c",17:"3b059c1297c2878cf360",18:"2a86dae3846ad0c55ede",19:"648c99c8e8fe2819fb13",20:"5bc5f503eb5c6ff0910d",21:"d24a865b728397e73fae",22:"060e3341da0fa1a38cd1",23:"81a6e57c470e55803cb3",24:"9fd47715beb050e00ea1",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 t=setTimeout(d,12e4);function d(){b.onerror=b.onload=null,clearTimeout(t);var f=c[e];0!==f&&(f&&f[1](new Error("Loading chunk "+e+" failed.")),c[e]=void 0)}return b.onerror=b.onload=d,r.appendChild(b),a},n.m=e,n.c=a,n.d=function(e,f,a){n.o(e,f)||Object.defineProperty(e,f,{configurable:!1,enumerable:!0,get:a})},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
src/components/star/starRank.vue
View file @ f9d6b564
......@@ -37,7 +37,8 @@
<span class="line"></span>
</div>
</div>
<van-swipe
<transition name="fade">
<van-swipe
:loop="false"
:show-indicators="false"
:touchable="true"
......@@ -45,7 +46,7 @@
class="scroll"
@change="swipeChange"
>
<van-swipe-item>
<van-swipe-item @click="swipeItemClick">
<scroll :style="{maxHeight: height +'px'}" v-if="starNum!=0&&tabIndex==1" ref="scrollItem" :data="starList" :bounce="false">
<div class="container">
<div class="stageBox" v-if="starInfo.code!=2001">
......@@ -79,7 +80,7 @@
<img :src="starPage.star_prize2" alt>
</div>
</div>
<div class="addr" @click="goAddr" v-if="!addressObj">
<div class="addr" @click="goAddr($event)" v-if="!addressObj">
点击这里，快去填写收货地址吧
<i class="iconfont icon-youjiantou"></i>
</div>
......@@ -117,7 +118,7 @@
<span class="add">{{starInfo.user_category_integral_last_ten}}/20</span>
<img :src="starPage.star_inner" alt>
</div>
<div class="tip" @click="goDetail(1)">
<div class="tip" v-on:click="goDetail(1,$event)">
查看明细
<i class="iconfont icon-youjiantou"></i>
</div>
......@@ -132,7 +133,7 @@
<span class="add">{{starInfo.user_category_integral_last_twenty}}/40</span>
<img :src="starPage.star_inner" alt>
</div>
<div class="tip" @click="goDetail(2)">
<div class="tip" @click="goDetail(2,$event)">
查看明细
<i class="iconfont icon-youjiantou"></i>
</div>
......@@ -185,6 +186,7 @@
</scroll>
</van-swipe-item>
</van-swipe>
</transition>
</div>
</template>
......@@ -204,6 +206,7 @@ export default {
name: "starRank",
data() {
return {
isClick: true,
height: 0,
pullup: true,
rankBg: rankBg,
......@@ -224,8 +227,13 @@ export default {
},
components: {},
methods: {
swipeItemClick(e){
console.log('swipeItemClick',e);
this.isClick = true;
},
swipeChange(index) {
this.tabIndex = index + 1;
this.isClick = false;
},
goResult() {
this.$router.push({
......@@ -233,8 +241,9 @@ export default {
query: { starInfo: this.starInfo }
});
},
goAddr() {
if (this.addressObj) {
goAddr(e) {
if(this.isClick){
if (this.addressObj) {
this.$router.push({
name: "activityAddr"
});
......@@ -243,9 +252,12 @@ export default {
name: "addressEdit"
});
}
}
},
goDetail(index) {
let obj = {};
goDetail(index,e) {
console.log('goDetail',e);
if(this.isClick){
let obj = {};
obj.index = index;
if (index == 1) {
obj.start_at = this.starInfo.start_at;
......@@ -260,6 +272,7 @@ export default {
name: "starDetail",
query: { starInfo: obj }
});
}
},
onReachBottom() {
if (!this.finished && this.loading) {
......@@ -370,6 +383,12 @@ export default {
<style scoped lang="less">
@import "../../util/public";
.fade-enter-active, .fade-leave-active {
transition: opacity .5s;
}
.fade-enter, .fade-leave-to /* .fade-leave-active below version 2.1.8 */ {
opacity: 0;
}
.star-activity-page {
border-top: 1px solid transparent;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment