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

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

 <!--pages/component/service/index.wxml-->
 <view>
   <image class="serviceIcon" bindtap="maskShow" src="{{imgUrl+'/newIcon/3.png'}}"></image>
-  <image class="serviceIcon" bindtap="openYuyue" style="top:577rpx;" src="{{imgUrl+'/newIcon/4.png'}}"></image>
+  <image class="serviceIcon" bindtap="openYuyue" style="top:376rpx;" src="{{imgUrl+'/newIcon/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>

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

   width: 81rpx;
   height: 81rpx;
   position: fixed;
-  top: 471rpx;
+  top: 270rpx;
   right: 30rpx;
 }
 .maskGroup{

496_dongfengqichen/pages/configure/configure.js

   data: {
     imgUrl: app.globalData.urlStatic,//图片路径
     paramesSwitchNum:0,
-    carTypeShow:false
+    carTypeShow:false,
+    carTypeData:[
+      { name: "260T 手动", edition: "星悦版" },
+      { name: "260T 自动", edition: "星尚版" },
+      { name: "260T 48V轻混增压", edition: "星享版" },
+      { name: "260T 48V轻混增压", edition: "星睿版" },
+      { name: "260T 48V轻混增压", edition: "星曜版" }
+    ],
+    chooseType:0
   },
 
   /**
     this.setData({
       carTypeShow: !this.data.carTypeShow
     })
+  },
+  selectCarType:function(e){
+    if (this.data.chooseType != e.currentTarget.dataset.num) {
+      this.setData({
+        chooseType: e.currentTarget.dataset.num
+      })
+    }
+    this.carTypeControl();
   }
 })

496_dongfengqichen/pages/configure/configure.wxml

     <image class="newImages2-82" src="{{imgUrl+'/newImages2/82.png'}}"></image>
   </view>
   <view class="carTitle">
-    <view>车型价格 12.78万元</view>
+    <view>车型价格 xxxxxx万元</view>
     <view class="selectTypeGroup" bindtap="carTypeControl">
       <view class="selectType">
-        <view>260T 手动星悦版</view>
+        <view>{{carTypeData[chooseType].name+carTypeData[chooseType].edition}}</view>
         <image class="newImages2-83" src="{{imgUrl+'/newImages2/83.png'}}"></image>
       </view>
     </view>
         <image class="newImages2-86" wx:if="{{paramesSwitchNum==1}}" src="{{imgUrl+'/newImages2/86.png'}}"></image>
       </view>
     </view>
-    <image class="newImages2-87" wx:if="{{paramesSwitchNum==1}}" src="{{imgUrl+'/newImages2/87.png'}}"></image>
+    <image class="configure1" wx:if="{{paramesSwitchNum==1}}" src="{{imgUrl+'/configure/'+chooseType+'/1.jpg'}}"></image>
     <view class="paramesGroup {{paramesSwitchNum==2?'selectSty':''}}" bindtap="chooseType" data-type="2">
       <view class="paramesContent">
         <view>全新造型</view>
         <image class="newImages2-86" wx:if="{{paramesSwitchNum==2}}" src="{{imgUrl+'/newImages2/86.png'}}"></image>
       </view>
     </view>
+    <image class="configure2" wx:if="{{paramesSwitchNum==2}}" src="{{imgUrl+'/configure/'+chooseType+'/2.jpg'}}"></image>
     <view class="paramesGroup {{paramesSwitchNum==3?'selectSty':''}}" bindtap="chooseType" data-type="3">
       <view class="paramesContent">
         <view>联盟技术</view>
         <image class="newImages2-86" wx:if="{{paramesSwitchNum==3}}" src="{{imgUrl+'/newImages2/86.png'}}"></image>
       </view>
     </view>
+    <image class="configure3" wx:if="{{paramesSwitchNum==3}}" src="{{imgUrl+'/configure/'+chooseType+'/3.jpg'}}"></image>
     <view class="paramesGroup {{paramesSwitchNum==4?'selectSty':''}}" bindtap="chooseType" data-type="4">
       <view class="paramesContent">
         <view>智趣科技</view>
         <image class="newImages2-86" wx:if="{{paramesSwitchNum==4}}" src="{{imgUrl+'/newImages2/86.png'}}"></image>
       </view>
     </view>
-    <image class="newImages2-88" wx:if="{{paramesSwitchNum==4}}" src="{{imgUrl+'/newImages2/88.png'}}"></image>
+    <image class="configure4" wx:if="{{paramesSwitchNum==4}}" src="{{imgUrl+'/configure/'+chooseType+'/4.jpg'}}"></image>
     <view class="paramesGroup {{paramesSwitchNum==5?'selectSty':''}}" bindtap="chooseType" data-type="5">
       <view class="paramesContent" style="border:none;">
         <view>越级舒适</view>
         <image class="newImages2-86" wx:if="{{paramesSwitchNum==5}}" src="{{imgUrl+'/newImages2/86.png'}}"></image>
       </view>
     </view>
-    <image class="newImages2-89" wx:if="{{paramesSwitchNum==5}}" src="{{imgUrl+'/newImages2/89.png'}}"></image>
+    <image class="configure5" wx:if="{{paramesSwitchNum==5}}" src="{{imgUrl+'/configure/'+chooseType+'/5.jpg'}}"></image>
   </view>
   <image class="newImages2-90" src="{{imgUrl+'/newImages2/90.png'}}"></image>
   <image class="newImages2-85" bindtap="backPage" src="{{imgUrl+'/newImages2/85.png'}}"></image>
   <image class="newImages2-91" src="{{imgUrl+'/newImages2/91.png'}}"></image>
   <view class="carTypeFrame" wx:if="{{carTypeShow}}">
-    <view class="carTypeGroup" bindtap="carTypeControl">
-      <view>260T 自动</view>
-      <view>星尚版</view>
-    </view>
-    <view class="carTypeGroup" bindtap="carTypeControl">
-      <view>260T 48V轻混增压</view>
-      <view>星享版</view>
-    </view>
-    <view class="carTypeGroup" bindtap="carTypeControl">
-      <view>260T 48V轻混增压</view>
-      <view>星睿版</view>
-    </view>
-    <view class="carTypeGroup" bindtap="carTypeControl">
-      <view>260T 48V轻混增压</view>
-      <view>星曜版</view>
+    <view class="carTypeGroup {{chooseType==index?'chooseTypeGroup':''}}" bindtap="selectCarType" data-num="{{index}}" wx:for="{{carTypeData}}" wx:key="index">
+      <view>{{item.name}}</view>
+      <view>{{item.edition}}</view>
     </view>
   </view>
 </view>

496_dongfengqichen/pages/configure/configure.wxss

   justify-content: space-between;
   padding: 0 30rpx;
   background-color: black;
-  font-size:30rpx;
-  font-family:PingFangSC;
+  font-size:28rpx;
+  font-family: NissanBrand;
   font-weight:300;
   color:rgba(255,255,255,1);
-  line-height:30rpx;
+  line-height:28rpx;
 }
 .newImages2-83{
   width: 23rpx;
   height: 14rpx;
-  margin-left: 6rpx;
+  margin-left: 17rpx;
 }
 .selectTypeGroup{
   height: 100%;
   height: 4rpx;
   margin-left: 6rpx;
 }
-.newImages2-87{
+.configure1{
+  width: 750rpx;
+  height: 1690rpx;
+}
+.configure2{
+  width: 750rpx;
+  height: 1051rpx;
+}
+.configure3{
+  width: 750rpx;
+  height: 2087rpx;
+}
+.configure4{
   width: 750rpx;
-  height: 5085rpx;
+  height: 3464rpx;
+}
+.configure5{
+  width: 750rpx;
+  height: 1775rpx;
 }
 .newImages2-88{
   width: 750rpx;
   position: absolute;
   top: 309rpx;
   right: 0;
-  background-color: black;
+  background-color: #f0f0f0;
 }
 .carTypeGroup{
   width: 340rpx;
   height: 100rpx;
-  font-size:30rpx;
+  font-size:28rpx;
   font-family:NissanBrand;
-  font-weight:300;
-  color:rgba(255,255,255,1);
+  font-weight:400;
+  color:rgba(35,24,21,1);
   line-height:40rpx;
   display: flex;
   flex-direction: column;
   align-items: center;
   justify-content: center;
+  border-bottom:2rpx solid white; 
+}
+.chooseTypeGroup{
+  background-color: #666666;
+  border-bottom:2rpx solid #8f8f8f; 
+  color:rgba(255,255,255,1);
+}
+.carTypeGroup:last-child{
+  border-bottom:none;
 }

496_dongfengqichen/pages/index/index.wxml

 <view class="all" wx:if="{{mainShow}}">
   <view class="main" wx:if="{{isStartAdvertising==0 || !isStartAdvertisingShow}}">
     <view class="contentFrame">
-      <image class="newImages2-76" src="{{imgUrl+'/newImages2/76.jpg'}}"></image>
-      <image class="newImages2-11" wx:if="{{!buyState}}" bindtap="placingControl" src="{{imgUrl+'/newImages2/11.png'}}"></image>
-      <image class="newImages2-12" bindtap="lookConfigure" src="{{imgUrl+'/newImages2/12.png'}}"></image>
-      <image class="newImages2-13" bindtap="vrLookCar" src="{{imgUrl+'/newImages2/13.png'}}"></image>
+      <image class="newImages2-76" src="{{imgUrl+'/newImages2/76.jpg?v=003'}}"></image>
+      <image class="newImages2-11" wx:if="{{buyState}}" bindtap="placingControl" src="{{imgUrl+'/newImages2/97.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}}">
         <swiper-item wx:for="{{swiperGroup.one.nums}}" wx:key="index">
           <image style="width:100%;height:100%;" src="{{imgUrl+'/newImages2/testImg/1/'+(index+1)+'_1.png'}}"></image>
       </view>
       <image class="testText4" src="{{imgUrl+'/newImages2/testImg/4/'+(swiperGroup.four.current+1)+'_2.png'}}"></image>
       <view class="lookMoreCar">
-        <image class="newImages2-14" bindtap="lookMore" src="{{imgUrl+'/newImages2/14.png'}}"></image>
+        <image class="newImages2-14" bindtap="lookMore" src="{{imgUrl+'/newImages2/100.png'}}"></image>
       </view>
     </view>
     <service></service>

496_dongfengqichen/pages/index/index.wxss

   background-color: #00a0e9;
 }
 .newImages2-14{
-  width: 448rpx;
-  height: 69rpx;
+  width: 449rpx;
+  height: 70rpx;
 }
 .newImages2-11{
-  width:389rpx;
-  height: 60rpx;
+  width:390rpx;
+  height: 62rpx;
   position: absolute;
   top: 971rpx;
   left: 50%;
   transform: translateX(-50%);
 }
 .newImages2-13{
-  width:391rpx;
-  height: 62rpx;
+  width:390rpx;
+  height: 61rpx;
   position: absolute;
   top: 3632rpx;
   left: 50%;

496_dongfengqichen/pages/mobileVerification/mobileVerification.js

     this.setData({
       agreement: !this.data.agreement
     })
+  },
+  showRule: function () {
+    if (app.globalData.entered) {
+      wx.navigateTo({ url: '/pages/everyday/everyday' })
+    } else {
+      wx.navigateTo({
+        url: '/pages/fragmentRule/fragmentRule'
+      })
+    }
   }
 })

496_dongfengqichen/pages/mobileVerification/mobileVerification.wxml

 <!--pages/mobileVerification/mobileVerification.wxml-->
 <view class="all" >
   <view class="main">
-    <image class="bg" src="{{imgUrl+'/star/bg.jpg'}}"></image>
+    <image class="bg" src="{{imgUrl+'/newImages2/92.png'}}"></image>
+    <image class="starRule" bindtap="showRule" src="{{imgUrl+'/newIcon/2.png'}}"></image>
     <view class="msgFrame">
       <view class="titleGroup">
         <image class="mobilepagelogo" src="{{imgUrl+'/images/mobilepagelogo.png'}}"></image>
         </view>
         <view class="inputGroup" style="justify-content: space-between;margin-top:30rpx;">
           <input class="inputText" bindinput="getCodeText" placeholder="短信验证码"></input>
+          <!-- <image src="{{imgUrl+'/newImages2/95.png'}}"></image> -->
           <view class="codeSty" bindtap="getCode">{{verificationCode}}</view>
         </view>
       </view>
       <view class="agreementGroup">
         <image class="agreeIcon" bindtap="agreementState" src="{{imgUrl+(isAgreement?'/images/agreeIcon.png':'/images/disagreeIcon.png')}}"></image>
-        <view class="agreementText"><view>我仔细阅读并接受所附的</view><view bindtap="agreementControl">《用户协议与隐私政策》</view></view>
+        <view class="agreementText"><view>我仔细阅读并接受所附的</view><view style="color:#355488;font-weight:bold;" bindtap="agreementControl">《用户协议与隐私政策》</view></view>
       </view>
-      <view class="submitBtn" bindtap="submitMobile">提交</view>
+      <image class="submitBtn" bindtap="submitMobile" src="{{imgUrl+'/newImages2/93.png'}}"></image>
     </view>
   </view>
   <agreement bindmyevent="agreementControl" wx:if="{{agreement}}"></agreement>

496_dongfengqichen/pages/mobileVerification/mobileVerification.wxss

   top: 0;
   left: 0;
   width: 750rpx;
-  height: 1353rpx;
+  height: 1111rpx;
 }
 .msgFrame{
   position: absolute;
 .codeSty{
   width:162rpx;
   height:50rpx;
-  background-color: #16538E;
+  background-color: #345482;
   border-radius: 20rpx;
   line-height: 50rpx;
   text-align: center;
   color:rgba(255,255,255,1);
 }
 .submitBtn{
-  width:710rpx;
-  height:71rpx;
-  background-color: #16538E;
-  text-align: center;
-  line-height: 71rpx;
-  font-size:30rpx;
-  font-family:PingFangSC;
-  font-weight:400;
-  color:rgba(255,255,255,1);
-  border-radius: 20rpx;
+  width:711rpx;
+  height:70rpx;
 }
 .agreementGroup{
   display: flex;
   top: 0;
   z-index: 2;
   opacity: 0;
+}
+.starRule{
+  width: 81rpx;
+  height: 81rpx;
+  position: fixed;
+  right: 29rpx;
+  top: 175rpx;
 }

496_dongfengqichen/pages/myCenter/myCenter.wxml

           <view class="cardCtime">{{buyStateTime}}</view>
         </view>
       </view>
-      <image class="orderCard" bindtap="vipDetailControl" src="{{imgUrl+'/newImages2/67.png'}}"></image>
+      <view style="display:flex;align-items:center;">
+        <image class="recordTip" bindtap="vipDetailControl" style="margin-right:25rpx;" src="{{imgUrl+'/images/recordTip.png'}}"></image>
+        <image class="orderCard" src="{{imgUrl+'/newImages2/67.png'}}"></image>
+      </view>
     </view>
     <service></service>
     <view class="prizeDesc" catchtouchmove="ture" wx:if="{{mycenterTipWindow==1}}">

496_dongfengqichen/pages/userMsg/userMsg.wxml

         <view class="headTitle">头像</view>
         <view class="selectGroup">
           <image class="avatarUrl" bindtap="changeHeadImg" src="{{avatarUrlShow}}"></image>
-          <image src="{{imgUrl+'/images/selectIcon.png'}}" class="selectIcon"></image>
+          <!-- <image src="{{imgUrl+'/images/selectIcon.png'}}" class="selectIcon"></image> -->
         </view>
       </view>
       <view class="headGroup nickGroup">
         <textarea class="msgInput addressTextarea" maxlength="-1" style="margin-top:{{marginT}}rpx;" bindinput="getAddressDetail" value="{{submitData.addressDetail}}"></textarea>
       </view>
     </view>
-    <image class="saveAddress" bindtap="saveUserMsg" src="{{imgUrl+'/btns/addressSave.png'}}"></image>
+    <image class="saveAddress" bindtap="saveUserMsg" src="{{imgUrl+'/newImages2/96.png'}}"></image>
   </view>
 </view>

496_dongfengqichen/pages/userMsg/userMsg.wxss

   width:109rpx;
   height:109rpx;
   border-radius: 50%;
+  margin-right: 49rpx;
 }
 .nickGroup{
   height: 119rpx;