| @@ -1,6 +1,7 @@ | |||||
| { | { | ||||
| "pages": [ | "pages": [ | ||||
| "pages/index/index", | "pages/index/index", | ||||
| "pages/cardorder/index/index", | |||||
| "pages/scanPay/scanPay", | "pages/scanPay/scanPay", | ||||
| "pages/edit/edit", | "pages/edit/edit", | ||||
| "pages/cartest/cartest", | "pages/cartest/cartest", | ||||
| @@ -14,7 +15,6 @@ | |||||
| "pages/rushToBuy/index", | "pages/rushToBuy/index", | ||||
| "pages/couponorder/index/index", | "pages/couponorder/index/index", | ||||
| "pages/couponorder/detail/index", | "pages/couponorder/detail/index", | ||||
| "pages/cardorder/index/index", | |||||
| "pages/cardorder/detail/index", | "pages/cardorder/detail/index", | ||||
| "pages/cardorder/userule/userule", | "pages/cardorder/userule/userule", | ||||
| "pages/order/detail/index", | "pages/order/detail/index", | ||||
| @@ -13,7 +13,7 @@ Page({ | |||||
| headbgUrl: imgurl.headbg.url, | headbgUrl: imgurl.headbg.url, | ||||
| quesBgUrl: imgurl.ques_bg.url, | quesBgUrl: imgurl.ques_bg.url, | ||||
| dingdanUrl: imgurl.dingdan.url, | dingdanUrl: imgurl.dingdan.url, | ||||
| cardDetail:null, | |||||
| cardDetail: null, | |||||
| data: { | data: { | ||||
| title: null | title: null | ||||
| }, | }, | ||||
| @@ -48,21 +48,45 @@ Page({ | |||||
| queueData: null, | queueData: null, | ||||
| zIndex: 11, | zIndex: 11, | ||||
| display: "none", | display: "none", | ||||
| showbutton: false | |||||
| showbutton: false, | |||||
| hidden: "hidden", | |||||
| height: "auto", | |||||
| more: "点击查看更多", | |||||
| showMore: true | |||||
| }, | }, | ||||
| phone: function (e) { | |||||
| phone: function(e) { | |||||
| let that = this; | let that = this; | ||||
| wx.makePhoneCall({ | wx.makePhoneCall({ | ||||
| phoneNumber: e.target.dataset.merchantlinkphone | phoneNumber: e.target.dataset.merchantlinkphone | ||||
| }); | }); | ||||
| }, | }, | ||||
| // 点击查看更多 | |||||
| more: function() { | |||||
| let that = this; | |||||
| if (that.data.height == 'auto') { | |||||
| this.setData({ | |||||
| hidden: "hidden", | |||||
| height: "auto", | |||||
| more: "点击查看更多", | |||||
| showMore: true | |||||
| }) | |||||
| } else { | |||||
| this.setData({ | |||||
| hidden: "", | |||||
| height: that.data.cardDetail.merchantVoList.length * 140 + 'rpx', | |||||
| more: "", | |||||
| showMore: false | |||||
| }) | |||||
| } | |||||
| }, | |||||
| onLoad(options) { | onLoad(options) { | ||||
| let that = this; | let that = this; | ||||
| console.log(options.cardId) | console.log(options.cardId) | ||||
| that.cardpayList(options.cardId); | that.cardpayList(options.cardId); | ||||
| that.cardDetail(options.cardId); | that.cardDetail(options.cardId); | ||||
| }, | }, | ||||
| cardpayList: function (cardId) { | |||||
| cardpayList: function(cardId) { | |||||
| let that = this; | let that = this; | ||||
| wx.showLoading({ | wx.showLoading({ | ||||
| title: "加载中..." | title: "加载中..." | ||||
| @@ -82,8 +106,7 @@ Page({ | |||||
| that.setData({ | that.setData({ | ||||
| showPage: true | showPage: true | ||||
| }) | }) | ||||
| } else { | |||||
| } | |||||
| } else {} | |||||
| wx.hideLoading(); | wx.hideLoading(); | ||||
| res.data.list.map(file => { | res.data.list.map(file => { | ||||
| file.updateDate = util.formatTime(file.updateDate, "yyyy-MM-dd hh:mm:ss") | file.updateDate = util.formatTime(file.updateDate, "yyyy-MM-dd hh:mm:ss") | ||||
| @@ -100,31 +123,41 @@ Page({ | |||||
| }); | }); | ||||
| }) | }) | ||||
| }, | }, | ||||
| cardDetail: function (couponOrderId) { | |||||
| cardDetail: function(couponOrderId) { | |||||
| let that = this; | let that = this; | ||||
| Http.get({ | Http.get({ | ||||
| url: config.api.cardDetail, | |||||
| data: { | |||||
| couponOrderId: couponOrderId | |||||
| } | |||||
| }) | |||||
| .then(res => { | |||||
| console.log(res) | |||||
| if (res.code == 200) { | |||||
| res.data.expiredTime = util.formatTime(res.data.expiredTime, "yyyy-MM-dd hh:mm:ss") | |||||
| that.setData({ | |||||
| showPage: true, | |||||
| cardDetail:res.data | |||||
| }) | |||||
| } | |||||
| }) | |||||
| .catch(err => { | |||||
| console.log(err) | |||||
| }) | |||||
| url: config.api.cardDetail, | |||||
| data: { | |||||
| couponOrderId: couponOrderId | |||||
| } | |||||
| }) | |||||
| .then(res => { | |||||
| console.log(res) | |||||
| if (res.code == 200) { | |||||
| res.data.expiredTime = util.formatTime(res.data.expiredTime, "yyyy-MM-dd hh:mm:ss") | |||||
| that.setData({ | |||||
| showPage: true, | |||||
| cardDetail: res.data | |||||
| }) | |||||
| if (that.data.cardDetail.merchantVoList && that.data.cardDetail.merchantVoList.length<=4){ | |||||
| that.setData({ | |||||
| height: that.data.cardDetail.merchantVoList.length * 140 + 'rpx' | |||||
| }) | |||||
| } else if (that.data.cardDetail.merchantVoList && that.data.cardDetail.merchantVoList.length >= 4){ | |||||
| that.setData({ | |||||
| height: 4 * 140 + 'rpx' | |||||
| }) | |||||
| } | |||||
| } | |||||
| }) | |||||
| .catch(err => { | |||||
| console.log(err) | |||||
| }) | |||||
| }, | }, | ||||
| onShow() { | onShow() { | ||||
| this.setData({ | |||||
| showbutton: false | |||||
| }) | |||||
| }, | |||||
| }); | |||||
| let that = this; | |||||
| that.setData({ | |||||
| showbutton: false | |||||
| }) | |||||
| }, | |||||
| }); | |||||
| @@ -1,4 +1,27 @@ | |||||
| <view wx:if="{{showPage}}" class='notes'> | <view wx:if="{{showPage}}" class='notes'> | ||||
| <view class='head'> | |||||
| <view class='titles' style='font-weight:bold;'>{{cardDetail.title}}</view> | |||||
| <view class='titles clearfix'> | |||||
| <text class='fl'>有效期:{{cardDetail.expiredTime}}</text> | |||||
| <view class='fr'>余额: | |||||
| <text>{{cardDetail.remainingAmount/100}}</text>元</view> | |||||
| </view> | |||||
| </view> | |||||
| <text class='title'>适用门店</text> | |||||
| <view class='posi' style='overflow:{{hidden}};height:{{height}}'> | |||||
| <view class='posi_logo' wx:for="{{cardDetail.merchantVoList}}" wx:key="index"> | |||||
| <view> | |||||
| <image src='{{item.merchantImgUrl}}'></image> | |||||
| </view> | |||||
| <view> | |||||
| <text>{{item.merchantName}}</text> | |||||
| <text>{{item.addr}}{{item.buildingName}}{{item.floorName}}</text> | |||||
| </view> | |||||
| <image bindtap='phone' data-merchantLinkPhone='{{item.merchantLinkPhone}}' class="tel" src="{{teljpgUrl}}" mode="widthFix" /> | |||||
| </view> | |||||
| </view> | |||||
| <view class='bottom' bindtap='more' wx:if="{{showMore}}">{{more}}</view> | |||||
| <text class='title'>交易记录</text> | |||||
| <view wx:for="{{data}}" wx:key="{{index}}" class='list'> | <view wx:for="{{data}}" wx:key="{{index}}" class='list'> | ||||
| <view class='record clearfix record1'> | <view class='record clearfix record1'> | ||||
| <text class='fl'>{{item.merchantName}}</text> | <text class='fl'>{{item.merchantName}}</text> | ||||
| @@ -27,6 +27,7 @@ | |||||
| } | } | ||||
| .title { | .title { | ||||
| display: block; | display: block; | ||||
| padding: 0 32rpx; | |||||
| font-weight: bold; | font-weight: bold; | ||||
| font-size: 32rpx; | font-size: 32rpx; | ||||
| color: rgba(51, 51, 51, 1); | color: rgba(51, 51, 51, 1); | ||||
| @@ -43,7 +44,7 @@ | |||||
| .posi { | .posi { | ||||
| position: relative; | position: relative; | ||||
| width: 100%; | |||||
| padding: 0 32rpx; | |||||
| margin: 0 auto; | margin: 0 auto; | ||||
| } | } | ||||
| @@ -52,7 +53,6 @@ | |||||
| height: 87rpx; | height: 87rpx; | ||||
| display: flex; | display: flex; | ||||
| justify-content: space-between; | justify-content: space-between; | ||||
| border-top: 1px solid #f6f6f6; | |||||
| line-height: 87rpx; | line-height: 87rpx; | ||||
| } | } | ||||
| @@ -72,7 +72,6 @@ | |||||
| padding: 20rpx 0; | padding: 20rpx 0; | ||||
| background: #fff; | background: #fff; | ||||
| height: 100rpx; | height: 100rpx; | ||||
| margin-bottom: 20rpx; | |||||
| } | } | ||||
| .posi_logo view:nth-child(1) { | .posi_logo view:nth-child(1) { | ||||
| @@ -121,6 +120,9 @@ | |||||
| .titles .fr { | .titles .fr { | ||||
| color: red; | color: red; | ||||
| } | } | ||||
| .titles .fr text{ | |||||
| font-size: 42rpx; | |||||
| } | |||||
| .notess view:nth-child(1) { | .notess view:nth-child(1) { | ||||
| width: 92%; | width: 92%; | ||||
| @@ -167,6 +169,7 @@ | |||||
| color: #333; | color: #333; | ||||
| letter-spacing: 0; | letter-spacing: 0; | ||||
| text-align: center; | text-align: center; | ||||
| padding: 30rpx 0; | |||||
| } | } | ||||
| .dingdan text:nth-of-type(2) { | .dingdan text:nth-of-type(2) { | ||||
| @@ -182,4 +185,14 @@ | |||||
| width: 300rpx; | width: 300rpx; | ||||
| height: 300rpx; | height: 300rpx; | ||||
| margin: 0 auto 16rpx; | margin: 0 auto 16rpx; | ||||
| } | |||||
| .head{ | |||||
| padding:32rpx 32rpx 0; | |||||
| } | |||||
| .bottom{ | |||||
| text-align: center; | |||||
| height: 70rpx; | |||||
| line-height: 70rpx; | |||||
| color: #999; | |||||
| font-size: 32rpx; | |||||
| } | } | ||||
| @@ -72,7 +72,6 @@ Page({ | |||||
| }, | }, | ||||
| // 跳转到详情 | // 跳转到详情 | ||||
| gotoConsumeDetail: function(e) { | gotoConsumeDetail: function(e) { | ||||
| console.log(e.currentTarget.dataset.id) | |||||
| wx.navigateTo({ | wx.navigateTo({ | ||||
| url: `/pages/ConsumeDetail/ConsumeDetail?cardId=${e.currentTarget.dataset.id}`, | url: `/pages/ConsumeDetail/ConsumeDetail?cardId=${e.currentTarget.dataset.id}`, | ||||
| }) | }) | ||||
| @@ -128,7 +127,7 @@ Page({ | |||||
| }) | }) | ||||
| } | } | ||||
| res.data.list.map(file => { | res.data.list.map(file => { | ||||
| file.expiredTime = util.fmtDate(file.expiredTime); | |||||
| file.expiredTime = util.formatTime(file.expiredTime, "yyyy.MM.dd") | |||||
| if (file.couponOrderStatus == 5 || file.couponOrderStatus == 6 || file.couponOrderStatus == 7) { | if (file.couponOrderStatus == 5 || file.couponOrderStatus == 6 || file.couponOrderStatus == 7) { | ||||
| file.background = 'rgba(179,180,181,1)'; | file.background = 'rgba(179,180,181,1)'; | ||||
| file.showImg = true; | file.showImg = true; | ||||
| @@ -17,23 +17,20 @@ | |||||
| <view class='mms' style='background:{{item.background}}'> | <view class='mms' style='background:{{item.background}}'> | ||||
| <view class='detail_msg'> | <view class='detail_msg'> | ||||
| <view class='info'> | <view class='info'> | ||||
| <view data-id='{{item.id}}' bindtap='gotoConsumeDetail' data-id='{{item.id}}'> | |||||
| <view class='title'> | |||||
| <text>{{item.title}}</text> | |||||
| <image class='fr' src='./../../../assets/images/icon01.png' mode="widthFix"></image> | |||||
| </view> | |||||
| <view class='expiretime'> | |||||
| <view class='clearfix' data-id='{{item.id}}' bindtap='gotoConsumeDetail' data-id='{{item.id}}'> | |||||
| <view class='title fl'> | |||||
| <text class='yue'><text class='yu'>余</text>{{item.remainingAmount/100}}<text class='yu'>元</text></text> | |||||
| <text class="txt2">{{item.expiredTime}}到期</text> | <text class="txt2">{{item.expiredTime}}到期</text> | ||||
| <text class='txt2 fr'>余额<text class='money'>{{item.remainingAmount/100}}</text>元</text> | |||||
| </view> | |||||
| <view class='expiretime fr'> | |||||
| <text>{{item.title}}</text> | |||||
| </view> | </view> | ||||
| </view> | </view> | ||||
| <view hover-class='active' bindtap='gotoPay' data-remainingAmount="{{item.remainingAmount/100}}" data-cardId="{{item.id}}" data-couponorderstatus="{{item.couponOrderStatus}}" wx:if="{{item.couponOrderStatus==4}}" class="btns">扫一扫付款</view> | |||||
| <view hover-class='active' wx:if="{{item.couponOrderStatus!=4}}" class="btns clearfix"> | |||||
| <text class='txtstatus fl' wx:if="{{item.couponOrderStatus == 5}}">已过期</text> | |||||
| <text class='txtstatus fl' wx:if="{{item.couponOrderStatus == 6}}">余额已用完</text> | |||||
| <text class='txtstatus fl' wx:if="{{item.couponOrderStatus == 7}}">已线下退款</text> | |||||
| <button class='buyagain fr' bindtap='gotoBuy'>再次购买</button> | |||||
| </view> | |||||
| <view hover-class='active' bindtap='gotoPay' data-remainingAmount="{{item.remainingAmount/100}}" data-cardId="{{item.id}}" data-couponorderstatus="{{item.couponOrderStatus}}" wx:if="{{item.couponOrderStatus==4}}" class="btns" style='color:{{item.background}}!important'>扫一扫付款</view> | |||||
| <view hover-class='active' bindtap='gotoBuy' wx:if="{{item.couponOrderStatus!=4}}" style='color:rgba(179,180,181,1);' class="btns clearfix">再次购买</view> | |||||
| <text class='txtstatus' wx:if="{{item.couponOrderStatus == 5}}">已过期</text> | |||||
| <text class='txtstatus' wx:if="{{item.couponOrderStatus == 6}}">余额已用完</text> | |||||
| <text class='txtstatus' wx:if="{{item.couponOrderStatus == 7}}">已线下退款</text> | |||||
| </view> | </view> | ||||
| <view class='imgicon' wx:if="{{item.showImg}}"> | <view class='imgicon' wx:if="{{item.showImg}}"> | ||||
| <image src='./../../../assets/images/shixiao.png' mode='widthFix'></image> | <image src='./../../../assets/images/shixiao.png' mode='widthFix'></image> | ||||
| @@ -41,7 +38,7 @@ | |||||
| </view> | </view> | ||||
| </view> | </view> | ||||
| </view> | </view> | ||||
| <view class='userule' bindtap='userule'>适用规则</view> | |||||
| <view class='userule' bindtap='userule' wx:if="{{list.length>0}}">使用规则</view> | |||||
| <view class="loading" wx:if="{{loading}}"> | <view class="loading" wx:if="{{loading}}"> | ||||
| <image src="{{loadingUrl}}" mode="widthFix"></image>{{content}} | <image src="{{loadingUrl}}" mode="widthFix"></image>{{content}} | ||||
| </view> | </view> | ||||
| @@ -28,26 +28,33 @@ | |||||
| position: relative; | position: relative; | ||||
| width: 690rpx; | width: 690rpx; | ||||
| background: #fff; | background: #fff; | ||||
| padding: 36rpx 0 0; | |||||
| height: 238rpx; | |||||
| margin: 0 auto 40rpx; | margin: 0 auto 40rpx; | ||||
| border-radius: 16rpx; | border-radius: 16rpx; | ||||
| box-shadow: 0 6px 20px 0 rgba(0, 0, 0, 0.10); | box-shadow: 0 6px 20px 0 rgba(0, 0, 0, 0.10); | ||||
| } | } | ||||
| .yu { | |||||
| display: inline-block !important; | |||||
| font-size: 30rpx; | |||||
| } | |||||
| .expiretime { | .expiretime { | ||||
| display: block; | |||||
| width: 100% !important; | |||||
| text-align: left; | |||||
| text-indent: 1em; | |||||
| height: 40rpx; | |||||
| line-height: 36rpx; | |||||
| font-size: 22rpx; | |||||
| color: #333; | |||||
| letter-spacing: 0; | |||||
| width: 250rpx; | |||||
| } | } | ||||
| .expiretime .fr { | |||||
| margin-right: 20rpx; | |||||
| .expiretime text { | |||||
| display: block; | |||||
| width: 262rpx; | |||||
| font-size: 30rpx; | |||||
| font-family: PingFang-SC-Medium; | |||||
| font-weight: 500; | |||||
| white-space: nowrap; | |||||
| text-align: center; | |||||
| text-overflow: ellipsis; | |||||
| overflow: hidden; | |||||
| margin-top: 35rpx; | |||||
| color: rgba(255, 255, 255, 1); | |||||
| } | } | ||||
| .money { | .money { | ||||
| @@ -76,20 +83,14 @@ | |||||
| border-radius: 50%; | border-radius: 50%; | ||||
| } | } | ||||
| .info >view view:nth-child(1) { | |||||
| display: flex; | |||||
| justify-content: space-between; | |||||
| padding: 0 2%; | |||||
| } | |||||
| .info { | .info { | ||||
| width: 100%; | width: 100%; | ||||
| } | } | ||||
| .info >view view:nth-child(1) text { | |||||
| font-size: 32rpx; | |||||
| line-height: 32rpx; | |||||
| height: 32rpx; | |||||
| .info .title .yue { | |||||
| font-size: 60rpx; | |||||
| line-height: 60rpx; | |||||
| font-weight: bold; | |||||
| color: #fff; | color: #fff; | ||||
| letter-spacing: 0; | letter-spacing: 0; | ||||
| width: 400rpx; | width: 400rpx; | ||||
| @@ -98,6 +99,8 @@ | |||||
| text-overflow: ellipsis; | text-overflow: ellipsis; | ||||
| overflow: hidden; | overflow: hidden; | ||||
| margin-bottom: 10rpx; | margin-bottom: 10rpx; | ||||
| margin-top: 38rpx; | |||||
| text-align: left; | |||||
| } | } | ||||
| .info >view view:nth-child(2) { | .info >view view:nth-child(2) { | ||||
| @@ -109,17 +112,21 @@ | |||||
| white-space: nowrap; | white-space: nowrap; | ||||
| text-overflow: ellipsis; | text-overflow: ellipsis; | ||||
| overflow: hidden; | overflow: hidden; | ||||
| width: 400rpx; | |||||
| margin-right: 25rpx; | |||||
| } | } | ||||
| .btns { | .btns { | ||||
| height: 80rpx; | |||||
| line-height: 80rpx; | |||||
| position: absolute; | |||||
| right: 30rpx; | |||||
| bottom: 53rpx; | |||||
| text-align: center; | text-align: center; | ||||
| color: #fff; | |||||
| font-size: 28rpx; | font-size: 28rpx; | ||||
| margin-top: 46rpx; | |||||
| border-top: 1px solid #e6e6e6; | |||||
| width: 250rpx !important; | |||||
| height: 61rpx; | |||||
| line-height: 61rpx; | |||||
| background: rgba(255, 255, 255, 1); | |||||
| border-radius: 30rpx; | |||||
| margin-top: 32rpx !important; | |||||
| } | } | ||||
| .active { | .active { | ||||
| @@ -200,17 +207,26 @@ | |||||
| line-height: 32px; | line-height: 32px; | ||||
| } | } | ||||
| .title .fr { | |||||
| width: 30rpx; | |||||
| margin-right: 10rpx; | |||||
| .title { | |||||
| width: 50%; | |||||
| } | } | ||||
| .title text { | |||||
| display: block; | |||||
| color: #fff; | |||||
| font-size: 24rpx; | |||||
| margin-left: 25rpx; | |||||
| text-align: left; | |||||
| } | |||||
| .txt2{ | |||||
| opacity:0.5; | |||||
| } | |||||
| .imgicon { | .imgicon { | ||||
| position: absolute; | position: absolute; | ||||
| width: 140rpx; | width: 140rpx; | ||||
| height: 100rpx; | height: 100rpx; | ||||
| z-index: 100; | z-index: 100; | ||||
| right: 191rpx; | |||||
| right: 257rpx; | |||||
| top: 0; | top: 0; | ||||
| } | } | ||||
| @@ -245,4 +261,11 @@ | |||||
| line-height: 44rpx; | line-height: 44rpx; | ||||
| margin-top: 30rpx; | margin-top: 30rpx; | ||||
| padding-bottom: 30rpx; | padding-bottom: 30rpx; | ||||
| background: #fff; | |||||
| } | |||||
| .yue text:nth-of-type(1){ | |||||
| margin-right: 6rpx; | |||||
| } | } | ||||
| .yue text:nth-of-type(2){ | |||||
| margin-left: 6rpx; | |||||
| } | |||||
| @@ -1,31 +1,31 @@ | |||||
| <view class="lists"> | <view class="lists"> | ||||
| <view class="list"> | <view class="list"> | ||||
| <view class="title"> | <view class="title"> | ||||
| 1、如何使用xx卡? | |||||
| 1、如何使用消费卡? | |||||
| </view> | </view> | ||||
| <view class="content"> | <view class="content"> | ||||
| 在门店消费后结算时,打开xx小程序,选择“我的”-“卡包”,选择扣款的消费卡,点击卡面上的”付款“,扫描 | |||||
| 在门店消费后结算时,打开小程序,选择“我的”-“卡包”,选择扣款的消费卡,点击卡面上的”付款“,扫描 | |||||
| </view> | </view> | ||||
| </view> | </view> | ||||
| <view class="list"> | <view class="list"> | ||||
| <view class="title"> | <view class="title"> | ||||
| 2、xx卡内余额不够支付最后一次消费额时怎么办? | |||||
| 2、消费卡内余额不够支付最后一次消费额时怎么办? | |||||
| </view> | </view> | ||||
| <view class="content"> | <view class="content"> | ||||
| 建议部分消费额用xx卡支付,部分消费额用微信、支付宝、刷卡或现金支付。 | |||||
| 建议部分消费额用消费卡支付,部分消费额用微信、支付宝、刷卡或现金支付。 | |||||
| </view> | </view> | ||||
| </view> | </view> | ||||
| <view class="list"> | <view class="list"> | ||||
| <view class="title"> | <view class="title"> | ||||
| 3、购买xx卡后,是否能退? | |||||
| 3、购买消费卡后,是否能退? | |||||
| </view> | </view> | ||||
| <view class="content"> | <view class="content"> | ||||
| xx卡一经出售,即完成开卡,不能退款。 | |||||
| 消费卡一经出售,即完成开卡,不能退款。 | |||||
| </view> | </view> | ||||
| </view> | </view> | ||||
| <view class="list"> | <view class="list"> | ||||
| <view class="title"> | <view class="title"> | ||||
| 4、xx卡会过期吗? | |||||
| 4、消费卡会过期吗? | |||||
| </view> | </view> | ||||
| <view class="content"> | <view class="content"> | ||||
| 会过期。请在卡面有效期内将面额使用完毕。 | 会过期。请在卡面有效期内将面额使用完毕。 | ||||
| @@ -36,7 +36,7 @@ | |||||
| 5、注意事项 | 5、注意事项 | ||||
| </view> | </view> | ||||
| <view class="content"> | <view class="content"> | ||||
| 在法律允许的范围内,XX商场保留对上述规则的解释权。 更多详情可至xx商场服务台咨询。 | |||||
| 在法律允许的范围内,商场保留对上述规则的解释权。 更多详情可至商场服务台咨询。 | |||||
| </view> | </view> | ||||
| </view> | </view> | ||||
| </view> | </view> | ||||
| @@ -42,24 +42,24 @@ | |||||
| </view> | </view> | ||||
| <view class='rest' wx:if="{{data.validType==2}}">有效期:自领取之日起 | <view class='rest' wx:if="{{data.validType==2}}">有效期:自领取之日起 | ||||
| <text class='time'>{{validDays}}</text>天内有效</view> | <text class='time'>{{validDays}}</text>天内有效</view> | ||||
| <view class='rest' wx:if="{{data.validType==1}}">有效期: | |||||
| <view class='rest' wx:if="{{data.validType==1}}">有效期: | |||||
| <text class='time'>{{validStartDate}}至{{validEndDate}}</text> | <text class='time'>{{validStartDate}}至{{validEndDate}}</text> | ||||
| </view> | </view> | ||||
| <view class='rest' wx:if="{{data.type==5}}"> | <view class='rest' wx:if="{{data.type==5}}"> | ||||
| <text class='time'>当次有效</text> | <text class='time'>当次有效</text> | ||||
| </view> | </view> | ||||
| <view class='rest' wx:if="{{data.type==1}}"> | <view class='rest' wx:if="{{data.type==1}}"> | ||||
| <text class='txt01'>使用条件:</text> | |||||
| <text class='txt01'>使用条件:</text> | |||||
| <text class='time'>满{{data.usePriceStr}}元可用</text> | <text class='time'>满{{data.usePriceStr}}元可用</text> | ||||
| </view> | </view> | ||||
| <view class='rest'> | <view class='rest'> | ||||
| <text class='txt01'>限购条件:</text> | |||||
| <text class='txt01'>限购条件:</text> | |||||
| <text class='time'>每人{{data.useLimitQuantity}}张</text> | <text class='time'>每人{{data.useLimitQuantity}}张</text> | ||||
| </view> | </view> | ||||
| </view> | </view> | ||||
| </view> | </view> | ||||
| <view class='posi'> | <view class='posi'> | ||||
| <view class='applyshop'>适用门店:</view> | |||||
| <view class='applyshop'>适用门店</view> | |||||
| <view class='posi_logo' wx:for="{{data.merchantVoList}}" wx:key="index"> | <view class='posi_logo' wx:for="{{data.merchantVoList}}" wx:key="index"> | ||||
| <view> | <view> | ||||
| <image src='{{item.merchantImgUrl}}'></image> | <image src='{{item.merchantImgUrl}}'></image> | ||||
| @@ -150,8 +150,6 @@ page { | |||||
| margin-left: 10rpx; | margin-left: 10rpx; | ||||
| } | } | ||||
| .fl { | .fl { | ||||
| float: left; | float: left; | ||||
| } | } | ||||
| @@ -165,6 +163,7 @@ page { | |||||
| width: 92%; | width: 92%; | ||||
| margin: 0 auto; | margin: 0 auto; | ||||
| } | } | ||||
| .posi>view:nth-child(2) { | .posi>view:nth-child(2) { | ||||
| width: 100%; | width: 100%; | ||||
| height: 87rpx; | height: 87rpx; | ||||
| @@ -229,11 +228,15 @@ page { | |||||
| } | } | ||||
| .notes view:nth-child(1) { | .notes view:nth-child(1) { | ||||
| width: 92%; | |||||
| height: 87rpx; | height: 87rpx; | ||||
| padding: 0 4%; | |||||
| line-height: 87rpx; | line-height: 87rpx; | ||||
| background: #fff; | background: #fff; | ||||
| border-top: 1px solid #f9f9f9; | |||||
| } | |||||
| .notes { | |||||
| width: 92%; | |||||
| margin: 0 auto; | |||||
| } | } | ||||
| .active { | .active { | ||||
| @@ -241,14 +244,14 @@ page { | |||||
| } | } | ||||
| .notes view:nth-child(1) text { | .notes view:nth-child(1) text { | ||||
| font-size: 24rpx; | |||||
| color: #333; | color: #333; | ||||
| letter-spacing: 0; | letter-spacing: 0; | ||||
| font-size: 30rpx; | |||||
| height: 70rpx; | |||||
| line-height: 70rpx; | |||||
| } | } | ||||
| .notes view:nth-child(2) { | .notes view:nth-child(2) { | ||||
| width: 92%; | |||||
| padding: 0 4%; | |||||
| background: #fff; | background: #fff; | ||||
| display: flex; | display: flex; | ||||
| flex-direction: column; | flex-direction: column; | ||||
| @@ -295,24 +298,28 @@ page { | |||||
| .txt { | .txt { | ||||
| margin-right: 30rpx; | margin-right: 30rpx; | ||||
| } | } | ||||
| .distance{ | |||||
| .distance { | |||||
| border: none; | border: none; | ||||
| border-radius:16rpx; | |||||
| border-radius: 16rpx; | |||||
| width: 600rpx; | width: 600rpx; | ||||
| padding: 16rpx 6rpx 0 0; | |||||
| padding: 16rpx 6rpx 0 0; | |||||
| } | } | ||||
| .distance .txt01{ | |||||
| .distance .txt01 { | |||||
| display: block; | display: block; | ||||
| font-size: 26rpx; | font-size: 26rpx; | ||||
| color: #ff4949; | color: #ff4949; | ||||
| } | } | ||||
| .clock{ | |||||
| width: 116rpx!important; | |||||
| .clock { | |||||
| width: 116rpx !important; | |||||
| vertical-align: middle; | vertical-align: middle; | ||||
| margin-right: 10rpx; | margin-right: 10rpx; | ||||
| margin-top: -4rpx; | margin-top: -4rpx; | ||||
| } | } | ||||
| .qiang{ | |||||
| .qiang { | |||||
| position: inline-block; | position: inline-block; | ||||
| width: 60rpx; | width: 60rpx; | ||||
| height: 40rpx; | height: 40rpx; | ||||
| @@ -322,14 +329,16 @@ page { | |||||
| font-size: 28rpx; | font-size: 28rpx; | ||||
| margin-right: 10rpx; | margin-right: 10rpx; | ||||
| } | } | ||||
| .times{ | |||||
| .times { | |||||
| display: inline-block; | display: inline-block; | ||||
| color: #ff4949; | |||||
| font-weight:bold; | |||||
| color: #ff4949; | |||||
| font-weight: bold; | |||||
| font-size: 26rpx; | font-size: 26rpx; | ||||
| text-align:center; | |||||
| text-align: center; | |||||
| } | } | ||||
| .times text{ | |||||
| .times text { | |||||
| display: inline-block; | display: inline-block; | ||||
| margin: 6rpx; | margin: 6rpx; | ||||
| width: 46rpx; | width: 46rpx; | ||||
| @@ -337,10 +346,10 @@ page { | |||||
| text-align: center; | text-align: center; | ||||
| font-size: 28rpx; | font-size: 28rpx; | ||||
| line-height: 60rpx; | line-height: 60rpx; | ||||
| border-radius:12rpx; | |||||
| border-radius: 12rpx; | |||||
| color: #fff; | color: #fff; | ||||
| font-weight:bold; | |||||
| background: #ff4949; | |||||
| font-weight: bold; | |||||
| background: #ff4949; | |||||
| } | } | ||||
| .b1 { | .b1 { | ||||
| @@ -364,7 +373,7 @@ page { | |||||
| width: 587rpx; | width: 587rpx; | ||||
| } | } | ||||
| .con .image{ | |||||
| .con .image { | |||||
| display: block; | display: block; | ||||
| width: 100%; | width: 100%; | ||||
| } | } | ||||
| @@ -372,6 +381,7 @@ page { | |||||
| .img { | .img { | ||||
| margin-top: -50rpx; | margin-top: -50rpx; | ||||
| } | } | ||||
| .question { | .question { | ||||
| display: block; | display: block; | ||||
| width: 587rpx; | width: 587rpx; | ||||
| @@ -398,55 +408,63 @@ page { | |||||
| text-align: center; | text-align: center; | ||||
| height: 50rpx; | height: 50rpx; | ||||
| margin: 0 auto; | margin: 0 auto; | ||||
| padding-top:10rpx; | |||||
| padding-bottom:20rpx; | |||||
| padding-top: 10rpx; | |||||
| padding-bottom: 20rpx; | |||||
| font-size: 32rpx; | font-size: 32rpx; | ||||
| font-weight: bold; | font-weight: bold; | ||||
| line-height: 41rpx; | line-height: 41rpx; | ||||
| border-bottom: 1rpx solid #eee; | border-bottom: 1rpx solid #eee; | ||||
| } | } | ||||
| .quessss >view:last-child{ | |||||
| border-bottom:0; | |||||
| .quessss >view:last-child { | |||||
| border-bottom: 0; | |||||
| } | } | ||||
| .close{ | |||||
| .close { | |||||
| position: relative; | position: relative; | ||||
| z-index: 10000; | z-index: 10000; | ||||
| display: block; | display: block; | ||||
| width: 70rpx; | width: 70rpx; | ||||
| } | } | ||||
| .ques_gou{ | |||||
| .ques_gou { | |||||
| position: absolute; | position: absolute; | ||||
| width: 20rpx; | width: 20rpx; | ||||
| top: 160rpx; | top: 160rpx; | ||||
| left: 23rpx; | left: 23rpx; | ||||
| } | } | ||||
| .btns{ | |||||
| .btns { | |||||
| color: #f8755b; | color: #f8755b; | ||||
| font-weight: bold; | |||||
| font-size: 30rpx!important; | |||||
| text-align: center!important; | |||||
| font-weight: bold; | |||||
| font-size: 30rpx !important; | |||||
| text-align: center !important; | |||||
| } | } | ||||
| .radios{ | |||||
| .radios { | |||||
| display: block; | display: block; | ||||
| font-size:28rpx; | |||||
| font-size: 28rpx; | |||||
| height: 95rpx; | height: 95rpx; | ||||
| line-height: 95rpx; | line-height: 95rpx; | ||||
| color: #333; | color: #333; | ||||
| text-indent: .5em; | |||||
| text-indent: 0.5em; | |||||
| } | } | ||||
| .elecard{ | |||||
| .elecard { | |||||
| display: inline-block; | display: inline-block; | ||||
| margin-left: 6rpx; | margin-left: 6rpx; | ||||
| color: #00c0ff; | color: #00c0ff; | ||||
| border: 1px solid #00c0ff; | border: 1px solid #00c0ff; | ||||
| border-radius:8rpx; | |||||
| font-style: normal; | |||||
| border-radius: 8rpx; | |||||
| font-style: normal; | |||||
| font-size: 30rpx; | font-size: 30rpx; | ||||
| line-height: 40rpx; | line-height: 40rpx; | ||||
| padding: 0 6rpx; | padding: 0 6rpx; | ||||
| } | } | ||||
| .applyshop{ | |||||
| .applyshop { | |||||
| font-size: 30rpx; | font-size: 30rpx; | ||||
| height:70rpx; | |||||
| line-height:70rpx; | |||||
| } | |||||
| height: 70rpx; | |||||
| line-height: 70rpx; | |||||
| color: #333; | |||||
| } | |||||
| @@ -1,3 +1,6 @@ | |||||
| page{ | |||||
| height: auto!important; | |||||
| } | |||||
| .header image{ | .header image{ | ||||
| width: 100%; | width: 100%; | ||||
| } | } | ||||
| @@ -47,7 +47,7 @@ Page({ | |||||
| var that = this; | var that = this; | ||||
| if (that.data.allow_load) { | if (that.data.allow_load) { | ||||
| Http.get({ | Http.get({ | ||||
| url: config.api.couponOrderList + "?type=5", | |||||
| url: config.api.couponOrderCarList, | |||||
| data: { | data: { | ||||
| pageNum: pageNum, | pageNum: pageNum, | ||||
| pageSize: 20, | pageSize: 20, | ||||
| @@ -43,7 +43,12 @@ Page{ | |||||
| .tit{ | .tit{ | ||||
| font-size:36rpx; | font-size:36rpx; | ||||
| color:rgba(51,51,51,1); | color:rgba(51,51,51,1); | ||||
| margin-top: -40rpx; | |||||
| margin: -40rpx auto 0; | |||||
| white-space: nowrap; | |||||
| text-overflow: ellipsis; | |||||
| overflow: hidden; | |||||
| width:280rpx; | |||||
| text-align: center; | |||||
| } | } | ||||
| .cardtype{ | .cardtype{ | ||||
| position: absolute; | position: absolute; | ||||