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

496_dongfengqichen/pages/component/tabBar/index.wxml

@@ -10,7 +10,7 @@
   </view>
   <view class="tabBarOption" bindtap="cutPage" data-page="3">
     <image class="tabBar3" src="{{imgUrl+'/tabBar/3_'+(nowPage==3?2:1)+'.png?v=002'}}"></image>
-    <view class="tabBarText {{nowPage==3?'tabBarText2':''}}">幸运星抓手</view>
+    <view class="tabBarText {{nowPage==3?'tabBarText2':''}}">玩出惊喜</view>
   </view>
   <view class="tabBarOption" bindtap="cutPage" data-page="4" style="border:none;">
     <image class="tabBar4" src="{{imgUrl+'/tabBar/4_'+(nowPage==4?2:1)+'.png?v=002'}}"></image>

496_dongfengqichen/pages/coupon/coupon.wxml

@@ -1,7 +1,7 @@
 <!--pages/coupon/coupon.wxml-->
 <view class="all" wx:if="{{pageShow}}">
   <view class="main">
-    <image class="couponBg" src="{{imgUrl+'/images/couponBg.png?v=002'}}"></image>
+    <image class="couponBg" src="{{imgUrl+'/newImages/54.png'}}"></image>
     <view class="btnGroup">
       <image wx:if="{{!isAppointmentShow}}" class="couponBtn" bindtap="showAppointment" src="{{imgUrl+'/btns/couponBtn1.png'}}"></image>
       <image wx:if="{{!isAppointmentShow}}" class="couponBtn" bindtap="cutPage" src="{{imgUrl+'/newImages/13.png'}}"></image>

496_dongfengqichen/pages/luckyStar/luckyStar.wxml

@@ -6,9 +6,9 @@
       <!-- <view class="gameTitle">幸运星抓手</view> -->
       <image class="gameTitle" src="{{imgUrl+'/images/luckyTitle.png'}}"></image>
       <view class="downTime">{{'00:'+downNum}}</view>
-      <image class="prizeIcon2" src="{{imgUrl+'/images/prizeIcon2.png?v=003'}}"></image>
+      <image class="prizeIcon2" src="{{imgUrl+'/newImages/57.png?v=003'}}"></image>
       <image class="gameClaw {{!gameEnd?'gameClaw2':''}}" style="top:{{clawTop}}rpx;left:{{clawLeft}}rpx;transform: scale({{clawScale}});" src="{{imgUrl+'/images/gameClaw'+(clawType?2:1)+'.png'}}"></image>
-      <image class="prizeIcon1" src="{{imgUrl+'/images/prizeIcon1.png?v=003'}}"></image>
+      <image class="prizeIcon1" src="{{imgUrl+'/newImages/56.png?v=003'}}"></image>
       <view class="getPrizeTip">
         <view class="prizeTipLine"></view>
         <view class="prizeTipText">他们都中奖了</view>

496_dongfengqichen/pages/luckyStar/luckyStar.wxss

@@ -112,7 +112,7 @@ view{
   left: 77rpx;
   top: 571rpx;
   width: 673rpx;
-  height: 287rpx;
+  height: 288rpx;
 }
 .gameGetBtn{
   position: absolute;

496_dongfengqichen/pages/star/star.wxml

@@ -2,7 +2,7 @@
 <view id="star" class="showView">
   <view class="home">
     <view class="bgGroup">
-      <image class="bg" src="{{imgUrl+'/newImages/42.png'}}"></image>
+      <image class="bg" src="{{imgUrl+'/newImages/55.png'}}"></image>
       <image class="starBtn" bindtap="scout" src="{{imgUrl+'/newImages/53.png'}}"></image>
     </view>
     <image class="logo1" src="{{imgUrl+'/star/logo1.png'}}"></image>