Merge branch 'master' of http://www.jiyou-tech.com:3000/chenming/496_dongfengqichen_wxsmall

496_dongfengqichen/pages/everyday/everyday.wxss

@@ -1,4 +1,7 @@
 /* pages/everyday/everyday.wxss */
+view{
+  -webkit-overflow-scrolling: touch;
+}
 .showImg {
   position: relative;
   width: 750rpx;

496_dongfengqichen/pages/luckyStar/luckyStar.js

@@ -15,7 +15,7 @@ Page({
     clawTop:-440,//爪子的top值
     clawLeft: 268,//爪子的left值
     clawScale: 1,//爪子的scale值
-    downNum:30,//倒计时时间
+    downNum:15,//倒计时时间
     setInt:null,//倒计时元素
     pizeTip:0,//抓奖提示框
     setGroup:{
@@ -335,7 +335,7 @@ Page({
   closeSetInt: function () {//关闭倒计时
     clearInterval(this.data.setInt);
       this.setData({
-        downNum: 30,
+        downNum: 15,
         clawTop: this.data.clawScale > 1 ? -100 - (2 * (this.data.clawScale - 1) * 440) : -100 + (2 * (1 - this.data.clawScale) * 440)
       })
     setTimeout(() => {
@@ -343,7 +343,7 @@ Page({
           gameEnd:false
         })
         this.setData({
-          downNum: 30,
+          downNum: 15,
           clawScale: 1
         })
         setTimeout(() => {

496_dongfengqichen/pages/prizeDetail/prizeDetail.wxss

@@ -2,4 +2,5 @@
 .main{
   height: calc(100vh - 150rpx);
   overflow: auto;
+  -webkit-overflow-scrolling: touch;
 }

496_dongfengqichen/pages/star/star.wxss

@@ -1,5 +1,7 @@
 /* pages/star/star.wxss */
-
+view{
+  -webkit-overflow-scrolling: touch;
+}
 .home {
   position: relative;
   height: 100%;