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

496_dongfengqichen/pages/index/index.js

@@ -39,6 +39,8 @@ Page({
     placing:false,
     buyState:false,
     isStartAdvertisingFunState:false,
+    playBtnDeg:0,
+    videoShow:false,
     swiperGroup:{
       one:{
         nums:4,
@@ -58,6 +60,9 @@ Page({
       }
     }
   },
+  onPageScroll: function (ev) {
+    console.log(ev);
+  },
   onLoad: function (options) {
     if (app.globalData.isFirstLogin){
       console.log("第一次进入");
@@ -93,6 +98,17 @@ Page({
         subscribeData: this.data.subscribeData
       })
     }
+    if (app.globalData.isFirstLogin) {
+      this.getHomeVideo();//获取视频
+    } else {
+      if (app.globalData.indexData.videoList) {
+        this.setData({
+          videoList: app.globalData.indexData.videoList
+        })
+      } else {
+        this.getHomeVideo();//获取视频
+      }
+    }
     this.setData({
       mainShow: true,
       isStartAdvertisingShow: this.data.isOnce ? true : app.globalData.isFirstLogin,
@@ -534,5 +550,34 @@ Page({
     this.setData({
       swiperGroup: this.data.swiperGroup
     })
+  },
+  playVideo:function(){
+    var animation = wx.createAnimation({
+      duration: 300
+    });
+    animation.rotate(360).step();
+    this.setData({
+      playBtnDeg: animation.export()
+    })
+    setTimeout(()=>{
+      this.setData({
+        videoShow:true
+      })
+      var videoContext = wx.createVideoContext("myVideo");
+      videoContext.requestFullScreen({ direction:0});
+      videoContext.play();
+
+      animation.rotate(0).step();
+      this.setData({
+        playBtnDeg: animation.export()
+      })
+    },300);
+  },
+  closeFull:function(e){
+    if (!e.detail.fullScreen) {
+      this.setData({
+        videoShow: false
+      })
+    }
   }
 })

496_dongfengqichen/pages/index/index.wxml

@@ -2,7 +2,12 @@
 <view class="all" wx:if="{{mainShow}}">
   <view class="main" wx:if="{{isStartAdvertising==0 || !isStartAdvertisingShow}}">
     <view class="contentFrame">
-      <image class="newImages2-76" src="{{imgUrl+'/newImages2/76.jpg?v=003'}}"></image>
+      <image class="newImages2-76" src="{{imgUrl+'/newImages2/109.png?v=004'}}"></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>
+        <video id="myVideo" class="myVideo" wx:if="{{videoShow}}" bindfullscreenchange="closeFull" src="{{videoList['videoUrl']}}"></video>
+      </view>
       <image class="newImages2-11" wx:if="{{buyState}}" bindtap="placingControl" src="{{imgUrl+'/newImages2/97.png'}}"></image>
       <image class="newImages2-12" bindtap="lookConfigure" src="{{imgUrl+'/newImages2/98.png'}}"></image>
       <image class="newImages2-13" bindtap="vrLookCar" src="{{imgUrl+'/newImages2/99.png'}}"></image>
@@ -20,7 +25,7 @@
       <view class="dotGroup1">
         <image class="{{swiperGroup.one.current!=index?'newImages2-80':'newImages2-81'}}" wx:for="{{swiperGroup.one.nums}}" wx:key="index" src="{{imgUrl+'/newImages2/'+(swiperGroup.one.current!=index?'80':'81')+'.png'}}"></image>
       </view>
-      <image class="testText" src="{{imgUrl+'/newImages2/testImg/1/'+(swiperGroup.one.current+1)+'_2.png?v=001'}}"></image>
+      <image class="testText" src="{{imgUrl+'/newImages2/testImg/1/'+(swiperGroup.one.current+1)+'_2.png?v=003'}}"></image>
       <swiper class="swiper2" bindchange="swiperChange" data-num="2" current="{{swiperGroup.two.current}}">
         <swiper-item wx:for="{{swiperGroup.two.nums}}" wx:key="index">
           <image style="width:100%;height:100%;" src="{{imgUrl+'/newImages2/testImg/2/'+(index+1)+'_1.png'}}"></image>
@@ -35,7 +40,7 @@
       <view class="dotGroup2">
         <image class="{{swiperGroup.two.current!=index?'newImages2-80':'newImages2-81'}}" wx:for="{{swiperGroup.two.nums}}" wx:key="index" src="{{imgUrl+'/newImages2/'+(swiperGroup.two.current!=index?'80':'81')+'.png'}}"></image>
       </view>
-      <image class="testText2" src="{{imgUrl+'/newImages2/testImg/2/'+(swiperGroup.two.current+1)+'_2.png'}}"></image>
+      <image class="testText2" src="{{imgUrl+'/newImages2/testImg/2/'+(swiperGroup.two.current+1)+'_2.png?v=003'}}"></image>
       <swiper class="swiper3" bindchange="swiperChange" data-num="3" current="{{swiperGroup.three.current}}">
         <swiper-item wx:for="{{swiperGroup.three.nums}}" wx:key="index">
           <image style="width:100%;height:100%;" src="{{imgUrl+'/newImages2/testImg/3/'+(index+1)+'_1.png'}}"></image>
@@ -50,7 +55,7 @@
       <view class="dotGroup3">
         <image class="{{swiperGroup.three.current!=index?'newImages2-80':'newImages2-81'}}" wx:for="{{swiperGroup.three.nums}}" wx:key="index" src="{{imgUrl+'/newImages2/'+(swiperGroup.three.current!=index?'80':'81')+'.png'}}"></image>
       </view>
-      <image class="testText3" src="{{imgUrl+'/newImages2/testImg/3/'+(swiperGroup.three.current+1)+'_2.png'}}"></image>
+      <image class="testText3" src="{{imgUrl+'/newImages2/testImg/3/'+(swiperGroup.three.current+1)+'_2.png?v=002'}}"></image>
       <swiper class="swiper4" bindchange="swiperChange" data-num="4" current="{{swiperGroup.four.current}}">
         <swiper-item wx:for="{{swiperGroup.four.nums}}" wx:key="index">
           <image style="width:100%;height:100%;" src="{{imgUrl+'/newImages2/testImg/4/'+(index+1)+'_1.png'}}"></image>
@@ -65,7 +70,7 @@
       <view class="dotGroup4">
         <image class="{{swiperGroup.four.current!=index?'newImages2-80':'newImages2-81'}}" wx:for="{{swiperGroup.four.nums}}" wx:key="index" src="{{imgUrl+'/newImages2/'+(swiperGroup.four.current!=index?'80':'81')+'.png'}}"></image>
       </view>
-      <image class="testText4" src="{{imgUrl+'/newImages2/testImg/4/'+(swiperGroup.four.current+1)+'_2.png'}}"></image>
+      <image class="testText4" src="{{imgUrl+'/newImages2/testImg/4/'+(swiperGroup.four.current+1)+'_2.png?v=002'}}"></image>
       <view class="lookMoreCar">
         <image class="newImages2-14" bindtap="lookMore" src="{{imgUrl+'/newImages2/100.png'}}"></image>
       </view>

496_dongfengqichen/pages/index/index.wxss

@@ -241,7 +241,7 @@ view{
 }
 .newImages2-76{
   width: 750rpx;
-  height: 9912rpx;
+  height: 10194rpx;
 }
 .lookMoreCar{
   width: 750rpx;
@@ -259,7 +259,7 @@ view{
   width:390rpx;
   height: 62rpx;
   position: absolute;
-  top: 971rpx;
+  top: 1257rpx;
   left: 50%;
   transform: translateX(-50%);
 }
@@ -267,7 +267,7 @@ view{
   width:390rpx;
   height: 62rpx;
   position: absolute;
-  top: 3262rpx;
+  top: 3545rpx;
   left: 50%;
   transform: translateX(-50%);
 }
@@ -275,20 +275,20 @@ view{
   width:390rpx;
   height: 61rpx;
   position: absolute;
-  top: 3632rpx;
+  top: 3915rpx;
   left: 50%;
   transform: translateX(-50%);
 }
 .swiper1{
   position: absolute;
   left: 0;
-  top: 4560rpx;
+  top: 4840rpx;
   width: 750rpx;
   height: 477rpx;
 }
 .arrow-left-1,.arrow-right-1,.arrow-left-2,.arrow-right-2,.arrow-left-3,.arrow-right-3,.arrow-left-4,.arrow-right-4{
   position: absolute;
-  top: 4560rpx;
+  top: 4840rpx;
   height: 477rpx;
   display: flex;
   align-items: center;
@@ -301,15 +301,15 @@ view{
   right:18rpx;
 }
 .arrow-left-2,.arrow-right-2{
-  top: 5954rpx;
+  top: 6233rpx;
   height: 496rpx;
 }
 .arrow-left-3,.arrow-right-3{
-  top: 7524rpx;
+  top: 7802rpx;
   height: 402rpx;
 }
 .arrow-left-4,.arrow-right-4{
-  top: 9010rpx;
+  top: 9285rpx;
   height: 447rpx;
 }
 .newImages2-78{
@@ -319,7 +319,7 @@ view{
 .dotGroup1,.dotGroup2,.dotGroup3,.dotGroup4{
   position: absolute;
   left: 0;
-  top: 5003rpx;
+  top: 5281rpx;
   width: 750rpx;
   height: 16rpx;
   display: flex;
@@ -327,13 +327,13 @@ view{
   justify-content: center;
 }
 .dotGroup2{
-  top: 6423rpx;
+  top: 6699rpx;
 }
 .dotGroup3{
-  top: 7894rpx;
+  top: 8157rpx;
 }
 .dotGroup4{
-  top: 9421rpx;
+  top: 9695rpx;
 }
 .newImages2-80{
   width: 17rpx;
@@ -347,54 +347,81 @@ view{
 }
 .testText{
   position: absolute;
-  top: 5049rpx;
+  top: 5327rpx;
   left: 50%;
   transform: translateX(-50%);
-  width: 732rpx;
-  height: 82rpx;
+  width: 548rpx;
+  height: 139rpx;
 }
 .swiper2{
   position: absolute;
   left: 0;
-  top: 5954rpx;
+  top: 6233rpx;
   width: 750rpx;
   height: 496rpx;
 }
 .testText2{
   position: absolute;
-  top: 6476rpx;
+  top: 6749rpx;
   left: 50%;
   transform: translateX(-50%);
-  width: 653rpx;
-  height: 99rpx;
+  width: 524rpx;
+  height: 103rpx;
 }
 .swiper3{
   position: absolute;
   left: 0;
-  top: 7524rpx;
+  top: 7802rpx;
   width: 750rpx;
   height: 402rpx;
 }
 .testText3{
   position: absolute;
-  top: 7953rpx;
+  top: 8226rpx;
   left: 50%;
   transform: translateX(-50%);
-  width: 525rpx;
-  height: 101rpx;
+  width: 513rpx;
+  height: 104rpx;
 }
 .swiper4{
   position: absolute;
   left: 0;
-  top: 9010rpx;
+  top: 9285rpx;
   width: 750rpx;
   height: 447rpx;
 }
 .testText4{
   position: absolute;
-  top: 9481rpx;
+  top: 9751rpx;
   left: 50%;
   transform: translateX(-50%);
-  width: 518rpx;
-  height: 99rpx;
+  width: 540rpx;
+  height: 104rpx;
+}
+.videoGroup{
+  position: absolute;
+  left: 340rpx;
+  top: 518rpx;
+  width: 69rpx;
+  height: 72rpx;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+}
+.newImages2-108{
+  width: 69rpx;
+  height: 72rpx;
+}
+.newImages2-110{
+  width: 17rpx;
+  height: 23rpx;
+  margin-top: -42rpx;
+}
+.myVideo{
+  position: fixed;
+  top: 0;
+  left: 0;
+  width: 750rpx;
+  height: calc(100vh - 120rpx);
+  z-index: 999;
 }

496_dongfengqichen/pages/luckyStar/luckyStar.wxml

@@ -4,11 +4,11 @@
     <view class="gameMain">
       <image class="gameStarBg" src="{{imgUrl+'/newImages2/23.png?v=004'}}"></image>
       <!-- <view class="gameTitle">幸运星抓手</view> -->
-      <image class="gameTitle" src="{{imgUrl+'/images/luckyTitle.png'}}"></image>
+      <image class="gameTitle" src="{{imgUrl+'/newImages2/102.png'}}"></image>
       <view class="downTime">{{'00:'+downNum}}</view>
-      <image class="prizeIcon2" src="{{imgUrl+'/newImages/57.png?v=003'}}"></image>
+      <image class="prizeIcon2" src="{{imgUrl+'/newImages2/105.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+'/newImages/56.png?v=003'}}"></image>
+      <image class="prizeIcon1" src="{{imgUrl+'/newImages2/104.png?v=003'}}"></image>
       <image class="newImages2-22" bindtap="gameStart" wx:if="{{!gameState}}" src="{{imgUrl+'/newImages2/22.png?v=003'}}"></image>
       <view class="getPrizeTip">
         <view class="prizeTipLine"></view>
@@ -42,8 +42,8 @@
       </view>
       <!-- <image class="gameOpen" bindtap="gameStart" wx:if="{{!gameState}}" src="{{imgUrl+'/newImages/23_1.png'}}"></image>
       <image class="gameOpen" wx:if="{{gameState}}" src="{{imgUrl+'/newImages/23_2.png'}}"></image> -->
-      <image class="newImages24" bindtap="openClaw" wx:if="{{!btnGroup.claw}}" src="{{imgUrl+'/newImages/24_1.png'}}"></image>
-      <image class="newImages24" wx:if="{{btnGroup.claw}}" src="{{imgUrl+'/newImages/24_2.png'}}"></image>
+      <image class="newImages24" bindtap="openClaw" wx:if="{{!btnGroup.claw}}" src="{{imgUrl+'/newImages2/103_1.png'}}"></image>
+      <image class="newImages24" wx:if="{{btnGroup.claw}}" src="{{imgUrl+'/newImages2/103_2.png'}}"></image>
       <!-- <view class="gameGetBtn" bindtouchstart="openClaw">
         <image class="luckyClaw" wx:if="{{btnGroup.claw}}" src="{{imgUrl+'/btns/luckyClaw.png'}}"></image>
       </view> -->

496_dongfengqichen/pages/prizes/prizes.wxml

@@ -2,7 +2,7 @@
 <view class="all">
   <view class="main">
     <view style="position: relative;">
-      <image class="prizeBg" src="{{imgUrl+'/newImages2/44.png'}}"></image>
+      <image class="prizeBg" src="{{imgUrl+'/newImages2/106.png'}}"></image>
       <view class="prize1" data-num="1" bindtap="lookDetail"></view>
       <view class="prize2" data-num="2" bindtap="lookDetail"></view>
       <view class="prize3" data-num="3" bindtap="lookDetail"></view>
@@ -12,8 +12,7 @@
       <view class="prize7" data-num="7" bindtap="lookDetail"></view>
       <view class="prize8" data-num="8" bindtap="lookDetail"></view>
       <view class="prize9" data-num="9" bindtap="lookDetail"></view>
-      <view class="prize10" data-num="10" bindtap="lookDetail"></view>
-      <view class="prize11" data-num="11" bindtap="lookDetail"></view>
+      <view class="prize10" data-num="11" bindtap="lookDetail"></view>
       <view class="bottomBtn" bindtap="backPage"></view>
     </view>
   </view>

496_dongfengqichen/pages/prizes/prizes.wxss

@@ -12,13 +12,13 @@ view{
 }
 .prizeBg{
   width: 750rpx;
-  height: 2169rpx;
+  height: 2018rpx;
 }
 .bottomBtn{
   position: absolute;
   left: 50%;
   transform: translateX(-50%);
-  bottom: 196rpx;
+  bottom: 218rpx;
   width: 711rpx;
   height: 71rpx;
 }
@@ -34,7 +34,7 @@ view{
   top: 621rpx;
   left: 61rpx;
   width: 144rpx;
-  height: 143rpx;
+  height: 144rpx;
 }
 .prize3{
   position: absolute;
@@ -45,57 +45,50 @@ view{
 }
 .prize4{
   position: absolute;
-  top: 635rpx;
+  top: 640rpx;
   left: 520rpx;
   width: 169rpx;
   height: 116rpx;
 }
 .prize5{
   position: absolute;
-  top: 1054rpx;
-  left: 39rpx;
-  width: 189rpx;
+  top: 1073rpx;
+  left: 36rpx;
+  width: 190rpx;
   height: 121rpx;
 }
 .prize6{
   position: absolute;
-  top: 1055rpx;
-  left: 283rpx;
+  top: 1073rpx;
+  left: 280rpx;
   width: 185rpx;
-  height: 118rpx;
+  height: 117rpx;
 }
 .prize7{
   position: absolute;
-  top: 1421rpx;
-  left: 48rpx;
-  width: 168rpx;
-  height: 106rpx;
+  top: 1469rpx;
+  left: 36rpx;
+  width: 135rpx;
+  height: 86rpx;
 }
 .prize8{
   position: absolute;
-  top: 1421rpx;
-  left: 262rpx;
-  width: 195rpx;
-  height: 107rpx;
+  top: 1469rpx;
+  left: 197rpx;
+  width: 156rpx;
+  height: 86rpx;
 }
 .prize9{
   position: absolute;
-  top: 1422rpx;
-  left: 502rpx;
-  width: 195rpx;
-  height: 107rpx;
+  top: 1469rpx;
+  left: 379rpx;
+  width: 156rpx;
+  height: 85rpx;
 }
 .prize10{
   position: absolute;
-  top: 1651rpx;
-  left: 47rpx;
-  width: 190rpx;
-  height: 103rpx;
-}
-.prize11{
-  position: absolute;
-  top: 1651rpx;
-  left: 262rpx;
-  width: 195rpx;
-  height: 106rpx;
+  top: 1471rpx;
+  left:560rpx;
+  width: 156rpx;
+  height: 86rpx;
 }