瀏覽代碼

[扫一扫付款显示卡余额,卡包列表]

tags/广东版3.2.1
meo 6 年之前
父節點
當前提交
a3e96e7593
共有 11 個檔案被更改,包括 23 行新增21 行删除
  1. 二進制
      assets/images/give.png
  2. +1
    -1
      config/config.js
  3. +0
    -1
      pages/ConsumeDetail/ConsumeDetail.js
  4. +1
    -1
      pages/ConsumeDetail/ConsumeDetail.json
  5. +1
    -1
      pages/cardorder/index/index.js
  6. +10
    -8
      pages/cardorder/index/index.wxml
  7. +3
    -3
      pages/cardorder/index/index.wxss
  8. +1
    -1
      pages/coupon/detail/index.wxml
  9. +2
    -2
      pages/scanPay/scanPay.js
  10. +1
    -0
      pages/scanPay/scanPay.wxml
  11. +3
    -3
      pages/scanPay/scanPay.wxss

二進制
assets/images/give.png 查看文件

Before After
Width: 200  |  Height: 200  |  Size: 10 KiB Width: 142  |  Height: 142  |  Size: 28 KiB

+ 1
- 1
config/config.js 查看文件

@@ -2,7 +2,7 @@ var config = {
url: "https://ciformall.youlane.cn/C/api",
// url:"https://c.malls.iformall.com/C/api",
// url:'https://ctest.malls.iformall.com/C/api',
// url:'http://10.100.33.66:7000/C/api',
// url:'http://10.100.33.68:7000/C/api',
// url: 'http://10.100.30.172:7000/C/api',
api: {
/**


+ 0
- 1
pages/ConsumeDetail/ConsumeDetail.js 查看文件

@@ -55,7 +55,6 @@ Page({
});
},
onLoad(options) {
console.log(config.api.cardpayList);
let that = this;
wx.showLoading({
title: "加载中..."


+ 1
- 1
pages/ConsumeDetail/ConsumeDetail.json 查看文件

@@ -1,3 +1,3 @@
{
"navigationBarTitleText": "券详情"
"navigationBarTitleText": "消费记录"
}

+ 1
- 1
pages/cardorder/index/index.js 查看文件

@@ -46,7 +46,7 @@ Page({
wx.scanCode({
success: (res) => {
wx.navigateTo({
url: `/pages/scanPay/scanPay?merChant=${res.result}&cardid=${e.currentTarget.dataset.cardid}`,
url: `/pages/scanPay/scanPay?merChant=${res.result}&cardid=${e.currentTarget.dataset.cardid}&remainingAmount=${e.currentTarget.dataset.remainingamount}`,
})
},
fail: (res) => {


+ 10
- 8
pages/cardorder/index/index.wxml 查看文件

@@ -17,15 +17,17 @@
<view class='mms' style='background:{{item.background}}'>
<view class='detail_msg'>
<view class='info'>
<view class='title'>
<text>{{item.title}}</text>
<image data-id='{{item.id}}' bindtap='gotoConsumeDetail' class='fr' src='./../../../assets/images/icon01.png' mode="widthFix"></image>
<view data-id='{{item.id}}' bindtap='gotoConsumeDetail'>
<view class='title'>
<text>{{item.title}}</text>
<image class='fr' src='./../../../assets/images/icon01.png' mode="widthFix"></image>
</view>
<view class='expiretime'>
<text class="txt2">{{item.expiredTime}}到期</text>
<text class='txt2 fr'>金额<text class='money'>{{item.remainingAmount/100}}</text>元</text>
</view>
</view>
<view class='expiretime'>
<text class="txt2">{{item.expiredTime}}到期</text>
<text class='txt2 fr'>金额<text class='money'>{{item.remainingAmount/100}}</text>元</text>
</view>
<view hover-class='active' bindtap='gotoPay' data-cardId="{{item.id}}" data-couponorderstatus="{{item.couponOrderStatus}}" wx:if="{{item.couponOrderStatus==4}}" class="btns">扫一扫付款</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">已失效</view>
</view>
</view>


+ 3
- 3
pages/cardorder/index/index.wxss 查看文件

@@ -72,7 +72,7 @@
border-radius: 50%;
}

.info view:nth-child(1) {
.info >view view:nth-child(1) {
display: flex;
justify-content: space-between;
padding: 0 2%;
@@ -82,7 +82,7 @@
width: 100%;
}

.info view:nth-child(1) text {
.info >view view:nth-child(1) text {
font-size: 32rpx;
line-height: 32rpx;
height: 32rpx;
@@ -96,7 +96,7 @@
margin-bottom: 10rpx;
}

.info view:nth-child(2) {
.info >view view:nth-child(2) {
font-size: 26rpx;
color: #fff;
letter-spacing: 0;


+ 1
- 1
pages/coupon/detail/index.wxml 查看文件

@@ -29,7 +29,7 @@
<text>{{sec}}</text>
</view>
</view>
<text class='title'>{{data.title}}<text class="elecard">电子卡</text></text>
<text class='title'>{{data.title}}<text class="elecard" wx:if="{{data.type==7}}">电子卡</text></text>
<text class="subTitle">{{data.subTitle}}</text>
<view class='salePriceStr clearfix'>
<view class="fl">售价:


+ 2
- 2
pages/scanPay/scanPay.js 查看文件

@@ -17,11 +17,11 @@ Page({
* 生命周期函数--监听页面加载
*/
onLoad: function(options) {
console.log(options)
let that = this;
that.setData({
merChant: JSON.parse(options.merChant),
cardid: options.cardid
cardid: options.cardid,
remainingAmount: options.remainingAmount
})
},
bindKeyInput(e) {


+ 1
- 0
pages/scanPay/scanPay.wxml 查看文件

@@ -1,4 +1,5 @@
<view class='content'>
<view class='title'>卡余额:{{remainingAmount}}元</view>
<view class='head clearfix'>
<text class='fl'>付款给{{merChant.merchant_name}}</text>
<image class='fr' src='{{merChant.merchant_img_url}}' mode='widthFix'></image>


+ 3
- 3
pages/scanPay/scanPay.wxss 查看文件

@@ -1,14 +1,14 @@
.content{
padding:0 57rpx;
}
.title{
margin-top: 60rpx;
}
.head image{
width: 100rpx;
height: 100rpx;
border-radius:50%;
}
.head{
margin-top: 80rpx;
}
.head .fl{
font-size:32rpx;
font-family:PingFang-SC-Bold;


Loading…
取消
儲存