二次竞猜结果

496_dongfengqichen/pages/guessSecondPoster/guessSecondPoster.js

@@ -85,7 +85,7 @@ Page({
    */
   onShareAppMessage: function () {
     return {
-      title: '发现宝藏小程序！我中了'+(this.data.prizeLevel==2?'百元京东卡':'免费升舱大奖')+'，来一起探寻更多惊喜吧！',
+      title: '发现宝藏小程序！我中了'+(this.data.prizeLevel==1?'免费升舱大奖':'百元京东卡')+'，来一起探寻更多惊喜吧！',
       imageUrl:this.data.imgUrl+'/newImages5/56.jpg',
       path: "/pages/guess/guess"
     }

496_dongfengqichen/pages/guessSecondResult/guessSecondResult.js

@@ -17,6 +17,8 @@ Page({
     buyState: false,
     httpState:false,//是否正在进行http请求
     isUserInfo:false,//是否有个人信息
+    getSecondGuessInfoV2:null,
+    windowTipShow:false,
   },
 
   /**
@@ -24,9 +26,11 @@ Page({
    */
   onLoad: function (options) {
     app.globalData.nowPage = 3;
+    this.setData({
+      getSecondGuessInfoV2:app.globalData.getSecondGuessInfoV2
+    })
     var getSecondGuessInfoV2 = app.globalData.getSecondGuessInfoV2;
     var userType = 3;
-    console.log(getSecondGuessInfoV2);
     if(getSecondGuessInfoV2){
       if(getSecondGuessInfoV2.lucky_result==-1){
         userType = 2
@@ -129,6 +133,34 @@ Page({
     })
   },
   drawBtn:function(){//立即抽取大奖
+    console.log(this.data.getSecondGuessInfoV2);
+    var lucky_result = 0;
+    if(this.data.getSecondGuessInfoV2.lucky_result==-2){
+      lucky_result = this.data.getSecondGuessInfoV2.lucky_result;
+    }else if(this.data.getSecondGuessInfoV2.lucky_result==1){
+      lucky_result = this.data.getSecondGuessInfoV2.lucky_result;
+    }else if(this.data.getSecondGuessInfoV2.lucky_result==2){
+      lucky_result = this.data.getSecondGuessInfoV2.lucky_result;
+    }
+    if(lucky_result!=0){
+      if(lucky_result==-2){
+        var drawResult = 0;
+        if(lucky_result==1){
+          drawResult = 1;
+        }else if(lucky_result==2){
+          drawResult = 2;
+        }else{
+          drawResult = 3;
+        }
+        this.setData({
+          drawResult:drawResult,
+          drawState:lucky_result
+        })
+      }else{
+        this.windowTipControl();
+      }
+      return;
+    }
     if(this.data.httpState){
       return;
     }
@@ -148,6 +180,7 @@ Page({
           drawResult:drawResult,
           drawState:res.data.lucky_result
         })
+        app.globalData.getSecondGuessInfoV2.lucky_result = res.data.lucky_result
       }
     }, this);
   },
@@ -210,5 +243,10 @@ Page({
       app.submitUserMsg(e.detail.userInfo.avatarUrl, e.detail.userInfo.nickName);
       this.enterGuess();
     }
+  },
+  windowTipControl:function(){
+    this.setData({
+      windowTipShow:!this.data.windowTipShow
+    })
   }
 })

496_dongfengqichen/pages/guessSecondResult/guessSecondResult.wxml

@@ -20,12 +20,13 @@
       </view>
       <view class="slideMask"></view>
     </view>
-    <image class="bottomBtn2" bindtap="drawBtn" wx:if="{{guessResult==1 && !drawState}}" src="{{imgUrl+'/newImages6/2.png'}}"></image>
-    <view class="bottomBtn2" wx:if="{{guessResult==1 && drawState}}">
+    <image class="bottomBtn2" bindtap="drawBtn" wx:if="{{guessResult==1}}" src="{{imgUrl+'/newImages6/2.png'}}"></image>
+    <!-- <image class="bottomBtn2" bindtap="drawBtn" wx:if="{{guessResult==1 && !drawState}}" src="{{imgUrl+'/newImages6/2.png'}}"></image> -->
+    <!-- <view class="bottomBtn2" wx:if="{{guessResult==1 && drawState}}">
       <image style="width:100%;height:100%;" bindtap="enterGuess" src="{{imgUrl+'/newImages6/21.png'}}"></image>
       <button open-type="getUserInfo" wx:if="{{!isUserInfo}}" bindgetuserinfo="getUserWxMsg" style="min-height:0;width: 100%;" class="getUserInfoBtn"></button>
-    </view>
-    <image class="bottomBtn2" bindtap="goLuckyStar" wx:if="{{drawState==-2}}" src="{{imgUrl+'/newImages6/22.png'}}"></image>
+    </view> -->
+    <!-- <image class="bottomBtn2" bindtap="goLuckyStar" wx:if="{{drawState==-2}}" src="{{imgUrl+'/newImages6/22.png'}}"></image> -->
     <image class="bottomBtn2" bindtap="goLuckyStar" wx:if="{{guessResult==2 || guessResult==3}}" src="{{imgUrl+'/newImages6/3.png'}}"></image>
   </view>
 </view>
@@ -50,5 +51,18 @@
     <image class="prizeWindowClose" bindtap="closeWindow" src="{{imgUrl+'/newImages5/12.png'}}"></image>
   </view>
 </view>
+<view class="ruleFrame ruleFrame2" wx:if="{{windowTipShow}}">
+  <view class="windowTipGroup">
+    <image class="windowTipImg" src="{{imgUrl+'/newImages6/14.png'}}"></image>
+    <view class="windowTipBtn">
+      <image style="width:100%;height:100%;" bindtap="enterGuess" src="{{imgUrl+'/newImages6/13.png'}}"></image>
+      <button open-type="getUserInfo" wx:if="{{!isUserInfo}}" bindgetuserinfo="getUserWxMsg" style="left: 50%;transform: translateX(-50%);bottom: 66rpx;min-height:0;width: 100%;" class="getUserInfoBtn"></button>
+    </view>
+    <view class="windowTipClose">
+      <image style="width:100%;height:100%;" bindtap="windowTipControl" src="{{imgUrl+'/newImages5/50.png'}}"></image>
+      <!-- <button open-type="getUserInfo" wx:if="{{!isUserInfo}}" bindgetuserinfo="getUserWxMsg" style="transform: translateX(0);min-height:0;width: 100%;" class="getUserInfoBtn"></button> -->
+    </view>
+  </view>
+</view>
 <placingOrder  bindplacing="placingControl" wx:if="{{placing}}"></placingOrder>
 <tabBar></tabBar>

496_dongfengqichen/pages/guessSecondResult/guessSecondResult.wxss

@@ -211,4 +211,28 @@ view{
   margin: 0;
   padding: 0;
   opacity: 0;
+}
+.windowTipGroup{
+  position: relative;
+  width: 501rpx;
+  height: 470rpx;
+}
+.windowTipImg{
+  width: 100%;
+  height: 100%;
+}
+.windowTipBtn{
+  position: absolute;
+  left: 50%;
+  transform: translateX(-50%);
+  bottom: 66rpx;
+  width: 389rpx;
+  height: 60rpx;
+}
+.windowTipClose{
+  position: absolute;
+  width: 42rpx;
+  height: 42rpx;
+  top: -32rpx;
+  right: -32rpx;
 }

496_dongfengqichen/pages/myCenter/myCenter.js

@@ -1029,5 +1029,19 @@ Page({
   },
   cardCodeCopy:function(){
     this.contentCopy(this.data.couponListCode);
+  },
+  lookOrder:function(){//跳转到智趣启辰小程序的订单页面
+    console.log("小程序跳转");
+    wx.navigateToMiniProgram({
+      appId:'wx1d585c8c2fffe589',
+      path:"/pages/carorder_info/carorder_info",
+      envVersion:"trial",
+      success(res) {
+        // 打开成功
+      },
+      complete(res){
+        console.log(res);
+      }
+    })
   }
 })

