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

496_dongfengqichen/app.js

     certificationInfo:false,
     getBuyState:null,
     entered:false,
-    authenticationStatus:null
+    authenticationStatus:null,
+    skipType:null
   },
   // 获取openId
   getOpenid: function (code) {

496_dongfengqichen/pages/coupon/coupon.js

     }
   },
   loadFun:function(){
-    this.getOrderInfo();
+    this.getOrderInfo(); 
   },
   /**
    * 生命周期函数--监听页面初次渲染完成
     })
   },
   showAppointment:function(){
-    this.setData({
-      isAppointmentShow:true
-    })
+    this.getUserLocation();//获取用户当前位置
   },
   provinceChane: function (e) {//选中省
     this.setData({
       },
       complete: (res) => {
         this.setData({
-          siteSelect: true,
+          isAppointmentShow: true
         })
       }
     })
   },
   showSite: function () {//显示地址选择框
     if (!this.data.siteSelect) {
-      this.getUserLocation();//获取用户当前位置
+      
     }
   },
   enterMyCenter: function () {

496_dongfengqichen/pages/coupon/coupon.wxml

         </view>
       </view>
       <view class="codeGroup">
-        <input class="inputCode" bindfocus="showSite" bindinput="getCaptcha" value="{{subscribeData.captcha}}" placeholder="验证码"></input>
+        <input class="inputCode" bindinput="getCaptcha" value="{{subscribeData.captcha}}" placeholder="验证码"></input>
         <view class="codeTime" bindtap="getCode">{{verificationCode}}</view>
       </view>
-      <view wx:if="{{siteSelect}}">
+      <!-- <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>
-      </view>
+      <!-- </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>

496_dongfengqichen/pages/fragmentRule/fragmentRule.wxml

 <view class="all">
   <view class="main">
     <view class="contentGroup">
-      <image class="newImages26" src="{{imgUrl+'/newImages/41.png'}}"></image>
+      <image class="newImages26" src="{{imgUrl+'/newImages/51.png'}}"></image>
       <image class="newImages27" bindtap="cutPage" src="{{imgUrl+'/newImages/27.png'}}"></image>
     </view>
   </view>

496_dongfengqichen/pages/luckyStar/luckyStar.js

     this.setData({
       addressShow: !this.data.addressShow
     })
+    if (this.data.addressShow) {
+      app.globalData.skipType = 'mycenter';
+    }
   },
   chanceShowControl:function(){
     this.setData({

496_dongfengqichen/pages/placingOrder/placingOrder.js

       }
     },
     loadFun: function () {
+      this.getUserLocation();//获取用户当前位置
       if (app.globalData.userMobile) {
         this.data.subscribeData.mobile = app.globalData.userMobile;
         this.setData({
     },
     showSite: function () {//显示地址选择框
       if (!this.data.siteSelect) {
-        this.getUserLocation();//获取用户当前位置
+        
       }
     },
     agreementState: function () {//协议

496_dongfengqichen/pages/placingOrder/placingOrder.wxml

       </view>
     </view>
     <view class="codeGroup">
-      <input class="userInput" bindfocus="showSite" bindinput="getCaptcha" style="width:350rpx;" placeholder="请输入您的验证码"></input>
+      <input class="userInput" bindinput="getCaptcha" style="width:350rpx;" placeholder="请输入您的验证码"></input>
       <view class="getCode" bindtap="getCode">{{verificationCode}}</view>
     </view>
-    <view wx:if="{{siteSelect}}" class="pickerGroup">
+    <!-- <view wx:if="{{siteSelect}}" class="pickerGroup"> -->
       <view class="inputGroup">
         <view class="userTitle">当前城市</view>
         <picker mode='multiSelector' range="{{provinceDataArr}}" value="{{provinceDataValue}}" bindcolumnchange="provinceDataChange" bindchange="provinceDataChane">
           </view>
         </picker>
       </view>
-    </view>
+    <!-- </view> -->
     <view class="agreementGroup">
       <image class="agreeIcon" bindtap="agreementState" src="{{imgUrl+(isAgreement?'/images/agreeIcon.png?v=003':'/images/disagreeIcon.png?v=002')}}"></image>
       <view class="agreementText">

496_dongfengqichen/pages/prizes/prizes.wxml

     <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;" src="{{imgUrl+'/newPrize/7.png'}}"></image>
+        <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>

496_dongfengqichen/pages/scout/scout.wxml

   </view>
   <view class="mask" wx:if="{{maskShow}}">
     <view class="tipContent" wx:if="{{tipShow}}">
-      <image wx:if="{{maskid==4}}" class="titleImg" src="{{imgUrl+'/star/scout/scoutTitle4.png'}}"></image>
-      <image wx:if="{{maskid==1}}" class="titleImg" src="{{imgUrl+'/star/scout/scoutTitle1.png'}}"></image>
-      <image wx:if="{{maskid==3}}" class="titleImg" src="{{imgUrl+'/star/scout/scoutTitle2.png'}}"></image>
-      <image wx:if="{{maskid==2}}" class="titleImg" src="{{imgUrl+'/star/scout/scoutTitle3.png'}}"></image>
+      <image wx:if="{{maskid==4}}" class="titleImg" src="{{imgUrl+'/star/scout/scoutTitle4.png?v=002'}}"></image>
+      <image wx:if="{{maskid==1}}" class="titleImg" src="{{imgUrl+'/star/scout/scoutTitle1.png?v=002'}}"></image>
+      <image wx:if="{{maskid==3}}" class="titleImg" src="{{imgUrl+'/star/scout/scoutTitle2.png?v=002'}}"></image>
+      <image wx:if="{{maskid==2}}" class="titleImg" src="{{imgUrl+'/star/scout/scoutTitle3.png?v=002'}}"></image>
       <image class="txt" wx:if="{{maskid<4}}" src="{{imgUrl+'/star/scout/tipContent.png'}}"></image>
       <image class="txt2" wx:if="{{maskid>3}}" src="{{imgUrl+'/star/txt1.png'}}"></image>
       <image class="closeBtn" src="{{imgUrl+'/star/closebtn.png'}}" bindtap="hiddenTip"></image>

496_dongfengqichen/pages/scout/scout.wxss

 }
 .tipContent{
   position: relative;
-  width: 560rpx;
+  width: 557rpx;
   height: 403rpx;
   border-radius: 30rpx;
   background-color: #ffffff;
   margin: 20rpx auto 40rpx auto;
 }
 .titleImg{
-  width: 560rpx;
-  height: 77rpx;
+  width: 557rpx;
+  height: 76rpx;
 }
 .newImagesGroup{
   position: relative;

496_dongfengqichen/pages/scoutRule/scoutRule.wxml

     <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/46.png'}}"></image>
+    <image class="newImages46" src="{{imgUrl+'/newImages/52.png'}}"></image>
   </view>
 </view>

496_dongfengqichen/pages/star/star.wxml

   <view class="home">
     <view class="bgGroup">
       <image class="bg" src="{{imgUrl+'/newImages/42.png'}}"></image>
-      <image class="starBtn" bindtap="scout" src="{{imgUrl+'/newImages/32.png'}}"></image>
+      <image class="starBtn" bindtap="scout" src="{{imgUrl+'/newImages/53.png'}}"></image>
     </view>
     <image class="logo1" src="{{imgUrl+'/star/logo1.png'}}"></image>
     <image class="logo2" src="{{imgUrl+'/star/logo2.png'}}"></image>

496_dongfengqichen/pages/userMsg/userMsg.js

           title: res.msg,
         })
         if (res.code == 200) {
-          this.closeXieyi();
+          if (app.globalData.skipType == 'mycenter') {
+            app.globalData.skipType = null;
+            wx.reLaunch({
+              url: '/pages/myCenter/myCenter',
+            })
+          } else {
+            this.closeXieyi();
+          }
         }
       }, this, "POST")
     },
           title: res.msg,
         })
         if (res.code == 200) {
-          this.closeXieyi();
+          if (app.globalData.skipType == 'mycenter') {
+            app.globalData.skipType = null;
+            wx.reLaunch({
+              url: '/pages/myCenter/myCenter',
+            })
+          } else {
+            this.closeXieyi();
+          }
         }
       }, this, "POST");
     },

496_dongfengqichen/pages/yuyue/yuyue.wxml

         </view>
       </view>
       <view class="subscribeBtn" bindtap="subscribeFun">
-        <image style="width:100%;height:100%;" src="{{imgUrl+'/btns/myCenterBtn1.png'}}"></image>
+        <image style="width:100%;height:100%;" src="{{imgUrl+'/newIcon/20.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+'/btns/myCenterBtn2.png'}}"></image>
+        <image style="width:100%;height:100%;" src="{{imgUrl+'/newIcon/21.png'}}"></image>
       </view>
   </view>
   <agreement bindmyevent="agreementControl" wx:if="{{agreement}}"></agreement>