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

496_dongfengqichen/pages/index/index.wxml

 <view class="all" wx:if="{{mainShow}}">
   <view class="main" wx:if="{{isStartAdvertising==0 || !isStartAdvertisingShow}}">
     <view class="contentFrame">
-      <image class="newImages2-76" src="{{imgUrl+'/newImages2/109.png?v=005'}}"></image>
+      <image class="newImages2-76" src="{{imgUrl+'/newImages2/109.png?v=006'}}"></image>
       <view class="videoGroup" bindtap="playVideo">
         <image class="newImages2-108" animation="{{playBtnDeg}}" src="{{imgUrl+'/newImages2/108.png?v=005'}}"></image>
         <image class="newImages2-110" src="{{imgUrl+'/newImages2/110.png?v=004'}}"></image>

496_dongfengqichen/pages/luckyStar/luckyStar.json

 {
-  "navigationBarTitleText": "幸运星抓手",
+  "navigationBarTitleText": "玩出惊喜",
   "usingComponents": {
     "tabBar": "../component/tabBar/index",
     "userMsg": "/pages/userMsg/userMsg"