496_dongfengqichen/pages/myCenter/myCenter.wxml

@@ -61,7 +61,10 @@
         <view class="selectText" style="color:{{selectNow==4?'#667ea3':'black'}}">我的卡包</view>
       </view>
     </view>
-    <image wx:if="{{selectNow<1 || selectNow>4}}" class="myCenterBotBg" src="{{imgUrl+'/images/myCenterBotBg.png'}}"></image>
+    <view class="myCenterBotBgGroup" wx:if="{{selectNow<1 || selectNow>4}}">
+      <image class="myCenterBotBg" src="{{imgUrl+'/images/myCenterBotBg.png'}}"></image>
+      <image class="myCenterBotBtn" wx:if="{{buyState}}" bindtap="lookOrder" src="{{imgUrl+'/newImages6/24.png'}}"></image>
+    </view>
     <view class="taskGroup" wx:if="{{selectNow==1}}">
       <view class="taskSelect" style="justify-content:center;">
         <!-- <view bindtap="selectTask" data-type='1' class="taskText {{taskNow==1?'taskText2':''}}">每日任务</view> -->

496_dongfengqichen/pages/myCenter/myCenter.wxss

@@ -102,10 +102,23 @@ view{
   align-items: center;
   justify-content: center;
 }
-.myCenterBotBg{
+.myCenterBotBgGroup{
+  position: relative;
   width: 750rpx;
   height: 589rpx;
 }
+.myCenterBotBg{
+  width: 100%;
+  height: 100%;
+}
+.myCenterBotBtn{
+  position: absolute;
+  left: 50%;
+  transform: translateX(-50%);
+  bottom: 40rpx;
+  width: 652rpx;
+  height: 70rpx;
+}
 .taskSelect{
   padding:0 55rpx;
   box-sizing: border-box;

496_dongfengqichen/pages/scout/scout.js

@@ -127,7 +127,7 @@ Page({
         authenticationShow:false
       })
     }
-    // app.globalData.certificationState=2;
+    // app.globalData.certificationState=4;
     this.setData({maskid: app.globalData.certificationState})
     if(app.globalData.certificationState==1){
       this.setData({titleContent:'尊敬的启辰车主您好'})

496_dongfengqichen/pages/scout/scout.wxml

@@ -12,13 +12,13 @@
     <!-- <image class="scoutbtn1" wx:if="{{maskid<4}}" bindtap="getPoster" src="{{imgUrl+'/newImages2/8.png'}}"></image> -->
   </view>
   <view class="mask" wx:if="{{maskShow}}">
-    <view class="tipContent" wx:if="{{tipShow}}">
+    <view class="tipContent" wx:if="{{tipShow}}" style="height:{{maskid>3?'460rpx':'403rpx'}};">
       <image wx:if="{{maskid==4}}" class="titleImg" src="{{imgUrl+'/star/scout/scoutTitle4.png?v=002'}}"></image>
       <image wx:if="{{maskid==1}}" class="titleImg" src="{{imgUrl+'/star/scout/scoutTitle1.png?v=002'}}"></image>
       <image wx:if="{{maskid==3}}" class="titleImg" src="{{imgUrl+'/star/scout/scoutTitle2.png?v=002'}}"></image>
       <image wx:if="{{maskid==2}}" class="titleImg" src="{{imgUrl+'/star/scout/scoutTitle3.png?v=002'}}"></image>
       <image class="txt" wx:if="{{maskid<4}}" src="{{imgUrl+'/star/scout/tipContent.png'}}"></image>
-      <image class="txt2" wx:if="{{maskid>3}}" src="{{imgUrl+'/star/txt1.png'}}"></image>
+      <image class="txt2" wx:if="{{maskid>3}}" src="{{imgUrl+'/newImages6/23.png'}}"></image>
       <image class="closeBtn" src="{{imgUrl+'/star/closebtn.png'}}" bindtap="hiddenTip"></image>
     </view>
   </view>

496_dongfengqichen/pages/scout/scout.wxss

@@ -75,8 +75,8 @@
   margin:  70rpx auto 0 auto;
 }
 .tipContent>.txt2{
-  width: 449rpx;
-  height: 181rpx;
+  width: 371rpx;
+  height: 233rpx;
   margin:  70rpx auto 0 auto;
 }
 .closeBtn {