功能优化

496_dongfengqichen/pages/configure/configure.wxml

@@ -4,7 +4,7 @@
     <image class="newImages2-82" src="{{imgUrl+'/newImages2/82.png'}}"></image>
   </view>
   <view class="carTitle">
-    <view>车型价格 xxxxxx万元</view>
+    <view>敬请期待</view>
     <view class="selectTypeGroup" bindtap="carTypeControl">
       <view class="selectType">
         <view>{{carTypeData[chooseType].name+carTypeData[chooseType].edition}}</view>

496_dongfengqichen/pages/index/index.wxml

@@ -64,7 +64,7 @@
       <view class="dotGroup3">
         <image class="{{swiperGroup.three.current!=index?'newImages2-80':'newImages2-81'}}" wx:for="{{swiperGroup.three.nums}}" wx:key="index" src="{{imgUrl+'/newImages2/'+(swiperGroup.three.current!=index?'80':'81')+'.png'}}"></image>
       </view>
-      <image class="testText3" src="{{imgUrl+'/newImages2/testImg/3/'+(swiperGroup.three.current+1)+'_2.png?v=004'}}"></image>
+      <image class="testText3" src="{{imgUrl+'/newImages2/testImg/3/'+(swiperGroup.three.current+1)+'_2.png?v=005'}}"></image>
       <swiper class="swiper4" bindchange="swiperChange" data-num="4" current="{{swiperGroup.four.current}}">
         <swiper-item wx:for="{{swiperGroup.four.nums}}" wx:key="index">
           <image style="width:100%;height:100%;" src="{{imgUrl+'/newImages2/testImg/4/'+(index+1)+'_1.png?v=003'}}"></image>
@@ -79,7 +79,7 @@
       <view class="dotGroup4">
         <image class="{{swiperGroup.four.current!=index?'newImages2-80':'newImages2-81'}}" wx:for="{{swiperGroup.four.nums}}" wx:key="index" src="{{imgUrl+'/newImages2/'+(swiperGroup.four.current!=index?'80':'81')+'.png'}}"></image>
       </view>
-      <image class="testText4" src="{{imgUrl+'/newImages2/testImg/4/'+(swiperGroup.four.current+1)+'_2.png?v=004'}}"></image>
+      <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>
       </view>

496_dongfengqichen/pages/lookPrizeDetail/lookPrizeDetail.wxml

@@ -28,7 +28,7 @@
       </view>
     </view>
     <view wx:if="{{lookIndex.awardId == 9 || lookIndex.awardId == 11}}">
-      <image src="{{imgUrl+'/newImages3/prizeDetail2/'+lookIndex.awardId+'_1.png'}}" style="width:750rpx;" mode="widthFix"></image>
+      <image src="{{imgUrl+'/newImages3/prizeDetail2/'+lookIndex.awardId+'_1.png?v=002'}}" style="width:750rpx;" mode="widthFix"></image>
       <view style="position: relative;">
         <image src="{{imgUrl+'/newImages3/prizeDetail2/'+lookIndex.awardId+'_2_'+showType+'.png?v=004'}}" style="width:750rpx;" mode="widthFix"></image>
         <view class="image6Btn3" wx:if="{{showType!=1}}" bindtap="showTypeControl" data-type="1"></view>

496_dongfengqichen/pages/myCenter/myCenter.js

