功能修改

496_dongfengqichen/pages/guess/guess.wxml

@@ -2,7 +2,7 @@
 <view class="all">
   <view class="main">
     <image class="pageBg" src="{{imgUrl+'/newImages4/20.png'}}"></image>
-    <image class="gameRule" src="{{imgUrl+'/newImages5/69.png'}}"></image>
+    <image class="gameRule" src="{{imgUrl+'/newImages5/69.png?v=002'}}"></image>
     <image class="startBtn" bindtap="enterGuessPrize" wx:if="{{userType==1}}" src="{{imgUrl+'/newImages5/60.png'}}"></image>
     <image class="startBtn" bindtap="enterGuessPrize" wx:if="{{userType==4}}" src="{{imgUrl+'/newImages5/61.png'}}"></image>
     <image class="startBtn" bindtap="enterGuessPrize" wx:if="{{userType==3}}" src="{{imgUrl+'/newImages5/62.png'}}"></image>

496_dongfengqichen/pages/guessSecond/guessSecond.wxml

@@ -24,7 +24,7 @@
     <image class="drawBtn" bindtap="ruleControl" src="{{imgUrl+'/versions/7.png'}}"></image>
     <image class="yuyue" bindtap="enterLucky" src="{{imgUrl+'/versions/1.png'}}"></image>
     <view class="ruleFrame" wx:if="{{ruleShow}}">
-      <image class="gameRule" src="{{imgUrl+'/newImages5/69.png'}}"></image>
+      <image class="gameRule" src="{{imgUrl+'/newImages5/69.png?v=002'}}"></image>
       <image class="closeRule" bindtap="ruleControl" src="{{imgUrl+'/versions/21.png'}}"></image>
     </view>
     <view class="ruleFrame ruleFrame2" wx:if="{{drawResult==1 || drawResult==2}}">

496_dongfengqichen/pages/guessSecondPrize/guessSecondPrize.wxml

@@ -45,7 +45,7 @@
     <image class="drawBtn" bindtap="ruleControl" src="{{imgUrl+'/versions/7.png'}}"></image>
     <image class="yuyue" bindtap="enterLucky" src="{{imgUrl+'/versions/1.png'}}"></image>
     <view class="ruleFrame" wx:if="{{ruleShow}}">
-      <image class="gameRule" src="{{imgUrl+'/newImages5/69.png'}}"></image>
+      <image class="gameRule" src="{{imgUrl+'/newImages5/69.png?v=002'}}"></image>
       <image class="closeRule" bindtap="ruleControl" src="{{imgUrl+'/versions/21.png'}}"></image>
     </view>
     <view class="ruleFrame ruleFrame2" wx:if="{{tipWindow}}">

496_dongfengqichen/pages/myCenter/myCenter.js

