页面更新

496_dongfengqichen/app.js

@@ -1,7 +1,6 @@
 //app.js
 App({
   onLaunch: function (options) {
-    console.log(options);
     this.globalData.sceneSource = options.scene;
     if (options.referrerInfo && options.referrerInfo.extraData && options.referrerInfo.extraData.source) {
       this.globalData.sceneSource = options.referrerInfo.extraData.source;
@@ -96,7 +95,10 @@ App({
     isFirstLucky: true,//是否为第一次进入幸运星抓手
     indexData:{},//首页数据
     myCenterData:null,//个人中心数据
-    userInfoData:null,
+    userInfoData:{
+      "avatarUrl":"",
+      "nickName":""
+    },
     certificationState:0,//1车主,2合伙人,3同事
     mobileData:null,
     userPhoneType:null,
@@ -115,6 +117,10 @@ App({
       myCenter:false,
       guessPrize:false,
       everyday:false
+    },
+    getSecondGuessInfo:{//第二轮价格竞猜信息
+      secondData:null,
+      firstData:null
     }
   },
   // 获取openId

496_dongfengqichen/pages/guess/guess.js

@@ -8,7 +8,7 @@ Page({
   data: {
     imgUrl: app.globalData.urlStatic,//图片路径
     yuyueShow:false,
-
+    userType:1,
   },
 
   /**
@@ -28,6 +28,7 @@ Page({
       app.addPageEnter("7C8AAA38F8D85EFC48C2995FB6EBAC19");
       app.globalData.addPageEnterState.guessPrize = true;
     }
+    this.getSecondGuessInfo();
   },
   /**
    * 生命周期函数--监听页面初次渲染完成
@@ -40,7 +41,9 @@ Page({
    * 生命周期函数--监听页面显示
    */
   onShow: function () {
-
+    if(app.globalData.getSecondGuessInfo.firstData){
+      this.data.userType = 1;
+    }
   },
 
   /**
@@ -88,8 +91,32 @@ Page({
     })
   },
   enterGuessPrize:function(){//开始竞猜
-    wx.navigateTo({
-      url: '/pages/guessPrize/guessPrize'
-    })
+    if(this.data.userType == 1){
+      wx.navigateTo({
+        url: '/pages/guessSecondPrize/guessSecondPrize'
+      })
+    }else if(this.data.userType == 2){
+      wx.navigateTo({
+        url: '/pages/guessSecond/guessSecond?type=1'
+      })
+    }else{
+      wx.navigateTo({
+        url: '/pages/guessSecond/guessSecond?type=2'
+      })
+    }
+  },
+  getSecondGuessInfo:function(){
+    app.wxRequest(app.globalData.urlRoot + "guessPrice/getSecondGuessInfo", {}, res => {
+      if (res.code == 200) {
+        app.globalData.getSecondGuessInfo = res.data;
+        if(res.data.secondData || !res.data.firstData){
+          this.data.userType = 1;
+        }else if(res.data.firstData.lucky_result==-1){
+          this.data.userType = 2;
+        }else{
+          this.data.userType = 3;
+        }
+      }
+    }, this);
   }
 })

496_dongfengqichen/pages/guessSecond/guessSecond.js

@@ -9,8 +9,11 @@ Page({
     imgUrl: app.globalData.urlStatic,//图片路径
     guessResult:true,//第一轮竞猜是否猜中
     drawResult:0,//1:京东卡,2:升舱卡,3:未抽中
+    drawState:false,//是否抽过奖
     guessPriceArr:[1,2,3,4,5,6],
     ruleShow:false,//是否显示竞猜规则
+    isUserAddress:false,//用户是否有地址
+    httpState:false,//是否正在进行http请求
   },
 
   /**
@@ -18,14 +21,31 @@ Page({
    */
   onLoad: function (options) {
     app.globalData.nowPage = 3;
-    if (app.globalData.openid) {
-      this.loadFun();
-    } else {
-      app.globalData.openidSuccessFuc = this.loadFun;
+    var getSecondGuessInfo = app.globalData.getSecondGuessInfo;
+    this.data.guessPriceArr = getSecondGuessInfo.firstData.guess_price.toString().split("");
+    for(let i=0;i<this.data.guessPriceArr.length;i++){
+      this.data.guessPriceArr[i] = parseInt(this.data.guessPriceArr[i]);
+    }
+    this.setData({
+      guessPriceArr:this.data.guessPriceArr
+    })
+    if(options.type==1){
+      this.setData({
+        guessResult:false
+      })
+    }else if(options.type==2){
+      this.setData({
+        guessResult:true
+      })
+    }
+    if(this.data.guessResult && app.globalData.getSecondGuessInfo.firstData.lucky_result!=0){
+      this.setData({
+        drawState:true
+      })
     }
   },
   loadFun:function(){
-    
+    this.getAddress();
   },
 
   /**
@@ -39,7 +59,11 @@ Page({
    * 生命周期函数--监听页面显示
    */
   onShow: function () {
-
+    if (app.globalData.openid) {
+      this.loadFun();
+    } else {
+      app.globalData.openidSuccessFuc = this.loadFun;
+    }
   },
 
   /**
@@ -92,9 +116,36 @@ Page({
     })
   },
   startDraw:function(){//抽奖
-    this.setData({
-      drawResult:1
-    })
+    if(this.data.httpState){
+      return;
+    }
+    this.data.httpState = true;
+    app.wxRequest(app.globalData.urlRoot+"guessPrice/getFirstGuessLucky",{},res =>{
+      this.data.httpState = false;
+      if(res.code==200){
+        app.globalData.getSecondGuessInfo.firstData.lucky_result = 1;
+        res.data.lucky_result = 1;
+        if(res.data.lucky_result==1){
+          this.setData({
+            drawResult:2
+          })
+        }else if(res.data.lucky_result==2){
+          this.setData({
+            drawResult:1
+          })
+        }else if(res.data.lucky_result==-2){
+          app.globalData.getSecondGuessInfo.firstData.lucky_result = -2;
+          this.setData({
+            drawResult:3
+          })
+        }
+      }else{
+        wx.showToast({
+          title: res.msg,
+          icon:'none'
+        })
+      }
+    },this);
   },
   prizeWindowControl:function(){//关闭抽奖弹窗
     this.setData({
@@ -102,8 +153,26 @@ Page({
     })
   },
   enterPerfectMsg:function(){//马上领取
+    if(this.data.isUserAddress){
+      this.enterGuess();
+    }else{
+      wx.navigateTo({
+        url: '/pages/perfectMsg/perfectMsg',
+      })
+    }
+  },
+  getAddress: function () {//获取地址
+    app.wxRequest(app.globalData.urlRoot + "address/getAddressV2", {}, res => {
+      if (res.code == 200) {
+        if (res.data) {
+          this.data.isUserAddress = true;
+        }
+      }
+    }, this);
+  },
+  lookConfigure: function () {
     wx.navigateTo({
-      url: '/pages/perfectMsg/perfectMsg',
+      url: '/pages/configure/configure',
     })
   }
 })

496_dongfengqichen/pages/guessSecond/guessSecond.wxml

@@ -3,9 +3,9 @@
     <image class="pageBg" src="{{imgUrl+'/versions/20.png?v=002'}}"></image>
     <view class="topGroup">
       <image class="newImages5-2" src="{{imgUrl+'/newImages5/2.png'}}"></image>
-      <image class="newImages5-1" src="{{imgUrl+'/newImages5/1.png'}}"></image>
+      <image class="newImages5-1" bindtap="lookConfigure" src="{{imgUrl+'/newImages5/1.png'}}"></image>
     </view>
-    <image class="newImages5-3" src="{{imgUrl+'/newImages5/'+(guessResult?'38':'37')+'.png'}}"></image>
+    <image class="newImages5-3" src="{{imgUrl+'/newImages5/'+(guessResult?drawState?'36':'38':'37')+'.png'}}"></image>
     <image class="newImages5-4" src="{{imgUrl+'/newImages5/4.png'}}"></image>
     <view class="selectFream">
       <image class="versions-19" src="{{imgUrl+'/versions/19.png'}}"></image>
@@ -16,8 +16,8 @@
       </view>
       <view class="slideMask"></view>
     </view>
-    <image class="newImages5-5" wx:if="{{!guessResult}}" bindtap="enterGuess" src="{{imgUrl+'/newImages5/5.png'}}"></image>
-    <image class="newImages5-5" wx:if="{{guessResult}}" bindtap="startDraw" src="{{imgUrl+'/newImages5/7.png'}}"></image>
+    <image class="newImages5-5" wx:if="{{!guessResult || drawState}}" bindtap="enterGuess" src="{{imgUrl+'/newImages5/5.png'}}"></image>
+    <image class="newImages5-5" wx:if="{{guessResult && !drawState}}" bindtap="startDraw" src="{{imgUrl+'/newImages5/7.png'}}"></image>
     <image class="drawBtn" bindtap="ruleControl" src="{{imgUrl+'/versions/7.png'}}"></image>
     <image class="yuyue" bindtap="enterLucky" src="{{imgUrl+'/versions/1.png'}}"></image>
     <view class="ruleFrame" wx:if="{{ruleShow}}">
@@ -33,7 +33,7 @@
           <image class="prizeTip" src="{{imgUrl+'/newImages5/9.png'}}"></image>
           <image class="prizeBtn" bindtap="enterPerfectMsg" src="{{imgUrl+'/newImages5/10.png'}}"></image>
         </view>
-        <image class="prizeWindowClose" bindtap="prizeWindowControl" src="{{imgUrl+'/newImages5/12.png'}}"></image>
+        <image class="prizeWindowClose" bindtap="enterPerfectMsg" src="{{imgUrl+'/newImages5/12.png'}}"></image>
       </view>
     </view>
     <view class="ruleFrame ruleFrame2" wx:if="{{drawResult==3}}">

496_dongfengqichen/pages/guessSecondPrize/guessSecondPrize.js

@@ -12,11 +12,14 @@ Page({
     stringValue:"",//输入的竞猜价格
     focusState:false,//输入框聚焦状态
     tipImgShow:true,//是否显示输入框提示
-    isGuess:true,//是否竞猜过价格
+    isGuess:false,//是否竞猜过价格
+    guessPrice:"",
     guessPriceArr:[1,2,3,4,5,6],
     slideDay:['0','0'],//距离上市时间
     randomNum:44,//随机数
     cartogramShow:false,//是否显示统计图
+    getSecondGuessInfo:null,
+    httpState:false,//是否正在进行http请求
   },
 
   /**
@@ -30,6 +33,20 @@ Page({
     } else {
       app.globalData.openidSuccessFuc = this.loadFun;
     }
+    this.setData({
+      getSecondGuessInfo:app.globalData.getSecondGuessInfo
+    })
+    var getSecondGuessInfo = app.globalData.getSecondGuessInfo;
+    if(getSecondGuessInfo.secondData){
+      this.data.guessPriceArr = getSecondGuessInfo.secondData.guess_price.toString().split("");
+      for(let i=0;i<this.data.guessPriceArr.length;i++){
+        this.data.guessPriceArr[i] = parseInt(this.data.guessPriceArr[i]);
+      }
+      this.setData({
+        isGuess:true,
+        guessPriceArr:this.data.guessPriceArr
+      })
+    }
   },
   loadFun:function(){
     
@@ -138,7 +155,6 @@ Page({
       console.log(this.data.guessPriceArr);
       this.tipWindowControl2();
     }
-    // this.submitFirstGuessInfo();
   },
   tipWindowControl:function(){
     this.setData({
@@ -181,5 +197,34 @@ Page({
       randomNum:randomNum,
       cartogramShow:!this.data.cartogramShow
     })
+  },
+  submitFirstGuessInfo:function(){//提交竞猜价格
+    if(this.data.httpState){
+      return;
+    }
+    this.data.httpState = true;
+    app.wxRequest(app.globalData.urlRoot + "guessPrice/submitSecondGuessInfo", {guess_price:this.data.guessPrice,statistics_scene:app.globalData.sceneSource}, res => {
+      this.data.httpState = false;
+      if (res.code == 200) {
+        app.globalData.getSecondGuessInfo.secondData = {};
+        app.globalData.getSecondGuessInfo.secondData.guess_price = this.data.guessPrice;
+        app.globalData.getSecondGuessInfo.secondData.firstData = null;
+        this.setData({
+          isGuess:true
+        })
+        this.tipWindowControl2();
+        this.shareWindowControl();
+      }else{
+        wx.showToast({
+          title: res.msg,
+          icon:"none"
+        })
+      }
+    }, this,"POST");
+  },
+  shareWindowControl:function(){//邀请好友弹窗显示控制
+    this.setData({
+      shareShow:!this.data.shareShow
+    })
   }
 })

496_dongfengqichen/pages/guessSecondPrize/guessSecondPrize.wxml

@@ -74,5 +74,13 @@
       <image class="tipWindowClose" bindtap="cartogramControl" src="{{imgUrl+'/newImages4/27.png'}}"></image>
     </view>
   </view>
+  <view class="shareWindow" wx:if="{{shareShow}}">
+    <view class="shareWindowGroup">
+      <image class="versions-23" src="{{imgUrl+'/versions/23.png?v=002'}}"></image>
+      <image class="versions-22" src="{{imgUrl+'/versions/22.png'}}"></image>
+      <button open-type="share" style="min-height:0;width: 462rpx;" class="shareBtn2"></button>
+      <image class="versions-24" bindtap="shareWindowControl" src="{{imgUrl+'/versions/24.png'}}"></image>
+    </view>
   </view>
-  <tabBar></tabBar>
+</view>
+<tabBar></tabBar>

496_dongfengqichen/pages/guessSecondPrize/guessSecondPrize.wxss

@@ -294,4 +294,48 @@ view{
   margin: 0;
   padding: 0;
   opacity: 0;
+}.shareWindow{
+  position: fixed;
+  top:0;
+  left: 0;
+  width: 100%;
+  height: calc(100vh - 120rpx);
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  background-color: rgba(000, 000, 000, 0.5);
+}
+.shareWindowGroup{
+  position: relative;
+  width: 591rpx;
+  height: 611rpx;
+}
+.versions-23{
+  width: 100%;
+  height: 100%;
+}
+.versions-22{
+  position: absolute;
+  left: 50%;
+  transform: translateX(-50%);
+  bottom: 60rpx;
+  width: 462rpx;
+  height: 54rpx;
+}
+.shareBtn2{
+  position: absolute;
+  left: 50%;
+  transform: translateX(-50%);
+  bottom: 60rpx;
+  height: 54rpx;
+  margin: 0;
+  padding: 0;
+  opacity: 0;
+}
+.versions-24{
+  position: absolute;
+  top: -42rpx;
+  right: -42rpx;
+  width: 42rpx;
+  height: 42rpx;
 }

496_dongfengqichen/pages/index/index.wxml

@@ -4,13 +4,13 @@
     <view class="contentFrame">
       <view class="newImages2-76">
         <!-- <image style="width:750rpx;height:10368rpx;" src="{{imgUrl+'/newImages4/16.png'}}"></image> -->
-        <image style="width:750rpx;height:1600rpx;" src="{{imgUrl+'/newImages4/indeximages/new_01.png?v=002'}}"></image>
-        <image style="width:750rpx;height:1600rpx;" src="{{imgUrl+'/newImages4/indeximages/new_02.png'}}"></image>
-        <image style="width:750rpx;height:1600rpx;" src="{{imgUrl+'/newImages4/indeximages/new_03.png'}}"></image>
-        <image style="width:750rpx;height:1600rpx;" src="{{imgUrl+'/newImages4/indeximages/new_04.png'}}"></image>
-        <image style="width:750rpx;height:1600rpx;" src="{{imgUrl+'/newImages4/indeximages/new_05.png'}}"></image>
-        <image style="width:750rpx;height:1600rpx;" src="{{imgUrl+'/newImages4/indeximages/new_06.png'}}"></image>
-        <image style="width:750rpx;height:768rpx;" src="{{imgUrl+'/newImages4/indeximages/new_07.png'}}"></image>
+        <image style="width:750rpx;height:1600rpx;" src="{{imgUrl+'/newImages5/images/newImg_01.png?v=002'}}"></image>
+        <image style="width:750rpx;height:1600rpx;" src="{{imgUrl+'/newImages5/images/newImg_02.png'}}"></image>
+        <image style="width:750rpx;height:1600rpx;" src="{{imgUrl+'/newImages5/images/newImg_03.png'}}"></image>
+        <image style="width:750rpx;height:1600rpx;" src="{{imgUrl+'/newImages5/images/newImg_04.png'}}"></image>
+        <image style="width:750rpx;height:1600rpx;" src="{{imgUrl+'/newImages5/images/newImg_05.png'}}"></image>
+        <image style="width:750rpx;height:1600rpx;" src="{{imgUrl+'/newImages5/images/newImg_06.png'}}"></image>
+        <image style="width:750rpx;height:768rpx;" src="{{imgUrl+'/newImages5/images/newImg_07.png'}}"></image>
       </view>
       <view class="videoGroup" bindtap="playVideo">
         <image class="newImages2-108" animation="{{playBtnDeg}}" src="{{imgUrl+'/newImages3/32.png'}}"></image>

496_dongfengqichen/pages/luckyStar/luckyStar.wxml

@@ -57,7 +57,7 @@
         <image class="gameRuleClose" wx:if="{{ruleCloseShow}}" bindtap="closeRule" src="{{imgUrl+'/star/closebtn.png'}}"></image>
         <view class="gameRuleGroup">
           <view style="width: 452rpx;height: 1661rpx;">
-            <image class="newImages48" style="width: 100%;height: 100%;" src="{{imgUrl+'/newImages3/30.png'}}"></image>
+            <image class="newImages48" style="width: 100%;height: 100%;" src="{{imgUrl+'/newImages5/51.png'}}"></image>
           </view>
           <view class="gameStrat" bindtap="closeRule">
             <image style="width:100%;height:100%;" src="{{imgUrl+'/btns/gameStart.png'}}"></image>

496_dongfengqichen/pages/perfectMsg/perfectMsg.js

@@ -12,6 +12,8 @@ Page({
     verificationCode:"获取验证码",
     sendCode:true,
     mobile2:"",
+    phoneInputShow: false,
+    isUserAddress:true,//用户是否有地址
     submitData:{
       realName:"",//姓名
       mobile:"",//手机号
@@ -29,6 +31,8 @@ Page({
     nowProvince: "",//选中的省市文字
     storeArr: [],//专营店数据
     storeValue: 0,//选中的专营店下标
+    httpState:false,//是否正在进行http请求
+    windowTipShow:false,//是否显示完善信息后的弹窗
   },
 
   /**
@@ -51,6 +55,7 @@ Page({
     if (app.globalData.userMobile) {
       this.data.submitData.mobile = app.globalData.userMobile;
       this.setData({
+        phoneInputShow: true,
         submitData: this.data.submitData
       })
     }
@@ -116,21 +121,38 @@ Page({
     })
   },
   chooseType:function(e){//选中的手机号类型
-    this.setData({
-      selectType:e.currentTarget.dataset.type
-    })
+    if(e){
+      this.setData({
+        selectType:e.currentTarget.dataset.type
+      })
+    }else{
+      this.setData({
+        selectType:1
+      })
+    }
   },
   getAddressDetail: function (e) {//获取详细地址
     this.data.submitData.addressDetail = e.detail.value;
+    this.setData({
+      submitData:this.data.submitData
+    })
   },
   getRealName:function(e){//获取用户输入的姓名
     this.data.submitData.realName = e.detail.value;
+    this.setData({
+      submitData:this.data.submitData
+    })
   },
   getMobile:function(e){//获取用户输入的电话
-    this.data.mobile2 = e.detail.value;
+    this.setData({
+      mobile2:e.detail.value
+    })
   },
   getCaptcha: function (e) {//获取用户输入的验证码
     this.data.submitData.captcha = e.detail.value;
+    this.setData({
+      submitData:this.data.submitData
+    })
   },
   getCode: function (e) {//获取验证码
     if (!app.mobileVerify(this.data.mobile2)) {
@@ -185,6 +207,29 @@ Page({
       }
     }, 1000);
   },
+  getUserPhone: function (e) {//获取用户手机号
+    if (e.detail.errMsg == 'getPhoneNumber:ok') {
+      app.getMobile(e.detail.encryptedData, e.detail.iv, res => {
+        if (res.code == 200) {
+          this.setData({
+            phoneInputShow: true
+          })
+          this.chooseType();
+          if (res.data && res.data.decodeData) {
+            this.data.submitData.mobile = res.data.decodeData.phoneNumber;
+            this.setData({
+              submitData: this.data.submitData
+            })
+          }
+        } else {
+          wx.showToast({
+            title: res.msg,
+            icon: "none"
+          })
+        }
+      }, this);
+    }
+  },
   getAddress: function () {//获取地址
     app.wxRequest(app.globalData.urlRoot + "address/getAddressV2", {}, res => {
       console.log(res);
@@ -196,11 +241,17 @@ Page({
           this.data.submitData.city = res.data.city;
           this.data.submitData.addressDetail = res.data.addressDetail;
           this.setData({
-            submitData: this.data.submitData
+            submitData: this.data.submitData,
+            mobile2:res.data.mobile
           })
           if(!res.data.agentDetail){
             this.getUserLocation();//获取用户当前位置
           }
+        }else{
+          this.getUserLocation();//获取用户当前位置
+          this.setData({
+            isUserAddress:false
+          })
         }
       } else {
         wx.showToast({
@@ -235,13 +286,19 @@ Page({
           city.push(res.data.list[res.data.nearData.provinceIndex].children[j].city)
         }
         //将数据赋值给变量
+        var storeArr = res.data.list[res.data.nearData.provinceIndex].children[res.data.nearData.cityIndex].children;
+        var storeValue = res.data.nearData.agentIndex;
+        this.data.submitData.agentDetail = storeArr[storeValue].agent_detail;
+        this.data.submitData.agent_code = storeArr[storeValue].agent_code;
+        this.data.submitData.province = province[res.data.nearData.provinceIndex];
+        this.data.submitData.city = city[res.data.nearData.cityIndex];
         this.setData({
           provinceDataAll: res.data.list,
           provinceDataArr: [province, city],
           provinceDataValue: [res.data.nearData.provinceIndex, res.data.nearData.cityIndex],
           nowProvince: province[res.data.nearData.provinceIndex] + " " + city[res.data.nearData.cityIndex],
-          storeArr: res.data.list[res.data.nearData.provinceIndex].children[res.data.nearData.cityIndex].children,
-          storeValue: res.data.nearData.agentIndex
+          storeArr: storeArr,
+          storeValue: storeValue
         })
       } else {
         wx.showToast({
@@ -275,5 +332,88 @@ Page({
     this.setData({
       storeValue: e.detail.value
     })
+  },
+  submitUserMsg:function(){//数据提交
+    if (!this.data.submitData.realName) {
+      wx.showToast({
+        title: '请输入姓名',
+        icon: "none"
+      })
+      return;
+    }
+    if (!this.data.mobile2 && this.data.selectType==2) {
+      wx.showToast({
+        title: '请输入电话',
+        icon: "none"
+      })
+      return;
+    }
+    if (this.data.selectType == 2) {
+      if (!this.data.submitData.captcha) {
+        wx.showToast({
+          title: '请输入验证码',
+          icon: "none"
+        })
+        return;
+      }
+    }
+    if(this.data.httpState){
+      return;
+    }
+    this.data.httpState = true;
+    this.data.submitData.province = this.data.provinceDataArr[0][this.data.provinceDataValue[0]];
+    this.data.submitData.city = this.data.provinceDataArr[1][this.data.provinceDataValue[1]];
+    this.data.submitData.agent_code = this.data.storeArr[this.data.storeValue].agent_code;
+    this.data.submitData.agentDetail = this.data.storeArr[this.data.storeValue].agent_detail;
+    this.data.submitData.scene = app.globalData.sceneSource;
+    if(this.data.isUserAddress){
+      this.updateAddress();
+    }else{
+      this.addAddress();
+    }
+  },
+  addAddress: function () {//添加地址
+    var mobile = this.data.submitData.mobile;
+    if(this.data.selectType==2){
+      this.data.submitData.mobile = this.data.mobile2;
+    }
+    app.wxRequest(app.globalData.urlRoot + "address/addAddressV2", this.data.submitData, res => {
+      this.data.httpState = false;
+      if (res.code == 200) {
+        this.windowTipControl();
+      }else{
+        this.data.submitData.mobile = mobile;
+        wx.showToast({
+          title: res.msg,
+        })
+      }
+    }, this, "POST")
+  },
+  updateAddress: function () {//更新地址
+    var mobile = this.data.submitData.mobile;
+    if(this.data.selectType==2){
+      this.data.submitData.mobile = this.data.mobile2;
+    }
+    app.wxRequest(app.globalData.urlRoot + "address/updateAddressV2", this.data.submitData, res => {
+      this.data.httpState = false;
+      if (res.code == 200) {
+        this.windowTipControl();
+      }else{
+        this.data.submitData.mobile = mobile;
+        wx.showToast({
+          title: res.msg,
+        })
+      }
+    }, this, "POST");
+  },
+  windowTipControl:function(){
+    this.setData({
+      windowTipShow:!this.data.windowTipShow
+    })
+  },
+  enterGuess:function(){//去竞猜
+    wx.redirectTo({
+      url: '/pages/guessSecondPrize/guessSecondPrize',
+    })
   }
 })

496_dongfengqichen/pages/perfectMsg/perfectMsg.wxml

@@ -4,7 +4,12 @@
     <image class="pageBg" src="{{imgUrl+'/versions/20.png?v=002'}}"></image>
     <view class="pageTitle">完善个人信息</view>
     <view class="selectGroup">
-      <view class="selectType {{selectType==1?'selectType2':''}}" bindtap="chooseType" data-type="1" style="margin-bottom:20rpx;">使用微信绑定手机号</view>
+      <view style="position: relative;">
+        <view class="selectType {{selectType==1?'selectType2':''}}" bindtap="chooseType" data-type="1" style="margin-bottom:20rpx;">使用微信绑定手机号</view>
+        <view class="getPhoneFrame" wx:if="{{!phoneInputShow}}">
+          <button class="getPhoneBtn" style="width: 100%;height: 100%;margin: 0;padding: 0;min-height: 0;" open-type="getPhoneNumber" bindgetphonenumber="getUserPhone"></button>
+        </view>
+      </view>
       <view class="selectType {{selectType==2?'selectType2':''}}" bindtap="chooseType" data-type="2">使用手机号码</view>
     </view>
     <view class="userMsgFrame">
@@ -20,7 +25,7 @@
         <view class="userMsgTitle">电话</view>
         <input class="userMsgInput" type="number" maxlength="11" bindinput="getMobile" value="{{mobile2}}" placeholder="请输入您的联系电话" placeholder-style="color:#99999A;"></input>
       </view>
-      <view class="userMsgGroup" style="justify-content: flex-end;">
+      <view class="userMsgGroup" wx:if="{{selectType==2}}" style="justify-content: flex-end;">
         <view class="userMsgGroup2">
           <input class="userMsgInput" style="width:350rpx;" bindinput="getCaptcha" placeholder="请输入验证码" placeholder-style="color:#99999A;"></input>
           <view class="getCode" bindtap="getCode">{{verificationCode}}</view>
@@ -42,10 +47,10 @@
     <view class="userMsgDetailGroup">
       <view class="userMsgDetail">
         <view class="detailTitle">收货地址：</view>
-        <textarea class="addressTextarea" maxlength="-1" style="margin-top:{{marginT}}rpx;width:490rpx;" bindinput="getAddressDetail" value=""></textarea>
+        <textarea class="addressTextarea" maxlength="-1" value="{{submitData.addressDetail}}" style="margin-top:{{marginT}}rpx;width:490rpx;" bindinput="getAddressDetail"></textarea>
       </view>
     </view>
-    <image class="submitBtn" src="{{imgUrl+'/newImages5/18.png'}}"></image>
+    <image class="submitBtn" bindtap="submitUserMsg" src="{{imgUrl+'/newImages5/18.png'}}"></image>
   </view>
   <image class="drawBtn" bindtap="ruleControl" src="{{imgUrl+'/versions/7.png'}}"></image>
   <image class="yuyue" bindtap="enterLucky" src="{{imgUrl+'/versions/1.png'}}"></image>
@@ -53,5 +58,12 @@
     <image class="gameRule" src="{{imgUrl+'/newImages4/17.png'}}"></image>
     <image class="closeRule" bindtap="ruleControl" src="{{imgUrl+'/versions/21.png'}}"></image>
   </view>
+  <view class="ruleFrame ruleFrame2" wx:if="{{windowTipShow}}">
+    <view class="windowTipGroup">
+      <image class="windowTipImg" src="{{imgUrl+'/newImages5/49.png'}}"></image>
+      <image class="windowTipBtn" bindtap="enterGuess" src="{{imgUrl+'/newImages5/48.png'}}"></image>
+      <image class="windowTipClose" bindtap="enterGuess" src="{{imgUrl+'/newImages5/50.png'}}"></image>
+    </view>
+  </view>
 </view>
 <tabBar></tabBar>

496_dongfengqichen/pages/perfectMsg/perfectMsg.wxss

@@ -179,4 +179,47 @@ view{
   font-family:PingFangSC;
   font-weight:300;
   color:white;
+}
+.getPhoneFrame{
+  position: absolute;
+  left: 0;
+  top: 0;
+  width:100%;
+  height: 70rpx;
+  z-index: 2;
+}
+.getPhoneBtn{
+  opacity: 0;
+}
+.ruleFrame2{
+  width: 100%;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  background-color: rgba(0,0,0,0.5);
+  z-index: 9;
+}
+.windowTipGroup{
+  position: relative;
+  width: 501rpx;
+  height: 550rpx;
+}
+.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;
 }