Skip to content

dev / marubi-wish-list-mp

Go to a project
Toggle navigation
Toggle navigation pinning
e8a14def by simon
Options

版本提交

1 parent d6ce1c64
Expand all
Inline Side-by-side
Showing 15 changed files with 93 additions and 20 deletions
...@@ -18,9 +18,12 @@ ...@@ -18,9 +18,12 @@
18 // 雪碧图 18 // 雪碧图
19 // @lazysprite "filetype"; 19 // @lazysprite "filetype";
20 20
21 .test { 21 // @import "style/wxss/animate.wxss";
22 background-image: url(%ASSETS_IMG%/qr-r.jpg); 22
23 } 23
24 // .test {
25 // background-image: url(%ASSETS_IMG%/qr-r.jpg);
26 // }
24 27
25 .app { 28 .app {
26 height: 100%; 29 height: 100%;
......
...@@ -10,3 +10,5 @@ ...@@ -10,3 +10,5 @@
10 @import "mixins"; 10 @import "mixins";
11 11
12 @import "var"; 12 @import "var";
13
14 @import "animate";
......
...@@ -14,7 +14,19 @@ ...@@ -14,7 +14,19 @@
14 } 14 }
15 15
16 .space1 { 16 .space1 {
17 height: 400px; 17 height: 200px;
18 }
19
20 .shake {
21 position: relative;
22 width: 344px;
23 height: 403px;
24 margin: 0 auto;
25
26 .image {
27 width: 344px;
28 height: 403px;
29 }
18 } 30 }
19 31
20 .btn { 32 .btn {
......
1 <view class="comp-item"> 1 <view class="comp-item">
2 <image bindtap="onShakeHandler" class="bg" src="../../image/oss/tips/tips-shake.png" mode="widthFix" /> 2 <image bindtap="onShakeHandler" class="bg" src="../../image/oss/tips/tips-shake.png" mode="widthFix" />
3 <view class="space1"></view>
4 <view class="shake">
5 <image class="image animated tada infinite" src="../../image/oss/tips/shake-c1.png" mode="widthFix" />
6 </view>
3 <!-- <view class="space1"></view> 7 <!-- <view class="space1"></view>
4 <view bindtap="hideMask" class="btn">知道了</view> --> 8 <view bindtap="hideMask" class="btn">知道了</view> -->
5 </view> 9 </view>
......
...@@ -21,6 +21,7 @@ Page({ ...@@ -21,6 +21,7 @@ Page({
21 userInfo: {}, 21 userInfo: {},
22 canShake: true, 22 canShake: true,
23 status: 0, 23 status: 0,
24 animationShake:{}, // 摇一摇动画
24 }, 25 },
25 onShareAppMessage() {}, 26 onShareAppMessage() {},
26 showAuth() { 27 showAuth() {
......
...@@ -47,6 +47,16 @@ ...@@ -47,6 +47,16 @@
47 position: absolute; 47 position: absolute;
48 } 48 }
49 49
50 .coop-shake {
51 width: 306px;
52 height: 335px;
53 position: absolute;
54 left: 0;
55 right: 0;
56 top: 170px;
57 margin: 0 auto;
58 }
59
50 .space1 { 60 .space1 {
51 height: 52px; 61 height: 52px;
52 } 62 }
...@@ -62,7 +72,8 @@ ...@@ -62,7 +72,8 @@
62 line-height: 1.6; 72 line-height: 1.6;
63 height: 140px; 73 height: 140px;
64 @include ellipsis(3); 74 @include ellipsis(3);
65 .t1{ 75
76 .t1 {
66 color: #bb3039; 77 color: #bb3039;
67 } 78 }
68 } 79 }
......
...@@ -11,6 +11,7 @@ ...@@ -11,6 +11,7 @@
11 <!-- bindtap="queryWishbillAssist" --> 11 <!-- bindtap="queryWishbillAssist" -->
12 <view bindtap="queryWishbillAssist" wx:if="{{status != 1}}" class="shake"> 12 <view bindtap="queryWishbillAssist" wx:if="{{status != 1}}" class="shake">
13 <image class="ebg" mode="widthFix" src="../../image/oss/coop/coop-c2.png" /> 13 <image class="ebg" mode="widthFix" src="../../image/oss/coop/coop-c2.png" />
14 <image class="coop-shake animated tada infinite" mode="widthFix " src="../../image/oss/coop/coop-shake.png" />
14 <view class="space1"></view> 15 <view class="space1"></view>
15 <view class="cont"> 16 <view class="cont">
16 <view class="tips"> 17 <view class="tips">
......
...@@ -15,7 +15,7 @@ Page({ ...@@ -15,7 +15,7 @@ Page({
15 tipsGroupMemberVisible: false, 15 tipsGroupMemberVisible: false,
16 tipsNewMemberVisible: false, 16 tipsNewMemberVisible: false,
17 tipsWishVisible: false, 17 tipsWishVisible: false,
18 tipsShakeVisible: false, 18 tipsShakeVisible: true,
19 tipsCommonVisible: false, 19 tipsCommonVisible: false,
20 tipsCreateCompleteVisible: false, 20 tipsCreateCompleteVisible: false,
21 tipsInnerText: "", 21 tipsInnerText: "",
......
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
27 </view> 27 </view>
28 </view> 28 </view>
29 </view> 29 </view>
30 <van-popup show="{{ authorizeVisible }}" > 30 <van-popup show="{{ authorizeVisible }}" bind:click-overlay="hideMask">
31 <authorize-comp bind:evtcomp="evtcomp"></authorize-comp> 31 <authorize-comp bind:evtcomp="evtcomp"></authorize-comp>
32 </van-popup> 32 </van-popup>
33 <van-popup show="{{ tipsRuleVisible }}" > 33 <van-popup show="{{ tipsRuleVisible }}" >
......
...@@ -23,8 +23,8 @@ ...@@ -23,8 +23,8 @@
23 <view class="plz"> 23 <view class="plz">
24 <image class="ebg" src="../../image/oss/register/plz-cont.png" mode="widthFix" /> 24 <image class="ebg" src="../../image/oss/register/plz-cont.png" mode="widthFix" />
25 <block wx:if="{{!isPlzAuth}}"> 25 <block wx:if="{{!isPlzAuth}}">
26 <image class="block shadow" mode="widthFix" src="../../image/oss/register/plz-block.png?ver=1" /> 26 <image class="block shadow" mode="widthFix" src="../../image/oss/register/plz-block.png" />
27 <image style="left:{{thumbX}}rpx;" class="block thumb" mode="widthFix" src="../../image/oss/register/plz-block-inline.png?ver=1" /> 27 <image style="left:{{thumbX}}rpx;" class="block thumb" mode="widthFix" src="../../image/oss/register/plz-block-inline.png" />
28 </block> 28 </block>
29 </view> 29 </view>
30 <view class="slider"> 30 <view class="slider">
......
...@@ -46,8 +46,8 @@ ...@@ -46,8 +46,8 @@
46 <view class="plz"> 46 <view class="plz">
47 <image class="ebg" src="../../image/oss/register/plz-cont.png" mode="widthFix" /> 47 <image class="ebg" src="../../image/oss/register/plz-cont.png" mode="widthFix" />
48 <block wx:if="{{!isPlzAuth}}"> 48 <block wx:if="{{!isPlzAuth}}">
49 <image class="block shadow" mode="widthFix" src="../../image/oss/register/plz-block.png?ver=1" /> 49 <image class="block shadow" mode="widthFix" src="../../image/oss/register/plz-block.png" />
50 <image style="left:{{thumbX}}rpx;" class="block thumb" mode="widthFix" src="../../image/oss/register/plz-block-inline.png?ver=1" /> 50 <image style="left:{{thumbX}}rpx;" class="block thumb" mode="widthFix" src="../../image/oss/register/plz-block-inline.png" />
51 </block> 51 </block>
52 </view> 52 </view>
53 <view class="slider"> 53 <view class="slider">
......
...@@ -18,8 +18,9 @@ Page({ ...@@ -18,8 +18,9 @@ Page({
18 wishList: [], 18 wishList: [],
19 helperInfo: {}, 19 helperInfo: {},
20 curWish: {}, 20 curWish: {},
21
22 status: 1, // 1正常(有库存) 2无库存 21 status: 1, // 1正常(有库存) 2无库存
22 animationThumbData: [], // 进度条动画
23 animationFlagData: [], // 旗帜画库
23 }, 24 },
24 onShareAppMessage(res) { 25 onShareAppMessage(res) {
25 if (res.from === 'button') { 26 if (res.from === 'button') {
...@@ -50,10 +51,45 @@ Page({ ...@@ -50,10 +51,45 @@ Page({
50 this.setData({ 51 this.setData({
51 userInfo: app.globalData.userInfo 52 userInfo: app.globalData.userInfo
52 }) 53 })
53 this.queryWishbillDetail(); 54 this.queryWishbillDetail().then((result) => {
55 this.playAnimation();
56 });
54 this.queryWishbillHelpers(); 57 this.queryWishbillHelpers();
55 }) 58 })
56 }, 59 },
60
61 // 播放动画
62 playAnimation() {
63 let wishList = this.data.wishList;
64 let animationThumbData = [];
65 let animationFlayData = [];
66 let animationFlagData = [];
67 wishList.forEach((element, index) => {
68 // 进度条动画
69 var animation1 = wx.createAnimation({
70 duration: 600,
71 delay: 600 * index + 1000
72 });
73 animation1.width(element.progress + "%").step()
74 let curAniData1 = animation1.export()
75 animationThumbData.push(curAniData1);
76
77 // 旗帜动画
78 var animation2 = wx.createAnimation({
79 duration: 600,
80 delay: 600 * index + 1000
81 });
82 animation2.left(element.progressLeft + "rpx").step()
83 let curAniData2 = animation2.export()
84 animationFlagData.push(curAniData2);
85
86 });
87 this.setData({
88 animationThumbData,
89 animationFlagData
90 })
91 },
92
57 /** 93 /**
58 * 领取我的奖品 94 * 领取我的奖品
59 */ 95 */
...@@ -172,7 +208,8 @@ Page({ ...@@ -172,7 +208,8 @@ Page({
172 this.setData({ 208 this.setData({
173 wishInfo: result, 209 wishInfo: result,
174 wishList: wishList 210 wishList: wishList
175 }) 211 });
212 resolve();
176 }) 213 })
177 }); 214 });
178 }, 215 },
......
...@@ -153,8 +153,8 @@ ...@@ -153,8 +153,8 @@
153 153
154 .flag { 154 .flag {
155 position: absolute; 155 position: absolute;
156 left: 0px; 156 left: -51px;
157 bottom: 10px; 157 bottom: 14px;
158 color: #a97a4b; 158 color: #a97a4b;
159 font-size: 16px; 159 font-size: 16px;
160 width: 51px; 160 width: 51px;
...@@ -175,7 +175,7 @@ ...@@ -175,7 +175,7 @@
175 } 175 }
176 176
177 .line { 177 .line {
178 $progressHeight: 8px; 178 $progressHeight: 12px;
179 width: $proWidth; 179 width: $proWidth;
180 height: $progressHeight; 180 height: $progressHeight;
181 background-color: #dcdcdc; 181 background-color: #dcdcdc;
......
...@@ -30,12 +30,14 @@ ...@@ -30,12 +30,14 @@
30 <view class="name">{{item.prizeName}}</view> 30 <view class="name">{{item.prizeName}}</view>
31 <view class="progress"> 31 <view class="progress">
32 <view class="pro"> 32 <view class="pro">
33 <view class="flag" style="left:{{item.progressLeft}}rpx;"> 33 <!-- <view class="flag" style="left:{{item.progressLeft}}rpx;"> -->
34 <view class="flag" animation="{{animationFlagData[index]}}">
34 <image class="prod" mode="aspectFit" src="../../image/oss/my-wish/my-wish-c4.png" /> 35 <image class="prod" mode="aspectFit" src="../../image/oss/my-wish/my-wish-c4.png" />
35 <view class="t1">{{item.elasticValue}}</view> 36 <view class="t1">{{item.elasticValue}}</view>
36 </view> 37 </view>
37 <view class="line"> 38 <view class="line">
38 <view class="line-thumb" style="width:{{item.progress}}%;"></view> 39 <!-- <view class="line-thumb" style="width:{{item.progress}}%;"></view> -->
40 <view class="line-thumb" animation="{{animationThumbData[index]}}"></view>
39 </view> 41 </view>
40 </view> 42 </view>
41 <view class="val">{{item.conditionElasticValue}}</view> 43 <view class="val">{{item.conditionElasticValue}}</view>
...@@ -85,7 +87,7 @@ ...@@ -85,7 +87,7 @@
85 </view> 87 </view>
86 </view> 88 </view>
87 </view> 89 </view>
88 <van-popup show="{{ tipsRuleVisible }}"> 90 <van-popup show="{{ tipsRuleVisible }}" bind:click-overlay="hideMask">
89 <tips-rule-comp bind:evtcomp="evtcomp"></tips-rule-comp> 91 <tips-rule-comp bind:evtcomp="evtcomp"></tips-rule-comp>
90 </van-popup> 92 </van-popup>
91 <van-popup show="{{ tipsPirzeVisible }}"> 93 <van-popup show="{{ tipsPirzeVisible }}">
......