docs: 和合并

src/components/custom/openAnimation.wpy

@@ -52,8 +52,8 @@
     created() {
       setTimeout(() => {
         this.showAnimation = true;
-        // this.click();
-      });
+         this.click();
+      },1000);
     }
   });
 </script>

src/components/custom/starAnimation1.wpy

@@ -10,7 +10,13 @@
   import wepy from '@wepy/core';
   
   wepy.component({
-
+    methods: {
+      onShareAppMessage: function(res) {
+        if (res.from === 'button') {
+          console.log('onShareAppMessage1', res.target);
+        }
+      }
+    }
   });
 </script>
 <style lang="less">
@@ -24,52 +30,53 @@
   // 	z-index: 1;
     .meteor {
         position: fixed;
-        top: 396rpx;
-        left: 44rpx;
-        width: calc(100% - 120rpx);;
+        top: 247rpx;
+        left: 94rpx;
+        width: calc(100% - 170rpx);;
         height: 0;
         // border: 2rpx solid #000;
-        z-index: 1;
-        transform: rotateZ(3deg)
+        z-index: 10;
+        transform: rotateZ(-10deg)
     }
     .star {
         position: absolute;
         left: -3rpx;
         // bottom: -220rpx;
-        top: -3rpx;
+        top: -7rpx;
         // left: -43%;
         height: 10rpx;
+        width: 150rpx;
         background: linear-gradient(-45deg,rgba(255,255,255,0),yellow);
         transform: translateX(300rpx);
         // background: -webkit-linear-gradient(-45deg,rgba(255,255,255,0),yellow);
         /*此处为下一步的添加动画*/
-        -webkit-animation: tail 1s ease-in forwards, shooting 1s ease-in forwards;
-        -o-animation: tail 1s ease-in forwards, shooting 1s ease-in forwards;
+        // -webkit-animation: tail 1s ease-in forwards, shooting 1s ease-in forwards;
+        // -o-animation: tail 1s ease-in forwards, shooting 1s ease-in forwards;
         animation: tail 1s ease-in forwards, shooting 1s ease-in forwards;
     }
     .star::before{
         content: "";
         position: absolute;
-        top: -15rpx;
-        left: 6rpx;
+        top: -29rpx;
+        left: -52rpx;
+        width: 78rpx;
+        height: 78rpx;
         // top: calc(100% - 1px);
         // left: 100%;
-        height: 40rpx;
-        width: 40rpx;
-        background: url('http://activitystatic.xyqb.com/sign@2x-76_74px.png') 0 0/contain no-repeat;
+        background: url('http://activitystatic.xyqb.com/sign@2x.png') 0 0/contain no-repeat;
         // background: -webkit-linear-gradient(45deg,rgba(255,255,255,0),yellow,rgba(255,255,255,0));
         /*此处为下一步的添加动画*/
         // -webkit-animation: shining 3s ease-in-out infinite;
         // -o-animation: shining 3s ease-in-out infinite;
-        // animation: shining 3s ease-in-out infinite;
+        animation: shining 1s ease-in-out forwards;
     }
     .star:before {
-        transform: translateX(-50%) rotateZ(-45deg);
-        transform: -webkit-translateX(-50%) -webkit-rotateZ(-45deg);
+        transform: rotateZ(15deg);
+        // transform: -webkit-translateX(-50%) -webkit-rotateZ(-45deg);
     }
     .star:after {
-        transform: translateX(-50%) rotateZ(45deg);
-        transform: -webkit-translateX(-50%) -webkit-rotateZ(45deg);
+        // transform: translateX(-50%) rotateZ(45deg);
+        // transform: -webkit-translateX(-50%) -webkit-rotateZ(45deg);
     }
 
     // @-webkit-keyframes shining {
@@ -78,9 +85,10 @@
     //     100% {width: 0;}
     // }
     @keyframes shining {
-        0% {width: 0;}
-        50% {width: 60rpx;}
-        100% {width: 0;}
+        0% {transform: scale(1);}
+        // 50% {transform: scale(0.8);}
+        99% {transform: scale(0.6);}
+        100% {transform: scale(0);}
     }
     // @-webkit-keyframes tail {
     //     0% {width: 0;}
@@ -89,7 +97,10 @@
     // }
     @keyframes tail {
         0% {width: 0;}
-        30% {width: 150rpx;}
+        10% {width: 0;}
+        50% {width: 150rpx;}
+        65% {width: 50rpx;}
+        80% {width: 150rpx;}
         100% {width: 0;}
     }
     // @-webkit-keyframes shooting {
@@ -105,7 +116,7 @@
     @keyframes shooting {
         0% {
             // -webkit-transform: translateX(0);
-            transform: translateX(630rpx);
+            transform: translateX(610rpx);
         }
         100% {
             // -webkit-transform: translateX(350px);

src/components/custom/videolist.wpy

@@ -105,6 +105,10 @@
         type: Array,
         value: []
       },
+      loading: {
+        type: Boolean,
+        default: false
+      },
       duration: {
         type: Number,
         value: 800

src/pages/index.wpy

@@ -240,7 +240,6 @@
   import store from '../store';
   import { mapState, mapActions } from '@wepy/x';
   import wepy from '@wepy/core';
-  import Dialog from '../components/vant/dialog/dialog';
   wepy.page({
     store,
     hooks: {
@@ -263,8 +262,7 @@
       sign: false,
       showAnimation: false,
       userImgStyle:'',
-      total: 4,
-      goldNum: 2500,
+      goldNum:2500,
     },
 
     computed: {
@@ -503,7 +501,10 @@
         }
       },
       getAwards: function() {
-        this.awards = !this.awards;
+        wx.navigateTo({
+          url: '/pages/raffle?id=1&progress=70&chance=1/780&corn=50000&imgsrc=/static/images/test2.png&goods=Nintendo Switch任天堂游戏机任天堂游戏机'
+        });
+//        this.awards = !this.awards;
       }
     },