页面更新+功能优化

496_dongfengqichen/app.js

@@ -318,12 +318,10 @@ App({
   },
   addAppEnter: function () {//小程序整体pv统计
     this.wxRequest(this.globalData.urlRoot + "statistics/addAppEnter", { scene:this.globalData.sceneSource}, res => {
-      console.log(res);
     }, this,"POST");
   },
   addPageEnter: function (e) {//小程序页面pv统计
     this.wxRequest(this.globalData.urlRoot + "statistics/addPageEnter", { scene: this.globalData.sceneSource, statisticsType:e }, res => {
-      console.log(res);
     }, this, "POST");
   }
 })

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

@@ -13,10 +13,18 @@ Component({
    */
   data: {
     imgUrl: app.globalData.urlStatic,//图片路径
-    maskState:false,//遮罩显示状态
-    yuyueShow:false,
+    maskState: false,//遮罩显示状态
+    placing: false,
+    buyState: false,
+    nowPage: '0',
+    yuyueShow: false,
+  },
+  attached:function(){
+    this.setData({
+      nowPage:app.globalData.nowPage,
+      buyState: app.globalData.getBuyState?app.globalData.getBuyState.success:false
+    })
   },
-
   /**
    * 组件的方法列表
    */
@@ -45,9 +53,19 @@ Component({
         }
       })
     },
-    openYuyue:function(){//预约
+    placingControl: function () {
+      if (app.globalData.getBuyState.success != this.data.buyState) {
+        this.setData({
+          buyState: app.globalData.getBuyState.success
+        })
+      }
+      this.setData({
+        placing: !this.data.placing
+      })
+    },
+    openYuyue: function () {//预约
       this.setData({
-        yuyueShow: !this.data.yuyueShow        
+        yuyueShow: !this.data.yuyueShow
       })
     }
   }

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

@@ -1,6 +1,7 @@
 {
   "component": true,
   "usingComponents": {
+    "placingOrder": "/pages/placingOrder/placingOrder",
     "yuyue": "/pages/yuyue/yuyue"
   }
 }

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

@@ -1,7 +1,8 @@
 <!--pages/component/service/index.wxml-->
 <view>
   <image class="serviceIcon" bindtap="maskShow" src="{{imgUrl+'/newIcon/3.png'}}"></image>
-  <image class="serviceIcon" bindtap="openYuyue" style="top:376rpx;" src="{{imgUrl+'/newIcon/4.png'}}"></image>
+  <image class="serviceIcon" wx:if="{{nowPage!=1}}" bindtap="openYuyue" style="top:376rpx;" src="{{imgUrl+'/newIcon/4.png'}}"></image>
+  <image class="serviceIcon" wx:if="{{!buyState && nowPage==1}}" bindtap="placingControl" style="top:376rpx;" src="{{imgUrl+'/newImages3/41.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>
@@ -10,5 +11,6 @@
       <button style="min-height: 0;" class="serviceBtn" open-type="contact"></button>
     </view>
   </view>
+  <placingOrder  bindplacing="placingControl" wx:if="{{placing}}"></placingOrder>
   <yuyue bindyuyue="openYuyue" wx:if="{{yuyueShow}}"></yuyue>
 </view>

496_dongfengqichen/pages/index/index.js

