下架618活动

496_dongfengqichen/app.js

@@ -83,10 +83,10 @@ App({
     })
   },
   globalData: {
-    // urlRoot: "https://dongfengqichen.jiyou-tech.com/",//测试接口根目录
-    urlRoot: "https://xing.venucia.com/api/",//接口根目录
-    // urlStatic: "https://www.jiyou-tech.com/2020/496_qichen/static",//测试静态资源根目录
-    urlStatic: "https://xingb.venucia.com/resource",//静态资源根目录
+    urlRoot: "https://dongfengqichen.jiyou-tech.com/",//测试接口根目录
+    // urlRoot: "https://xing.venucia.com/api/",//接口根目录
+    urlStatic: "https://www.jiyou-tech.com/2020/496_qichen/static",//测试静态资源根目录
+    // urlStatic: "https://xingb.venucia.com/resource",//静态资源根目录
     openid: "",//OPENID
     parentOpenid:"",//推荐人的openid
     session_key: "",//session_key
@@ -129,7 +129,6 @@ App({
     getSecondGuessInfoV2:null,//第二轮价格竞猜结果
     phonebolb:false,
     isStar:null,//是否为星探
-    luckyTokenList:[],//可用抽奖token列表
   },
   // 获取openId
   getOpenid: function (code) {
@@ -322,13 +321,10 @@ App({
     },this)
   },
   getBuyState: function () {//查询是否已下订
-    this.wxRequest(this.globalData.urlRoot + "wxPay/v3/getLuckyTokenList", {}, res => {
+    this.wxRequest(this.globalData.urlRoot + "wxPay/getBuyState", {source:2}, res => {
       if (res.code == 200) {
         if (res.data) {
           res.data.cdate = res.data.cdate ? res.data.cdate : "";
-          if(res.data.luckyTokenList){
-            this.globalData.luckyTokenList = res.data.luckyTokenList;
-          }
           this.globalData.getBuyState = res.data;
           if (this.globalData.buyStateSuccessFuc){
             this.globalData.buyStateSuccessFuc();

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

@@ -3,8 +3,8 @@
   <image class="serviceIcon"  style="top:{{nowPage!=1?'100rpx;':'206rpx;'}}" bindtap="maskShow" src="{{imgUrl+'/newIcon/3.png'}}"></image>
   <image class="serviceIcon" style="top:206rpx;" wx:if="{{nowPage!=1}}" bindtap="lookOrder" src="{{imgUrl+'/newImages7/18.png'}}"></image>
   <!-- <image class="serviceIcon" wx:if="{{nowPage!=1}}" bindtap="openYuyue" src="{{imgUrl+'/newIcon/4.png'}}"></image> -->
-  <!-- <image class="serviceIcon" wx:if="{{!buyState && nowPage==1}}" bindtap="placingControl" src="{{imgUrl+'/newImages6/28.png'}}"></image> -->
-  <image class="serviceIcon" style="width:73rpx;height:83rpx;" wx:if="{{nowPage==1}}" bindtap="openYuyue" src="{{imgUrl+'/newImages8/4.png'}}"></image>
+  <image class="serviceIcon" wx:if="{{!buyState && nowPage==1}}" bindtap="placingControl" src="{{imgUrl+'/newImages6/28.png'}}"></image>
+  <!-- <image class="serviceIcon" style="width:73rpx;height:83rpx;" wx:if="{{nowPage==1}}" bindtap="openYuyue" src="{{imgUrl+'/newImages8/4.png'}}"></image> -->
   <view wx:if="{{maskState}}" class="maskGroup" catchtouchmove="ture">
     <view class="contentGroup">
       <image style="width:100%;height:100%;" src="{{imgUrl+'/images/serviceBg.png'}}"></image>
@@ -13,6 +13,6 @@
       <button style="min-height: 0;" class="serviceBtn" open-type="contact"></button>
     </view>
   </view>
-  <orderActivity  bindplacing="placingControl" wx:if="{{placing}}"></orderActivity>
+  <placingOrder  bindplacing="placingControl" wx:if="{{placing}}"></placingOrder>
   <yuyue bindyuyue="openYuyue" wx:if="{{yuyueShow}}"></yuyue>
 </view>

496_dongfengqichen/pages/index/index.js

@@ -36,8 +36,8 @@ Page({
     kvurl: null,//顶部大图
     kvurlH:0,
     showAppointment:false,
-    placing:false,//是否显示下定按钮
-    buyState:false,//下订状态
+    // placing:false,//是否显示下定按钮
+    // buyState:false,//下订状态
     isStartAdvertisingFunState:false,
     playBtnDeg:0,
     videoShow: false,
@@ -63,8 +63,6 @@ Page({
     showMaskNum:0,//要显示的弹窗
     addressShow:false,
     isAddress:false,//是否有地址
-    drawNum:0,//可用抽奖次数
-    maskNewCard:false,
   },
   onLoad: function (options) {
     if (app.globalData.isFirstLogin) {
@@ -124,35 +122,21 @@ Page({
     this.getFirstMsg();
   },
   onShow:function () {
-    if(app.globalData.luckyTokenList && app.globalData.luckyTokenList.length){
-      this.setData({
-        drawNum:app.globalData.luckyTokenList.length
-      })
-    }else{
-      this.setData({
-        drawNum: 0
-      })
-    }
-    if (app.globalData.getBuyState) {
-      this.getBuyStates();
-    } else {
-      app.globalData.buyStateSuccessFuc = this.getBuyStates;
-    }
+    // if (app.globalData.getBuyState) {
+    //   this.getBuyStates();
+    // } else {
+    //   app.globalData.buyStateSuccessFuc = this.getBuyStates;
+    // }
     this.setData({
       siteSelect: false
     })
     this.data.subscribeData.parentOpenid = app.globalData.parentOpenid;
   },
-  getBuyStates:function(){
-    this.setData({
-      buyState: app.globalData.getBuyState.success
-    })
-    if(app.globalData.luckyTokenList && app.globalData.luckyTokenList.length){
-      this.setData({
-        drawNum:app.globalData.luckyTokenList.length
-      })
-    }
-  },
+  // getBuyStates:function(){
+  //   this.setData({
+  //     buyState: app.globalData.getBuyState.success
+  //   })
+  // },
   provinceChane: function (e) {//选中省
     this.setData({
       provinceValue: e.detail.value,
@@ -529,51 +513,16 @@ Page({
       showAppointment: !this.data.showAppointment
     })
   },
-  placingControl:function(){
-    console.log("是否已支付"+app.globalData.getBuyState.success);
-    console.log("抽奖机会次数"+app.globalData.luckyTokenList.length);
-    if(app.globalData.getBuyState.success && app.globalData.luckyTokenList.length){
-      wx.navigateTo({
-        url: '/pages/rotaryDraw/rotaryDraw',
-      })
-    }else{
-      if(app.globalData.getBuyState.success && !app.globalData.luckyTokenList.length && !this.data.placing){
-        this.maskNewControl();
-      }else{
-        this.setData({
-          placing: !this.data.placing
-        })
-      }
-    }
-    
-
-    return
-    if(app.globalData.getBuyState){
-      if(!app.globalData.getBuyState.success){
-        this.setData({
-          placing: !this.data.placing
-        })
-      }
-    }
-
-    if (this.data.buyState && !this.data.placing){
-      wx.navigateTo({
-        url: '/pages/rotaryDraw/rotaryDraw',
-      })
-    }else{
-      if(this.data.buyState && !this.data.drawNum){
-        this.maskNewControl();
-        return;
-      }else{
-        this.setData({
-          placing: !this.data.placing
-        })
-      }
-    }
-    console.log("是否打开了支付页面"+this.data.placing);
-    console.log("是否已支付"+this.data.buyState);
-    console.log("抽奖机会次数"+this.data.drawNum);
-  },
+  // placingControl:function(){
+  //   if (app.globalData.getBuyState.success != this.data.buyState){
+  //     this.setData({
+  //       buyState: app.globalData.getBuyState.success
+  //     })
+  //   }
+  //   this.setData({
+  //     placing: !this.data.placing
+  //   })
+  // },
   swiperChange:function(e){
     var num = e.currentTarget.dataset.num;
     if(num==1){
@@ -690,9 +639,9 @@ Page({
       }
     }, this)
   },
-  maskNewControl(){
-    this.setData({
-      maskNewCard:!this.data.maskNewCard
-    })
-  }
+  // maskNewControl(){
+  //   this.setData({
+  //     maskNewCard:!this.data.maskNewCard
+  //   })
+  // }
 })

496_dongfengqichen/pages/index/index.wxml

@@ -5,24 +5,23 @@
       <view class="newImages2-76">
         <!-- <image style="width:750rpx;height:11693rpx;" src="{{imgUrl+'/newImages8/newHome/newHomeBg.png'}}"></image> -->
         <!-- <image style="width:750rpx;height:10368rpx;" src="{{imgUrl+'/newImages4/16.png'}}"></image> -->
-        <image style="width:750rpx;height:1600rpx;" src="{{imgUrl+'/newImages8/newHome2/images/newHome2_01.png?v=003'}}"></image>
-        <image style="width:750rpx;height:1600rpx;" src="{{imgUrl+'/newImages8/newHome2/images/newHome2_02.png?v=006'}}"></image>
-        <image style="width:750rpx;height:1600rpx;" src="{{imgUrl+'/newImages8/newHome2/images/newHome2_03.png'}}"></image>
-        <image style="width:750rpx;height:1600rpx;" src="{{imgUrl+'/newImages8/newHome2/images/newHome2_04.png'}}"></image>
-        <image style="width:750rpx;height:1600rpx;" src="{{imgUrl+'/newImages8/newHome2/images/newHome2_05.png'}}"></image>
-        <image style="width:750rpx;height:1600rpx;" src="{{imgUrl+'/newImages8/newHome2/images/newHome2_06.png'}}"></image>
-        <image style="width:750rpx;height:1600rpx;" src="{{imgUrl+'/newImages8/newHome2/images/newHome2_07.png'}}"></image>
-        <image style="width:750rpx;height:493rpx;" src="{{imgUrl+'/newImages8/newHome2/images/newHome2_08.png'}}"></image>
+        <image style="width:750rpx;height:1600rpx;" src="{{imgUrl+'/newImages6/images/newImg_01.png?v=002'}}"></image>
+        <image style="width:750rpx;height:1600rpx;" src="{{imgUrl+'/newImages6/images/newImg_02.png?v=004'}}"></image>
+        <image style="width:750rpx;height:1600rpx;" src="{{imgUrl+'/newImages6/images/newImg_03.png'}}"></image>
+        <image style="width:750rpx;height:1600rpx;" src="{{imgUrl+'/newImages6/images/newImg_04.png'}}"></image>
+        <image style="width:750rpx;height:1600rpx;" src="{{imgUrl+'/newImages6/images/newImg_05.png'}}"></image>
+        <image style="width:750rpx;height:1600rpx;" src="{{imgUrl+'/newImages6/images/newImg_06.png'}}"></image>
+        <image style="width:750rpx;height:768rpx;" src="{{imgUrl+'/newImages6/images/newImg_07.png'}}"></image>
       </view>
       <view class="videoGroup" bindtap="playVideo">
-        <image class="newImages2-108" animation="{{playBtnDeg}}" src="{{imgUrl+'/newImages8/10.png'}}"></image>
-        <image class="newImages2-110" src="{{imgUrl+'/newImages8/11.png'}}"></image>
+        <image class="newImages2-108" animation="{{playBtnDeg}}" src="{{imgUrl+'/newImages3/32.png'}}"></image>
+        <image class="newImages2-110" src="{{imgUrl+'/newImages3/31.png'}}"></image>
         <video id="myVideo" class="myVideo" wx:if="{{videoShow}}" bindfullscreenchange="closeFull" src="{{videoList['videoUrl']}}"></video>
       </view>
       <image class="computeBtn" bindtap="compute" src="{{imgUrl+'/newImages7/19.png'}}"></image>
-      <!-- <image class="newImages2-11" bindtap="placingControl" wx:if="{{!buyState}}" src="{{imgUrl+'/newImages8/5.png'}}"></image> -->
+      <image class="newImages2-11" bindtap="openYuyue" src="{{imgUrl+'/newImages7/20.png'}}"></image>
       <!-- <image class="newImages2-11" bindtap="placingControl" wx:if="{{!buyState || drawNum}}" src="{{imgUrl+'/newImages8/5.png'}}"></image> -->
-      <image class="newImages2-11" bindtap="placingControl" src="{{imgUrl+'/newImages8/5.png'}}"></image>
+      <!-- <image class="newImages2-11" bindtap="placingControl" src="{{imgUrl+'/newImages8/5.png'}}"></image> -->
       <image class="newImages2-12" bindtap="lookConfigure" src="{{imgUrl+'/newImages2/98.png'}}"></image>
       <image class="newImages2-13" bindtap="vrLookCar" src="{{imgUrl+'/newImages2/99.png'}}"></image>
       <swiper class="swiper1" bindchange="swiperChange" data-num="1" current="{{swiperGroup.one.current}}">
@@ -86,8 +85,8 @@
       </view>
       <image class="testText4" src="{{imgUrl+'/newImages2/testImg/4/'+(swiperGroup.four.current+1)+'_2.png?v=005'}}"></image>
       <view class="lookMoreCar" style="padding-bottom:190rpx;">
-        <!-- <image class="newImages2-14" bindtap="lookMore" src="{{imgUrl+'/newImages2/100.png'}}"></image> -->
-        <image class="newImages2-14" bindtap="navSkip" src="{{imgUrl+'/newImages8/23.png'}}"></image>
+        <image class="newImages2-14" bindtap="lookMore" src="{{imgUrl+'/newImages2/100.png'}}"></image>
+        <!-- <image class="newImages2-14" bindtap="navSkip" src="{{imgUrl+'/newImages8/23.png'}}"></image> -->
       </view>
     </view>
     <view class="mask" wx:if="{{showMaskNum}}">
@@ -97,13 +96,13 @@
         <image class="receiveBtn" wx:if="{{!isAddress}}" bindtap="addressControl" src="{{imgUrl+'/newImages7/21.png'}}"></image>
       </view>
     </view>
-    <view class="newCardFrame" wx:if="{{maskNewCard}}">
+    <!-- <view class="newCardFrame" wx:if="{{maskNewCard}}">
       <view class="newCardGroup">
         <image class="newCardImg" src="{{imgUrl+'/newImages8/22.png?v=002'}}"></image>
         <view class="closeCard" bindtap="maskNewControl"></view>
         <view class="btnCard" bindtap="maskNewControl"></view>
       </view>
-    </view>
+    </view> -->
     <!-- <view class="mask" wx:if="{{!maskNewCard}}" style="display:block;">
       <view style="width:100%;calc(100vh - 120rpx);position:relative;">
         <image class="newCardImg" src="{{imgUrl+'/newImages8/22.png'}}"></image>
@@ -112,7 +111,7 @@
 
     <service></service>
     <yuyue bindyuyue="openYuyue" wx:if="{{yuyueShow}}"></yuyue>
-    <orderActivity bindplacing="placingControl" wx:if="{{placing}}"></orderActivity>
+    <!-- <orderActivity bindplacing="placingControl" wx:if="{{placing}}"></orderActivity> -->
   </view>
   <userMsg bindaddress="addressControl" wx:if="{{addressShow}}"></userMsg>
   <tabBar wx:if="{{isStartAdvertising==0 || !isStartAdvertisingShow}}"></tabBar>

496_dongfengqichen/pages/index/index.wxss

@@ -269,7 +269,7 @@ view{
   width:390rpx;
   height: 62rpx;
   position: absolute;
-  top: 5043rpx;
+  top: 3718rpx;
   left: 50%;
   transform: translateX(-50%);
 }
@@ -277,20 +277,20 @@ view{
   width:390rpx;
   height: 61rpx;
   position: absolute;
-  top: 5413rpx;
+  top: 4088rpx;
   left: 50%;
   transform: translateX(-50%);
 }
 .swiper1{
   position: absolute;
   left: 0;
-  top: 6337rpx;
+  top: 5012rpx;
   width: 750rpx;
   height: 477rpx;
 }
 .arrow-left-1,.arrow-right-1,.arrow-left-2,.arrow-right-2,.arrow-left-3,.arrow-right-3,.arrow-left-4,.arrow-right-4{
   position: absolute;
-  top: 6337rpx;
+  top: 5012rpx;
   height: 477rpx;
   display: flex;
   align-items: center;
@@ -303,15 +303,15 @@ view{
   right:18rpx;
 }
 .arrow-left-2,.arrow-right-2{
-  top: 7731rpx;
+  top: 6406rpx;
   height: 496rpx;
 }
 .arrow-left-3,.arrow-right-3{
-  top: 9301rpx;
+  top: 7976rpx;
   height: 402rpx;
 }
 .arrow-left-4,.arrow-right-4{
-  top: 10784rpx;
+  top: 9459rpx;
   height: 447rpx;
 }
 .newImages2-78{
@@ -321,7 +321,7 @@ view{
 .dotGroup1,.dotGroup2,.dotGroup3,.dotGroup4{
   position: absolute;
   left: 0;
-  top: 6779rpx;
+  top: 5454rpx;
   width: 750rpx;
   height: 16rpx;
   display: flex;
@@ -329,13 +329,13 @@ view{
   justify-content: center;
 }
 .dotGroup2{
-  top: 8197rpx;
+  top: 6872rpx;
 }
 .dotGroup3{
-  top: 9656rpx;
+  top: 8331rpx;
 }
 .dotGroup4{
-  top: 11194rpx;
+  top: 9869rpx;
 }
 .newImages2-80{
   width: 17rpx;
@@ -349,7 +349,7 @@ view{
 }
 .testText{
   position: absolute;
-  top: 6833rpx;
+  top: 5508rpx;
   left: 50%;
   transform: translateX(-50%);
   width: 584rpx;
@@ -358,13 +358,13 @@ view{
 .swiper2{
   position: absolute;
   left: 0;
-  top: 7731rpx;
+  top: 6406rpx;
   width: 750rpx;
   height: 496rpx;
 }
 .testText2{
   position: absolute;
-  top: 8247rpx;
+  top: 6922rpx;
   left: 50%;
   transform: translateX(-50%);
   width: 598rpx;
@@ -373,13 +373,13 @@ view{
 .swiper3{
   position: absolute;
   left: 0;
-  top: 9301rpx;
+  top: 7976rpx;
   width: 750rpx;
   height: 402rpx;
 }
 .testText3{
   position: absolute;
-  top: 9725rpx;
+  top: 8400rpx;
   left: 50%;
   transform: translateX(-50%);
   width: 513rpx;
@@ -388,13 +388,13 @@ view{
 .swiper4{
   position: absolute;
   left: 0;
-  top: 10784rpx;
+  top: 9459rpx;
   width: 750rpx;
   height: 447rpx;
 }
 .testText4{
   position: absolute;
-  top: 11250rpx;
+  top: 9925rpx;
   left: 50%;
   transform: translateX(-50%);
   width: 522rpx;
@@ -403,8 +403,8 @@ view{
 .videoGroup{
   position: absolute;
   left: 340rpx;
-  top: 620rpx;
-  width: 72rpx;
+  top: 518rpx;
+  width: 69rpx;
   height: 72rpx;
   display: flex;
   flex-direction: column;
@@ -415,7 +415,7 @@ view{
   height: 72rpx;
 }
 .newImages2-110{
-  width: 22rpx;
+  width: 21rpx;
   height: 29rpx;
   margin-top: -42rpx;
 }
@@ -431,7 +431,7 @@ view{
   width:390rpx;
   height: 62rpx;
   position: absolute;
-  top: 3895rpx;
+  top: 2570rpx;
   left: 50%;
   transform: translateX(-50%);
 }

496_dongfengqichen/pages/myCenter/myCenter.js

@@ -17,7 +17,7 @@ Page({
     isLogin:false,//登录状态
     selectNow:0,//现在的选项
     taskNow:2,//现在的任务类型
-    recordNow: 2,//现在的记录类型
+    recordNow: 1,//现在的记录类型
     taskList: [],//任务列表
     shareFriendList:[],//星探小分队列表
     couponList:[],//卡券列表
@@ -828,7 +828,7 @@ Page({
     wx.showLoading({
       title: '获取数据中'
     })
-    this.data.parames2.awardSource = this.data.recordNow==2?4:this.data.recordNow;
+    this.data.parames2.awardSource = this.data.recordNow;
     app.wxRequest(app.globalData.urlRoot + "award/getMyAwardList", this.data.parames2, res => {
       wx.hideLoading();
       if(res.code == 200){

496_dongfengqichen/pages/myCenter/myCenter.wxml

@@ -115,7 +115,7 @@
     </view>
     <view class="taskGroup" wx:if="{{selectNow==2}}">
       <view class="taskSelect">
-        <view bindtap="selectRecord" data-type='2' class="taskText recordText {{recordNow==2?'taskText2':''}}">618星动狂欢节</view>
+        <!-- <view bindtap="selectRecord" data-type='2' class="taskText recordText {{recordNow==2?'taskText2':''}}">618星动狂欢节</view> -->
         <view bindtap="selectRecord" data-type='1' class="taskText recordText {{recordNow==1?'taskText2':''}}">玩出惊喜奖品</view>
         <!-- <view bindtap="selectRecord" data-type='2' class="taskText recordText {{recordNow==2?'taskText2':''}}">每日任务奖品</view> -->
         <view bindtap="selectRecord" data-type='3' class="taskText recordText {{recordNow==3?'taskText2':''}}">星探奖励</view>
@@ -123,8 +123,8 @@
       <!-- <view class="recordFrame"> -->
         <image class="newImages1" wx:if="{{!recordList.length && recordNow==1 && !getState}}" src="{{imgUrl+'/newImages3/16.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+'/newImages8/12.png'}}"></image>
-        <image class="newImages6" bindtap="enterIndex" wx:if="{{!recordList.length && recordNow==2 && !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+'/newImages3/19.png'}}"></image>
         <image class="newImages6" bindtap="starGo" wx:if="{{!recordList.length && recordNow==3 && !getState}}" src="{{imgUrl+'/newImages2/64.png'}}"></image>
         

496_dongfengqichen/pages/myCenter/myCenter.wxss

@@ -846,11 +846,11 @@ view{
   margin: 0 auto;
 }
 .newImages5{
-  width: 195rpx;
-  height:182rpx;
+  width: 223rpx;
+  height:157rpx;
   margin: 0 auto;
   margin-top: 30rpx;
-  margin-bottom: 17rpx;
+  margin-bottom: 26rpx;
 }
 .newImages6{
   width: 256rpx;

496_dongfengqichen/pages/star/star.wxml

@@ -2,7 +2,7 @@
 <view id="star" class="showView">
   <view class="home">
     <view class="bgGroup">
-      <image class="bg" src="{{imgUrl+'/newImages8/28.png'}}"></image>
+      <image class="bg" src="{{imgUrl+'/newImages7/13.png?v=006'}}"></image>
       <image class="selectImg1" wx:if="{{!selectGroup[0]}}" bindtap="cutSelect" data-type="0" src="{{imgUrl+'/newImages7/7.png'}}"></image>
       <image class="selectImg1_1" wx:if="{{selectGroup[0]}}" bindtap="cutSelect" data-type="0" src="{{imgUrl+'/newImages7/10.png?v=004'}}"></image>
       <image class="selectImg2" wx:if="{{!selectGroup[1]}}" bindtap="cutSelect" data-type="1" src="{{imgUrl+'/newImages7/8.png'}}"></image>

496_dongfengqichen/pages/yuyue/yuyue.js

@@ -15,8 +15,8 @@ Component({
    * 组件的初始数据
    */
   data: {
-    prizeShow:false,//是否显示获奖弹窗
-    prizeShow2:false,//是否显示未获奖弹窗
+    // prizeShow:false,//是否显示获奖弹窗
+    // prizeShow2:false,//是否显示未获奖弹窗
     ruleShow:true,//是否显示规则
     imgUrl: app.globalData.urlStatic,//图片路径
     agreement:false,
@@ -90,7 +90,7 @@ Component({
         })
       }
       this.getUserLocation();//获取用户当前位置
-      this.getAddress(); 
+      // this.getAddress(); 
     },
     getDistributorList: function (longitude, latitude) {//获取经销商列表
       app.wxRequest(app.globalData.urlRoot + "agent/getAgentList", { longitude: longitude, latitude: latitude }, res => {
@@ -219,7 +219,7 @@ Component({
         this.data.subscribeData.mobile = this.data.mobile2;
       }
       this.data.subscribeData.parentOpenid = app.globalData.parentOpenid;
-      app.wxRequest(app.globalData.urlRoot + "userInfo/v2/submitOrderInfo", this.data.subscribeData, res => {
+      app.wxRequest(app.globalData.urlRoot + "userInfo/submitOrderInfo", this.data.subscribeData, res => {
         this.data.subscribeData.mobile = sourceMobile;
         this.data.appointment = true;
         if (res.code == 200) {
@@ -229,18 +229,14 @@ Component({
             })
             return;
           }
-          if(res.data.awardResult){
-            this.prizeControl();
-          }else{
-            this.prizeControl2();
-          }
-          // wx.showToast({
-          //   title: '预约成功',
-          //   mask:true
-          // })
-          // setTimeout(()=>{
-          //   this.closeXieyi();
-          // },1500)
+          wx.showToast({
+            title: '预约成功',
+            mask:true
+          })
+          setTimeout(()=>{
+            this.closeXieyi();
+          },1500)
+          
           // this.data.subscribeData.realname = "";
           // this.data.subscribeData.captcha = "";
           // this.setData({

496_dongfengqichen/pages/yuyue/yuyue.wxml

@@ -1,7 +1,7 @@
 <!--pages/yuyue/yuyue.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="yuyueTop" src="{{imgUrl+'/newImages6/47.png'}}"></image>
@@ -51,22 +51,22 @@
         </view>
       </view>
       <view class="subscribeBtn" style="margin-top:34rpx;">
-        <image style="width:100%;height:100%;" bindtap="subscribeFun" src="{{imgUrl+'/newImages8/1.png'}}"></image>
+        <image style="width:100%;height:100%;" bindtap="subscribeFun" src="{{imgUrl+'/newImages3/21.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">
         <image style="width:100%;height:100%;" src="{{imgUrl+'/newImages3/22.png'}}"></image>
       </view>
   </view>
-  <view class="ruleMask" wx:if="{{ruleShow}}">
+  <!-- <view class="ruleMask" wx:if="{{ruleShow}}">
     <view class="ruleGroup">
       <image style="width:100%;height:100%;" src="{{imgUrl+'/newImages8/2.png?v=002'}}"></image>
       <image class="closeRule" src="{{imgUrl+'/newImages8/3.png'}}" bindtap="ruleControl"></image>
     </view>
-  </view>
-  <view class="ruleMask" wx:if="{{prizeShow}}">
-    <view class="ruleGroup" style="width:570rpx;height:556rpx;">
-      <image style="width:100%;height:100%;" src="{{imgUrl+'/newImages8/17.png'}}"></image>
+  </view> -->
+  <!-- <view class="ruleMask" wx:if="{{prizeShow}}">
+    <view class="ruleGroup" style="width:570rpx;height:558rpx;">
+      <image style="width:100%;height:100%;" src="{{imgUrl+'/newImages8/9.png'}}"></image>
       <image class="closeRule" style="top:-30rpx;right:-30rpx;" src="{{imgUrl+'/newImages8/3.png'}}" bindtap="closeXieyi"></image>
       <image class="getNow" wx:if="{{!isAddress}}" bindtap="addressControl" src="{{imgUrl+'/newImages8/16.png'}}"></image>
     </view>
@@ -78,6 +78,6 @@
       <view class="getNow" bindtap="closeXieyi"></view>
     </view>
   </view>
-  <userMsg bindaddress="addressControl" wx:if="{{addressShow}}"></userMsg>
+  <userMsg bindaddress="addressControl" wx:if="{{addressShow}}"></userMsg> -->
   <agreement bindmyevent="agreementControl" wx:if="{{agreement}}"></agreement>
 </view>

496_dongfengqichen/pages/yuyue/yuyue.wxss

@@ -170,7 +170,7 @@
 .ruleGroup{
   position: relative;
   width: 641rpx;
-  height: 1028rpx;
+  height: 995rpx;
 }
 .closeRule{
   position: absolute;
@@ -184,6 +184,6 @@
   left: 50%;
   transform: translateX(-50%);
   top: 435rpx;
-  width: 366rpx;
-  height: 56rpx;
+  width: 368rpx;
+  height: 60rpx;
 }

496_dongfengqichen/project.config.json

@@ -4,7 +4,7 @@
 		"ignore": []
 	},
 	"setting": {
-		"urlCheck": true,
+		"urlCheck": false,
 		"es6": true,
 		"postcss": true,
 		"minified": true,