@@ -20,6 +20,7 @@ Page({
     recordNow: 1,//现在的记录类型
     taskList: [],//任务列表
     shareFriendList:[],//星探小分队列表
+    couponList:[],//卡券列表
     recordList:[],//获奖记录列表
     provinceArr: [],//省
     provinceValue: 0,//选中的省下标
@@ -29,6 +30,8 @@ Page({
     sendCode: true,
     appointment: true,
     getFriendListState:false,
+    couponListState:false,
+    couponListCode:"",
     subscribeData: {
       realname: "",//姓名
       mobile: "",//手机号
@@ -54,8 +57,13 @@ Page({
       page:1,
       count:20
     },
+    parames3:{
+      page:1,
+      count:5
+    },
     noData:false,
     noData2:false,
+    noData3:false,
     optionsData:null,
     lookDescId: null,
     agreement: false,//是否显示协议
@@ -65,6 +73,7 @@ Page({
     getState:true,
     scoutRule:false,
     vipDetailShow:false,
+    machineShow:false,
     lookPrizeDetail:false,
     lookIndex:null,
     buyStateCouponCode:"",
@@ -353,9 +362,9 @@ Page({
     return app.sharePack();
   },
   selectChange:function(e){
-      this.setData({
-        selectNow: e.currentTarget.dataset.value
-      })
+    this.setData({
+      selectNow: e.currentTarget.dataset.value
+    })
     if (e.currentTarget.dataset.value == 1) {
       this.getFriendBuCarNum();
     } else if (e.currentTarget.dataset.value == 2) {
@@ -373,8 +382,44 @@ Page({
         shareFriendList:[]
       })
       this.getShareList();
+    }else if(e.currentTarget.dataset.value == 4){
+      this.data.parames3.page = 1;
+      this.data.noData3 = false;
+      this.setData({
+        couponList:[]
+      })
+      this.getMyCouponList();
     }
   },
+  getMyCouponList:function(){//获取我的卡包
+    this.setData({
+      couponListState: true
+    })
+    wx.showLoading({
+      title: '获取数据中'
+    })
+    app.wxRequest(app.globalData.urlRoot +"/bag/getMyCouponList",this.data.parames3,res=>{
+      wx.hideLoading();
+      if(res.code==200){
+        if(res.data){
+          for(let i=0;i<res.data.list.length;i++){
+            this.data.couponList.push(res.data.list[i]);
+          }
+          this.setData({
+            couponList: this.data.couponList
+          })
+          if (res.data.list.length<this.data.parames3.count){
+            this.setData({
+              noData3: true
+            })
+          }
+        }
+      }
+      this.setData({
+        couponListState: false
+      })
+    },this);
+  },
   selectTask: function (e) {
     this.setData({
       taskNow: e.currentTarget.dataset.type
@@ -752,6 +797,12 @@ Page({
       this.getMyAwardList();
     }
   },
+  scrolltolower3:function(){
+    if(!this.data.noData3){
+      this.data.parames3.page+=1;
+      this.getMyCouponList();
+    }
+  },
   getMyAwardList: function () {//获取获奖记录
     this.setData({
       getState:true
@@ -829,7 +880,8 @@ Page({
       })
     }
     this.setData({
-      addressShow:!this.data.addressShow
+      addressShow:!this.data.addressShow,
+      mycenterTipWindow:0
     })
     if (!this.data.isAddress){
       this.getAddress();
@@ -842,6 +894,14 @@ Page({
       })
       this.getMyAwardList();
     }
+    if(this.data.selectNow==4 && this.data.couponList.length && !this.data.addressShow){
+      this.data.parames3.page = 1;
+      this.data.noData3 = false;
+      this.setData({
+        couponList:[]
+      })
+      this.getMyCouponList();
+    }
   },
   agreementState: function () {//协议
     this.setData({
@@ -935,11 +995,40 @@ Page({
       url: '/pages/everyday/everyday',
     })
   },
-  vipDetailControl:function(){
+  vipDetailControl:function(e){
+    var index = e.currentTarget.dataset.index;
+    if (!this.data.couponList[index].addressState){
+      this.setData({
+        mycenterTipWindow:1,
+      })
+      return;
+    }
+    this.setData({
+      couponListCode:this.data.couponList[index].couponCode?this.data.couponList[index].couponCode:""
+    })
+    if(this.data.couponList[index].couponId=="175978"){
+      this.vipDetailHide();
+    }else if(this.data.couponList[index].couponId=="171748"){
+      this.machineHide();
+    }else if(this.data.couponList[index].couponId=="177275"){
+      this.upgradeHide();
+    }
+  },
+  vipDetailHide:function(){
     this.setData({
       vipDetailShow:!this.data.vipDetailShow
     })
   },
+  machineHide:function(){
+    this.setData({
+      machineShow:!this.data.machineShow
+    })
+  },
+  upgradeHide:function(){
+    this.setData({
+      upgradeShow:!this.data.upgradeShow
+    })
+  },
   cardCodeCopy:function(){
     this.contentCopy(this.data.buyStateCouponCode);
   }

496_dongfengqichen/pages/myCenter/myCenter.wxml

@@ -155,68 +155,46 @@
         </view>
       </scroll-view>
     </view>
-    <!-- <view class="subscribeGroup" wx:if="{{selectNow==4}}">
-      <view class="inputGroup">
-        <input class="inputCode" bindinput="getRealname" value="{{subscribeData.realname}}" placeholder="请输入您的姓名"></input>
+    <scroll-view class="placingOrderGroup" wx:if="{{selectNow==4}}" scroll-y bindscrolltolower="scrolltolower3">
+      <view class="orderDescGroup" wx:if="{{!couponList.length && !couponListState}}">
+        <image class="orderDesc" src="{{imgUrl+'/newImages5/59.png'}}"></image>
+        <image class="indexOrderIcon" bindtap="placingControl" src="{{imgUrl+'/images/indexOrderIcon.png'}}"></image>
       </view>
-      <view class="inputGroup">
-        <input class="inputCode" bindinput="getMobile" type="number" value="{{subscribeData.mobile}}" maxlength='11' placeholder="请输入您的联系电话"></input>
-        <view class="getPhoneFrame" wx:if="{{!phoneInputShow}}">
-          <button class="getPhoneBtn" style="width: 652rpx;height: 65rpx;margin: 0;padding: 0;min-height: 0;" open-type="getPhoneNumber" bindgetphonenumber="getUserPhone"></button>
-        </view>
-      </view>
-      <view class="inputGroup">
-        <input class="inputCode" bindfocus="showSite" style="width:450rpx;" value="{{subscribeData.captcha}}" bindinput="getCaptcha" placeholder="请输入验证码"></input>
-        <view class="codeTime" bindtap="getCode">{{verificationCode}}</view>
-      </view>
-      <view wx:if="{{siteSelect}}">
-        <picker mode='selector' range="{{provinceArr}}" range-key="province" value="{{provinceValue}}" bindchange="provinceChane">
-          <view class="selectSiteGroup">
-            <text class="selectName">{{provinceArr[provinceValue].province}}</text>
-            <image src="{{imgUrl+'/images/selectIcon.png'}}" class="selectIcon"></image>
+      <view class="placingOrderGroupList" wx:if="{{couponList.length}}">
+        <view wx:for="{{couponList}}" wx:key="index">
+          <view class="placingOrder" wx:if="{{item.couponId=='175978'}}">
+            <view style="display:flex;align-items:center;">
+              <image class="orderHead" src="{{imgUrl+'/newImages3/52.png'}}"></image>
+              <view style="margin-left:15rpx;margin-right:101rpx;">
+                <view class="cardTitle">启辰星预售豪礼卡</view>
+                <view class="cardCtime">{{item.cdate}}</view>
+              </view>
+            </view>
+            <image class="orderCard" data-index="{{index}}" bindtap="vipDetailControl" src="{{imgUrl+'/newImages3/48.png'}}"></image>
           </view>
-        </picker>
-        <picker mode='selector' range="{{storeArr}}" range-key="agent_detail" value="{{storeValue}}" bindchange="storeChane">
-          <view class="selectSiteGroup">
-            <text class="selectName">{{storeArr[storeValue].agent_detail}}</text>
-            <image src="{{imgUrl+'/images/selectIcon.png'}}" class="selectIcon"></image>
+          <view class="placingOrder" wx:if="{{item.couponId=='171748'}}">
+            <view style="display:flex;align-items:center;">
+              <image class="orderHead" src="{{imgUrl+'/newImages5/70.png'}}" mode="aspectFit"></image>
+              <view style="margin-left:15rpx;margin-right:101rpx;">
+                <view class="cardTitle">100元机油券</view>
+                <view class="cardCtime">{{item.cdate}}</view>
+              </view>
+            </view>
+            <image class="orderCard" data-index="{{index}}" bindtap="vipDetailControl" src="{{imgUrl+'/newImages3/48.png'}}"></image>
           </view>
-        </picker>
-      </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">
-          <image style="width:261rpx;height:23rpx;" src="{{imgUrl+'/images/myCenterAgreenTip.png'}}"></image>
-          <view bindtap="agreementControl">
-          <image style="width:240rpx;height:23rpx;margin-left:3rpx;" src="{{imgUrl+'/images/myCenterAgreen.png'}}"></image>
+          <view class="placingOrder" wx:if="{{item.couponId=='177275'}}">
+            <view style="display:flex;align-items:center;">
+              <image class="orderHead" src="{{imgUrl+'/newImages5/71.png'}}" mode="aspectFit"></image>
+              <view style="margin-left:15rpx;margin-right:101rpx;">
+                <view class="cardTitle">启辰星免费升舱卡</view>
+                <view class="cardCtime">{{item.cdate}}</view>
+              </view>
+            </view>
+            <image class="orderCard" data-index="{{index}}" bindtap="vipDetailControl" src="{{imgUrl+'/newImages3/48.png'}}"></image>
           </view>
         </view>
       </view>
-      <view class="subscribeBtn" bindtap="subscribeFun">
-        <image style="width:100%;height:100%;" src="{{imgUrl+'/btns/myCenterBtn1.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></view>
-    </view> -->
-    <view class="orderDescGroup" wx:if="{{selectNow==4 && !buyState}}">
-      <image class="orderDesc" src="{{imgUrl+'/newImages5/59.png'}}"></image>
-      <image class="indexOrderIcon" bindtap="placingControl" src="{{imgUrl+'/images/indexOrderIcon.png'}}"></image>
-    </view>
-    <view class="placingOrder" wx:if="{{selectNow==4 && buyState}}">
-      <view style="display:flex;align-items:center;">
-        <image class="orderHead" src="{{imgUrl+'/newImages3/52.png'}}"></image>
-        <view style="margin-left:15rpx;margin-right:101rpx;">
-          <view class="cardTitle">启辰星预售豪礼卡</view>
-          <view class="cardCtime">{{buyStateTime}}</view>
-        </view>
-      </view>
-      <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>
+    </scroll-view>
     <service></service>
     <view class="prizeDesc" catchtouchmove="ture" wx:if="{{mycenterTipWindow==1}}">
       <view class="mycenterTipWindowGroup">
@@ -275,16 +253,30 @@
     <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>
+      <image class="closeXieyi" bindtap="vipDetailHide" src="{{imgUrl+'/images/closeXieyi.png'}}"></image>
       <view style="position:relative;">
         <image style="width:750rpx;height:1810rpx;" src="{{imgUrl+'/newImages5/58.png?v=003'}}"></image>
-        <image class="newImages3-45" bindtap="vipDetailControl" src="{{imgUrl+'/newImages3/45.png'}}"></image>
+        <image class="newImages3-45" bindtap="vipDetailHide" src="{{imgUrl+'/newImages3/45.png'}}"></image>
+      </view>
+      <view class="cardCode" wx:if="{{couponListCode}}">{{couponListCode}}<view bindtap="cardCodeCopy" class="cardCodeCopy">复制</view></view>
+    </view>
+    <view class="prizeDesc" style="background-color:white;display:block;overflow:auto;" wx:if="{{machineShow}}">
+      <view class="titleText">查看详情</view>
+      <view class="lineSty"></view>
+      <image class="closeXieyi" bindtap="machineHide" src="{{imgUrl+'/images/closeXieyi.png'}}"></image>
+      <view style="position:relative;">
+        <image style="width:750rpx;height:1206rpx;" src="{{imgUrl+'/newImages5/73.png?v=003'}}"></image>
+      </view>
+      <view class="cardCode" wx:if="{{couponListCode}}" style="left:220rpx;top:415rpx;font-size:24rpx;color:#a99247;">{{couponListCode}}<view bindtap="cardCodeCopy" class="cardCodeCopy">复制</view></view>
+    </view>
+    <view class="prizeDesc" style="background-color:white;display:block;overflow:auto;" wx:if="{{upgradeShow}}">
+      <view class="titleText">查看详情</view>
+      <view class="lineSty"></view>
+      <image class="closeXieyi" bindtap="upgradeHide" src="{{imgUrl+'/images/closeXieyi.png'}}"></image>
+      <view style="position:relative;">
+        <image style="width:750rpx;height:1410rpx;" src="{{imgUrl+'/newImages5/72.png?v=003'}}"></image>
       </view>
-      <view class="cardCode">{{buyStateCouponCode}}<view bindtap="cardCodeCopy" class="cardCodeCopy">复制</view></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 class="cardCode" wx:if="{{couponListCode}}" style="left:168rpx;top:480rpx;font-size:20rpx;color:white;">{{couponListCode}}<view bindtap="cardCodeCopy" class="cardCodeCopy2">复制</view></view>
     </view>
   </view>
   <agreement bindmyevent="agreementControl" wx:if="{{agreement}}"></agreement>

496_dongfengqichen/pages/myCenter/myCenter.wxss

@@ -654,15 +654,13 @@ view{
 }
 .placingOrder{
   width: 610rpx;
-  margin: 0 auto;
-  margin-top: 37rpx;
   display: flex;
   align-items: center;
   justify-content: space-between;
   box-sizing: border-box;
-  margin-bottom: 154rpx;
   border-bottom: 2rpx solid #DBD9DC;
   padding-bottom: 11rpx;
+  margin-bottom: 20rpx;
 }
 .orderHead{
   width: 163rpx;
@@ -955,8 +953,30 @@ view{
   margin-left: 20rpx;
   border-radius: 15rpx;
 }
+.cardCodeCopy2{
+  margin-left: 15rpx;
+  width:66rpx;
+  height:20rpx;
+  border:2rpx solid rgba(231,228,230,1);
+  border-radius:10rpx;
+  text-align: center;
+  font-size:16rpx;
+  font-family:PingFangSC;
+  font-weight:400;
+  color:rgba(250,246,246,1);
+  line-height:20rpx;
+}
 .newImages3-58{
   width: 660rpx;
   height: 96rpx;
   margin: 0 auto;
+}
+.placingOrderGroup{
+  height: 589rpx;
+}
+.placingOrderGroupList{
+  padding: 20rpx 0;
+  display: flex;
+  align-items: center;
+  flex-direction: column;
 }