页面及逻辑更新

496_dongfengqichen/app.js

@@ -76,7 +76,8 @@ App({
     nowPage:'1',//当前tabBar
     isRegister:false,//是否已注册
     userMobile:null,//用户手机号
-    isFirstLogin:true,//是否为第一次登录
+    isFirstLogin: true,//是否为第一次登录
+    isFirstLucky: true,//是否为第一次进入幸运星抓手
     indexData:{},//首页数据
     myCenterData:null,//个人中心数据
     userInfoData:null,

496_dongfengqichen/app.wxss

@@ -7,7 +7,7 @@ image{
 }
 .showView{
   position: relative;
-  height: calc(100vh - 153rpx);
+  height: calc(100vh - 120rpx);
   background-color: #ffffff;
   overflow: scroll;
 }

496_dongfengqichen/pages/address/address.wxss

@@ -6,7 +6,7 @@ view{
   -webkit-overflow-scrolling: touch;
 }
 .main{
-  height: calc(100vh - 150rpx);
+  height: calc(100vh - 120rpx);
   overflow: auto;
   position: relative;
 }

496_dongfengqichen/pages/agreement/agreement.wxss

@@ -10,7 +10,7 @@
   position: fixed;
   left: 0;
   top: 0;
-  height: calc(100vh - 150rpx);
+  height: calc(100vh - 120rpx);
   overflow: auto;
   background-color: white;
   z-index: 99;

496_dongfengqichen/pages/component/service/index.wxss

@@ -14,7 +14,7 @@
   width: 100%;
   height: 100%;
   background-color: rgba(000, 000, 000, 0.8);
-  padding-bottom: 150rpx;
+  padding-bottom: 120rpx;
   z-index: 99;
   box-sizing: border-box;
 }

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

@@ -5,7 +5,7 @@
   bottom: 0;
   background-color: white;
   width:750rpx;
-  height:150rpx;
+  height:120rpx;
   box-sizing: border-box;
   border-top: 2rpx solid #B8B6B9;
   display: flex;

496_dongfengqichen/pages/coupon/coupon.js

@@ -13,12 +13,12 @@ Page({
     isAppointmentShow: false,//是否显示预约弹框
     phoneInputShow: false,//是否显示电话输入框
     siteSelect: false,//是否显示位置选择框
-    provinceArr: [],//省
-    provinceValue: 0,//选中的省下标
-    cityArr: [],//省
-    cityValue: 0,//选中的省下标
-    storeArr: [],//店铺
-    storeValue: 0,//选中的店铺下标
+    provinceDataAll: null,//地区所有数据
+    provinceDataArr: [[""], [""]],//省市数据
+    provinceDataValue: [0, 0],//选中的省市下标
+    nowProvince: "",//选中的省市文字
+    storeArr: [],//专营店数据
+    storeValue: 0,//选中的专营店下标
     verificationCode: '获取验证码',//验证码文案
     sendCode: true,
     appointment: true,
@@ -32,7 +32,8 @@ Page({
       agentDetail: "",//经销商详细信息
       parentOpenid: app.globalData.friendOpenid,//好友openid
     },
-    submitSuccess:false
+    submitSuccess:false,
+    placing:false
   },
 
   /**
@@ -113,6 +114,9 @@ Page({
           wx.reLaunch({
             url: '/pages/index/index',
           })
+          // this.setData({
+          //   pageShow: true
+          // })
         }else{
           this.setData({
             pageShow:true
@@ -127,37 +131,7 @@ Page({
     })
   },
   showAppointment:function(){
-    this.getUserLocation();//获取用户当前位置
-  },
-  provinceChane: function (e) {//选中省
-    this.setData({
-      provinceValue: e.detail.value,
-      cityArr: this.data.provinceArr[e.detail.value].children,
-      cityValue: 0,
-      storeArr: this.data.provinceArr[e.detail.value].children[0].children,
-      storeValue: 0
-    })
-    this.data.subscribeData.province = this.data.provinceArr[this.data.provinceValue].province;
-    this.data.subscribeData.city = this.data.cityArr[this.data.cityValue].city;
-    this.data.subscribeData.agentDetail = this.data.storeArr[this.data.storeValue].agent_detail;
-    this.data.subscribeData.agent_code = this.data.storeArr[this.data.storeValue].agent_code;
-  },
-  cityChane: function (e) {//选中城市
-    this.setData({
-      cityValue: e.detail.value,
-      storeArr: this.data.provinceArr[this.data.provinceValue].children[e.detail.value].children,
-      storeValue: 0
-    })
-    this.data.subscribeData.city = this.data.cityArr[this.data.cityValue].city;
-    this.data.subscribeData.agentDetail = this.data.storeArr[this.data.storeValue].agent_detail;
-    this.data.subscribeData.agent_code = this.data.storeArr[this.data.storeValue].agent_code;
-  },
-  storeChane: function (e) {//选中店铺
-    this.setData({
-      storeValue: e.detail.value,
-    })
-    this.data.subscribeData.agentDetail = this.data.storeArr[this.data.storeValue].agent_detail;
-    this.data.subscribeData.agent_code = this.data.storeArr[this.data.storeValue].agent_code;
+    this.placingControl();
   },
   getUserPhone: function (e) {//获取用户手机号
     this.setData({
@@ -200,25 +174,25 @@ Page({
   getDistributorList: function (longitude, latitude) {//获取经销商列表
     app.wxRequest(app.globalData.urlRoot + "agent/getAgentList", { longitude: longitude, latitude: latitude }, res => {
       if (res.code == 200) {
-        app.globalData.myCenterData = {};
+        //整理数据
+        var datas = res.data;
+        var province = [];
+        var city = [];
+        for (let i = 0; i < res.data.list.length; i++) {
+          province.push(res.data.list[i].province);
+        }
+        for (let j = 0; j < res.data.list[res.data.nearData.provinceIndex].children.length; j++) {
+          city.push(res.data.list[res.data.nearData.provinceIndex].children[j].city)
+        }
+        //将数据赋值给变量
         this.setData({
-          provinceArr: res.data.list,
-          cityArr: res.data.list[res.data.nearData.provinceIndex].children,
+          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,
-          provinceValue: res.data.nearData.provinceIndex,
-          cityValue: res.data.nearData.cityIndex,
           storeValue: res.data.nearData.agentIndex
         })
-        this.data.subscribeData.province = this.data.provinceArr[this.data.provinceValue].province;
-        this.data.subscribeData.city = this.data.cityArr[this.data.cityValue].city;
-        this.data.subscribeData.agentDetail = this.data.storeArr[this.data.storeValue].agent_detail;
-        this.data.subscribeData.agent_code = this.data.storeArr[this.data.storeValue].agent_code;
-        app.globalData.myCenterData.provinceArr = res.data.list;
-        app.globalData.myCenterData.cityArr = res.data.list[res.data.nearData.provinceIndex].children;
-        app.globalData.myCenterData.storeArr = res.data.list[res.data.nearData.provinceIndex].children[res.data.nearData.cityIndex].children;
-        app.globalData.myCenterData.provinceValue = res.data.nearData.provinceIndex;
-        app.globalData.myCenterData.cityValue = res.data.nearData.cityValue;
-        app.globalData.myCenterData.storeValue = res.data.nearData.agentIndex;
       } else {
         wx.showToast({
           title: res.msg,
@@ -315,6 +289,10 @@ Page({
       return;
     }
     this.data.appointment = false;
+    this.data.subscribeData.province = this.data.provinceDataArr[0][this.data.provinceDataValue[0]];
+    this.data.subscribeData.city = this.data.provinceDataArr[1][this.data.provinceDataValue[1]];
+    this.data.subscribeData.agent_code = this.data.storeArr[this.data.storeValue].agent_code;
+    this.data.subscribeData.agentDetail = this.data.storeArr[this.data.storeValue].agent_detail;
     app.wxRequest(app.globalData.urlRoot + "userInfo/submitOrderInfo", this.data.subscribeData, res => {
       this.data.appointment = true;
       if (res.code == 200) {
@@ -343,9 +321,39 @@ Page({
       
     }
   },
-  enterMyCenter: function () {
-    wx.reLaunch({
-      url: '/pages/myCenter/myCenter',
+  controlWindow: function () {
+    this.setData({
+      submitSuccess: !this.data.submitSuccess
+    })
+  },
+  provinceDataChange: function (e) {
+    if (e.detail.column == 0) {
+      var city = [];
+      for (let i = 0; i < this.data.provinceDataAll[e.detail.value].children.length; i++) {
+        city.push(this.data.provinceDataAll[e.detail.value].children[i].city);
+      }
+      this.data.provinceDataArr[1] = city;
+      this.setData({
+        provinceDataArr: this.data.provinceDataArr
+      })
+    }
+  },
+  provinceDataChane: function (e) {
+    this.setData({
+      provinceDataValue: e.detail.value,
+      nowProvince: this.data.provinceDataArr[0][e.detail.value[0]] + " " + this.data.provinceDataArr[1][e.detail.value[1]],
+      storeArr: this.data.provinceDataAll[e.detail.value[0]].children[e.detail.value[1]].children,
+      storeValue: 0
+    })
+  },
+  storeChane: function (e) {
+    this.setData({
+      storeValue: e.detail.value
+    })
+  },
+  placingControl:function(){
+    this.setData({
+      placing: !this.data.placing
     })
   }
 })

496_dongfengqichen/pages/coupon/coupon.json

@@ -1,6 +1,7 @@
 {
   "navigationBarTitleText": "东风启辰“星探计划”",
   "usingComponents": {
-    "tabBar": "../component/tabBar/index"
+    "tabBar": "../component/tabBar/index",
+    "placingOrder": "/pages/placingOrder/placingOrder"
   }
 }

496_dongfengqichen/pages/coupon/coupon.wxml

@@ -1,56 +1,20 @@
 <!--pages/coupon/coupon.wxml-->
 <view class="all" wx:if="{{pageShow}}">
   <view class="main">
-    <image class="couponBg" src="{{imgUrl+'/newImages/54.png'}}"></image>
+    <image class="couponBg" src="{{imgUrl+'/newImages2/37.png'}}"></image>
+    <view class="showWindow" bindtap="controlWindow"></view>
     <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>
-    </view>
-    <view class="msgFrame" wx:if="{{isAppointmentShow}}">
-      <view class="inputGroup">
-        <input class="inputSty" placeholder="姓名" value="{{subscribeData.realname}}" bindinput="getRealname"></input>
-        <input class="inputSty" bindinput="getMobile" type="number" value="{{subscribeData.mobile}}" maxlength='11' placeholder="电话"></input>
-        <view class="getPhoneFrame" wx:if="{{!phoneInputShow}}">
-          <button class="getPhoneBtn" style="width:100%;height:100%;min-height:0;" open-type="getPhoneNumber" bindgetphonenumber="getUserPhone"></button>
-        </view>
-      </view>
-      <view class="codeGroup">
-        <input class="inputCode" bindinput="getCaptcha" value="{{subscribeData.captcha}}" placeholder="验证码"></input>
-        <view class="codeTime" bindtap="getCode">{{verificationCode}}</view>
-      </view>
-      <!-- <view wx:if="{{siteSelect}}"> -->
-        <picker mode='selector' range="{{provinceArr}}" range-key="province" value="{{provinceValue}}" bindchange="provinceChane">
-          <view class="selectGroup">
-            <text class="selectName">{{provinceArr[provinceValue].province}}</text>
-            <image src="{{imgUrl+'/images/selectIcon.png'}}" class="selectIcon"></image>
-          </view>
-        </picker>
-        <picker mode='selector' range="{{cityArr}}" range-key="city" value="{{cityValue}}" bindchange="cityChane">
-          <view class="selectGroup">
-            <text class="selectName">{{cityArr[cityValue].city}}</text>
-            <image src="{{imgUrl+'/images/selectIcon.png'}}" class="selectIcon"></image>
-          </view>
-        </picker>
-        <picker mode='selector' range="{{storeArr}}" range-key="agent_detail" value="{{storeValue}}" bindchange="storeChane">
-          <view class="selectGroup">
-            <text class="selectName">{{storeArr[storeValue].agent_detail}}</text>
-            <image src="{{imgUrl+'/images/selectIcon.png'}}" class="selectIcon"></image>
-          </view>
-        </picker>
-      <!-- </view> -->
-      <view class="subscribeBtn" bindtap="subscribeFun">
-        <image style="width:100%;height:100%;" src="{{imgUrl+'/btns/indexMake.png'}}"></image>
-        <button wx:if="{{!userData}}" class="getUserMsgBtn" open-type="getUserInfo" lang="zh_CN" bindgetuserinfo="getUserWxMsg" style="width:100%;height:100%;min-height:0;"></button>
-      </view>
+      <image class="couponBtn" bindtap="showAppointment" src="{{imgUrl+'/newImages2/38.png'}}"></image>
     </view>
   </view>
   <view class="maskWindow" wx:if="{{submitSuccess}}">
     <view class="newImagesGroup">
-      <image class="newImages16" bindtap="enterMyCenter" src="{{imgUrl+'/newImages/16.png'}}"></image>
-      <image class="newImages14" src="{{imgUrl+'/newImages/14.png'}}"></image>
-      <image class="newImages15" bindtap="enterMyCenter" src="{{imgUrl+'/newImages/15.png'}}"></image>
+      <image class="newImages14" src="{{imgUrl+'/newImages2/39.png'}}"></image>
+      <image class="newImages16" bindtap="controlWindow" src="{{imgUrl+'/newImages/16.png'}}"></image>
     </view>
   </view>
+  <image class="lookCar" bindtap="cutPage" src="{{imgUrl+'/newImages2/36.png'}}"></image>
+  <placingOrder  bindplacing="placingControl" wx:if="{{placing}}"></placingOrder>
   <tabBar></tabBar>
 </view>
 

496_dongfengqichen/pages/coupon/coupon.wxss

@@ -6,13 +6,13 @@ view{
   -webkit-overflow-scrolling: touch;
 }
 .main{
-  height: calc(100vh - 150rpx);
+  height: calc(100vh - 120rpx);
   overflow: auto;
   position: relative;
 }
 .maskWindow{
   width: 750rpx;
-  height: calc(100vh - 150rpx);
+  height: calc(100vh - 120rpx);
   position: fixed;
   top: 0;
   left: 0;
@@ -24,7 +24,7 @@ view{
 }
 .couponBg{
   width: 750rpx;
-  height: 1172rpx;
+  height: 1126rpx;
 }
 .prizeFrame{
   position: absolute;
@@ -74,21 +74,20 @@ view{
   text-align: center;
 }
 .btnGroup{
-  padding: 90rpx 20rpx 40rpx;
+  padding: 40rpx 0;
   display: flex;
   align-items: center;
-  justify-content: space-between;
-  height: 65rpx;
+  justify-content: center;
 }
 .couponBtn{
-  width: 348rpx;
-  height: 65rpx;
+  width: 711rpx;
+  height: 71rpx;
 }
 
 
 .msgFrame{
   position: fixed;
-  bottom: 150rpx;
+  bottom: 120rpx;
   left: 0;
   width:750rpx;
   padding: 40rpx 20rpx;
@@ -185,8 +184,8 @@ view{
   opacity: 0;
 }
 .newImagesGroup{
-  width: 627rpx;
-  height: 511rpx;
+  width: 628rpx;
+  height: 773rpx;
   position: relative;
 }
 .newImages14{
@@ -207,4 +206,18 @@ view{
   right: -30rpx;
   width: 38rpx;
   height: 37rpx;
+}
+.lookCar{
+  width: 81rpx;
+  height: 81rpx;
+  position: fixed;
+  top: 267rpx;
+  right: 34rpx;
+}
+.showWindow{
+  position: absolute;
+  top: 670rpx;
+  left: 70rpx;
+  width: 610rpx;
+  height: 450rpx;
 }

496_dongfengqichen/pages/everyday/everyday.wxss

@@ -148,7 +148,7 @@ view{
   left: 0;
   top: 0;
   width: 100%;
-  height: calc(100vh - 150rpx);
+  height: calc(100vh - 120rpx);
   display: flex;
   align-items: center;
   justify-content: center;
@@ -289,7 +289,7 @@ view{
   left: 0;
   top: 0;
   width: 750rpx;
-  height: calc(100vh - 150rpx);
+  height: calc(100vh - 120rpx);
   background-color: rgba(000, 000, 000, 0.2);
   display: flex;
   align-items: center;
@@ -324,7 +324,7 @@ view{
   top: 0;
   left: 0;
   width: 100%;
-  height: calc(100vh - 150rpx);
+  height: calc(100vh - 120rpx);
   background-color: rgba( 000, 000, 000, 0.3);
   display: flex;
   align-items: center;
@@ -525,7 +525,7 @@ view{
   display: flex;
   align-items: center;
   justify-content: center;
-  padding-bottom: 150rpx;
+  padding-bottom: 120rpx;
   box-sizing: border-box;
 }
 .mycenterTipWindow1{

496_dongfengqichen/pages/fragmentRule/fragmentRule.wxss

@@ -6,7 +6,7 @@ view{
   -webkit-overflow-scrolling: touch;
 }
 .main{
-  height: calc(100vh - 150rpx);
+  height: calc(100vh - 120rpx);
   overflow: auto;
 }
 .contentGroup{

496_dongfengqichen/pages/index/index.js

@@ -364,7 +364,7 @@ Page({
         app.globalData.isFirstLogin = false;
         setTimeout(() => {
           this.isStartAdvertisingFun();
-        }, 2000);
+        }, 1000);
       }
       if (app.globalData.openid) {
         this.loadFun();

496_dongfengqichen/pages/index/index.wxss

@@ -6,7 +6,7 @@ view{
   -webkit-overflow-scrolling: touch;
 }
 .main{
-  height: calc(100vh - 150rpx);
+  height: calc(100vh - 120rpx);
   overflow: auto;
   position: relative;
 }
@@ -20,7 +20,7 @@ view{
 }
 .msgFrame{
   position: fixed;
-  bottom: 150rpx;
+  bottom: 120rpx;
   left: 0;
   width:750rpx;
   padding: 40rpx 20rpx;
@@ -231,7 +231,7 @@ view{
   position: fixed;
   left: 50%;
   transform: translateX(-50%);
-  bottom: 188rpx;
+  bottom: 154rpx;
   width: 710rpx;
   height: 71rpx;
   z-index: 9;

496_dongfengqichen/pages/luckyStar/luckyStar.js

@@ -10,7 +10,7 @@ Page({
   data: {
     imgUrl: app.globalData.urlStatic,//图片路径
     buyState:false,
-    ruleShow: true,//是否显示游戏玩法
+    ruleShow: false,//是否显示游戏玩法
     ruleCloseShow: true,//是否显示游戏玩法关闭按钮
     clawTop:-440,//爪子的top值
     clawLeft: 268,//爪子的left值
@@ -51,12 +51,20 @@ Page({
     certificationInfo:false,//是否车主认证了
     addressShow:false,
     isChanceShow:true,//是否还有机会
+    operationExampleShow:false,
+    operationExampleNum:0
   },
 
   /**
    * 生命周期函数--监听页面加载
    */
   onLoad: function (options) {
+    if (app.globalData.isFirstLucky){
+      this.setData({
+        ruleShow:true
+      })
+      app.globalData.isFirstLucky = false;
+    }
     query = wx.createSelectorQuery();
     app.globalData.nowPage = 3;
     if (app.globalData.openid) {
@@ -156,29 +164,29 @@ Page({
   },
   beginGame: function () {//开始游戏
     app.wxRequest(app.globalData.urlRoot + "dollGame/beginGame", {}, res => {
-      if(res.code==200){
-        this.setData({
-          startDown: 3
-        })
+      if (res.code == 200) {
+        this.data.gameSign = res.data.sign;
         this.setData({
-          gameState: true
+          operationExampleShow: true,
+          operationExampleNum: 1
         })
-        var setInt2 = setInterval(() => {
-          if (this.data.startDown > -1) {
-            this.data.startDown -= 1;
+        var setInt = setInterval(() => {
+          if (!this.data.operationExampleShow) {
+            clearInterval(setInt);
             this.setData({
-              startDown: this.data.startDown
+              operationExampleNum: 0
+            })
+          }
+          if (this.data.operationExampleNum == 4) {
+            this.setData({
+              operationExampleNum: 1
+            })
+          } else {
+            this.setData({
+              operationExampleNum: this.data.operationExampleNum += 1
             })
-            if (this.data.startDown==-1){
-              clearInterval(setInt2);
-              this.data.gameSign = res.data.sign;
-              this.endGame();
-              if (this.data.gameSign) {
-                this.downTimeFun();
-              }
-            }
           }
-        }, 1000);
+        }, 800)
       }else{
         this.setData({
           isChanceShow:false
@@ -559,5 +567,31 @@ Page({
     this.setData({
       isChanceShow:true
     })
+  },
+  operationControl:function(){
+    this.setData({
+      operationExampleShow: !this.data.operationExampleShow
+    })
+    this.setData({
+      startDown: 3
+    })
+    this.setData({
+      gameState: true
+    })
+    var setInt2 = setInterval(() => {
+      if (this.data.startDown > -1) {
+        this.data.startDown -= 1;
+        this.setData({
+          startDown: this.data.startDown
+        })
+        if (this.data.startDown == -1) {
+          clearInterval(setInt2);
+          this.endGame();
+          if (this.data.gameSign) {
+            this.downTimeFun();
+          }
+        }
+      }
+    }, 1000);
   }
 })

496_dongfengqichen/pages/luckyStar/luckyStar.wxml

@@ -2,13 +2,14 @@
 <view class="all">
   <view class="main">
     <view class="gameMain">
-      <image class="gameStarBg" src="{{imgUrl+'/newImages/22.png?v=004'}}"></image>
+      <image class="gameStarBg" src="{{imgUrl+'/newImages2/23.png?v=004'}}"></image>
       <!-- <view class="gameTitle">幸运星抓手</view> -->
       <image class="gameTitle" src="{{imgUrl+'/images/luckyTitle.png'}}"></image>
       <view class="downTime">{{'00:'+downNum}}</view>
       <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+'/newImages/56.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>
         <view class="prizeTipText">他们都中奖了</view>
@@ -26,21 +27,21 @@
       <view class="gameControlFrame">
         <view class="gameControlGroup">
           <view class="btnControlL" bindtouchstart="startClaw" bindtouchend="endClaw" data-direction="L">
-            <image wx:if="{{btnGroup.left}}" class="luckyLeft" src="{{imgUrl+'/btns/luckyLeft.png'}}"></image>
+            <image wx:if="{{btnGroup.left}}" class="luckyLeft" src="{{imgUrl+'/newImages2/25.png'}}"></image>
           </view>
           <view class="btnControlR" bindtouchstart="startClaw" bindtouchend="endClaw" data-direction="R">
-            <image wx:if="{{btnGroup.right}}" class="luckyRight" src="{{imgUrl+'/btns/luckyRight.png'}}"></image>
+            <image wx:if="{{btnGroup.right}}" class="luckyRight" src="{{imgUrl+'/newImages2/26.png'}}"></image>
           </view>
           <view class="btnControlT" bindtouchstart="startClaw" bindtouchend="endClaw" data-direction="T">
-            <image wx:if="{{btnGroup.top}}" class="luckyTop" src="{{imgUrl+'/btns/luckyTop.png'}}"></image>
+            <image wx:if="{{btnGroup.top}}" class="luckyTop" src="{{imgUrl+'/newImages2/24.png'}}"></image>
           </view>
           <view class="btnControlB" bindtouchstart="startClaw" bindtouchend="endClaw" data-direction="B">
-            <image wx:if="{{btnGroup.bottom}}" class="luckyBottom" src="{{imgUrl+'/btns/luckyBottom.png'}}"></image>
+            <image wx:if="{{btnGroup.bottom}}" class="luckyBottom" src="{{imgUrl+'/newImages2/27.png'}}"></image>
           </view>
         </view>
       </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="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>
       <!-- <view class="gameGetBtn" bindtouchstart="openClaw">
@@ -55,8 +56,8 @@
         <image class="gameRuleIcon" src="{{imgUrl+'/newImages/47.png'}}"></image>
         <image class="gameRuleClose" wx:if="{{ruleCloseShow}}" bindtap="closeRule" src="{{imgUrl+'/star/closebtn.png'}}"></image>
         <view class="gameRuleGroup">
-          <view style="width: 460rpx;height: 839rpx;">
-            <image class="newImages48" style="width: 100%;height: 100%;" src="{{imgUrl+'/newImages/48.png'}}"></image>
+          <view style="width: 452rpx;height: 1542rpx;">
+            <image class="newImages48" style="width: 100%;height: 100%;" src="{{imgUrl+'/newImages2/10.png'}}"></image>
           </view>
           <view class="gameStrat" bindtap="closeRule">
             <image style="width:100%;height:100%;" src="{{imgUrl+'/btns/gameStart.png'}}"></image>
@@ -92,9 +93,23 @@
     <view class="downTimeGroup" wx:if="{{startDown!=-1}}">
       <image class="luckyNum" src="{{imgUrl+'/images/luckyNum'+startDown+'.png'}}"></image>
     </view>
+    <view class="downTimeGroup" wx:if="{{operationExampleShow}}">
+      <view class="operationExample">
+        <image class="newImages2-29" src="{{imgUrl+'/newImages2/29.png'}}"></image>
+        <image class="newImages2-30" src="{{imgUrl+'/newImages2/30.png'}}"></image>
+        <image class="newImages24 newImages24-2" src="{{imgUrl+'/newImages/24_1.png'}}"></image>
+        <image class="newImages24 newImages24-2 {{operationExampleNum?'ani2':''}}" style="opacity:0;" src="{{imgUrl+'/newImages/24_2.png'}}"></image>
+        <image class="newImages2-28" bindtap="operationControl" src="{{imgUrl+'/newImages2/28.png'}}"></image>
+        <image class="luckyLeft-2 {{operationExampleNum == 1?'ani':''}}" src="{{imgUrl+'/newImages2/31.png'}}"></image>
+        <image class="luckyRight-2 {{operationExampleNum == 2?'ani':''}}" src="{{imgUrl+'/newImages2/33.png'}}"></image>
+        <image class="luckyTop-2 {{operationExampleNum == 3?'ani':''}}" src="{{imgUrl+'/newImages2/32.png'}}"></image>
+        <image class="luckyBottom-2 {{operationExampleNum == 4?'ani':''}}" src="{{imgUrl+'/newImages2/34.png'}}"></image>
+        <image class="gameRuleClose" bindtap="operationControl" src="{{imgUrl+'/star/closebtn.png'}}"></image>
+      </view>
+    </view>
     <view class="downTimeGroup" wx:if="{{!isChanceShow}}">
       <view class="chanceGroup">
-        <image class="newImages44" src="{{imgUrl+'/newImages/44.png'}}"></image>
+        <image class="newImages44" src="{{imgUrl+'/newImages2/9.png'}}"></image>
         <image class="newImages45" bindtap="chanceShowControl" src="{{imgUrl+'/newImages/45.png'}}"></image>
         <image class="gameRuleClose" bindtap="chanceShowControl" src="{{imgUrl+'/star/closebtn.png'}}"></image>
       </view>

496_dongfengqichen/pages/luckyStar/luckyStar.wxss

@@ -6,7 +6,7 @@ view{
   -webkit-overflow-scrolling: touch;
 }
 .main{
-  height: calc(100vh - 150rpx);
+  height: calc(100vh - 120rpx);
   overflow: auto;
 }
 .gameRuleBtn{
@@ -31,7 +31,7 @@ view{
   left: 0;
   top: 0;
   width: 100%;
-  height: calc(100vh - 150rpx);
+  height: calc(100vh - 120rpx);
   background-color: rgba( 000, 000, 000, 0.3);
   display: flex;
   align-items: center;
@@ -123,10 +123,10 @@ view{
 }
 .gameControlFrame{
   position: absolute;
-  left: 102rpx;
-  top: 915rpx;
-  width: 174rpx;
-  height: 106rpx;
+  left: 110rpx;
+  top: 895rpx;
+  width: 224rpx;
+  height: 127rpx;
 }
 .gameControlGroup{
   widows: 100%;
@@ -136,41 +136,37 @@ view{
 .btnControlL{
   position: absolute;
   left: 0;
-  top: 38rpx;
-  width: 60rpx;
-  height: 30rpx;
-  /* background-color: rgba( 000, 000, 000, 0.3); */
+  top: 39rpx;
+  width: 71rpx;
+  height: 51rpx;
 }
 .btnControlR{
   position: absolute;
   right: 0;
-  top: 38rpx;
-  width: 64rpx;
-  height: 30rpx;
-  /* background-color: rgba(228, 15, 15, 0.849); */
+  top: 39rpx;
+  width: 71rpx;
+  height: 51rpx;
 }
 .btnControlT{
   position: absolute;
-  left: 65rpx;
-  top: 0;
-  width: 48rpx;
-  height: 44rpx;
-  /* background-color: rgba(209, 135, 45, 0.5); */
+  left: 75rpx;
+  top: 4rpx;
+  width: 71rpx;
+  height: 51rpx;
 }
 .btnControlB{
   position: absolute;
-  left: 60rpx;
+  left: 75rpx;
   bottom: 0;
-  width: 50rpx;
-  height: 47rpx;
-  /* background-color: rgba(233, 222, 111, 0.5); */
+  width: 71rpx;
+  height: 51rpx;
 }
 .successPop{
   position: fixed;
   top: 0;
   left: 0;
   width: 100%;
-  height: calc(100vh - 150rpx);
+  height: calc(100vh - 120rpx);
   background-color: rgba( 000, 000, 000, 0.3);
   display: flex;
   align-items: center;
@@ -345,33 +341,27 @@ view{
   margin-left: -2rpx;
 }
 .luckyLeft{
-  width: 83rpx;
-  height: 40rpx;
-  margin-left: -4rpx;
-  margin-top: -1rpx;
+  width: 71rpx;
+  height: 51rpx;
 }
 .luckyRight{
-  width: 83rpx;
-  height: 40rpx;
-  margin-left: -5rpx;
-  margin-top: -2rpx;
+  width: 71rpx;
+  height: 51rpx;
 }
 .luckyTop{
-  width: 72rpx;
-  height: 47rpx;
+  width: 71rpx;
+  height: 51rpx;
 }
 .luckyBottom{
-  width: 73rpx;
-  height: 47rpx;
-  margin-left: -14rpx;
-  margin-top: 6rpx;
+  width: 71rpx;
+  height: 51rpx;
 }
 .downTimeGroup{
   position: fixed;
   left: 0;
   top: 0;
   width: 100%;
-  height: calc(100vh - 150rpx);
+  height: calc(100vh - 120rpx);
   background-color: rgba( 000, 000, 000, 0.3);
   display: flex;
   align-items: center;
@@ -458,4 +448,85 @@ view{
   flex-direction: column;
   align-items: center;
   overflow: auto;
+}
+.newImages2-22{
+  position: absolute;
+  left: 50%;
+  transform: translateX(-50%);
+  top: 369rpx;
+  width: 247rpx;
+  height: 91rpx;
+}
+.operationExample{
+  position: relative;
+  width: 489rpx;
+  height: 460rpx;
+}
+.newImages2-29{
+  width: 100%;
+  height: 100%;
+}
+.newImages2-28{
+  position: absolute;
+  left: 50%;
+  transform: translateX(-50%);
+  bottom:58rpx;
+  width: 277rpx;
+  height: 51rpx;
+}
+.newImages2-30{
+  position: absolute;
+  left: 72rpx;
+  top: 183rpx;
+  width: 164rpx;
+  height: 93rpx;
+}
+.newImages24-2{
+  top: 180rpx;
+  right: 71rpx;
+  left: auto;
+}
+.luckyLeft-2{
+  position: absolute;
+  top: 208rpx;
+  left: 74rpx;
+  width: 53rpx;
+  height: 39rpx;
+  opacity: 0;
+}
+.luckyRight-2{
+  position: absolute;
+  top: 208rpx;
+  left: 182rpx;
+  width: 53rpx;
+  height: 39rpx;
+  opacity: 0;
+}
+.luckyTop-2{
+  position: absolute;
+  top: 182rpx;
+  left: 126rpx;
+  width: 53rpx;
+  height: 39rpx;
+  opacity: 0;
+}
+.luckyBottom-2{
+  position: absolute;
+  top: 236rpx;
+  left: 126rpx;
+  width: 53rpx;
+  height: 39rpx;
+  opacity: 0;
+}
+.ani{
+  animation:mymove 800ms linear;
+}
+.ani2{
+  animation:mymove 2s linear;
+}
+@keyframes mymove{
+  25% {opacity:1;}
+  50% {opacity:0;}
+  75% {opacity:1;}
+  100% {opacity:0;}
 }

496_dongfengqichen/pages/mobileVerification/mobileVerification.wxml

@@ -6,7 +6,7 @@
       <view class="titleGroup">
         <image class="mobilepagelogo" src="{{imgUrl+'/images/mobilepagelogo.png'}}"></image>
         <view class="goodsName">启辰</view>
-        <view class="goodsText">申请</view>
+        <view class="goodsText">申请加入星探计划，享千元现金红包</view>
       </view>
       <view class="inputFrame">
         <view class="inputGroup">

496_dongfengqichen/pages/mobileVerification/mobileVerification.wxss

@@ -6,7 +6,7 @@ view{
   -webkit-overflow-scrolling: touch;
 }
 .main{
-  height: calc(100vh - 150rpx);
+  height: calc(100vh - 120rpx);
   overflow: auto;
 }
 .bg {
@@ -19,7 +19,7 @@ view{
 .msgFrame{
   position: absolute;
   left: 0;
-  bottom: 150rpx;
+  bottom: 120rpx;
   width: 750rpx;
   padding: 30rpx 20rpx;
   background-color: white;
@@ -44,9 +44,9 @@ view{
   color:rgba(30,27,28,1);
 }
 .goodsText{
-  margin-left: 30rpx;
-  font-size:30rpx;
-  line-height: 30rpx;
+  margin-left: 24rpx;
+  font-size:24rpx;
+  line-height: 24rpx;
   font-family:PingFangSC;
   font-weight:400;
   color:rgba(30,27,28,1);

496_dongfengqichen/pages/myCenter/myCenter.js

@@ -57,7 +57,145 @@ Page({
     mycenterTipWindow:0,
     barNums:0,
     getState:true,
-    scoutRule:false
+    scoutRule:false,
+    vipDetailShow:false,
+    testData:[
+      { 
+        awardDetailPicContentHeight:0,
+        awardName: "200元加油卡", //奖品名称
+        awardDetailPicurl: app.globalData.urlStatic +"/testImg/200元加油卡.png",//奖品详情
+        awardPicurl:"https://xingb.venucia.com/award/10_1.png",//奖品小图
+        productCode:"3cce61eac692e0dd37f0330dd2bb4df7",//奖品兑换码
+        awardState: 0,
+        cdate: "2020-03-23",
+      },
+      {
+        awardDetailPicContentHeight: 0,
+        awardName: "500元现金", //奖品名称
+        awardDetailPicurl: app.globalData.urlStatic + "/testImg/500元现金.png",//奖品详情
+        awardPicurl: "https://xingb.venucia.com/award/10_1.png",//奖品小图
+        productCode: "3cce61eac692e0dd37f0330dd2bb4df7",//奖品兑换码
+        awardState: 0,
+        cdate: "2020-03-23",
+      },
+      {
+        awardDetailPicContentHeight: 0,
+        awardName: "1000元现金", //奖品名称
+        awardDetailPicurl: app.globalData.urlStatic + "/testImg/1000元现金.png",//奖品详情
+        awardPicurl: "https://xingb.venucia.com/award/10_1.png",//奖品小图
+        productCode: "3cce61eac692e0dd37f0330dd2bb4df7",//奖品兑换码
+        awardState: 0,
+        cdate: "2020-03-23",
+      },
+      {
+        awardDetailPicContentHeight: 398,
+        awardName: "爱奇艺月卡", //奖品名称
+        awardDetailPicurl: app.globalData.urlStatic + "/testImg/爱奇艺月卡.png",//奖品详情
+        awardPicurl: "https://xingb.venucia.com/award/10_1.png",//奖品小图
+        productCode: "3cce61eac692e0dd37f0330dd2bb4df7",//奖品兑换码
+        awardState: 1,
+        cdate: "2020-03-23",
+      },
+      {
+        awardDetailPicContentHeight: 798,
+        awardName: "购车优惠券", //奖品名称
+        awardDetailPicurl: app.globalData.urlStatic + "/testImg/购车优惠券.png",//奖品详情
+        awardPicurl: "https://xingb.venucia.com/award/10_1.png",//奖品小图
+        productCode: "3cce61eac692e0dd37f0330dd2bb4df7",//奖品兑换码
+        awardState: 1,
+        cdate: "2020-03-23",
+      },
+      {
+        awardDetailPicContentHeight: 602,
+        awardName: "机油升级券", //奖品名称
+        awardDetailPicurl: app.globalData.urlStatic + "/testImg/机油升级券.png",//奖品详情
+        awardPicurl: "https://xingb.venucia.com/award/10_1.png",//奖品小图
+        productCode: "3cce61eac692e0dd37f0330dd2bb4df7",//奖品兑换码
+        awardState: 1,
+        cdate: "2020-03-23",
+      },
+      {
+        awardDetailPicContentHeight: 398,
+        awardName: "京东E卡", //奖品名称
+        awardDetailPicurl: app.globalData.urlStatic + "/testImg/京东E卡.png",//奖品详情
+        awardPicurl: "https://xingb.venucia.com/award/10_1.png",//奖品小图
+        productCode: "3cce61eac692e0dd37f0330dd2bb4df7",//奖品兑换码
+        awardState: 1,
+        cdate: "2020-03-23",
+      },
+      {
+        awardDetailPicContentHeight: 0,
+        awardName: "美的烤箱", //奖品名称
+        awardDetailPicurl: app.globalData.urlStatic + "/testImg/美的烤箱.png",//奖品详情
+        awardPicurl: "https://xingb.venucia.com/award/10_1.png",//奖品小图
+        productCode: "3cce61eac692e0dd37f0330dd2bb4df7",//奖品兑换码
+        awardState: 0,
+        cdate: "2020-03-23",
+      },
+      {
+        awardDetailPicContentHeight: 0,
+        awardName: "米家扫地机器人", //奖品名称
+        awardDetailPicurl: app.globalData.urlStatic + "/testImg/米家扫地机器人.png",//奖品详情
+        awardPicurl: "https://xingb.venucia.com/award/10_1.png",//奖品小图
+        productCode: "3cce61eac692e0dd37f0330dd2bb4df7",//奖品兑换码
+        awardState: 0,
+        cdate: "2020-03-23",
+      },
+      {
+        awardDetailPicContentHeight: 0,
+        awardName: "启辰星定制旅行箱", //奖品名称
+        awardDetailPicurl: app.globalData.urlStatic + "/testImg/启辰星定制旅行箱.png",//奖品详情
+        awardPicurl: "https://xingb.venucia.com/award/10_1.png",//奖品小图
+        productCode: "3cce61eac692e0dd37f0330dd2bb4df7",//奖品兑换码
+        awardState: 0,
+        cdate: "2020-03-23",
+      },
+      {
+        awardDetailPicContentHeight: 398,
+        awardName: "瑞幸咖啡免费券", //奖品名称
+        awardDetailPicurl: app.globalData.urlStatic + "/testImg/瑞幸咖啡免费券.png",//奖品详情
+        awardPicurl: "https://xingb.venucia.com/award/10_1.png",//奖品小图
+        productCode: "3cce61eac692e0dd37f0330dd2bb4df7",//奖品兑换码
+        awardState: 1,
+        cdate: "2020-03-23",
+      },
+      {
+        awardDetailPicContentHeight: 0,
+        awardName: "索尼无线蓝牙耳机", //奖品名称
+        awardDetailPicurl: app.globalData.urlStatic + "/testImg/索尼无线蓝牙耳机.png",//奖品详情
+        awardPicurl: "https://xingb.venucia.com/award/10_1.png",//奖品小图
+        productCode: "3cce61eac692e0dd37f0330dd2bb4df7",//奖品兑换码
+        awardState: 0,
+        cdate: "2020-03-23",
+      },
+      {
+        awardDetailPicContentHeight: 398,
+        awardName: "腾讯视频月卡", //奖品名称
+        awardDetailPicurl: app.globalData.urlStatic + "/testImg/腾讯视频月卡.png",//奖品详情
+        awardPicurl: "https://xingb.venucia.com/award/10_1.png",//奖品小图
+        productCode: "3cce61eac692e0dd37f0330dd2bb4df7",//奖品兑换码
+        awardState: 1,
+        cdate: "2020-03-23",
+      },
+      {
+        awardDetailPicContentHeight: 0,
+        awardName: "头等舱", //奖品名称
+        awardDetailPicurl: app.globalData.urlStatic + "/testImg/头等舱.png",//奖品详情
+        awardPicurl: "https://xingb.venucia.com/award/10_1.png",//奖品小图
+        productCode: "3cce61eac692e0dd37f0330dd2bb4df7",//奖品兑换码
+        awardState: 0,
+        cdate: "2020-03-23",
+      },
+      {
+        awardDetailPicContentHeight: 398,
+        awardName: "网易云音乐月卡", //奖品名称
+        awardDetailPicurl: app.globalData.urlStatic + "/testImg/网易云音乐月卡.png",//奖品详情
+        awardPicurl: "https://xingb.venucia.com/award/10_1.png",//奖品小图
+        productCode: "3cce61eac692e0dd37f0330dd2bb4df7",//奖品兑换码
+        awardState: 1,
+        cdate: "2020-03-23",
+      }
+    ]
   },
 
   /**
@@ -477,7 +615,8 @@ Page({
     }
     if (this.data.recordList[e.currentTarget.dataset.value].awardState == 0){
       this.setData({
-        mycenterTipWindow:this.data.isAddress?2:1
+        mycenterTipWindow:this.data.isAddress?2:1,
+        lookDescId: e.currentTarget.dataset.value || e.currentTarget.dataset.value == 0 ? e.currentTarget.dataset.value : null
       })
     } else {
       this.setData({
@@ -550,6 +689,7 @@ Page({
         getState: false
       })
       if(res.code == 200){
+        // res.data = this.data.testData;
         this.setData({
           recordList:res.data
         })
@@ -680,5 +820,10 @@ Page({
     wx.navigateTo({
       url: '/pages/everyday/everyday',
     })
+  },
+  vipDetailControl:function(){
+    this.setData({
+      vipDetailShow:!this.data.vipDetailShow
+    })
   }
 })

496_dongfengqichen/pages/myCenter/myCenter.wxml

@@ -19,15 +19,15 @@
         <image bindtap="addressControl" class="userNameEdit" src="{{imgUrl+'/newImages/40.png'}}"></image>
       </view>
       <view class="userLevel" wx:if="{{userData.userLevel}}">
-        <image class="userLevelIcon" src="{{imgUrl+'/images/userLevelIcon'+userData.userLevel+'.png'}}"></image>
-        <image class="userLevelTip" src="{{imgUrl+'/images/myCenterTipLevel.jpg'}}"></image>
-        <image class="userLevelText" src="{{imgUrl+'/images/userLevelText'+userData.userLevel+'.png'}}"></image>
-        <image class="lookRule" bindtap="scoutRuleControl" data-value="{{true}}" src="{{imgUrl+'/btns/myCenterRule.jpg'}}"></image>
+        <image class="userLevelIcon" src="{{imgUrl+'/newImages2/'+(50+userData.userLevel)+'.png'}}"></image>
+        <image class="userLevelTip" src="{{imgUrl+'/newImages2/54.png'}}"></image>
+        <image class="userLevelText" src="{{imgUrl+'/newImages2/'+(47+userData.userLevel)+'.png'}}"></image>
+        <image class="lookRule" bindtap="scoutRuleControl" data-value="{{true}}" src="{{imgUrl+'/newImages2/47.png'}}"></image>
       </view>
       <view class="userLevel" wx:if="{{!userData.userLevel}}">
-        <image class="userWaitIcon" src="{{imgUrl+'/images/userWaitIcon.png'}}"></image>
+        <image class="userWaitIcon" src="{{imgUrl+'/newImages2/60.png'}}"></image>
         <view class="userWaitText">您的星探待激活</view>
-        <image class="lookRule" bindtap="scoutRuleControl" data-value="{{true}}" src="{{imgUrl+'/btns/myCenterRule.jpg'}}"></image>
+        <image class="lookRule" bindtap="scoutRuleControl" data-value="{{true}}" src="{{imgUrl+'/newImages2/47.png'}}"></image>
       </view>
     </view>
     <view class="funList">
@@ -35,28 +35,28 @@
       <view bindtap="selectChange" data-value="1" class="selectGroup" style="border-color:{{selectNow==1?'#667ea3':'#7A797E'}}">
         <view wx:if="{{selectNow==1}}" class="arrowIcon"></view>
         <view class="imgFrame">
-          <image class="taskIcon" src="{{selectNow==1?imgUrl+'/images/taskIcon2.png':imgUrl+'/images/taskIcon.png'}}"></image>
+          <image class="taskIcon" src="{{imgUrl+'/newImages2/55_'+(selectNow==1?2:1)+'.png'}}"></image>
         </view>
         <view class="selectText" style="color:{{selectNow==1?'#667ea3':'black'}}">我的任务</view>
       </view>
       <view bindtap="selectChange" data-value="2" class="selectGroup" style="border-color:{{selectNow==2?'#667ea3':'#7A797E'}}">
         <view wx:if="{{selectNow==2}}" class="arrowIcon"></view>
         <view class="imgFrame">
-          <image class="recordIcon" src="{{selectNow==2?imgUrl+'/images/recordIcon2.png':imgUrl+'/images/recordIcon.png'}}"></image>
+          <image class="recordIcon" src="{{imgUrl+'/newImages2/56_'+(selectNow==2?2:1)+'.png'}}"></image>
         </view>
         <view class="selectText" style="color:{{selectNow==2?'#667ea3':'black'}}">获奖记录</view>
       </view>
       <view bindtap="selectChange" data-value="3" class="selectGroup" style="border-color:{{selectNow==3?'#667ea3':'#7A797E'}}">
         <view wx:if="{{selectNow==3}}" class="arrowIcon"></view>
         <view class="imgFrame">
-          <image class="detachmentIcon" src="{{selectNow==3?imgUrl+'/images/detachmentIcon2.png':imgUrl+'/images/detachmentIcon.png'}}"></image>
+          <image class="detachmentIcon" src="{{imgUrl+'/newImages2/57_'+(selectNow==3?2:1)+'.png'}}"></image>
         </view>
         <view class="selectText" style="color:{{selectNow==3?'#667ea3':'black'}}">星探小分队</view>
       </view>
       <view bindtap="selectChange" data-value="4" class="selectGroup" style="border-color:{{selectNow==4?'#667ea3':'#7A797E'}}">
         <view wx:if="{{selectNow==4}}" class="arrowIcon"></view>
         <view class="imgFrame">
-          <image class="appreciateIcon" src="{{selectNow==4?imgUrl+'/images/appreciateIcon2.png?v=002':imgUrl+'/images/appreciateIcon.png?v=002'}}"></image>
+          <image class="appreciateIcon" src="{{imgUrl+'/newImages2/58_'+(selectNow==4?2:1)+'.png'}}"></image>
         </view>
         <view class="selectText" style="color:{{selectNow==4?'#667ea3':'black'}}">{{buyState?"我的VIP卡":"我的订单"}}</view>
       </view>
@@ -67,6 +67,7 @@
         <view bindtap="selectTask" data-type='1' class="taskText {{taskNow==1?'taskText2':''}}">每日任务</view>
         <view bindtap="selectTask" data-type='2' class="taskText {{taskNow==2?'taskText2':''}}">星探任务</view>
       </view>
+      <image class="newImages2-59" wx:if="{{taskNow==1}}" src="{{imgUrl+'/newImages2/59.png?v=001'}}"></image>
       <view class="taskDetailFrame" wx:if="{{taskNow==1}}">
         <view class="taskDetailGroup" wx:for="{{taskList}}" wx:key="id">
           <view class="taskName">{{item.fullName}}</view>
@@ -85,8 +86,8 @@
           <view wx:if="{{item.unlockNum!=4}}" class="taskWaitBtn">未完成</view>
         </view>
       </view>
-      <view class="taskDetailFrame" wx:if="{{taskNow==2}}">
-        <image class="scoutTaskDesc" src="{{imgUrl+'/newIcon/5.png'}}"></image>
+      <view class="taskDetailFrame" style="top: 104rpx;height:485rpx;" wx:if="{{taskNow==2}}">
+        <image class="scoutTaskDesc" src="{{imgUrl+'/newImages2/61.png'}}"></image>
         <image class="scoutTaskIcon" src="{{imgUrl+'/newIcon/'+(barNums>3?'12':barNums>0?'6':'11')+'.png?v=002'}}"></image>
         <view class="barFrame">
           <view style="position:absolute;top:-5rpx;left:295rpx;">
@@ -102,7 +103,7 @@
             </view>
           </view>
         </view>
-        <image class="scoutTaskGo" bindtap="starGo" src="{{imgUrl+'/newIcon/10.png'}}"></image>
+        <image class="scoutTaskGo" bindtap="starGo" src="{{imgUrl+'/newImages2/62.png'}}"></image>
       </view>
     </view>
     <view class="taskGroup" wx:if="{{selectNow==2}}">
@@ -112,12 +113,12 @@
         <view bindtap="selectRecord" data-type='3' class="taskText recordText {{recordNow==3?'taskText2':''}}">星探奖励</view>
       </view>
       <view class="recordFrame">
-        <image class="newImages1" wx:if="{{!recordList.length && recordNow==1 && !getState}}" src="{{imgUrl+'/newIcon/16.png'}}"></image>
-        <image class="newImages2" bindtap="enterLucky" wx:if="{{!recordList.length && recordNow==1 && !getState}}" src="{{imgUrl+'/newImages/2.png'}}"></image>
-        <image class="newImages5" wx:if="{{!recordList.length && recordNow==2 && !getState}}" src="{{imgUrl+'/newIcon/15.png'}}"></image>
-        <image class="newImages6" bindtap="enterEvery" wx:if="{{!recordList.length && recordNow==2 && !getState}}" src="{{imgUrl+'/newImages/6.png'}}"></image>
-        <image class="newImages8" wx:if="{{!recordList.length && recordNow==3 && !getState}}" src="{{imgUrl+'/newIcon/13.png'}}"></image>
-        <image class="newImages6" bindtap="starGo" wx:if="{{!recordList.length && recordNow==3 && !getState}}" src="{{imgUrl+'/newImages/6.png'}}"></image>
+        <image class="newImages1" wx:if="{{!recordList.length && recordNow==1 && !getState}}" src="{{imgUrl+'/newImages2/63.png'}}"></image>
+        <image class="newImages2-64" bindtap="enterLucky" wx:if="{{!recordList.length && recordNow==1 && !getState}}" src="{{imgUrl+'/newImages2/64.png'}}"></image>
+        <image class="newImages5" wx:if="{{!recordList.length && recordNow==2 && !getState}}" src="{{imgUrl+'/newImages2/65.png'}}"></image>
+        <image class="newImages6" bindtap="enterEvery" wx:if="{{!recordList.length && recordNow==2 && !getState}}" src="{{imgUrl+'/newImages2/64.png'}}"></image>
+        <image class="newImages8" wx:if="{{!recordList.length && recordNow==3 && !getState}}" src="{{imgUrl+'/newImages2/66.png'}}"></image>
+        <image class="newImages6" bindtap="starGo" wx:if="{{!recordList.length && recordNow==3 && !getState}}" src="{{imgUrl+'/newImages2/64.png'}}"></image>
         <view class="recordGroup" wx:if="{{recordList.length}}" wx:for="{{recordList}}" wx:key="index">
           <view class="recordGroupLeft">
             <view class="recordHeadGroup">
@@ -145,9 +146,9 @@
       </view>
     </view>
     <view class="ranksGroup" wx:if="{{selectNow==3}}">
-      <image class="newImages3" wx:if="{{!shareFriendList.length}}" src="{{imgUrl+'/newIcon/18.png'}}"></image>
-      <image class="newImages4" bindtap="starGo" wx:if="{{!shareFriendList.length}}" src="{{imgUrl+'/newIcon/17.png'}}"></image>
-      <image class="newImages7" wx:if="{{shareFriendList.length}}" src="{{imgUrl+'/newIcon/19.png'}}"></image>
+      <image class="newImages3" wx:if="{{!shareFriendList.length}}" src="{{imgUrl+'/newImages2/69.png'}}"></image>
+      <image class="newImages4" bindtap="starGo" wx:if="{{!shareFriendList.length}}" src="{{imgUrl+'/newImages2/70.png'}}"></image>
+      <image class="newImages7" wx:if="{{shareFriendList.length}}" src="{{imgUrl+'/newImages2/71.png'}}"></image>
       <scroll-view class="ranksList" wx:if="{{shareFriendList.length}}" scroll-y bindscrolltolower="scrolltolower">
         <view class="detachmentGroup" wx:for="{{shareFriendList}}" wx:key="index">
           <view class="detachmentGroupLeft">
@@ -209,7 +210,7 @@
         <image style="width:100%;height:100%;" src="{{imgUrl+'/btns/myCenterBtn2.png'}}"></image></view>
     </view> -->
     <view class="orderDescGroup" wx:if="{{selectNow==4 && !buyState}}">
-      <image class="orderDesc" src="{{imgUrl+'/newImages/43.png'}}"></image>
+      <image class="orderDesc" src="{{imgUrl+'/newImages2/68.png'}}"></image>
       <image class="indexOrderIcon" bindtap="placingControl" src="{{imgUrl+'/images/indexOrderIcon.png'}}"></image>
     </view>
     <view class="placingOrder" wx:if="{{selectNow==4 && buyState}}">
@@ -220,35 +221,40 @@
           <view class="cardCtime">{{buyStateTime}}</view>
         </view>
       </view>
-      <image class="orderCard" src="{{imgUrl+'/images/orderCard.png'}}"></image>
+      <image class="orderCard" bindtap="vipDetailControl" src="{{imgUrl+'/newImages2/67.png'}}"></image>
     </view>
     <service></service>
     <view class="prizeDesc" catchtouchmove="ture" wx:if="{{mycenterTipWindow==1}}">
       <view class="mycenterTipWindowGroup">
-        <image class="mycenterTipWindow1" src="{{imgUrl+'/images/mycenterTipWindow1.png'}}"></image>
+        <image class="mycenterTipWindow1" src="{{imgUrl+'/newImages2/72.png?v=001'}}"></image>
         <image bindtap="tipWindow" class="closeDescIcon" style="top:-10rpx;right:-10rpx;" src="{{imgUrl+'/images/closeDescIcon.png'}}"></image>
         <view class="mycenterTipBtnGroup">
-          <image class="mycenterTipBtn" bindtap="lookAddress" style="margin-bottom:30rpx;" src="{{imgUrl+'/images/mycenterTipBtn2.png'}}"></image>
-          <image class="mycenterTipBtn" bindtap="tipWindow" src="{{imgUrl+'/images/mycenterTipBtn1.png'}}"></image>
+          <image class="mycenterTipBtn" bindtap="lookAddress" style="margin-bottom:20rpx;" src="{{imgUrl+'/newImages2/74.png'}}"></image>
+          <image class="newMycenterTipBtn" bindtap="tipWindow" src="{{imgUrl+'/newImages2/73.png'}}"></image>
         </view>
       </view>
     </view>
     <view class="prizeDesc" catchtouchmove="ture" wx:if="{{mycenterTipWindow==2}}">
-      <view class="mycenterTipWindowGroup" style="width:654rpx;height:536rpx;">
-        <image class="mycenterTipWindow1" src="{{imgUrl+'/images/mycenterTipWindow2.png'}}"></image>
+      <view class="mycenterTipWindowGroup" style="width:660rpx;height:auto;">
+        <image class="mycenterTipWindow1" mode="widthFix" src="{{recordList[lookDescId].awardDetailPicurl}}"></image>
         <image bindtap="tipWindow" class="closeDescIcon" style="top:-10rpx;right:-10rpx;" src="{{imgUrl+'/images/closeDescIcon.png'}}"></image>
-        <view class="mycenterTipBtnGroup">
-          <image class="mycenterTipBtn" bindtap="lookAddress" style="margin-bottom:30rpx;" src="{{imgUrl+'/images/mycenterTipBtn2.png'}}"></image>
+        <view class="mycenterTipBtnGroup" style="top:auto;bottom:40rpx;">
+          <image class="mycenterTipBtn" bindtap="lookAddress" style="margin-bottom:30rpx;" src="{{imgUrl+'/newImages2/74.png'}}"></image>
           <image class="mycenterTipBtn" bindtap="tipWindow" src="{{imgUrl+'/images/mycenterTipBtn1.png'}}"></image>
         </view>
       </view>
     </view>
     <view class="prizeDesc" catchtouchmove="ture" wx:if="{{descFrameShow}}">
-      <view class="prizeImgGroup" wx:if="{{recordList[lookDescId].awardId!=1}}">
-        <image class="prizeImg" src="{{imgUrl+'/images/prizeDetailtext.png'}}"></image>
+      <view class="prizeImgGroup" style="width:660rpx;height:auto;" wx:if="{{recordList[lookDescId].awardId!=1}}">
+        <!-- <image class="prizeImg" src="{{imgUrl+'/images/prizeDetailtext.png'}}"></image> -->
+        <image class="prizeImg" mode="widthFix" src="{{recordList[lookDescId].awardDetailPicurl+'?v=001'}}"></image>
         <image bindtap="lookDesc" data-value="{{false}}" style="top:-10rpx;right:-10rpx;" class="closeDescIcon" src="{{imgUrl+'/images/closeDescIcon.png'}}"></image>
-        <view class="exchangeCode">{{recordList[lookDescId].couponCode || recordList[lookDescId].productCode || ''}}<image class="copyBtn" bindtap="copyExchangeCode" src="{{imgUrl+'/images/copyBtn.png'}}"></image></view>
-        <image class="mycenterConfirmBtn" bindtap="lookDesc" src="{{imgUrl+'/images/mycenterConfirmBtn.png'}}"></image>
+        <view class="mycenterTipBtnGroup" style="top:auto;bottom:40rpx;" wx:if="{{!recordList[lookDescId].awardDetailPicContentHeight}}">
+          <image class="mycenterTipBtn" bindtap="lookAddress" style="margin-bottom:30rpx;" src="{{imgUrl+'/newImages2/74.png'}}"></image>
+          <image class="mycenterTipBtn" bindtap="lookDesc" data-value="{{false}}" src="{{imgUrl+'/images/mycenterTipBtn1.png'}}"></image>
+        </view>
+        <view class="exchangeCode" wx:if="{{recordList[lookDescId].awardDetailPicContentHeight}}" style="top:{{recordList[lookDescId].awardDetailPicContentHeight+30}}rpx;">{{recordList[lookDescId].couponCode || recordList[lookDescId].productCode || ''}}<image class="copyBtn" bindtap="copyExchangeCode" src="{{imgUrl+'/images/copyBtn.png'}}"></image></view>
+        <image class="mycenterConfirmBtn" wx:if="{{recordList[lookDescId].awardDetailPicContentHeight}}" style="top:{{recordList[lookDescId].awardDetailPicContentHeight+120}}rpx;" bindtap="lookDesc" src="{{imgUrl+'/images/mycenterConfirmBtn.png'}}"></image>
       </view>
       <view class="prizeCustomGroup" wx:if="{{recordList[lookDescId].awardId==1}}">
         <view class="prizeCustom">
@@ -272,6 +278,12 @@
         <image class="closeBtn" src="{{imgUrl+'/star/closebtn.png'}}" bindtap="lookRule" data-value="{{false}}"></image>
       </view>
     </view>
+    <view class="prizeDesc" wx:if="{{vipDetailShow}}">
+      <view class="vipDetail">
+        <image style="width:100%;height:100%;" src="{{imgUrl+'/newImages2/46.png?v=001'}}"></image>
+        <image class="vipDetailY" bindtap="vipDetailControl" src="{{imgUrl+'/newImages2/45.png'}}"></image>
+      </view>
+    </view>
   </view>
   <agreement bindmyevent="agreementControl" wx:if="{{agreement}}"></agreement>
   <userMsg bindaddress="addressControl" wx:if="{{addressShow}}"></userMsg>

496_dongfengqichen/pages/myCenter/myCenter.wxss

@@ -6,8 +6,8 @@ view{
   -webkit-overflow-scrolling: touch;
 }
 .main{
-  /* height: calc(100vh - 150rpx); */
-  padding-bottom: 150rpx;
+  /* height: calc(100vh - 120rpx); */
+  padding-bottom: 120rpx;
   overflow: auto;
 }
 .msgGroup{
@@ -24,10 +24,10 @@ view{
   display: flex;
   align-items: center;
   justify-content: center;
-  width: 178rpx;
-  height: 178rpx;
+  width: 140rpx;
+  height: 140rpx;
   margin: 0 auto;
-  margin-bottom: 27rpx;
+  margin-bottom: 30rpx;
   overflow: hidden;
 }
 .defaultHead{
@@ -45,7 +45,7 @@ view{
   position: relative;
   width: 750rpx;
   height: 233rpx;
-  padding: 0 72rpx;
+  padding: 0 55rpx;
   display: flex;
   align-items: center;
   justify-content: space-between;
@@ -61,8 +61,8 @@ view{
 }
 .selectGroup{
   position: relative;
-  width:137rpx;
-  height:137rpx;
+  width:147rpx;
+  height:147rpx;
   border: 1rpx solid #355485;
   border-radius: 10rpx;
   display: flex;
@@ -71,27 +71,29 @@ view{
   flex-direction: column;
 }
 .taskIcon{
-  width: 42rpx;
-  height: 38rpx;
-  margin-bottom: 8rpx;
+  width: 50rpx;
+  height: 45rpx;
+  margin-bottom: 16rpx;
 }
 .recordIcon{
-  width: 38rpx;
-  height: 43rpx;
-  margin-bottom: 8rpx;
+  width: 47rpx;
+  height: 54rpx;
+  margin-bottom: 16rpx;
 }
 .detachmentIcon{
-  width: 44rpx;
-  height: 40rpx;
-  margin-bottom: 8rpx;
+  width: 52rpx;
+  height: 46rpx;
+  margin-bottom: 16rpx;
 }
 .appreciateIcon{
-  width: 38rpx;
-  height: 44rpx;
-  margin-bottom: 8rpx;
+  width: 45rpx;
+  height: 52rpx;
+  margin-bottom: 16rpx;
 }
 .selectText{
-  font-size: 20rpx;
+  font-size:24rpx;
+  font-family:PingFangSC;
+  font-weight:400;
 }
 .imgFrame{
   width:65rpx;
@@ -105,7 +107,7 @@ view{
   height: 589rpx;
 }
 .taskSelect{
-  padding:0 72rpx;
+  padding:0 55rpx;
   box-sizing: border-box;
   display: flex;
   justify-content: space-between;
@@ -113,10 +115,10 @@ view{
 }
 .taskText{
   width:256rpx;
-  height:41rpx;
+  height:52rpx;
   text-align: center;
-  line-height: 41rpx;
-  font-size:21rpx;
+  line-height: 52rpx;
+  font-size:24rpx;
   border-radius: 10rpx;
   border: 1rpx solid #345486;
   color: black;
@@ -189,13 +191,13 @@ view{
   position: absolute;
   left: 0;
   bottom: 0;
-  top: 104rpx;
+  top: 184rpx;
   width: 750rpx;
-  height: 485rpx;
+  height: 405rpx;
   overflow-y: auto;
 }
 .recordText{
-  width: 187rpx;
+  width: 202rpx;
 }
 .recordPic{
   display: flex;
@@ -247,8 +249,8 @@ view{
   margin-left: 3rpx;
 }
 .recordHeadGroup{
-  width: 90rpx;
-  height: 90rpx;
+  width: 80rpx;
+  height: 80rpx;
   overflow: hidden;
   border-radius: 50%;
   margin-right: 25rpx;
@@ -259,7 +261,7 @@ view{
 }
 .recordGroup{
   margin: 0 auto;
-  padding: 30rpx 0;
+  padding: 20rpx 0;
   width: 606rpx;
   box-sizing: border-box;
   display: flex;
@@ -337,14 +339,13 @@ view{
   display: flex;
   align-items: center;
   justify-content: center;
-  height: 30rpx;
   margin-bottom: 44rpx;
 }
 .userName{
-  font-size:36rpx;
+  font-size:26rpx;
   font-family:NissanBrand;
-  font-weight:bold;
-  color:rgba(30,27,28,1);
+  font-weight:400;
+  color:rgba(35,33,34,1);
 }
 .userNameEdit{
   width: 39rpx;
@@ -361,50 +362,55 @@ view{
 }
 .userLevel{
   width: 750rpx;
-  padding-top: 36rpx;
-  padding-bottom: 27rpx;
+  height: 290rpx;
   display: flex;
   flex-direction: column;
   align-items: center;
+  background-color: white;
 }
 .userLevelIcon{
-  width: 76rpx;
-  height: 60rpx;
+  margin-top: 14rpx;
+  width: 73rpx;
+  height: 48rpx;
 }
 .userLevelTip{
-  margin-top: 32rpx;
-  margin-bottom: 11rpx;
-  width:103rpx;
-  height:21rpx;
+  margin-top: 26rpx;
+  margin-bottom: 20rpx;
+  width:104rpx;
+  height:20rpx;
 }
 .userLevelText{
-  width: 352rpx;
-  height: 75rpx;
+  width: 284rpx;
+  height: 59rpx;
 }
 .lookRule{
-  margin-top: 27rpx;
-  width:367rpx;
+  margin-top: 20rpx;
+  width:282rpx;
   height:57rpx;
 }
 .userWaitIcon{
-  width:48rpx;
-  height: 59rpx;
+  width:38rpx;
+  height: 48rpx;
+  margin-top: 47rpx;
+  margin-bottom: 28rpx;
 }
 .userWaitText{
-  margin-top: 36rpx;
-  font-size: 55rpx;
-  font-weight: bold;
-  margin-bottom: 50rpx;
+  line-height: 48rpx;
+  font-size:48rpx;
+  font-family:PingFangSC;
+  font-weight:bold;
+  color:rgba(35,33,34,1);
+  margin-bottom: 8rpx;
 }
 .arrowIcon{
-  border-left: 10rpx solid transparent;
-  border-right: 10rpx solid transparent;
-  border-top: 10rpx solid #355485;
+  border-left: 15rpx solid transparent;
+  border-right: 15rpx solid transparent;
+  border-top: 15rpx solid #355485;
   content: "";
   /* position: relative;     */
   width: 0;
   position: absolute;
-  top: 143rpx;
+  top: 150rpx;
 }
 .inputGroup{
   width:652rpx;
@@ -475,7 +481,7 @@ view{
 }
 .orderDesc{
   width: 627rpx;
-  height: 842rpx;
+  height: 849rpx;
   margin-bottom: 81rpx;
 }
 /* .ranksList{
@@ -526,7 +532,7 @@ view{
   display: flex;
   align-items: center;
   justify-content: center;
-  padding-bottom: 150rpx;
+  padding-bottom: 120rpx;
   box-sizing: border-box;
 }
 .prizeImgGroup{
@@ -656,13 +662,13 @@ view{
   padding-bottom: 11rpx;
 }
 .orderHead{
-  width: 90rpx;
-  height: 90rpx;
+  width: 80rpx;
+  height: 80rpx;
   border-radius: 50%;
 }
 .orderCard{
-  width: 240rpx;
-  height: 155rpx;
+  width: 181rpx;
+  height: 117rpx;
 }
 .cardTitle{
   line-height: 18rpx;
@@ -685,18 +691,25 @@ view{
 }
 .mycenterTipWindowGroup{
   position: relative;
-  width: 611rpx;
-  height: 530rpx;
+  width: 450rpx;
+  height: 411rpx;
 }
 .mycenterTipBtnGroup{
   position: absolute;
   left: 50%;
   transform: translateX(-50%);
-  top: 320rpx;
+  top: 210rpx;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
 }
 .mycenterTipBtn{
-  width: 346rpx;
-  height: 62rpx;
+  width: 276rpx;
+  height: 50rpx;
+}
+.newMycenterTipBtn{
+  width: 275rpx;
+  height: 49rpx;
 }
 .mycenterConfirmBtn{
   width: 275rpx;
@@ -704,7 +717,7 @@ view{
   position: absolute;
   left: 50%;
   transform: translateX(-50%);
-  bottom: 70rpx;
+  top: 70rpx;
 }
 .copyBtn{
   width: 108rpx;
@@ -726,10 +739,11 @@ view{
   align-items: center;
 }
 .scoutTaskDesc{
-  width: 263rpx;
-  height: 41rpx;
+  width: 337rpx;
+  height: 45rpx;
   margin: 0 auto;
   margin-top: 10rpx;
+  margin-left: 255rpx;
 }
 .scoutTaskIcon{
   width: 182rpx;
@@ -784,16 +798,23 @@ view{
 }
 .scoutTaskGo{
   width: 256rpx;
-  height: 40rpx;
+  height: 52rpx;
   margin: 0 auto;
   margin-top: 60rpx;
 }
 .newImages1{
-  width: 108rpx;
-  height: 170rpx;
+  width: 169rpx;
+  height: 180rpx;
   margin: 0 auto;
+  margin-top: 30rpx;
   margin-bottom: 17rpx;
 }
+.newImages2-64{
+  width: 256rpx;
+  height: 51rpx;
+  margin: 0 auto;
+  margin-top: 25rpx;
+}
 .newImages2{
   width: 256rpx;
   height: 40rpx;
@@ -801,25 +822,26 @@ view{
 }
 .newImages3{
   width: 567rpx;
-  height:222rpx;
+  height:247rpx;
   margin: 0 auto;
   margin-bottom: 46rpx;
   margin-top: 22rpx;
 }
 .newImages4{
   width: 256rpx;
-  height:40rpx;
+  height:51rpx;
   margin: 0 auto;
 }
 .newImages5{
   width: 223rpx;
-  height:144rpx;
+  height:157rpx;
   margin: 0 auto;
+  margin-top: 30rpx;
   margin-bottom: 26rpx;
 }
 .newImages6{
   width: 256rpx;
-  height:39rpx;
+  height:52rpx;
   margin: 0 auto;
 }
 .newImages7{
@@ -829,9 +851,10 @@ view{
   margin-top: 22rpx;
 }
 .newImages8{
-  width: 146rpx;
-  height:159rpx;
+  width: 192rpx;
+  height:165rpx;
   margin: 0 auto;
+  margin-top: 30rpx;
   margin-bottom: 21rpx;
 }
 .noLock{
@@ -847,4 +870,24 @@ view{
   text-align: center;
   border-radius: 20rpx;
   margin-right: 14rpx;
+}
+.vipDetail{
+  position: relative;
+  width: 663rpx;
+  height: 935rpx;
+}
+.vipDetailY{
+  position: absolute;
+  left: 50%;
+  transform: translateX(-50%);
+  bottom: 80rpx;
+  width: 275rpx;
+  height: 50rpx;
+}
+.newImages2-59{
+  width: 270rpx;
+  height: 19rpx;
+  margin: 0 auto;
+  margin-top: 61rpx;
+  margin-bottom: 20rpx;
 }

496_dongfengqichen/pages/placingOrder/placingOrder.js

@@ -29,6 +29,7 @@ Component({
     subscribeData: {
       realname: "",//姓名
       mobile: "",//手机号
+      mobile2:"",
       captcha: "",//验证码
       province: "",//省份
       city:"",//市区
@@ -36,7 +37,8 @@ Component({
       agentDetail: "",//经销商详细信息
       parentOpenid: app.globalData.friendOpenid,//好友openid
     },
-    getBuyState:false
+    getBuyState: false,
+    mobileType: 2
   },
   attached: function () {
     if (app.globalData.openid) {
@@ -54,12 +56,13 @@ Component({
       this.triggerEvent('placing')
     },
     getUserPhone: function (e) {//获取用户手机号
-      this.setData({
-        phoneInputShow: true
-      })
       if (e.detail.errMsg == 'getPhoneNumber:ok') {
         app.getMobile(e.detail.encryptedData, e.detail.iv, res => {
           if (res.code == 200) {
+            this.setData({
+              phoneInputShow: true
+            })
+            this.cutType();
             if (res.data && res.data.decodeData) {
               this.data.subscribeData.mobile = res.data.decodeData.phoneNumber;
               this.setData({
@@ -91,6 +94,9 @@ Component({
     getMobile: function (e) {//获取用户输入的电话
       this.data.subscribeData.mobile = e.detail.value;
     },
+    getMobile2: function (e) {//获取用户输入的电话---无验证码
+      this.data.subscribeData.mobile2 = e.detail.value;
+    },
     getCaptcha: function (e) {//获取用户输入的验证码
       this.data.subscribeData.captcha = e.detail.value;
     },
@@ -125,8 +131,8 @@ Component({
       }, this);
     },
     getCode: function (e) {//获取验证码
-      if (!app.mobileVerify(this.data.subscribeData.mobile)) {
-        if (this.data.subscribeData.mobile) {
+      if (!app.mobileVerify(this.data.subscribeData.mobile2)) {
+        if (this.data.subscribeData.mobile2) {
           wx.showToast({
             title: '请输入正确的电话',
             icon: 'none'
@@ -143,7 +149,7 @@ Component({
         return;
       }
       this.data.sendCode = false;
-      app.wxRequest(app.globalData.urlRoot + "captcha/sendCaptcha", { mobile: this.data.subscribeData.mobile }, res => {
+      app.wxRequest(app.globalData.urlRoot + "captcha/sendCaptcha", { mobile: this.data.subscribeData.mobile2 }, res => {
         if (res.code == 200) {
           this.countDown();
           wx.showToast({
@@ -216,19 +222,21 @@ Component({
         })
         return;
       }
-      if (!this.data.subscribeData.mobile) {
+      if (!this.data.subscribeData.mobile2 && this.data.mobileType==2) {
         wx.showToast({
           title: '请输入电话',
           icon: "none"
         })
         return;
       }
-      if (!this.data.subscribeData.captcha) {
-        wx.showToast({
-          title: '请输入验证码',
-          icon: "none"
-        })
-        return;
+      if (this.data.mobileType == 2) {
+        if (!this.data.subscribeData.captcha) {
+          wx.showToast({
+            title: '请输入验证码',
+            icon: "none"
+          })
+          return;
+        }
       }
       if (!this.data.isAgreement) {
         wx.showToast({
@@ -245,7 +253,12 @@ Component({
       this.data.subscribeData.city = this.data.provinceDataArr[1][this.data.provinceDataValue[1]];
       this.data.subscribeData.agent_code = this.data.storeArr[this.data.storeValue].agent_code;
       this.data.subscribeData.agentDetail = this.data.storeArr[this.data.storeValue].agent_detail;
+      var sourceMobile = this.data.subscribeData.mobile;
+      if (this.data.mobileType == 2) {
+        this.data.subscribeData.mobile = this.data.subscribeData.mobile2;
+      }
       app.wxRequest(app.globalData.urlRoot + "wxPay/preBuy", this.data.subscribeData, res => {
+        this.data.subscribeData.mobile = sourceMobile;
         if (res.code == 200) {
           wx.requestPayment({
             timeStamp: res.data.jsSubmit.timeStamp,
@@ -300,7 +313,10 @@ Component({
       },this,"POST");
     },
     closePage:function(){
-      this.closeXieyi();
+      // this.closeXieyi();
+      wx.reLaunch({
+        url: '/pages/index/index',
+      })
     },
     provinceDataChange:function(e){
       if (e.detail.column==0) {
@@ -326,6 +342,16 @@ Component({
       this.setData({
         storeValue:e.detail.value
       })
+    },
+    enterMycenter:function(){
+      wx.reLaunch({
+        url: '/pages/myCenter/myCenter',
+      })
+    },
+    cutType: function () {
+      this.setData({
+        mobileType: this.data.mobileType == 1 ? 2 : 1
+      })
     }
   }
 })

496_dongfengqichen/pages/placingOrder/placingOrder.wxml

@@ -1,23 +1,37 @@
 <!--pages/placingOrder/placingOrder.wxml-->
 <!--pages/yuyue/yuyue.wxml-->
 <view class="main">
-  <view class="closeGroup">
-    <image class="closeXieyi" bindtap="closeXieyi" src="{{imgUrl+'/images/closeXieyi.png'}}"></image>
-  </view>
-  <image class="placingIcon" src="{{imgUrl+'/images/placingIcon.png'}}"></image>
-  <view class="msgGroup">
+  <view class="titleText">立即下订</view>
+  <view class="lineSty"></view>
+  <image class="closeXieyi" bindtap="closeXieyi" src="{{imgUrl+'/images/closeXieyi.png'}}"></image>
+  <image class="yuyueTop" src="{{imgUrl+'/newImages2/40.png'}}"></image>
+  <view class="selectType">
+      <view style="position: relative;">
+        <image class="newImages2-41" bindtap="cutType" style="margin-bottom:23rpx;" src="{{imgUrl+'/newImages2/41_'+(mobileType==1?'2':'1')+'.png'}}"></image>
+        <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>
+      <image class="newImages2-41" bindtap="cutType" src="{{imgUrl+'/newImages2/42_'+(mobileType==1?'1':'2')+'.png'}}"></image>
+    </view>
+  <view class="msgGroup" style="margin-top:44rpx;">
     <view class="inputGroup">
       <view class="userTitle">姓名</view>
       <input class="userInput" bindinput="getRealname" value="{{subscribeData.realname}}" placeholder="请输入您的姓名"></input>
     </view>
-    <view class="inputGroup">
+    <view class="inputGroup" wx:if="{{mobileType==1}}">
       <view class="userTitle">电话</view>
       <view class="userInput">
-        <input style="width:100%;height:100%;" bindinput="getMobile" type="number" maxlength='11' value="{{subscribeData.mobile}}" placeholder="请输入您的联系电话"></input>
-        <button class="getPhoneBtn" wx:if="{{!phoneInputShow}}" style="width: 100%;height: 100%;margin: 0;padding: 0;min-height: 0;" open-type="getPhoneNumber" bindgetphonenumber="getUserPhone"></button>
+        <input style="width:100%;height:100%;" disabled="true" bindinput="getMobile" type="number" maxlength='11' value="{{subscribeData.mobile}}" placeholder="请输入您的联系电话"></input>
       </view>
     </view>
-    <view class="codeGroup">
+    <view class="inputGroup" wx:if="{{mobileType==2}}">
+      <view class="userTitle">电话</view>
+      <view class="userInput">
+        <input style="width:100%;height:100%;" bindinput="getMobile2" type="number" maxlength='11' value="{{subscribeData.mobile2}}" placeholder="请输入您的联系电话"></input>
+      </view>
+    </view>
+    <view class="codeGroup" wx:if="{{mobileType==2}}">
       <input class="userInput" bindinput="getCaptcha" style="width:350rpx;" placeholder="请输入您的验证码"></input>
       <view class="getCode" bindtap="getCode">{{verificationCode}}</view>
     </view>
@@ -58,11 +72,9 @@
   <view class="receiveFrame" wx:if="{{getBuyState}}">
     <view class="receiveGroup">
       <image class="newImages12" bindtap="closePage" src="{{imgUrl+'/newImages/12.png'}}"></image>
-      <view class="receiveGroupContent">
-        <image class="newImages10" src="{{imgUrl+'/newImages/10.png'}}"></image>
-        <image class="newImages9" bindtap="closePage" src="{{imgUrl+'/newImages/9.png'}}"></image>
-      </view>
-      <image class="newImages11" src="{{imgUrl+'/newImages/11.png'}}"></image>
+      <image class="newImages2-1" src="{{imgUrl+'/newImages2/1.png'}}"></image>
+      <image class="newImages2-2" bindtap="enterMycenter" src="{{imgUrl+'/newImages2/2.png'}}"></image>
+      <image class="newImages2-3" bindtap="enterMycenter" src="{{imgUrl+'/newImages2/3.png'}}"></image>
     </view>
   </view>
 </view>

496_dongfengqichen/pages/placingOrder/placingOrder.wxss

@@ -7,7 +7,7 @@
   position: fixed;
   left: 0;
   top: 0;
-  height: calc(100vh - 150rpx);
+  height: calc(100vh - 120rpx);
   overflow: auto;
   background-color: white;
   z-index: 99;
@@ -19,10 +19,6 @@
   padding-right: 48rpx;
   padding-top: 38rpx;
 }
-.closeXieyi{
-  width: 42rpx;
-  height: 42rpx;
-}
 .placingIcon{
   width: 663rpx;
   height: 515rpx;
@@ -120,13 +116,6 @@
   margin-top: 39rpx;
   margin-bottom: 99rpx;
 }
-.getPhoneBtn{
-  position: absolute;
-  left: 0;
-  top: 0;
-  opacity: 0;
-  z-index: 9;
-}
 .pickerGroup{
   width: 100%;
 }
@@ -135,49 +124,91 @@
   top: 0;
   left: 0;
   width: 750rpx;
-  height: calc(100vh - 150rpx);
-  background-color: #7F93B3;
+  height: calc(100vh - 120rpx);
   z-index: 9;
   display: flex;
   flex-direction: column;
   align-items: center;
+  overflow: auto;
 }
 .receiveGroup{
-  width: 100%;
-  height: 100%;
+  width: 750rpx;
+  height: 1353rpx;
   position: relative;
 }
-.receiveGroupContent{
-  position: relative;
-  margin: 0 auto;
-  margin-top: 225rpx;
-  width: 569rpx;
-  height: 492rpx;
+.newImages12{
+  position: absolute;
+  top:48rpx;
+  right: 38rpx;
+  width: 42rpx;
+  height: 42rpx;
 }
-.newImages10{
-  width: 100%;
-  height: 100%;
+.newImages2-3{
+  position: absolute;
+  left: 50%;
+  transform: translateX(-50%);
+  bottom: 41rpx;
+  width: 322rpx;
+  height: 71rpx;
 }
-.newImages9{
+.newImages2-1{
+  width: 750rpx;
+  height: 1353rpx;
+}
+.newImages2-2{
   position: absolute;
   left: 50%;
   transform: translateX(-50%);
+  top: 593rpx;
   width: 366rpx;
   height: 57rpx;
-  bottom: 25rpx;
 }
-.newImages12{
+.titleText{
+  width: 682rpx;
+  margin: 0 auto;
+  margin-top: 78rpx;
+  margin-bottom: 28rpx;
+  line-height: 39rpx;
+  font-size:39rpx;
+  font-family:PingFangSC;
+  font-weight:bold;
+  color:rgba(0,77,149,1);
+}
+.lineSty{
+  width: 682rpx;
+  height:2rpx;
+  background-color: #B6B6B6;
+  margin: 0 auto;
+  margin-bottom: 45rpx;
+}
+.closeXieyi{
   position: absolute;
-  top:48rpx;
-  right: 38rpx;
+  right: 48rpx;
+  top: 38rpx;
   width: 42rpx;
   height: 42rpx;
 }
-.newImages11{
+.yuyueTop{
+  display: block;
+  margin: 0 auto;
+  width: 699rpx;
+  height: 226rpx;
+  margin-bottom: 45rpx;
+}
+.newImages2-41{
+  width:653rpx;
+  height: 71rpx;
+  margin: 0 auto;
+}
+.getPhoneFrame{
   position: absolute;
   left: 50%;
   transform: translateX(-50%);
-  bottom: 44rpx;
-  width: 322rpx;
+  top: 0;
+  width:653rpx;
   height: 71rpx;
+  z-index: 2;
+}
+.getPhoneBtn{
+  opacity: 0;
 }

496_dongfengqichen/pages/poster/poster.js

@@ -50,7 +50,7 @@ Page({
         this.data.windowH = option.windowHeight;
         for (let i = 0; i < 3; i++) {
           wx.getImageInfo({//缓存海报背景
-            src: this.data.imgUrl + '/images/tempImg'+(i+1)+'.jpg?v=006',
+            src: this.data.imgUrl + '/images/tempImg'+(i+1)+'.jpg?v=007',
             success: res => {
               this.data.posterBg[i] = res.path;
             }
@@ -302,8 +302,8 @@ Page({
         this.setData({
           qrCodeUrl: res.data.qrcodeUrl
         })
+        this.cacheFun();
       }
-      this.cacheFun();
     }, this)
   },
   closeXieyi:function(){

496_dongfengqichen/pages/poster/poster.wxml

@@ -1,12 +1,12 @@
 <!--pages/poster/poster.wxml-->
 <view class="all">
   <view class="main">
-    <view class="titleText">分享类型</view>
+    <!-- <view class="titleText">分享类型</view>
     <view class="lineSty"></view>
-    <image class="closeXieyi" bindtap="closeXieyi" src="{{imgUrl+'/images/closeXieyi.png'}}"></image>
+    <image class="closeXieyi" bindtap="closeXieyi" src="{{imgUrl+'/images/closeXieyi.png'}}"></image> -->
     <view class="selectFrame">
-      <image class="newImages17" bindtap="changeSelect" wx:if="{{selectType==1}}" src="{{imgUrl+'/newImages/17.png'}}"></image>
-      <image class="newImages17" bindtap="changeSelect" wx:if="{{selectType==2}}" src="{{imgUrl+'/newImages/18.png'}}"></image>
+      <image class="newImages17" bindtap="changeSelect" wx:if="{{selectType==1}}" src="{{imgUrl+'/newImages2/15.png'}}"></image>
+      <image class="newImages17" bindtap="changeSelect" wx:if="{{selectType==2}}" src="{{imgUrl+'/newImages2/16.png'}}"></image>
       <view style="left:{{selectType==1?'0':'50%'}}" class="maskSelect"></view>
     </view>
   <!-- <image class="posterBg" src="{{imgUrl+'/images/posterBg.jpg'}}"></image> -->
@@ -18,7 +18,7 @@
           <swiper-item wx:for="{{3}}" wx:key="index">
             <view class="selectTempFrame {{index==swiperCurrent?'selectTempFrameBorder':''}}">
               <view class="imgGroup">
-                <image style="width:100%;height:100%;" src="{{imgUrl+'/images/tempImg'+(index+1)+'.jpg?v=004'}}"></image>
+                <image style="width:100%;height:100%;" src="{{imgUrl+'/images/tempImg'+(index+1)+'.jpg?v=005'}}"></image>
                 <view class="userMsg">
                   <image class="userHead" src="{{userHead}}"></image>
                   <!-- <image class="userHead" src="{{imgUrl+'/images/posterChoose.png'}}"></image> -->
@@ -40,18 +40,16 @@
             </view>
           </swiper-item>
         </swiper>
-        <image class="leftArrow" wx:if="{{swiperCurrent!=0}}" bindtap="prevImg" src="{{imgUrl+'/images/leftArrow.png'}}"></image>
-        <image class="rightArrow" wx:if="{{swiperCurrent!=2}}" bindtap="nextImg" src="{{imgUrl+'/images/rightArrow.png'}}"></image>
+        <image class="leftArrow" wx:if="{{swiperCurrent!=0}}" bindtap="prevImg" src="{{imgUrl+'/newImages2/21.png'}}"></image>
+        <image class="rightArrow" wx:if="{{swiperCurrent!=2}}" bindtap="nextImg" src="{{imgUrl+'/newImages2/20.png'}}"></image>
       </view>
-      <view class="operationFrame">
-        <view class="operationGroup" style="margin-right:55rpx;" bindtap="saveImg">
-          <image class="saveIcon" src="{{imgUrl+'/images/saveIcon.png'}}"></image>
-          <view class="operationText">保存本地</view>
+      <view class="operationFrame" style="background-image: url({{imgUrl+'/newImages2/17.png'}});">
+        <view class="operationGroup" bindtap="saveImg">
+          <image class="saveIcon" src="{{imgUrl+'/newImages2/18.png'}}"></image>
         </view>
         <view class="operationGroup">
-          <image class="saveIcon" src="{{imgUrl+'/images/shareIcon.png'}}"></image>
-          <view class="operationText">分享好友</view>
-          <button class="shareBtn" open-type="share"></button>
+          <image class="saveIcon" src="{{imgUrl+'/newImages2/19.png'}}"></image>
+          <button class="shareBtn" style="min-height:0;width:100%;" open-type="share"></button>
         </view>
       </view>
     </view>

496_dongfengqichen/pages/poster/poster.wxss

@@ -6,21 +6,22 @@ view{
   -webkit-overflow-scrolling: touch;
 }
 .main{
-  height: calc(100vh - 150rpx);
+  height: calc(100vh - 120rpx);
   overflow: auto;
   position: relative;
-  /* background-image: url('https://www.jiyou-tech.com/2020/496_qichen/static/images/posterBg.jpg?v=002'); */
 }
 .operationFrame{
   width: 750rpx;
-  height: 285rpx;
-  background-image: url('https://www.jiyou-tech.com/2020/496_qichen/static/images/posterBg.png?v=002');
+  height: 386rpx;
   display: flex;
-  align-items: center;
-  justify-content:center;
+  justify-content:space-between;
+  box-sizing: border-box;
+  padding: 0 112rpx;
+  padding-top: 102rpx;
 }
 .operationGroup{
-  width: 96rpx;
+  width: 237rpx;
+  height: 56rpx;
   display: flex;
   flex-direction: column;
   align-items: center;
@@ -28,8 +29,8 @@ view{
   overflow: hidden;
 }
 .saveIcon{
-  width: 96rpx;
-  height: 96rpx;
+  width: 237rpx;
+  height: 56rpx;
 }
 .operationText{
   margin-top: 19rpx;
@@ -43,8 +44,8 @@ view{
   position: absolute;
   top: 0;
   left: 0;
-  width: 96rpx;
-  height: 96rpx;
+  width: 100%;
+  height: 100%;
   margin: 0;
   padding: 0;
   opacity: 0;
@@ -121,8 +122,8 @@ view{
 }
 .rightArrow{
   position: absolute;
-  width: 27rpx;
-  height: 118rpx;
+  width: 28rpx;
+  height: 119rpx;
   top:50%;
   right: 23rpx;
   transform: translateY(-50%);
@@ -234,8 +235,9 @@ view{
 .selectFrame{
   position: relative;
   width: 611rpx;
-  height: 81rpx;
+  height: 80rpx;
   margin: 0 auto;
+  margin-top: 102rpx;
 }
 .newImages17{
   width: 100%;

496_dongfengqichen/pages/prizeDetail/prizeDetail.js

@@ -8,19 +8,6 @@ Page({
   data: {
     imgUrl: app.globalData.urlStatic,//图片路径
     nums:1,
-    heightList:[
-      566,
-      592,
-      602,
-      592,
-      212,
-      405,
-      387,
-      467,
-      315,
-      512,
-      545
-    ]
   },
 
   /**

496_dongfengqichen/pages/prizeDetail/prizeDetail.wxml

@@ -1,7 +1,7 @@
 <!--pages/prizeDetail/prizeDetail.wxml-->
 <view class="all">
   <view class="main">
-    <image style="width:750rpx;height:{{heightList[nums-1]}}rpx;" wx:for="{{10}}" wx:key="index" src="{{imgUrl+'/prizeDetail/'+nums+'/'+(index+1)+'.png'}}"></image>
+    <image style="width:750rpx;" mode="widthFix" src="{{imgUrl+'/newImages2/prizeDetail/'+nums+'.png'}}"></image>
   </view>
   <tabBar></tabBar>
 </view>

496_dongfengqichen/pages/prizeDetail/prizeDetail.wxss

@@ -1,6 +1,6 @@
 /* pages/prizeDetail/prizeDetail.wxss */
 .main{
-  height: calc(100vh - 150rpx);
+  height: calc(100vh - 120rpx);
   overflow: auto;
   -webkit-overflow-scrolling: touch;
 }

496_dongfengqichen/pages/prizes/prizes.wxml

@@ -1,89 +1,20 @@
 <!--pages/prizes/prizes.wxml-->
 <view class="all">
   <view class="main">
-    <view class="prizeTitleFrame">
-      <image class="prizeTitle" src="{{imgUrl+'/btns/luckyPrize.png'}}"></image>
-    </view>
-    <view class="thirdAward" style="margin-top:0;">一等奖</view>
-    <view class="firstPrize">
-      <image class="firstPrizePic" bindtap="lookDetail" data-num="1" src="{{imgUrl+'/newPrize/1.png'}}"></image>
-      <view class="firstPrizeText">头等舱机票</view>
-      <view class="priceText">¥4999</view>
-    </view>
-    <view class="thirdAward">二等奖</view>
-    <view class="ticketGroup">
-      <image class="prizeTicketPic" bindtap="lookDetail" data-num="2" src="{{imgUrl+'/newPrize/2.png'}}"></image>
-      <image class="prizeTicketPic" bindtap="lookDetail" data-num="3" style="width:147rpx;height:166rpx;" src="{{imgUrl+'/newPrize/3.png'}}"></image>
-      <image class="prizeTicketPic" bindtap="lookDetail" data-num="4" style="width:191rpx;height:131rpx;" src="{{imgUrl+'/newPrize/4.png'}}"></image>
-    </view>
-    <view class="prizeTicket">
-      <view class="prizeTicketName" style="width:162rpx;">
-        米家扫拖一体机器人家用吸尘器
-        <view class="priceText">¥1799</view>
-      </view>
-      <view class="prizeTicketName" style="width:167rpx;">
-        Sony/索尼 WI-H700入耳式无线蓝牙耳机
-        <view class="priceText">¥1399</view>
-      </view>
-      <view class="prizeTicketName" style="width:191rpx;">
-        美的(Midea)电烤箱多功能全自动32升大容量
-        <view class="priceText">¥1089</view>
-      </view>
-    </view>
-    <view class="thirdAward">三等奖</view>
-    <view class="thirdAwardGroup">
-      <view class="threeFrame" style="margin-right:40rpx;">
-        <image class="three1" bindtap="lookDetail" data-num="5" src="{{imgUrl+'/newPrize/5.png'}}"></image>
-        <view class="threeText">
-          中国石化加油卡
-          <view class="priceText">¥200</view>
-        </view>
-      </view>
-      <view class="threeFrame">
-        <image class="three2" bindtap="lookDetail" data-num="6" src="{{imgUrl+'/newPrize/6.png'}}"></image>
-        <view class="threeText">
-          京东E卡经典卡
-          <view class="priceText">¥100</view>
-        </view>
-      </view>
-    </view>
-    <view class="thirdAward">入门奖</view>
-    <view class="introductionGroup">
-      <view class="introduction" style="padding-right:51rpx;">
-        <image class="introductionPic" bindtap="lookDetail" data-num="7" style="width:168rpx;height:107rpx;margin-top:10rpx;" src="{{imgUrl+'/newPrize/7.png'}}"></image>
-        <view class="introductionText" style="width:168rpx;">
-          京东E卡经典卡
-          <view class="priceText">¥50</view>
-        </view>
-      </view><view class="introduction" style="padding-right:36rpx;">
-        <image class="introductionPic" bindtap="lookDetail" data-num="8" style="width:194rpx;height:106rpx;" src="{{imgUrl+'/newPrize/8.png'}}"></image>
-        <view class="introductionText" style="width:194rpx;">
-          网易云音乐黑胶VIP会员一个月月卡
-          <view class="priceText">¥15</view>
-        </view>
-      </view><view class="introduction">
-        <image class="introductionPic" bindtap="lookDetail" data-num="9" style="width:195rpx;height:107rpx;"  src="{{imgUrl+'/newPrize/9.png'}}"></image>
-        <view class="introductionText" style="width:195rpx;">
-          爱奇艺vip会员1个月黄金会员月卡
-          <view class="priceText">¥19.8</view>
-        </view>
-      </view><view class="introduction" style="padding-right:30rpx;">
-        <image class="introductionPic" bindtap="lookDetail" data-num="10" style="width:189rpx;height:102rpx;"  src="{{imgUrl+'/newPrize/10.png?v=002'}}"></image>
-        <view class="introductionText" style="width:189rpx;">
-          礼券luckincoffee瑞幸咖啡电子兑换券1张
-          <view class="priceText">¥66</view>
-        </view>
-      </view><view class="introduction">
-        <image class="introductionPic" bindtap="lookDetail" data-num="11" style="width:194rpx;height:106rpx;"  src="{{imgUrl+'/newPrize/11.png'}}"></image>
-        <view class="introductionText" style="width:194rpx;">
-          腾讯视频VIP会员1个月官方激活码月卡
-          <view class="priceText">¥20</view>
-        </view>
-      </view><view class="introduction">
-      </view>
-    </view>
-    <view class="immediateFetching">
-      <image class="prizeTitle" bindtap="backPage" src="{{imgUrl+'/btns/gameStart2.png'}}"></image>
+    <view style="position: relative;">
+      <image class="prizeBg" src="{{imgUrl+'/newImages2/44.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>
+      <view class="prize4" data-num="4" bindtap="lookDetail"></view>
+      <view class="prize5" data-num="5" bindtap="lookDetail"></view>
+      <view class="prize6" data-num="6" bindtap="lookDetail"></view>
+      <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="bottomBtn" bindtap="backPage"></view>
     </view>
   </view>
   <tabBar></tabBar>

496_dongfengqichen/pages/prizes/prizes.wxss

@@ -6,161 +6,96 @@ view{
   -webkit-overflow-scrolling: touch;
 }
 .main{
-  height: calc(100vh - 150rpx);
+  height: calc(100vh - 120rpx);
   overflow: auto;
-  padding-top: 222rpx;
-  padding-bottom: 152rpx;
   box-sizing: border-box;
 }
-.prizeTitle{
-  width:710rpx;
-  height:70rpx;
-  margin: 0 auto;
-}
-.ticketGroup{
-  padding: 0 45rpx;
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  margin-top:35rpx; 
-}
-.prizeTicket{
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  margin-top: 30rpx;
-  padding: 0 45rpx;
-}
-.prizeTicketPic{
-  width: 162rpx;
-  height: 162rpx;
-}
-.prizeTicketName{
-  font-size:20rpx;
-  line-height: 24rpx;
-  font-family:PingFang;
-  font-weight:400;
-  color:rgba(35,33,34,1);
-  text-align: center;
-}
-.thirdAward{
-  width:128rpx;
-  height:30rpx;
-  background-color: #17528A;
-  font-size:18rpx;
-  line-height: 30rpx;
-  font-family:PingFang;
-  font-weight:400;
-  color:rgba(255,255,255,1);
-  border-radius: 20rpx;
-  text-align: center;
-  margin-top: 65rpx;
-  margin-left: 45rpx;
-}
-.thirdAwardGroup{
-  display: flex;
-  align-items: center;
-  padding: 0 45rpx;
-}
-.threeFrame{
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  margin-top: 45rpx;
-}
-.threeGroup{
-  display: flex;
-  align-items: center;
-  justify-content: center;
-}
-.three1{
-  width: 190rpx;
+.prizeBg{
+  width: 750rpx;
+  height: 2169rpx;
+}
+.bottomBtn{
+  position: absolute;
+  left: 50%;
+  transform: translateX(-50%);
+  bottom: 196rpx;
+  width: 711rpx;
+  height: 71rpx;
+}
+.prize1{
+  position: absolute;
+  top: 167rpx;
+  left: 145rpx;
+  width: 460rpx;
+  height: 172rpx;
+}
+.prize2{
+  position: absolute;
+  top: 621rpx;
+  left: 61rpx;
+  width: 144rpx;
+  height: 143rpx;
+}
+.prize3{
+  position: absolute;
+  top: 620rpx;
+  left: 310rpx;
+  width: 130rpx;
+  height: 147rpx;
+}
+.prize4{
+  position: absolute;
+  top: 635rpx;
+  left: 520rpx;
+  width: 169rpx;
+  height: 116rpx;
+}
+.prize5{
+  position: absolute;
+  top: 1054rpx;
+  left: 39rpx;
+  width: 189rpx;
   height: 121rpx;
 }
-.three2{
-  width: 184rpx;
-  height: 117rpx;
-}
-.three3{
-  width: 147rpx;
-  height: 166rpx;
-}
-.threeText{
-  line-height: 20rpx;
-  font-size:20rpx;
-  font-family:PingFang;
-  font-weight:400;
-  color:rgba(35,33,34,1);
-  margin-top: 30rpx;
-}
-.introductionGroup{
-  display: flex;
-  align-items: center;
-  flex-wrap: wrap;
-  padding: 0 45rpx;
-}
-.introduction{
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  padding-top: 15rpx;
-}
-.introductionPic{
-  width: 194rpx;
+.prize6{
+  position: absolute;
+  top: 1055rpx;
+  left: 283rpx;
+  width: 185rpx;
+  height: 118rpx;
+}
+.prize7{
+  position: absolute;
+  top: 1421rpx;
+  left: 48rpx;
+  width: 168rpx;
+  height: 106rpx;
+}
+.prize8{
+  position: absolute;
+  top: 1421rpx;
+  left: 262rpx;
+  width: 195rpx;
   height: 107rpx;
-  margin-bottom: 26rpx;
-  margin-top: 30rpx;
-}
-.introductionText{
-  font-size:20rpx;
-  line-height: 24rpx;
-  font-family:PingFang;
-  font-weight:400;
-  color:rgba(35,33,34,1);
-  text-align: center;
-}
-.immediateFetching{
-  position: fixed;
-  left: 0;
-  bottom: 150rpx;
-  width: 750rpx;
-  padding-top: 37rpx;
-  padding-bottom: 45rpx;
-  background-color: white;
 }
-.firstPrize{
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  margin-top: 35rpx;
-}
-.firstPrizePic{
-  width:460rpx;
-  height:172rpx;
-}
-.firstPrizeText{
-  line-height: 28rpx;
-  font-size:28rpx;
-  font-family:PingFang;
-  font-weight:400;
-  color:rgba(35,33,34,1);
-  margin-top: 30rpx;
-}
-.prizeTitleFrame{
-  position: fixed;
-  top: 0;
-  left: 0;
-  padding-top: 87rpx;
-  padding-bottom:65rpx;
-  background-color: white; 
-  width: 750rpx;
+.prize9{
+  position: absolute;
+  top: 1422rpx;
+  left: 502rpx;
+  width: 195rpx;
+  height: 107rpx;
 }
-.priceText{
-  text-align: center;
-  line-height: 24rpx;
-  font-size:24rpx;
-  font-family:PingFangSC;
-  font-weight:600;
-  color:rgba(53,84,128,1);
-  margin-top: 16rpx;
+.prize10{
+  position: absolute;
+  top: 1651rpx;
+  left: 47rpx;
+  width: 190rpx;
+  height: 103rpx;
+}
+.prize11{
+  position: absolute;
+  top: 1651rpx;
+  left: 262rpx;
+  width: 195rpx;
+  height: 106rpx;
 }

496_dongfengqichen/pages/scout/register/register.wxss

@@ -210,7 +210,7 @@ image.arrowDown{
   left: 0;
   top: 0;
   width: 100%;
-  height: calc(100% - 150rpx);
+  height: calc(100% - 120rpx);
   display: flex;
   align-items: center;
   justify-content: center;

496_dongfengqichen/pages/scout/scout.wxml

@@ -2,10 +2,11 @@
 <view class="showView">
   <view class="content">
     <image class="bg" src="{{imgUrl+'/newImages/scoutbg.jpg?v=004'}}"></image>
-    <image class="reward" wx:if="{{maskid<4}}" src="{{imgUrl+'/star/scout/reward.png?v=002'}}"></image>
-    <image class="reward" wx:if="{{maskid>3}}" src="{{imgUrl+'/star/tu1.png?v=002'}}"></image>
-    <image class="scoutbtn1" wx:if="{{maskid>3}}" bindtap="getPoster" src="{{imgUrl+'/star/scout/scoutbtn2.png'}}"></image>
-    <image class="scoutbtn1" wx:if="{{maskid<4}}" bindtap="getPoster" src="{{imgUrl+'/star/scout/scoutbtn1.png'}}"></image>
+    <image class="reward" wx:if="{{maskid<4}}" src="{{imgUrl+'/newImages2/6.png?v=003'}}"></image>
+    <image class="reward" wx:if="{{maskid>3}}" src="{{imgUrl+'/newImages2/7.png?v=002'}}"></image>
+    <image class="scoutbtn1" bindtap="getPoster" src="{{imgUrl+'/newImages2/8.png'}}"></image>
+    <!-- <image class="scoutbtn1" wx:if="{{maskid>3}}" bindtap="getPoster" src="{{imgUrl+'/newImages2/8.png'}}"></image> -->
+    <!-- <image class="scoutbtn1" wx:if="{{maskid<4}}" bindtap="getPoster" src="{{imgUrl+'/newImages2/8.png'}}"></image> -->
     <button class="btn2" wx:if="{{iconShow}}" open-type="getUserInfo" bindgetuserinfo="getUserWxMsg"></button>
   </view>
   <view class="mask" wx:if="{{maskShow}}">

496_dongfengqichen/pages/scout/scout.wxss

@@ -100,7 +100,7 @@
   padding: 0;
 }
 .scoutbtn1{
-  width: 654rpx;
+  width: 653rpx;
   height: 70rpx;
   margin: 20rpx auto 40rpx auto;
 }

496_dongfengqichen/pages/scoutRule/scoutRule.js

@@ -21,6 +21,29 @@ Component({
   methods: {
     closeXieyi: function () {
       this.triggerEvent('scoutRule')
+    },
+    cutPage:function(){
+      app.wxRequest(app.globalData.urlRoot + "userInfo/getCertificationInfo", {}, res => {
+        if (res.code == 200) {
+          app.globalData.authenticationStatus = res.data;
+          if (!app.globalData.certificationInfo) {
+            app.globalData.certificationInfo = true;
+            wx.setStorageSync("certificationInfo", true);
+          }
+          app.globalData.certificationState = res.data.certificationState;
+          wx.navigateTo({
+            url: '/pages/scout/scout'
+          })
+        } else if (res.code == -307) {
+          wx.navigateTo({
+            url: '/pages/mobileVerification/mobileVerification'
+          })
+        } else if (res.code == -308) {
+          wx.navigateTo({
+            url: '/pages/scout/register/register'
+          })
+        }
+      }, this);
     }
   }
 })

496_dongfengqichen/pages/scoutRule/scoutRule.wxml

@@ -1,9 +1,10 @@
 <!--pages/scoutRule/scoutRule.wxml-->
 <view class="all">
   <view class="main">
-    <view class="titleText">预约试驾</view>
+    <view class="titleText">星探规则</view>
     <view class="lineSty"></view>
     <image class="closeXieyi" bindtap="closeXieyi" src="{{imgUrl+'/images/closeXieyi.png'}}"></image>
-    <image class="newImages46" src="{{imgUrl+'/newImages/52.png'}}"></image>
+    <image class="newImages46" src="{{imgUrl+'/newImages2/35.png'}}"></image>
+    <image class="newImages2-4" bindtap="cutPage" src="{{imgUrl+'/newImages2/4.png'}}"></image>
   </view>
 </view>

496_dongfengqichen/pages/scoutRule/scoutRule.wxss

@@ -4,7 +4,7 @@
   position: fixed;
   left: 0;
   top: 0;
-  height: calc(100vh - 150rpx);
+  height: calc(100vh - 120rpx);
   overflow: auto;
   background-color: white;
   z-index: 99;
@@ -36,6 +36,12 @@
 }
 .newImages46{
   width: 750rpx;
-  height: 3578rpx;
-  margin-bottom: 77rpx;
+  height: 4927rpx;
+  margin-bottom: 70rpx;
+}
+.newImages2-4{
+  width: 711rpx;
+  height: 70rpx;
+  margin: 0 auto;
+  margin-bottom: 70rpx;
 }

496_dongfengqichen/pages/star/star.wxml

@@ -2,11 +2,11 @@
 <view id="star" class="showView">
   <view class="home">
     <view class="bgGroup">
-      <image class="bg" src="{{imgUrl+'/newImages/55.png'}}"></image>
-      <image class="starBtn" bindtap="scout" src="{{imgUrl+'/newImages/53.png'}}"></image>
+      <image class="bg" src="{{imgUrl+'/newImages2/5.png'}}"></image>
+      <image class="starBtn" bindtap="scout" src="{{imgUrl+'/newImages2/4.png'}}"></image>
     </view>
     <image class="logo1" src="{{imgUrl+'/star/logo1.png'}}"></image>
-    <image class="logo2" src="{{imgUrl+'/star/logo2.png'}}"></image>
+    <!-- <image class="logo2" src="{{imgUrl+'/star/logo2.png'}}"></image> -->
     <image class="starRule" bindtap="showRule" src="{{imgUrl+'/newIcon/2.png'}}"></image>
     <!-- <view class="ruleBtn" wx:if="{{!maskShow}}" bindtap="showRule">规则说明</view> -->
     <!-- <view class="ruleBtn ruleBtnColor" wx:if="{{maskShow}}" bindtap="showRule">规则说明</view> -->
@@ -20,6 +20,7 @@
       </view>
       <text class="text">人加入星探计划</text>
     </view>
+    <image class="newImages2-4" bindtap="scout" src="{{imgUrl+'/newImages2/4.png'}}"></image>
     <!-- <view class="btnBox">
       <image class="starBtn" bindtap="scout" src="{{imgUrl+'/btns/starBtn1.png'}}"></image>
       <image class="starBtn" bindtap="everyDay" src="{{imgUrl+'/btns/starBtn2.png'}}"></image>

496_dongfengqichen/pages/star/star.wxss

@@ -10,7 +10,7 @@ view{
 
 .bg {
   width: 750rpx;
-  height: 5377rpx;
+  height: 6570rpx;
 }
 
 .home>.logo1 {
@@ -171,7 +171,7 @@ view{
 }
 .starBtn{
   position: absolute;
-  bottom: 219rpx;
+  bottom: 68rpx;
   left: 50%;
   transform: translateX(-50%);
   width: 711rpx;
@@ -184,5 +184,13 @@ view{
 .bgGroup{
   position: relative;
   width: 750rpx;
-  height: 5377rpx;
+  height: 6570rpx;
+}
+.newImages2-4{
+  position: absolute;
+  left: 50%;
+  transform: translateX(-50%);
+  bottom: 25rpx;
+  width: 733rpx;
+  height: 70rpx;
 }

496_dongfengqichen/pages/supplement/supplement.wxss

@@ -6,7 +6,7 @@ view{
   -webkit-overflow-scrolling: touch;
 }
 .main{
-  height: calc(100vh - 150rpx);
+  height: calc(100vh - 120rpx);
   overflow: auto;
   position: relative;
 }
@@ -15,7 +15,7 @@ view{
   height: 634rpx;
 }
 .msgFrame{
-  padding: 114rpx 35rpx 38rpx;
+  padding: 50rpx 35rpx 38rpx;
 }
 .inputGroup{
   width: 100%;
@@ -50,7 +50,7 @@ view{
 .agreementGroup{
   display: flex;
   align-items: center;
-  margin-top: 15rpx;
+  margin-top: 51rpx;
 }
 .agreeIcon{
   width: 29rpx;
@@ -70,5 +70,5 @@ view{
   width: 675rpx;
   height: 70rpx;
   margin: 0 auto;
-  margin-top: 60rpx;
+  margin-top: 37rpx;
 }

496_dongfengqichen/pages/userMsg/userMsg.wxss

@@ -4,7 +4,7 @@
   position: fixed;
   left: 0;
   top: 0;
-  height: calc(100vh - 150rpx);
+  height: calc(100vh - 120rpx);
   overflow: auto;
   background-color: white;
   z-index: 99;

496_dongfengqichen/pages/yuyue/yuyue.js

@@ -17,27 +17,29 @@ Component({
     isAgreement: true,//是否同意协议
     phoneInputShow: false,//是否显示电话输入框
     siteSelect: false,//是否显示位置选择框
-    provinceArr: [],//省
-    provinceValue: 0,//选中的省下标
-    cityArr:[],//市
-    cityValue:0,//选中的市下标
-    storeArr: [],//店铺
-    storeValue: 0,//选中的店铺下标
+    provinceDataAll: null,//地区所有数据
+    provinceDataArr: [[""], [""]],//省市数据
+    provinceDataValue: [0, 0],//选中的省市下标
+    nowProvince: "",//选中的省市文字
+    storeArr: [],//专营店数据
+    storeValue: 0,//选中的专营店下标
     verificationCode: '获取验证码',//验证码文案
     sendCode: true,
     appointment: true,
     subscribeData: {
       realname: "",//姓名
-      mobile: "",//手机号
+      mobile: "",//手机号---无验证码
+      mobile2: "",//手机号---有验证码
       captcha: "",//验证码
       province: "",//省份
       city:"",//城市
       agent_code: "",//经销商编码
       agentDetail: "",//经销商详细信息
       parentOpenid: app.globalData.friendOpenid,//好友openid
-    }
+    },
+    mobileType:2
   },
-  attached:function(){
+  ready:function(){
     if (app.globalData.openid) {
       this.loadFun();
     } else {
@@ -54,27 +56,16 @@ Component({
     getRealname: function (e) {//获取用户输入的姓名
       this.data.subscribeData.realname = e.detail.value;
     },
-    getMobile: function (e) {//获取用户输入的电话
+    getMobile: function (e) {//获取用户输入的电话---有验证码
       this.data.subscribeData.mobile = e.detail.value;
     },
+    getMobile2: function (e) {//获取用户输入的电话---无验证码
+      this.data.subscribeData.mobile2 = e.detail.value;
+    },
     getCaptcha: function (e) {//获取用户输入的验证码
       this.data.subscribeData.captcha = e.detail.value;
     },
     loadFun: function () {
-      if (app.globalData.myCenterData) {
-        this.setData({
-          provinceArr: app.globalData.myCenterData.provinceArr,
-          cityArr: app.globalData.myCenterData.cityArr,
-          storeArr: app.globalData.myCenterData.storeArr,
-          provinceValue: app.globalData.myCenterData.provinceValue,
-          cityValue: app.globalData.myCenterData.cityValue,
-          storeValue: app.globalData.myCenterData.storeValue,
-        })
-        this.data.subscribeData.province = this.data.provinceArr[this.data.provinceValue].province;
-        this.data.subscribeData.city = this.data.cityArr[this.data.cityValue].city;
-        this.data.subscribeData.agentDetail = this.data.storeArr[this.data.storeValue].agent_detail;
-        this.data.subscribeData.agent_code = this.data.storeArr[this.data.storeValue].agent_code;
-      }
       if (app.globalData.userMobile) {
         this.data.subscribeData.mobile = app.globalData.userMobile;
         this.setData({
@@ -87,25 +78,25 @@ Component({
     getDistributorList: function (longitude, latitude) {//获取经销商列表
       app.wxRequest(app.globalData.urlRoot + "agent/getAgentList", { longitude: longitude, latitude: latitude }, res => {
         if (res.code == 200) {
-          app.globalData.myCenterData = {};
+          //整理数据
+          var datas = res.data;
+          var province = [];
+          var city = [];
+          for (let i = 0; i < res.data.list.length; i++) {
+            province.push(res.data.list[i].province);
+          }
+          for (let j = 0; j < res.data.list[res.data.nearData.provinceIndex].children.length; j++) {
+            city.push(res.data.list[res.data.nearData.provinceIndex].children[j].city)
+          }
+          //将数据赋值给变量
           this.setData({
-            provinceArr: res.data.list,
-            cityArr: res.data.list[res.data.nearData.provinceIndex].children,
+            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,
-            provinceValue: res.data.nearData.provinceIndex,
-            cityValue: res.data.nearData.cityIndex,
             storeValue: res.data.nearData.agentIndex
           })
-          this.data.subscribeData.province = this.data.provinceArr[this.data.provinceValue].province;
-          this.data.subscribeData.city = this.data.cityArr[this.data.cityValue].city;
-          this.data.subscribeData.agentDetail = this.data.storeArr[this.data.storeValue].agent_detail;
-          this.data.subscribeData.agent_code = this.data.storeArr[this.data.storeValue].agent_code;
-          app.globalData.myCenterData.provinceArr = res.data.list;
-          app.globalData.myCenterData.cityArr = res.data.list[res.data.nearData.provinceIndex].children;
-          app.globalData.myCenterData.storeArr = res.data.list[res.data.nearData.provinceIndex].children[res.data.nearData.cityIndex].children;
-          app.globalData.myCenterData.provinceValue = res.data.nearData.provinceIndex;
-          app.globalData.myCenterData.cityValue = res.data.nearData.cityValue;
-          app.globalData.myCenterData.storeValue = res.data.nearData.agentIndex;
         } else {
           wx.showToast({
             title: res.msg,
@@ -114,39 +105,9 @@ Component({
         }
       }, this);
     },
-    provinceChane: function (e) {//选中省
-      this.setData({
-        provinceValue: e.detail.value,
-        cityArr: this.data.provinceArr[e.detail.value].children,
-        cityValue: 0,
-        storeArr: this.data.provinceArr[e.detail.value].children[0].children,
-        storeValue: 0
-      })
-      this.data.subscribeData.province = this.data.provinceArr[this.data.provinceValue].province;
-      this.data.subscribeData.city = this.data.cityArr[this.data.cityValue].city;
-      this.data.subscribeData.agentDetail = this.data.storeArr[this.data.storeValue].agent_detail;
-      this.data.subscribeData.agent_code = this.data.storeArr[this.data.storeValue].agent_code;
-    },
-    cityChane:function(e){//选中城市
-      this.setData({
-        cityValue: e.detail.value,
-        storeArr: this.data.provinceArr[this.data.provinceValue].children[e.detail.value].children,
-        storeValue: 0
-      })
-      this.data.subscribeData.city = this.data.cityArr[this.data.cityValue].city;
-      this.data.subscribeData.agentDetail = this.data.storeArr[this.data.storeValue].agent_detail;
-      this.data.subscribeData.agent_code = this.data.storeArr[this.data.storeValue].agent_code;
-    },
-    storeChane: function (e) {//选中店铺
-      this.setData({
-        storeValue: e.detail.value,
-      })
-      this.data.subscribeData.agentDetail = this.data.storeArr[this.data.storeValue].agent_detail;
-      this.data.subscribeData.agent_code = this.data.storeArr[this.data.storeValue].agent_code;
-    },
     getCode: function (e) {//获取验证码
-      if (!app.mobileVerify(this.data.subscribeData.mobile)) {
-        if (this.data.subscribeData.mobile) {
+      if (!app.mobileVerify(this.data.subscribeData.mobile2)) {
+        if (this.data.subscribeData.mobile2) {
           wx.showToast({
             title: '请输入正确的电话',
             icon: 'none'
@@ -163,7 +124,7 @@ Component({
         return;
       }
       this.data.sendCode = false;
-      app.wxRequest(app.globalData.urlRoot + "captcha/sendCaptcha", { mobile: this.data.subscribeData.mobile }, res => {
+      app.wxRequest(app.globalData.urlRoot + "captcha/sendCaptcha", { mobile: this.data.subscribeData.mobile2 }, res => {
         if (res.code == 200) {
           this.countDown();
           wx.showToast({
@@ -205,19 +166,21 @@ Component({
         })
         return;
       }
-      if (!this.data.subscribeData.mobile) {
+      if (!this.data.subscribeData.mobile2 && this.data.mobileType==2) {
         wx.showToast({
           title: '请输入电话',
           icon: "none"
         })
         return;
       }
-      if (!this.data.subscribeData.captcha) {
-        wx.showToast({
-          title: '请输入验证码',
-          icon: "none"
-        })
-        return;
+      if (this.data.mobileType == 2) {
+        if (!this.data.subscribeData.captcha) {
+          wx.showToast({
+            title: '请输入验证码',
+            icon: "none"
+          })
+          return;
+        }
       }
       if (!this.data.isAgreement) {
         wx.showToast({
@@ -230,7 +193,16 @@ Component({
         return;
       }
       this.data.appointment = false;
+      this.data.subscribeData.province = this.data.provinceDataArr[0][this.data.provinceDataValue[0]];
+      this.data.subscribeData.city = this.data.provinceDataArr[1][this.data.provinceDataValue[1]];
+      this.data.subscribeData.agent_code = this.data.storeArr[this.data.storeValue].agent_code;
+      this.data.subscribeData.agentDetail = this.data.storeArr[this.data.storeValue].agent_detail;
+      var sourceMobile = this.data.subscribeData.mobile;
+      if(this.data.mobileType==2){
+        this.data.subscribeData.mobile = this.data.subscribeData.mobile2;
+      }
       app.wxRequest(app.globalData.urlRoot + "userInfo/submitOrderInfo", this.data.subscribeData, res => {
+        this.data.subscribeData.mobile = sourceMobile;
         this.data.appointment = true;
         if (res.code == 200) {
           wx.showToast({
@@ -249,7 +221,7 @@ Component({
           //   isRegister: true
           // })
           // app.globalData.isRegister = true;
-          app.globalData.userMobile = this.data.subscribeData.mobile;
+          // app.globalData.userMobile = this.data.subscribeData.mobile;
         } else {
           wx.showToast({
             title: res.msg,
@@ -258,13 +230,39 @@ Component({
         }
       }, this, "POST")
     },
-    getUserPhone: function (e) {//获取用户手机号
+    provinceDataChange: function (e) {
+      if (e.detail.column == 0) {
+        var city = [];
+        for (let i = 0; i < this.data.provinceDataAll[e.detail.value].children.length; i++) {
+          city.push(this.data.provinceDataAll[e.detail.value].children[i].city);
+        }
+        this.data.provinceDataArr[1] = city;
+        this.setData({
+          provinceDataArr: this.data.provinceDataArr
+        })
+      }
+    },
+    provinceDataChane: function (e) {
       this.setData({
-        phoneInputShow: true
+        provinceDataValue: e.detail.value,
+        nowProvince: this.data.provinceDataArr[0][e.detail.value[0]] + " " + this.data.provinceDataArr[1][e.detail.value[1]],
+        storeArr: this.data.provinceDataAll[e.detail.value[0]].children[e.detail.value[1]].children,
+        storeValue: 0
+      })
+    },
+    storeChane: function (e) {
+      this.setData({
+        storeValue: e.detail.value
       })
+    },
+    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.cutType();
             if (res.data && res.data.decodeData) {
               this.data.subscribeData.mobile = res.data.decodeData.phoneNumber;
               this.setData({
@@ -309,11 +307,6 @@ Component({
         },
         fail: (res) => {
           this.getDistributorList("", "");
-        },
-        complete: (res) => {
-          this.setData({
-            siteSelect: true,
-          })
         }
       })
     },
@@ -321,6 +314,11 @@ Component({
       this.setData({
         agreement: !this.data.agreement
       })
+    },
+    cutType:function(){
+      this.setData({
+        mobileType: this.data.mobileType==1?2:1
+      })
     }
   }
 })

496_dongfengqichen/pages/yuyue/yuyue.wxml

@@ -4,40 +4,42 @@
     <view class="titleText">预约试驾</view>
     <view class="lineSty"></view>
     <image class="closeXieyi" bindtap="closeXieyi" src="{{imgUrl+'/images/closeXieyi.png'}}"></image>
-    <image class="yuyueTop" src="{{imgUrl+'/images/yuyueTop.png'}}"></image>
-    <view class="inputGroup">
+    <image class="yuyueTop" src="{{imgUrl+'/newImages2/40.png'}}"></image>
+    <view class="selectType">
+      <view style="position: relative;">
+        <image class="newImages2-41" bindtap="cutType" style="margin-bottom:23rpx;" src="{{imgUrl+'/newImages2/41_'+(mobileType==1?'2':'1')+'.png'}}"></image>
+        <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>
+      <image class="newImages2-41" bindtap="cutType" src="{{imgUrl+'/newImages2/42_'+(mobileType==1?'1':'2')+'.png'}}"></image>
+    </view>
+    <view class="inputGroup" style="margin-top:44rpx;">
       <input class="inputCode" bindinput="getRealname" value="{{subscribeData.realname}}" placeholder="请输入您的姓名"></input>
     </view>
-    <view class="inputGroup">
-      <input class="inputCode" bindinput="getMobile" type="number" value="{{subscribeData.mobile}}" maxlength='11' placeholder="请输入您的联系电话"></input>
-      <view class="getPhoneFrame" wx:if="{{!phoneInputShow}}">
-        <button class="getPhoneBtn" style="width: 652rpx;height: 65rpx;margin: 0;padding: 0;min-height: 0;" open-type="getPhoneNumber" bindgetphonenumber="getUserPhone"></button>
-      </view>
+    <view class="inputGroup" wx:if="{{mobileType==1}}">
+      <input class="inputCode" bindinput="getMobile" disabled="true" type="number" value="{{subscribeData.mobile}}" maxlength='11' placeholder="请输入您的联系电话"></input>
     </view>
-    <view class="inputGroup">
+    <view class="inputGroup" wx:if="{{mobileType==2}}">
+      <input class="inputCode" bindinput="getMobile2" type="number" value="{{subscribeData.mobile2}}" maxlength='11' placeholder="请输入您的联系电话"></input>
+    </view>
+    <view class="inputGroup" wx:if="{{mobileType==2}}">
       <input class="inputCode" style="width:450rpx;" value="{{subscribeData.captcha}}" bindinput="getCaptcha" placeholder="请输入验证码"></input>
       <view class="codeTime" bindtap="getCode">{{verificationCode}}</view>
     </view>
     <!-- <view wx:if="{{siteSelect}}"> -->
-      <picker mode='selector' range="{{provinceArr}}" range-key="province" value="{{provinceValue}}" bindchange="provinceChane">
+      <picker mode='multiSelector' range="{{provinceDataArr}}" value="{{provinceDataValue}}" bindcolumnchange="provinceDataChange" bindchange="provinceDataChane">
         <view class="selectSiteGroup">
-          <text class="selectName">{{provinceArr[provinceValue].province}}</text>
+          <text class="selectName">{{nowProvince}}</text>
           <image src="{{imgUrl+'/images/selectIcon.png'}}" class="selectIcon"></image>
         </view>
       </picker>
-      <picker mode='selector' range="{{cityArr}}" range-key="city" value="{{cityValue}}" bindchange="cityChane">
-        <view class="selectSiteGroup">
-            <text class="selectName">{{cityArr[cityValue].city}}</text>
-            <image src="{{imgUrl+'/images/selectIcon.png'}}" class="selectIcon"></image>
-        </view>
-      </picker>
       <picker mode='selector' range="{{storeArr}}" range-key="agent_detail" value="{{storeValue}}" bindchange="storeChane">
         <view class="selectSiteGroup">
           <text class="selectName">{{storeArr[storeValue].agent_detail}}</text>
           <image src="{{imgUrl+'/images/selectIcon.png'}}" class="selectIcon"></image>
         </view>
       </picker>
-      <image class="newImages50" src="{{imgUrl+'/newImages/50.png'}}"></image>
     <!-- </view> -->
     <view class="agreementGroup">
         <image class="agreeIcon" bindtap="agreementState" src="{{imgUrl+(isAgreement?'/images/agreeIcon.png?v=003':'/images/disagreeIcon.png?v=002')}}"></image>
@@ -48,8 +50,8 @@
           </view>
         </view>
       </view>
-      <view class="subscribeBtn" bindtap="subscribeFun">
-        <image style="width:100%;height:100%;" src="{{imgUrl+'/newIcon/20.png'}}"></image>
+      <view class="subscribeBtn" bindtap="subscribeFun" style="margin-top:34rpx;">
+        <image style="width:100%;height:100%;" src="{{imgUrl+'/newImages2/43.png'}}"></image>
         <button wx:if="{{userData}}" class="getUserMsgBtn" open-type="getUserInfo" lang="zh_CN" bindgetuserinfo="getUserWxMsg" style="width:100%;height:100%;min-height:0;padding:0;margin:0;"></button>
       </view>
       <view class="subscribeBtn" bindtap="lookMore">

496_dongfengqichen/pages/yuyue/yuyue.wxss

@@ -7,7 +7,7 @@
   position: fixed;
   left: 0;
   top: 0;
-  height: calc(100vh - 150rpx);
+  height: calc(100vh - 120rpx);
   overflow: auto;
   background-color: white;
   z-index: 99;
@@ -47,8 +47,8 @@
   display: block;
   margin: 0 auto;
   width: 699rpx;
-  height: 225rpx;
-  margin-bottom: 143rpx;
+  height: 226rpx;
+  margin-bottom: 45rpx;
 }
 
 .inputGroup{
@@ -75,10 +75,11 @@
 }
 .getPhoneFrame{
   position: absolute;
-  left: 0;
+  left: 50%;
+  transform: translateX(-50%);
   top: 0;
-  width: 652rpx;
-  height: 65rpx;
+  width:653rpx;
+  height: 71rpx;
   z-index: 2;
 }
 .getPhoneBtn{
@@ -110,7 +111,7 @@
   width:652rpx;
   height:70rpx;
   margin-top: 18rpx;
-  margin-bottom: 24rpx;
+  margin-bottom: 17rpx;
 }
 .getUserMsgBtn{
   position: absolute;
@@ -132,7 +133,7 @@
   margin: 0 auto;
   display: flex;
   align-items: center;
-  margin-top: 15rpx;
+  margin-top: 47rpx;
 }
 .agreementText{
   line-height: 24rpx;
@@ -148,4 +149,9 @@
   height: 66rpx;
   margin: 0 auto;
   margin-top: 18rpx;
+}
+.newImages2-41{
+  width:653rpx;
+  height: 71rpx;
+  margin: 0 auto;
 }