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

496_dongfengqichen/pages/index/index.wxml

@@ -1,7 +1,8 @@
 <!--index.wxml-->
 <view class="all" wx:if="{{mainShow}}">
   <view class="main" wx:if="{{isStartAdvertising==0 || !isStartAdvertisingShow}}">
-    <image class="indexOrderIcon" wx:if="{{!buyState}}" bindtap="placingControl" src="{{imgUrl+'/images/indexOrderIcon.png'}}"></image>
+  <!-- wx:if="{{!buyState}}" -->
+    <image class="indexOrderIcon"  bindtap="placingControl" src="{{imgUrl+'/images/indexOrderIcon.png'}}"></image>
     <view class="contentFrame">
       <image class="kvurlImg" style="width:100%;height:{{kvurlH}}px;" mode="widthFix" src="{{kvurl}}"></image>
       <image style="width:750rpx;height:331rpx;" src="{{imgUrl+'/images/indexText.png'}}"></image>

496_dongfengqichen/pages/index/index.wxss

@@ -228,10 +228,11 @@ view{
   background-color: #ececec;
 }
 .indexOrderIcon{
-  position: absolute;
+  position: fixed;
   left: 50%;
   transform: translateX(-50%);
-  bottom: 38rpx;
+  bottom: 188rpx;
   width: 710rpx;
   height: 71rpx;
+  z-index: 9;
 }

496_dongfengqichen/pages/luckyStar/luckyStar.js

@@ -291,7 +291,11 @@ Page({
       clearInterval(this.data.setGroup.bottom);
     }
   },
-  getClaw:function(){//抓取
+  getClaw: function () {//抓取
+    clearInterval(this.data.setGroup.top);
+    clearInterval(this.data.setGroup.left);
+    clearInterval(this.data.setGroup.right);
+    clearInterval(this.data.setGroup.bottom);
     this.setData({
       clawType:true
     })

496_dongfengqichen/pages/luckyStar/luckyStar.wxss

@@ -126,7 +126,7 @@ view{
 }
 .gameControlFrame{
   position: absolute;
-  left: 120rpx;
+  left: 102rpx;
   top: 915rpx;
   width: 174rpx;
   height: 106rpx;

496_dongfengqichen/pages/star/star.wxss

@@ -165,7 +165,7 @@ view{
 .starRule{
   width: 81rpx;
   height: 81rpx;
-  position: absolute;
+  position: fixed;
   right: 29rpx;
   top: 175rpx;
 }