版本提交

@@ -18,9 +18,12 @@
 // 雪碧图
 // @lazysprite "filetype";
 
-.test {
-  background-image: url(%ASSETS_IMG%/qr-r.jpg);
-}
+// @import "style/wxss/animate.wxss";
+
+
+// .test {
+//   background-image: url(%ASSETS_IMG%/qr-r.jpg);
+// }
 
 .app {
   height: 100%;

@@ -10,3 +10,5 @@
 @import "mixins";
 
 @import "var";
+
+@import "animate";

@@ -14,7 +14,19 @@
   }
 
   .space1 {
-    height: 400px;
+    height: 200px;
+  }
+
+  .shake {
+    position: relative;
+    width: 344px;
+    height: 403px;
+    margin: 0 auto;
+
+    .image {
+      width: 344px;
+      height: 403px;
+    }
   }
 
   .btn {

 <view class="comp-item">
   <image bindtap="onShakeHandler" class="bg" src="../../image/oss/tips/tips-shake.png" mode="widthFix" />
+  <view class="space1"></view>
+  <view class="shake">
+    <image class="image animated tada infinite" src="../../image/oss/tips/shake-c1.png" mode="widthFix" />
+  </view>
   <!-- <view class="space1"></view>
   <view bindtap="hideMask" class="btn">知道了</view> -->
 </view>

@@ -21,6 +21,7 @@ Page({
     userInfo: {},
     canShake: true,
     status: 0,
+    animationShake:{}, // 摇一摇动画
   },
   onShareAppMessage() {},
   showAuth() {

@@ -47,6 +47,16 @@
           position: absolute;
         }
 
+        .coop-shake {
+          width: 306px;
+          height: 335px;
+          position: absolute;
+          left: 0;
+          right: 0;
+          top: 170px;
+          margin: 0 auto;
+        }
+
         .space1 {
           height: 52px;
         }
@@ -62,7 +72,8 @@
             line-height: 1.6;
             height: 140px;
             @include ellipsis(3);
-            .t1{
+
+            .t1 {
               color: #bb3039;
             }
           }

@@ -11,6 +11,7 @@
       <!-- bindtap="queryWishbillAssist" -->
       <view bindtap="queryWishbillAssist" wx:if="{{status != 1}}" class="shake">
         <image class="ebg" mode="widthFix" src="../../image/oss/coop/coop-c2.png" />
+        <image class="coop-shake animated tada infinite" mode="widthFix " src="../../image/oss/coop/coop-shake.png" />
         <view class="space1"></view>
         <view class="cont">
           <view class="tips">

@@ -15,7 +15,7 @@ Page({
     tipsGroupMemberVisible: false,
     tipsNewMemberVisible: false,
     tipsWishVisible: false,
-    tipsShakeVisible: false,
+    tipsShakeVisible: true,
     tipsCommonVisible: false,
     tipsCreateCompleteVisible: false,
     tipsInnerText: "",

@@ -27,7 +27,7 @@
     </view>
   </view>
 </view>
-<van-popup show="{{ authorizeVisible }}" >
+<van-popup show="{{ authorizeVisible }}"  bind:click-overlay="hideMask">
   <authorize-comp bind:evtcomp="evtcomp"></authorize-comp>
 </van-popup>
 <van-popup show="{{ tipsRuleVisible }}" >

@@ -23,8 +23,8 @@
             <view class="plz">
               <image class="ebg" src="../../image/oss/register/plz-cont.png" mode="widthFix" />
               <block wx:if="{{!isPlzAuth}}">
-                <image class="block shadow" mode="widthFix" src="../../image/oss/register/plz-block.png?ver=1" />
-                <image style="left:{{thumbX}}rpx;" class="block thumb" mode="widthFix" src="../../image/oss/register/plz-block-inline.png?ver=1" />
+                <image class="block shadow" mode="widthFix" src="../../image/oss/register/plz-block.png" />
+                <image style="left:{{thumbX}}rpx;" class="block thumb" mode="widthFix" src="../../image/oss/register/plz-block-inline.png" />
               </block>
             </view>
             <view class="slider">

@@ -46,8 +46,8 @@
             <view class="plz">
               <image class="ebg" src="../../image/oss/register/plz-cont.png" mode="widthFix" />
               <block wx:if="{{!isPlzAuth}}">
-                <image class="block shadow" mode="widthFix" src="../../image/oss/register/plz-block.png?ver=1" />
-                <image style="left:{{thumbX}}rpx;" class="block thumb" mode="widthFix" src="../../image/oss/register/plz-block-inline.png?ver=1" />
+                <image class="block shadow" mode="widthFix" src="../../image/oss/register/plz-block.png" />
+                <image style="left:{{thumbX}}rpx;" class="block thumb" mode="widthFix" src="../../image/oss/register/plz-block-inline.png" />
               </block>
             </view>
             <view class="slider">

@@ -18,8 +18,9 @@ Page({
     wishList: [],
     helperInfo: {},
     curWish: {},
-
     status: 1, // 1正常(有库存) 2无库存
+    animationThumbData: [], // 进度条动画
+    animationFlagData: [], // 旗帜画库
   },
   onShareAppMessage(res) {
     if (res.from === 'button') {
@@ -50,10 +51,45 @@ Page({
       this.setData({
         userInfo: app.globalData.userInfo
       })
-      this.queryWishbillDetail();
+      this.queryWishbillDetail().then((result) => {
+        this.playAnimation();
+      });
       this.queryWishbillHelpers();
     })
   },
+
+  // 播放动画
+  playAnimation() {
+    let wishList = this.data.wishList;
+    let animationThumbData = [];
+    let animationFlayData = [];
+    let animationFlagData = [];
+    wishList.forEach((element, index) => {
+      // 进度条动画
+      var animation1 = wx.createAnimation({
+        duration: 600,
+        delay: 600 * index + 1000
+      });
+      animation1.width(element.progress + "%").step()
+      let curAniData1 = animation1.export()
+      animationThumbData.push(curAniData1);
+
+      // 旗帜动画
+      var animation2 = wx.createAnimation({
+        duration: 600,
+        delay: 600 * index + 1000
+      });
+      animation2.left(element.progressLeft + "rpx").step()
+      let curAniData2 = animation2.export()
+      animationFlagData.push(curAniData2);
+
+    });
+    this.setData({
+      animationThumbData,
+      animationFlagData
+    })
+  },
+
   /**
    * 领取我的奖品
    */
@@ -172,7 +208,8 @@ Page({
         this.setData({
           wishInfo: result,
           wishList: wishList
-        })
+        });
+        resolve();
       })
     });
   },

@@ -153,8 +153,8 @@
 
                   .flag {
                     position: absolute;
-                    left: 0px;
-                    bottom: 10px;
+                    left: -51px;
+                    bottom: 14px;
                     color: #a97a4b;
                     font-size: 16px;
                     width: 51px;
@@ -175,7 +175,7 @@
                   }
 
                   .line {
-                    $progressHeight: 8px;
+                    $progressHeight: 12px;
                     width: $proWidth;
                     height: $progressHeight;
                     background-color: #dcdcdc;

@@ -30,12 +30,14 @@
               <view class="name">{{item.prizeName}}</view>
               <view class="progress">
                 <view class="pro">
-                  <view class="flag" style="left:{{item.progressLeft}}rpx;">
+                  <!-- <view class="flag" style="left:{{item.progressLeft}}rpx;"> -->
+                  <view class="flag" animation="{{animationFlagData[index]}}">
                     <image class="prod" mode="aspectFit" src="../../image/oss/my-wish/my-wish-c4.png" />
                     <view class="t1">{{item.elasticValue}}</view>
                   </view>
                   <view class="line">
-                    <view class="line-thumb" style="width:{{item.progress}}%;"></view>
+                    <!-- <view class="line-thumb" style="width:{{item.progress}}%;"></view> -->
+                    <view class="line-thumb" animation="{{animationThumbData[index]}}"></view>
                   </view>
                 </view>
                 <view class="val">{{item.conditionElasticValue}}</view>
@@ -85,7 +87,7 @@
     </view>
   </view>
 </view>
-<van-popup show="{{ tipsRuleVisible }}">
+<van-popup show="{{ tipsRuleVisible }}" bind:click-overlay="hideMask">
   <tips-rule-comp bind:evtcomp="evtcomp"></tips-rule-comp>
 </van-popup>
 <van-popup show="{{ tipsPirzeVisible }}">