@@ -103,7 +103,7 @@ Page({
         couponCode: "我是卡号",//卡号
         couponSecret:"我是卡密",//卡密
         dead_date:"我是有效期",//有效期
-        awardState: 0,
+        awardState: 1,
         cdate: "2020-03-23",
         awardId: 4
       },
@@ -114,7 +114,7 @@ Page({
         couponCode: "我是卡号",//卡号
         couponSecret:"我是卡密",//卡密
         dead_date:"我是有效期",//有效期
-        awardState: 0,
+        awardState: 1,
         cdate: "2020-03-23",
         awardId: 5
       },
@@ -125,7 +125,7 @@ Page({
         couponCode: "我是卡号",//卡号
         couponSecret:"我是卡密",//卡密
         dead_date:"我是有效期",//有效期
-        awardState: 0,
+        awardState: 1,
         cdate: "2020-03-23",
         awardId: 6,
         productId:2501
@@ -137,7 +137,7 @@ Page({
         couponCode: "我是卡号",//卡号
         couponSecret:"我是卡密",//卡密
         dead_date:"我是有效期",//有效期
-        awardState: 0,
+        awardState: 1,
         cdate: "2020-03-23",
         awardId: 7
       },
@@ -148,7 +148,7 @@ Page({
         couponCode: "我是卡号",//卡号
         couponSecret:"我是卡密",//卡密
         dead_date:"我是有效期",//有效期
-        awardState: 0,
+        awardState: 1,
         cdate: "2020-03-23",
         awardId: 8
       },
@@ -159,7 +159,7 @@ Page({
         couponCode: "我是卡号",//卡号
         couponSecret:"我是卡密",//卡密
         dead_date:"我是有效期",//有效期
-        awardState: 0,
+        awardState: 1,
         cdate: "2020-03-23",
         awardId: 9
       },
@@ -170,7 +170,7 @@ Page({
         couponCode: "我是卡号",//卡号
         couponSecret:"我是卡密",//卡密
         dead_date:"我是有效期",//有效期
-        awardState: 0,
+        awardState: 1,
         cdate: "2020-03-23",
         awardId: 11
       },
@@ -656,7 +656,12 @@ Page({
       this.setData({
         mycenterTipWindow:1,
       })
-    } else {
+    } else if(this.data.recordList[index].awardState == 0 && this.data.isAddress){
+      wx.showToast({
+        title:"购车成功后可用",
+        icon:"none"
+      })
+    }else {
       this.setData({
         lookIndex: (index || index == 0) ? this.data.recordList[index] : null,
         lookPrizeDetail: !this.data.lookPrizeDetail
@@ -778,9 +783,12 @@ Page({
     this.setData({
       addressShow:!this.data.addressShow
     })
-    if (this.data.isAddress== false){
+    if (!this.data.isAddress){
       this.getAddress();
     }
+    if(this.data.selectNow==2 && this.data.recordNow == 1 && !this.data.addressShow){
+      this.getMyAwardList();
+    }
   },
   agreementState: function () {//协议
     this.setData({

496_dongfengqichen/pages/myCenter/myCenter.wxml

@@ -216,16 +216,17 @@
     </view>
     <view class="placingOrder" wx:if="{{selectNow==4 && buyState}}">
       <view style="display:flex;align-items:center;">
-        <image class="orderHead" src="{{userData.avatarUrl}}"></image>
+        <image class="orderHead" src="{{imgUrl+'/newImages3/47.png'}}"></image>
         <view style="margin-left:15rpx;margin-right:101rpx;">
           <view class="cardTitle">启辰星VIP预定卡</view>
           <view class="cardCtime">{{buyStateTime}}</view>
         </view>
       </view>
-      <view style="display:flex;align-items:center;">
+      <image class="orderCard" bindtap="vipDetailControl" src="{{imgUrl+'/newImages3/48.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> -->
     </view>
     <service></service>
     <view class="prizeDesc" catchtouchmove="ture" wx:if="{{mycenterTipWindow==1}}">
@@ -282,11 +283,18 @@
         <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">
+    <view class="prizeDesc" style="background-color:white;display:block;overflow:auto;" wx:if="{{vipDetailShow}}">
+      <view class="titleText">查看详情</view>
+      <view class="lineSty"></view>
+      <image class="closeXieyi" bindtap="vipDetailControl" src="{{imgUrl+'/images/closeXieyi.png'}}"></image>
+      <view style="position:relative;">
+        <image style="width:750rpx;height:1900rpx;" src="{{imgUrl+'/newImages3/46.png'}}"></image>
+        <image class="newImages3-45" bindtap="vipDetailControl" src="{{imgUrl+'/newImages3/45.png'}}"></image>
+      </view>
+      <!-- <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>
   </view>
   <agreement bindmyevent="agreementControl" wx:if="{{agreement}}"></agreement>

496_dongfengqichen/pages/myCenter/myCenter.wxss

@@ -665,13 +665,12 @@ view{
   padding-bottom: 11rpx;
 }
 .orderHead{
-  width: 80rpx;
-  height: 80rpx;
-  border-radius: 50%;
+  width: 163rpx;
+  height: 105rpx;
 }
 .orderCard{
-  width: 181rpx;
-  height: 117rpx;
+  width: 98rpx;
+  height: 39rpx;
 }
 .cardTitle{
   line-height: 18rpx;
@@ -902,4 +901,38 @@ view{
 .lookDetail{
   width: 98rpx;
   height: 39rpx;
+}
+
+.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;
+  right: 48rpx;
+  top: 38rpx;
+  width: 42rpx;
+  height: 42rpx;
+}
+.newImages3-45{
+  position: absolute;
+  left: 50%;
+  transform: translateX(-50%);
+  bottom: 70rpx;
+  width:276rpx;
+  height: 50rpx;
 }