HolyKnightIX 2 лет назад
Родитель
Сommit
ca85cdfcb4
7 измененных файлов: 56 добавлений и 39 удалений
  1. Двоичные данные
      assets/images/negatived.png
  2. +12
    -11
      pages/ConsumeDetail/ConsumeDetail.js
  3. +2
    -2
      pages/ConsumeDetail/ConsumeDetail.wxml
  4. +11
    -2
      pages/cardorder/cardUse/cardUse.js
  5. +27
    -10
      pages/cardorder/cardUse/cardUse.wxml
  6. +2
    -12
      pages/cardorder/index/index.js
  7. +2
    -2
      pages/cardorder/index/index.wxml

Двоичные данные
assets/images/negatived.png Просмотреть файл

До После
Ширина: 600  |  Высота: 572  |  Размер: 62 KiB

+ 12
- 11
pages/ConsumeDetail/ConsumeDetail.js Просмотреть файл

@@ -136,7 +136,7 @@ Page({
let that = this; let that = this;


if (options.cardId) { if (options.cardId) {
// that.cardpayList(options.cardId);
that.cardpayList(options.cardId);
that.cardDetail(options.cardId); that.cardDetail(options.cardId);
} }


@@ -163,19 +163,20 @@ Page({
Http.get(parmer) Http.get(parmer)
.then(res => { .then(res => {
console.log(res); console.log(res);
if (res.code == 200 && res.data.list.length > 0) {
if (res.code == 200 && res.data.list && res.data.list.length > 0) {
wx.hideLoading();
res.data.list.map(file => {
file.updateDate = util.formatTime(file.updateDate, "yyyy-MM-dd hh:mm:ss")
})
that.setData({ that.setData({
showPage: true
showPage: true,
data: res.data.list
}) })
} else { }
wx.hideLoading();
res.data.list.map(file => {
file.updateDate = util.formatTime(file.updateDate, "yyyy-MM-dd hh:mm:ss")
})
that.setData({
data: res.data.list
});
} else {
wx.hideLoading();
}
}).catch(err => { }).catch(err => {
console.log(err, 'err');
wx.showToast({ wx.showToast({
title: err.message, title: err.message,
icon: 'none', icon: 'none',


+ 2
- 2
pages/ConsumeDetail/ConsumeDetail.wxml Просмотреть файл

@@ -25,7 +25,7 @@
</view> </view>
<view class='bottom' bindtap='more' wx:if="{{showMore}}">{{more}}</view> <view class='bottom' bindtap='more' wx:if="{{showMore}}">{{more}}</view>
<text class='title' wx:if="{{supportTransfer!=1}}">交易记录</text> <text class='title' wx:if="{{supportTransfer!=1}}">交易记录</text>
<!-- <view wx:for="{{data}}" wx:key="index" class='list'>
<view wx:if="{{data.length>0}}" 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>
<text class='fr'>-{{item.deductionAmount/100}}元</text> <text class='fr'>-{{item.deductionAmount/100}}元</text>
@@ -34,7 +34,7 @@
<text class='fl'>{{item.updateDate}}</text> <text class='fl'>{{item.updateDate}}</text>
<text class='fr'>余 {{item.cardRemainAmount/100}}元</text> <text class='fr'>余 {{item.cardRemainAmount/100}}元</text>
</view> </view>
</view> -->
</view>
<view class="dingdan" wx:if="{{data.length==0&&supportTransfer!=1}}"> <view class="dingdan" wx:if="{{data.length==0&&supportTransfer!=1}}">
<image src="{{dingdanUrl}}" mode="widthFix"></image> <image src="{{dingdanUrl}}" mode="widthFix"></image>
<text>暂无交易明细</text> <text>暂无交易明细</text>


+ 11
- 2
pages/cardorder/cardUse/cardUse.js Просмотреть файл

@@ -23,7 +23,8 @@ Page({
QRdata: {}, QRdata: {},
isShowQR: true, isShowQR: true,
showhieRq: false, showhieRq: false,
cardId: ''
cardId: '',
showImg: ''
}, },


cardDetail(couponOrderId) { cardDetail(couponOrderId) {
@@ -161,6 +162,12 @@ Page({
}) })
}, },


goCheck() {
wx.navigateTo({
url: `/pages/ConsumeDetail/ConsumeDetail?cardId=${this.data.data.id}`,
})
},

// 无法转赠 // 无法转赠
goGiveNone() { goGiveNone() {
if (this.data.data.amount !== this.data.data.remainingAmount) { if (this.data.data.amount !== this.data.data.remainingAmount) {
@@ -251,9 +258,11 @@ Page({
if (options.cardId) { if (options.cardId) {
this.cardDetail(options.cardId); this.cardDetail(options.cardId);
this.setData({ this.setData({
cardId: options.cardId
cardId: options.cardId,
showImg: options.showImg
}) })
} }
console.log(this.data.showImg, 'showImg');
}, },


/** /**


+ 27
- 10
pages/cardorder/cardUse/cardUse.wxml Просмотреть файл

@@ -44,22 +44,37 @@
<canvas canvas-id="qrcode" /> <canvas canvas-id="qrcode" />
</view> --> </view> -->


<view class="canWrap" wx:if="{{isShowQR}}">
<canvas canvas-id="qrcode" style="width: 1200rpx; height: 800rpx;" />
<!-- 正常显示二维码 -->
<view wx:if="{{showImg=='1'}}">
<view class="canWrap" wx:if="{{isShowQR}}">
<canvas canvas-id="qrcode" style="width: 1200rpx; height: 800rpx;" />
</view>
<image wx:if="{{isShowQR}}" src="{{tempFilePath}}" mode="aspectFit" />
</view>

<!-- 二维码已停用 -->
<view wx:if="{{showImg=='1'}}">
<view class="canWrap" wx:if="{{!isShowQR }}">
<canvas canvas-id="qrcode" style="width: 1200rpx; height: 800rpx;" />
</view>
<image wx:if="{{!isShowQR}}" src="https://formall.oss-accelerate.aliyuncs.com/cimg/stoped.png" mode="aspectFit" />
</view> </view>
<image wx:if="{{isShowQR}}" src="{{tempFilePath}}" mode="aspectFit" />


<view class="canWrap" wx:if="{{!isShowQR}}">
<canvas canvas-id="qrcode" style="width: 1200rpx; height: 800rpx;" />
<!-- 二维码已失效 -->
<view wx:if="{{showImg=='0'}}">
<view class="canWrap">
<canvas canvas-id="qrcode" style="width: 1200rpx; height: 800rpx;" />
</view>
<image src="/assets/images/negatived.png" mode="aspectFit" />
</view> </view>
<image wx:if="{{!isShowQR}}" src="https://formall.oss-accelerate.aliyuncs.com/cimg/stoped.png" mode="aspectFit" />


<view class="closeRq" wx:if="{{showhieRq}}" bindtap="reQR">

<view class="closeRq" wx:if="{{showhieRq && (showImg=='1')}}" bindtap="reQR">
<image class="updataRqCode" mode='widthFix' src="{{upDataRqUrlF}}"></image> <image class="updataRqCode" mode='widthFix' src="{{upDataRqUrlF}}"></image>
<view class="upDataRq">点一点刷新二维码</view> <view class="upDataRq">点一点刷新二维码</view>
</view> </view>


<view class="coedTiem" wx:if="{{!showhieRq&&expiredSeconds>0}}">二维码在
<view class="coedTiem" wx:if="{{!showhieRq && (expiredSeconds>0) && (showImg=='1')}}">二维码在
<text style="color:red">{{expiredSeconds}}s</text> <text style="color:red">{{expiredSeconds}}s</text>
后失效 后失效
</view> </view>
@@ -134,8 +149,10 @@
</view> </view>
</view> --> </view> -->
<view class="bottomBtn"> <view class="bottomBtn">
<button wx:if="{{isShowQR}}" class="btn" bindtap='gotoPay'>扫一扫付款</button>
<button wx:if="{{data.supportTransfer==1}}" class="btn" bindtap="goGive">转送给微信好友</button>
<!-- wx:if="{{showImg=='0'}}" -->
<button class="btn" bindtap='goCheck'>查看交易记录</button>
<button wx:if="{{isShowQR && showImg=='1'}}" class="btn" bindtap='gotoPay'>扫一扫付款</button>
<button wx:if="{{(data.supportTransfer==1) && showImg=='1'}}" class="btn" bindtap="goGive">转送给微信好友</button>
<!-- <button wx:else class="btnGrey" bindtap="goGiveNone">转送给微信好友</button> --> <!-- <button wx:else class="btnGrey" bindtap="goGiveNone">转送给微信好友</button> -->
</view> </view>
</view> </view>


+ 2
- 12
pages/cardorder/index/index.js Просмотреть файл

@@ -124,27 +124,17 @@ Page({
}, },
// 跳转到详情 // 跳转到详情
gotoConsumeDetail: function (e) { gotoConsumeDetail: function (e) {
if (e.currentTarget.dataset.id) {
// wx.navigateTo({
// url: `/pages/ConsumeDetail/ConsumeDetail?cardId=${e.currentTarget.dataset.id}`,
// })
wx.navigateTo({
url: `/pages/cardorder/cardUse/cardUse?cardId=${e.currentTarget.dataset.id}`,
})
}
},

gotoConsumeDetailII: function (e) {
console.log(e, 'e'); console.log(e, 'e');
if (e.currentTarget.dataset.id) { if (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}`,
// }) // })
wx.navigateTo({ wx.navigateTo({
url: `/pages/ConsumeDetail/ConsumeDetail?cardId=${e.currentTarget.dataset.id}`,
url: `/pages/cardorder/cardUse/cardUse?cardId=${e.currentTarget.dataset.id}&showImg=${e.currentTarget.dataset.showimg}`,
}) })
} }
}, },

//点击跳转到券详情页面 //点击跳转到券详情页面
gotouse: function (e) { gotouse: function (e) {
if (this.data.mystatus == '' || this.data.mystatus == 'undefined') { if (this.data.mystatus == '' || this.data.mystatus == 'undefined') {


+ 2
- 2
pages/cardorder/index/index.wxml Просмотреть файл

@@ -23,9 +23,9 @@
<view class="gray-bg"></view> <view class="gray-bg"></view>
<image class="cover-img" src="{{item.coverImg}}" /> <image class="cover-img" src="{{item.coverImg}}" />
<image src="{{canTransferred}}" wx-if='{{item.supportTransfer==1&&!item.showImg}}' class='cantransferred' mode="aspectFill" /> <image src="{{canTransferred}}" wx-if='{{item.supportTransfer==1&&!item.showImg}}' class='cantransferred' mode="aspectFill" />
<view class='detail_msg' data-id='{{item.id}}' bindtap='{{!item.showImg?"":"gotoConsumeDetailII"}}'>
<view class='detail_msg'>
<view class='info'> <view class='info'>
<view class='clearfix' data-id='{{item.id}}' bindtap='{{!item.showImg?"gotoConsumeDetail":""}}'>
<view class='clearfix' data-id='{{item.id}}' data-showImg='{{item.showImg? "0":"1"}}' bindtap='gotoConsumeDetail'>
<view class='title fl'> <view class='title fl'>
<text class='yue'><text class='yu'>余</text>{{item.remainingAmount/100}}<text class='yu'>元</text></text> <text class='yue'><text class='yu'>余</text>{{item.remainingAmount/100}}<text class='yu'>元</text></text>
<text class="txt2" style='margin-top:9rpx!important;' wx:if="{{item.couponOrderStatus == 5 || item.couponOrderStatus == 6 || item.couponOrderStatus == 7|| item.couponOrderStatus == 8}}">{{item.expiredTime}}到期</text> <text class="txt2" style='margin-top:9rpx!important;' wx:if="{{item.couponOrderStatus == 5 || item.couponOrderStatus == 6 || item.couponOrderStatus == 7|| item.couponOrderStatus == 8}}">{{item.expiredTime}}到期</text>


Загрузка…
Отмена
Сохранить