@@ -36,11 +36,12 @@ Page({
     kvurl: null,//顶部大图
     kvurlH:0,
     showAppointment:false,
-    placing:false,
-    buyState:false,
+    // placing:false,
+    // buyState:false,
     isStartAdvertisingFunState:false,
     playBtnDeg:0,
-    videoShow:false,
+    videoShow: false,
+    yuyueShow: false,
     swiperGroup:{
       one:{
         nums:4,
@@ -62,7 +63,7 @@ Page({
   },
   onLoad: function (options) {
     if (app.globalData.isFirstLogin) {
-      console.log("第一次进入");
+      // console.log("第一次进入");
       wx.reportAnalytics('event_source_launch', {
         source: options.source ? options.source :0
       });
@@ -117,21 +118,21 @@ Page({
     })
   },
   onShow: function () {
-    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
-    })
-  },
+  // getBuyStates:function(){
+  //   this.setData({
+  //     buyState: app.globalData.getBuyState.success
+  //   })
+  // },
   provinceChane: function (e) {//选中省
     this.setData({
       provinceValue: e.detail.value,
@@ -497,16 +498,16 @@ Page({
       showAppointment: !this.data.showAppointment
     })
   },
-  placingControl:function(){
-    if (app.globalData.getBuyState.success != this.data.buyState){
-      this.setData({
-        buyState: app.globalData.getBuyState.success
-      })
-    }
-    this.setData({
-      placing: !this.data.placing
-    })
-  },
+  // 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){
@@ -580,5 +581,10 @@ Page({
         videoShow: false
       })
     }
+  },
+  openYuyue: function () {//预约
+    this.setData({
+      yuyueShow: !this.data.yuyueShow
+    })
   }
 })

496_dongfengqichen/pages/index/index.json

@@ -3,6 +3,6 @@
   "usingComponents": {
     "service": "../component/service/index",
     "tabBar": "../component/tabBar/index",
-    "placingOrder": "/pages/placingOrder/placingOrder"
+    "yuyue": "/pages/yuyue/yuyue"
   }
 }

496_dongfengqichen/pages/index/index.wxml

@@ -2,13 +2,22 @@
 <view class="all" wx:if="{{mainShow}}">
   <view class="main" wx:if="{{isStartAdvertising==0 || !isStartAdvertisingShow}}">
     <view class="contentFrame">
-      <image class="newImages2-76" src="{{imgUrl+'/newImages3/33.png'}}"></image>
+      <view class="newImages2-76">
+        <!-- <image style="width:750rpx;height:10694rpx;" src="{{imgUrl+'/newImages3/44.png'}}"></image> -->
+        <image style="width:750rpx;height:1370rpx;" src="{{imgUrl+'/newImages3/indexImgs/1.png?v=006'}}"></image>
+        <image style="width:750rpx;height:1574rpx;" src="{{imgUrl+'/newImages3/indexImgs/2.png?v=006'}}"></image>
+        <image style="width:750rpx;height:1606rpx;" src="{{imgUrl+'/newImages3/indexImgs/3.png?v=006'}}"></image>
+        <image style="width:750rpx;height:1446rpx;" src="{{imgUrl+'/newImages3/indexImgs/4.png?v=006'}}"></image>
+        <image style="width:750rpx;height:1420rpx;" src="{{imgUrl+'/newImages3/indexImgs/5.png?v=006'}}"></image>
+        <image style="width:750rpx;height:1458rpx;" src="{{imgUrl+'/newImages3/indexImgs/6.png?v=006'}}"></image>
+        <image style="width:750rpx;height:1820rpx;" src="{{imgUrl+'/newImages3/indexImgs/7.png?v=006'}}"></image>
+      </view>
       <view class="videoGroup" bindtap="playVideo">
         <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="newImages2-11" wx:if="{{!buyState}}" bindtap="placingControl" src="{{imgUrl+'/newImages2/111.png'}}"></image>
+      <image class="newImages2-11" bindtap="openYuyue" src="{{imgUrl+'/newImages3/42.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}}">
@@ -71,12 +80,12 @@
         <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>
-      <view class="lookMoreCar" style="padding-bottom:{{!buyState?190:60}}rpx;">
+      <view class="lookMoreCar" style="padding-bottom:190rpx;">
         <image class="newImages2-14" bindtap="lookMore" src="{{imgUrl+'/newImages2/100.png'}}"></image>
       </view>
     </view>
     <service></service>
-    <placingOrder  bindplacing="placingControl" wx:if="{{placing}}"></placingOrder>
+    <yuyue bindyuyue="openYuyue" wx:if="{{yuyueShow}}"></yuyue>
   </view>
   <tabBar wx:if="{{isStartAdvertising==0 || !isStartAdvertisingShow}}"></tabBar>
   <image wx:if="{{isStartAdvertisingShow}}" bindtap="isStartAdvertisingFun" mode="widthFix" style="opacity:{{isStartAdvertising}};" src="{{startAdvertisingUrl}}" class='imgBg' catchtouchmove="ture"></image>

496_dongfengqichen/pages/index/index.wxss

@@ -241,7 +241,7 @@ view{
 }
 .newImages2-76{
   width: 750rpx;
-  height: 10194rpx;
+  /* height: 10694rpx; */
 }
 .lookMoreCar{
   width: 750rpx;
@@ -258,7 +258,7 @@ view{
 }
 .newImages2-11{
   width:710rpx;
-  height: 70rpx;
+  height: 71rpx;
   position: fixed;
   bottom: 180rpx;
   left: 50%;
@@ -269,7 +269,7 @@ view{
   width:390rpx;
   height: 62rpx;
   position: absolute;
-  top: 3545rpx;
+  top: 4044rpx;
   left: 50%;
   transform: translateX(-50%);
 }
@@ -277,20 +277,20 @@ view{
   width:390rpx;
   height: 61rpx;
   position: absolute;
-  top: 3915rpx;
+  top: 4414rpx;
   left: 50%;
   transform: translateX(-50%);
 }
 .swiper1{
   position: absolute;
   left: 0;
-  top: 4840rpx;
+  top: 5338rpx;
   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: 4840rpx;
+  top: 5338rpx;
   height: 477rpx;
   display: flex;
   align-items: center;
@@ -303,15 +303,15 @@ view{
   right:18rpx;
 }
 .arrow-left-2,.arrow-right-2{
-  top: 6233rpx;
+  top: 6732rpx;
   height: 496rpx;
 }
 .arrow-left-3,.arrow-right-3{
-  top: 7802rpx;
+  top: 8302rpx;
   height: 402rpx;
 }
 .arrow-left-4,.arrow-right-4{
-  top: 9285rpx;
+  top: 9785rpx;
   height: 447rpx;
 }
 .newImages2-78{
@@ -321,7 +321,7 @@ view{
 .dotGroup1,.dotGroup2,.dotGroup3,.dotGroup4{
   position: absolute;
   left: 0;
-  top: 5281rpx;
+  top: 5780rpx;
   width: 750rpx;
   height: 16rpx;
   display: flex;
@@ -329,13 +329,13 @@ view{
   justify-content: center;
 }
 .dotGroup2{
-  top: 6699rpx;
+  top: 7198rpx;
 }
 .dotGroup3{
-  top: 8157rpx;
+  top: 8657rpx;
 }
 .dotGroup4{
-  top: 9695rpx;
+  top: 10195rpx;
 }
 .newImages2-80{
   width: 17rpx;
@@ -349,7 +349,7 @@ view{
 }
 .testText{
   position: absolute;
-  top: 5327rpx;
+  top: 5834rpx;
   left: 50%;
   transform: translateX(-50%);
   width: 584rpx;
@@ -358,13 +358,13 @@ view{
 .swiper2{
   position: absolute;
   left: 0;
-  top: 6233rpx;
+  top: 6732rpx;
   width: 750rpx;
   height: 496rpx;
 }
 .testText2{
   position: absolute;
-  top: 6749rpx;
+  top: 7248rpx;
   left: 50%;
   transform: translateX(-50%);
   width: 598rpx;
@@ -373,13 +373,13 @@ view{
 .swiper3{
   position: absolute;
   left: 0;
-  top: 7802rpx;
+  top: 8302rpx;
   width: 750rpx;
   height: 402rpx;
 }
 .testText3{
   position: absolute;
-  top: 8226rpx;
+  top: 8726rpx;
   left: 50%;
   transform: translateX(-50%);
   width: 513rpx;
@@ -388,13 +388,13 @@ view{
 .swiper4{
   position: absolute;
   left: 0;
-  top: 9285rpx;
+  top: 9785rpx;
   width: 750rpx;
   height: 447rpx;
 }
 .testText4{
   position: absolute;
-  top: 9751rpx;
+  top: 10251rpx;
   left: 50%;
   transform: translateX(-50%);
   width: 522rpx;

496_dongfengqichen/pages/lookPrizeDetail/lookPrizeDetail.js

@@ -20,7 +20,9 @@ Component({
   },
   //组件生命周期函数-在组件实例进入页面节点树时执行
   attached(){
-    
+    if(this.data.lookIndex.productId){
+      this.getAwardProductInfo();
+    }
   },
   /**
    * 组件的方法列表
@@ -34,8 +36,13 @@ Component({
         showType: e.currentTarget.dataset.type
       })
     },
-    copyExchangeCode: function () {
-      var text = this.data.lookIndex.couponCode || this.data.lookIndex.productCode || "";
+    copyExchangeCode: function (e) {
+      var type = e.currentTarget.dataset.type;
+      if(type==1){
+        var text = this.data.lookIndex.couponCode;
+      }else{
+        var text = this.data.lookIndex.couponSecret;
+      }
       this.contentCopy(text);
     },
     contentCopy: function (text) {//内容复制
@@ -43,5 +50,17 @@ Component({
         data: text
       })
     },
+    getAwardProductInfo:function(){
+      app.wxRequest(app.globalData.urlRoot +"award/getAwardProductInfo",{productId:this.data.lookIndex.productId},res=>{
+        if(res.code==200){
+          this.data.lookIndex.couponCode = res.data.productCode;
+          this.data.lookIndex.couponSecret = res.data.productSecret;
+          this.data.lookIndex.dead_date = res.data.dead_date;
+          this.setData({
+            lookIndex: this.data.lookIndex
+          })
+        }
+      },this);
+    }
   }
 })

496_dongfengqichen/pages/lookPrizeDetail/lookPrizeDetail.wxml

@@ -17,9 +17,13 @@
       </view>
       <view style="position: relative;">
         <image src="{{imgUrl+'/newImages3/prizeDetail2/'+lookIndex.awardId+'_3.png'}}" style="width:750rpx;" mode="widthFix"></image>
-        <view class="exchangeCode">{{lookIndex.couponCode || lookIndex.productCode || ''}}
-          <image class="copyBtn" bindtap="copyExchangeCode" src="{{imgUrl+'/images/copyBtn.png'}}"></image>
+        <view class="exchangeCode">卡号：{{lookIndex.couponCode || ''}}
+          <image class="copyBtn" bindtap="copyExchangeCode" data-type="1" src="{{imgUrl+'/images/copyBtn.png'}}"></image>
         </view>
+        <view class="exchangeCode" style="top:600rpx;">卡密：{{lookIndex.couponSecret || ''}}
+          <image class="copyBtn" bindtap="copyExchangeCode" data-type="2" src="{{imgUrl+'/images/copyBtn.png'}}"></image>
+        </view>
+        <view class="exchangeCode" style="top:650rpx;">有效期：{{lookIndex.dead_date || ''}}</view>
         <!-- <image class="newImages3-37" src="{{imgUrl+'/newImages3/37.png'}}"></image> -->
       </view>
     </view>
@@ -33,9 +37,13 @@
       </view>
       <view style="position: relative;">
         <image src="{{imgUrl+'/newImages3/prizeDetail2/'+lookIndex.awardId+'_3.png'}}" style="width:750rpx;" mode="widthFix"></image>
-        <view class="exchangeCode" style="top:520rpx;">{{lookIndex.couponCode || lookIndex.productCode || ''}}
-          <image class="copyBtn" bindtap="copyExchangeCode" src="{{imgUrl+'/images/copyBtn.png'}}"></image>
+        <view class="exchangeCode" style="top:520rpx;">卡号：{{lookIndex.couponCode || ''}}
+          <image class="copyBtn" bindtap="copyExchangeCode" data-type="1" src="{{imgUrl+'/images/copyBtn.png'}}"></image>
+        </view>
+        <view class="exchangeCode" style="top:570rpx;">卡密：{{lookIndex.couponSecret || ''}}
+          <image class="copyBtn" bindtap="copyExchangeCode" data-type="2" src="{{imgUrl+'/images/copyBtn.png'}}"></image>
         </view>
+        <view class="exchangeCode" style="top:620rpx;">有效期：{{lookIndex.dead_date || ''}}</view>
         <!-- <image class="newImages3-37" src="{{imgUrl+'/newImages3/37.png'}}"></image> -->
       </view>
     </view>
@@ -43,9 +51,13 @@
         <image src="{{imgUrl+'/newImages3/prizeDetail2/'+lookIndex.awardId+'_1.png'}}" style="width:750rpx;" mode="widthFix"></image>
       <view style="position: relative;" wx:if="{{lookIndex.awardId != 16 && lookIndex.awardId != 17}}">
         <image src="{{imgUrl+'/newImages3/prizeDetail2/13_2.png'}}" style="width:750rpx;" mode="widthFix"></image>
-        <view class="exchangeCode" style="top:100rpx;">{{lookIndex.couponCode || lookIndex.productCode || ''}}
-          <image class="copyBtn" bindtap="copyExchangeCode" src="{{imgUrl+'/images/copyBtn.png'}}"></image>
+        <view class="exchangeCode" style="top:100rpx;">卡号：{{lookIndex.couponCode || ''}}
+          <image class="copyBtn" bindtap="copyExchangeCode" data-type="1" src="{{imgUrl+'/images/copyBtn.png'}}"></image>
+        </view>
+        <view class="exchangeCode" style="top:150rpx;">卡密：{{lookIndex.couponSecret || ''}}
+          <image class="copyBtn" bindtap="copyExchangeCode" data-type="2" src="{{imgUrl+'/images/copyBtn.png'}}"></image>
         </view>
+        <view class="exchangeCode" style="top:200rpx;">有效期：{{lookIndex.dead_date || ''}}</view>
         <!-- <image class="newImages3-37" src="{{imgUrl+'/newImages3/37.png'}}"></image> -->
       </view>
     </view>

496_dongfengqichen/pages/myCenter/myCenter.js

@@ -67,7 +67,9 @@ Page({
         awardDetailPicContentHeight:0,
         awardName: "头等舱机票", //奖品名称
         awardPicurl:"https://xingb.venucia.com/award/10_1.png",//奖品小图
-        productCode:"3cce61eac692e0dd37f0330dd2bb4df7",//奖品兑换码
+        couponCode: "我是卡号",//卡号
+        couponSecret:"我是卡密",//卡密
+        dead_date:"我是有效期",//有效期
         awardState: 0,
         cdate: "2020-03-23",
         awardId:1
@@ -76,7 +78,9 @@ Page({
         awardDetailPicContentHeight: 0,
         awardName: "小米扫地机器人", //奖品名称
         awardPicurl: "https://xingb.venucia.com/award/10_1.png",//奖品小图
-        productCode: "3cce61eac692e0dd37f0330dd2bb4df7",//奖品兑换码
+        couponCode: "我是卡号",//卡号
+        couponSecret:"我是卡密",//卡密
+        dead_date:"我是有效期",//有效期
         awardState: 1,
         cdate: "2020-03-23",
         awardId: 2
@@ -85,7 +89,9 @@ Page({
         awardDetailPicContentHeight: 0,
         awardName: "索尼无线蓝牙耳机", //奖品名称
         awardPicurl: "https://xingb.venucia.com/award/10_1.png",//奖品小图
-        productCode: "3cce61eac692e0dd37f0330dd2bb4df7",//奖品兑换码
+        couponCode: "我是卡号",//卡号
+        couponSecret:"我是卡密",//卡密
+        dead_date:"我是有效期",//有效期
         awardState: 1,
         cdate: "2020-03-23",
         awardId: 3
@@ -94,7 +100,9 @@ Page({
         awardDetailPicContentHeight: 0,
         awardName: "美的烤箱", //奖品名称
         awardPicurl: "https://xingb.venucia.com/award/10_1.png",//奖品小图
-        productCode: "3cce61eac692e0dd37f0330dd2bb4df7",//奖品兑换码
+        couponCode: "我是卡号",//卡号
+        couponSecret:"我是卡密",//卡密
+        dead_date:"我是有效期",//有效期
         awardState: 0,
         cdate: "2020-03-23",
         awardId: 4
@@ -103,7 +111,9 @@ Page({
         awardDetailPicContentHeight: 0,
         awardName: "200元油卡", //奖品名称
         awardPicurl: "https://xingb.venucia.com/award/10_1.png",//奖品小图
-        productCode: "3cce61eac692e0dd37f0330dd2bb4df7",//奖品兑换码
+        couponCode: "我是卡号",//卡号
+        couponSecret:"我是卡密",//卡密
+        dead_date:"我是有效期",//有效期
         awardState: 0,
         cdate: "2020-03-23",
         awardId: 5
@@ -112,16 +122,21 @@ Page({
         awardDetailPicContentHeight: 0,
         awardName: "100元京东E卡", //奖品名称
         awardPicurl: "https://xingb.venucia.com/award/10_1.png",//奖品小图
-        productCode: "3cce61eac692e0dd37f0330dd2bb4df7",//奖品兑换码
+        couponCode: "我是卡号",//卡号
+        couponSecret:"我是卡密",//卡密
+        dead_date:"我是有效期",//有效期
         awardState: 0,
         cdate: "2020-03-23",
-        awardId: 6
+        awardId: 6,
+        productId:2501
       },
       {
         awardDetailPicContentHeight: 0,
         awardName: "50元京东E卡", //奖品名称
         awardPicurl: "https://xingb.venucia.com/award/10_1.png",//奖品小图
-        productCode: "3cce61eac692e0dd37f0330dd2bb4df7",//奖品兑换码
+        couponCode: "我是卡号",//卡号
+        couponSecret:"我是卡密",//卡密
+        dead_date:"我是有效期",//有效期
         awardState: 0,
         cdate: "2020-03-23",
         awardId: 7
@@ -130,7 +145,9 @@ Page({
         awardDetailPicContentHeight: 0,
         awardName: "网易云音乐vip月卡", //奖品名称
         awardPicurl: "https://xingb.venucia.com/award/10_1.png",//奖品小图
-        productCode: "3cce61eac692e0dd37f0330dd2bb4df7",//奖品兑换码
+        couponCode: "我是卡号",//卡号
+        couponSecret:"我是卡密",//卡密
+        dead_date:"我是有效期",//有效期
         awardState: 0,
         cdate: "2020-03-23",
         awardId: 8
@@ -139,7 +156,9 @@ Page({
         awardDetailPicContentHeight: 0,
         awardName: "爱奇艺vip月卡", //奖品名称
         awardPicurl: "https://xingb.venucia.com/award/10_1.png",//奖品小图
-        productCode: "3cce61eac692e0dd37f0330dd2bb4df7",//奖品兑换码
+        couponCode: "我是卡号",//卡号
+        couponSecret:"我是卡密",//卡密
+        dead_date:"我是有效期",//有效期
         awardState: 0,
         cdate: "2020-03-23",
         awardId: 9
@@ -148,7 +167,9 @@ Page({
         awardDetailPicContentHeight: 0,
         awardName: "腾讯会员vip月卡", //奖品名称
         awardPicurl: "https://xingb.venucia.com/award/10_1.png",//奖品小图
-        productCode: "3cce61eac692e0dd37f0330dd2bb4df7",//奖品兑换码
+        couponCode: "我是卡号",//卡号
+        couponSecret:"我是卡密",//卡密
+        dead_date:"我是有效期",//有效期
         awardState: 0,
         cdate: "2020-03-23",
         awardId: 11
@@ -157,7 +178,9 @@ Page({
         awardDetailPicContentHeight: 0,
         awardName: "100元购车红包", //奖品名称
         awardPicurl: "https://xingb.venucia.com/award/10_1.png",//奖品小图
-        productCode: "3cce61eac692e0dd37f0330dd2bb4df7",//奖品兑换码
+        couponCode: "我是卡号",//卡号
+        couponSecret:"我是卡密",//卡密
+        dead_date:"我是有效期",//有效期
         awardState: 0,
         cdate: "2020-03-23",
         awardId: 13
@@ -166,7 +189,9 @@ Page({
         awardDetailPicContentHeight: 0,
         awardName: "100元机油升级券", //奖品名称
         awardPicurl: "https://xingb.venucia.com/award/10_1.png",//奖品小图
-        productCode: "3cce61eac692e0dd37f0330dd2bb4df7",//奖品兑换码
+        couponCode: "我是卡号",//卡号
+        couponSecret:"我是卡密",//卡密
+        dead_date:"我是有效期",//有效期
         awardState: 0,
         cdate: "2020-03-23",
         awardId: 14
@@ -175,7 +200,9 @@ Page({
         awardDetailPicContentHeight: 0,
         awardName: "500元现金", //奖品名称
         awardPicurl: "https://xingb.venucia.com/award/10_1.png",//奖品小图
-        productCode: "3cce61eac692e0dd37f0330dd2bb4df7",//奖品兑换码
+        couponCode: "我是卡号",//卡号
+        couponSecret:"我是卡密",//卡密
+        dead_date:"我是有效期",//有效期
         awardState: 0,
         cdate: "2020-03-23",
         awardId: 16
@@ -184,7 +211,9 @@ Page({
         awardDetailPicContentHeight: 0,
         awardName: "1000元现金", //奖品名称
         awardPicurl: "https://xingb.venucia.com/award/10_1.png",//奖品小图
-        productCode: "3cce61eac692e0dd37f0330dd2bb4df7",//奖品兑换码
+        couponCode: "我是卡号",//卡号
+        couponSecret:"我是卡密",//卡密
+        dead_date:"我是有效期",//有效期
         awardState: 0,
         cdate: "2020-03-23",
         awardId: 17
@@ -193,7 +222,9 @@ Page({
         awardDetailPicContentHeight: 0,
         awardName: "10元京东E卡", //奖品名称
         awardPicurl: "https://xingb.venucia.com/award/10_1.png",//奖品小图
-        productCode: "3cce61eac692e0dd37f0330dd2bb4df7",//奖品兑换码
+        couponCode: "我是卡号",//卡号
+        couponSecret:"我是卡密",//卡密
+        dead_date:"我是有效期",//有效期
         awardState: 0,
         cdate: "2020-03-23",
         awardId: 18
@@ -815,6 +846,9 @@ Page({
       if (res.code == 200) {
         if (res.data) {
           this.data.isAddress = true;
+          this.setData({
+            mycenterTipWindow:0
+          })
         }
       } else {
         wx.showToast({

496_dongfengqichen/pages/myCenter/myCenter.wxml

@@ -56,9 +56,9 @@
       <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="{{imgUrl+'/newImages2/58_'+(selectNow==4?2:1)+'.png'}}"></image>
+          <image class="appreciateIcon" src="{{imgUrl+'/newImages3/'+(selectNow==4?38:39)+'.png'}}"></image>
         </view>
-        <view class="selectText" style="color:{{selectNow==4?'#667ea3':'black'}}">{{buyState?"我的VIP卡":"我的订单"}}</view>
+        <view class="selectText" style="color:{{selectNow==4?'#667ea3':'black'}}">我的卡包</view>
       </view>
     </view>
     <image wx:if="{{selectNow<1 || selectNow>4}}" class="myCenterBotBg" src="{{imgUrl+'/images/myCenterBotBg.png'}}"></image>
@@ -211,7 +211,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+'/newImages2/68.png'}}"></image>
+      <image class="orderDesc" src="{{imgUrl+'/newImages3/40.png'}}"></image>
       <image class="indexOrderIcon" bindtap="placingControl" src="{{imgUrl+'/images/indexOrderIcon.png'}}"></image>
     </view>
     <view class="placingOrder" wx:if="{{selectNow==4 && buyState}}">

496_dongfengqichen/pages/myCenter/myCenter.wxss

@@ -86,8 +86,8 @@ view{
   margin-bottom: 16rpx;
 }
 .appreciateIcon{
-  width: 45rpx;
-  height: 52rpx;
+  width: 58rpx;
+  height: 46rpx;
   margin-bottom: 16rpx;
 }
 .selectText{
@@ -483,8 +483,8 @@ view{
   padding-bottom: 64rpx;
 }
 .orderDesc{
-  width: 627rpx;
-  height: 849rpx;
+  width: 636rpx;
+  height: 1107rpx;
   margin-bottom: 81rpx;
 }
 /* .ranksList{

496_dongfengqichen/pages/placingOrder/placingOrder.js

@@ -315,10 +315,10 @@ Component({
       },this,"POST");
     },
     closePage:function(){
-      // this.closeXieyi();
-      wx.reLaunch({
-        url: '/pages/index/index',
-      })
+      this.closeXieyi();
+      // wx.reLaunch({
+      //   url: '/pages/index/index',
+      // })
     },
     provinceDataChange:function(e){
       if (e.detail.column==0) {

496_dongfengqichen/pages/prizeDetail/prizeDetail.wxml

@@ -1,25 +1,25 @@
 <!--pages/prizeDetail/prizeDetail.wxml-->
 <view class="all">
   <view class="main">
-    <image wx:if="{{imgShow}}" style="width:750rpx;" mode="widthFix" src="{{imgUrl+'/newImages3/prizeDetail/'+nums+'.png'}}"></image>
+    <image wx:if="{{imgShow}}" style="width:750rpx;" mode="widthFix" src="{{imgUrl+'/newImages3/prizeDetail/'+nums+'.png?v=003'}}"></image>
     <view wx:if="{{nums==6 || nums==7 || nums==8}}">
-      <image style="width:750rpx;" mode="widthFix" src="{{imgUrl+'/newImages3/prizeDetail/'+nums+'_1.png'}}"></image>
+      <image style="width:750rpx;" mode="widthFix" src="{{imgUrl+'/newImages3/prizeDetail/'+nums+'_1.png?v=003'}}"></image>
       <view class="image6Group">
-        <image style="width:750rpx;" mode="widthFix" src="{{imgUrl+'/newImages3/prizeDetail/'+nums+'_2_'+showType+'.png'}}"></image>
+        <image style="width:750rpx;" mode="widthFix" src="{{imgUrl+'/newImages3/prizeDetail/'+nums+'_2_'+showType+'.png?v=003'}}"></image>
         <view class="image6Btn1" style="{{nums==7||nums==8?'top:20rpx;':''}}" wx:if="{{showType==2}}" bindtap="showTypeControl" data-type="1"></view>
         <view class="image6Btn2" style="{{nums==7||nums==8?'top:20rpx;':''}}" wx:if="{{showType==1}}" bindtap="showTypeControl" data-type="2"></view>
       </view>
-      <image style="width:750rpx;" mode="widthFix" src="{{imgUrl+'/newImages3/prizeDetail/'+nums+'_3.png'}}"></image>
+      <image style="width:750rpx;" mode="widthFix" src="{{imgUrl+'/newImages3/prizeDetail/'+nums+'_3.png?v=003'}}"></image>
     </view>
     <view wx:if="{{nums==9 || nums==10}}">
-      <image style="width:750rpx;" mode="widthFix" src="{{imgUrl+'/newImages3/prizeDetail/'+nums+'_1.png'}}"></image>
+      <image style="width:750rpx;" mode="widthFix" src="{{imgUrl+'/newImages3/prizeDetail/'+nums+'_1.png?v=003'}}"></image>
       <view class="image6Group">
-        <image style="width:750rpx;" mode="widthFix" src="{{imgUrl+'/newImages3/prizeDetail/'+nums+'_2_'+showType+'.png?v=002'}}"></image>
+        <image style="width:750rpx;" mode="widthFix" src="{{imgUrl+'/newImages3/prizeDetail/'+nums+'_2_'+showType+'.png?v=003'}}"></image>
         <view class="image6Btn3" wx:if="{{showType!=1}}" bindtap="showTypeControl" data-type="1"></view>
         <view class="image6Btn4" wx:if="{{showType!=2}}" bindtap="showTypeControl" data-type="2"></view>
         <view class="image6Btn5" wx:if="{{showType!=3}}" bindtap="showTypeControl" data-type="3"></view>
       </view>
-      <image style="width:750rpx;" mode="widthFix" src="{{imgUrl+'/newImages3/prizeDetail/'+nums+'_3.png'}}"></image>
+      <image style="width:750rpx;" mode="widthFix" src="{{imgUrl+'/newImages3/prizeDetail/'+nums+'_3.png?v=003'}}"></image>
     </view>
   </view>
   <tabBar></tabBar>

496_dongfengqichen/pages/userMsg/userMsg.js

@@ -186,6 +186,7 @@ Component({
         mask: true
       })
       app.wxRequest(app.globalData.urlRoot + "userInfo/updateUserInfo", this.data.userData, res => {
+        wx.hideLoading();
         if (res.code == 200) {
           app.globalData.userInfoData.avatarUrl = this.data.userData.avatarUrl;
           app.globalData.userInfoData.nickName = this.data.userData.nickName;