Преглед на файлове

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

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 Целия файл

Преди След
Ширина: 200  |  Височина: 200  |  Големина: 10 KiB Ширина: 142  |  Височина: 142  |  Големина: 28 KiB

+ 1
- 1
config/config.js Целия файл

@@ -2,7 +2,7 @@ var config = {
url: "https://ciformall.youlane.cn/C/api", url: "https://ciformall.youlane.cn/C/api",
// url:"https://c.malls.iformall.com/C/api", // url:"https://c.malls.iformall.com/C/api",
// url:'https://ctest.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', // url: 'http://10.100.30.172:7000/C/api',
api: { api: {
/** /**


+ 0
- 1
pages/ConsumeDetail/ConsumeDetail.js Целия файл

@@ -55,7 +55,6 @@ Page({
}); });
}, },
onLoad(options) { onLoad(options) {
console.log(config.api.cardpayList);
let that = this; let that = this;
wx.showLoading({ wx.showLoading({
title: "加载中..." 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({ wx.scanCode({
success: (res) => { success: (res) => {
wx.navigateTo({ 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) => { fail: (res) => {


+ 10
- 8
pages/cardorder/index/index.wxml Целия файл

@@ -17,15 +17,17 @@
<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 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>
<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 hover-class='active' wx:if="{{item.couponOrderStatus!=4}}" class="btns">已失效</view>
</view> </view>
</view> </view>


+ 3
- 3
pages/cardorder/index/index.wxss Целия файл

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


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


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


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


+ 1
- 1
pages/coupon/detail/index.wxml Целия файл

@@ -29,7 +29,7 @@
<text>{{sec}}</text> <text>{{sec}}</text>
</view> </view>
</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> <text class="subTitle">{{data.subTitle}}</text>
<view class='salePriceStr clearfix'> <view class='salePriceStr clearfix'>
<view class="fl">售价: <view class="fl">售价:


+ 2
- 2
pages/scanPay/scanPay.js Целия файл

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


+ 1
- 0
pages/scanPay/scanPay.wxml Целия файл

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


+ 3
- 3
pages/scanPay/scanPay.wxss Целия файл

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


Зареждане…
Отказ
Запис