From 16d9802ad6cc80a10454ecf701514e8a14275ee1 Mon Sep 17 00:00:00 2001
From: 石广澎 <shiguangpeng@163.com>
Date: 星期二, 16 七月 2024 18:57:33 +0800
Subject: [PATCH] feat(支付): 支付页修改
---
pay/scanpay.vue | 110 ++++++++++++++++++++++++++++++++-----------------------
1 files changed, 64 insertions(+), 46 deletions(-)
diff --git a/pay/scanpay.vue b/pay/scanpay.vue
index 89935e8..6257895 100644
--- a/pay/scanpay.vue
+++ b/pay/scanpay.vue
@@ -3,49 +3,65 @@
<view class="page">
<view class="shop u-flex u-row-between">
<view class="u-m-r-30">
- <view class="u-font-28 color-666 u-m-b-10">浠樻缁�</view>
- <view class="u-font-34 font-bold color-333">{{ shopInfo.shopName }}</view>
+ <view class="u-font-26 color-666 u-m-b-10">浠樻缁�</view>
+ <view class="u-font-34 color-333">{{ shopInfo.shopName }}</view>
</view>
- <u-image width="94rpx" height="94rpx" radius="10rpx" :src="shopInfo.logoImage||'/static/imgs/store-logo.png'"></u-image>
+ <u-image width="88rpx" height="88rpx" shape="circle" :src="shopInfo.logoImage||'/static/store-logo.png'"></u-image>
</view>
- <view class="u-p-48 bg-fff u-flex-1 content">
- <view class="u-font-28 color-666">閲戦</view>
- <view class="u-p-v-20 u-flex u-border-bottom u-relative money-box">
- <view class="money-icon color-333">楼</view>
- <view class="u-flex-1 u-flex u-m-l-10" style="height: 80rpx;">
- <view v-if="money" class="money-num">{{ money }}</view>
+ <view class="u-p-24 bg-fff u-m-32 u-br-10">
+ <view class="u-flex u-row-between">
+ <view class="u-font-28 color-666">閲戦</view>
+ <view class="remark">娣诲姞澶囨敞</view>
+ </view>
+ <view class="u-p-v-20 u-flex u-col-bottom u-border-bottom u-relative money-box">
+ <view class="money-icon color-333 lh-1">楼</view>
+ <view class="u-flex-1 u-flex u-col-bottom u-m-l-10" style="height: 80rpx;">
+ <view v-if="money" class="money-num lh-1">{{ money }}</view>
<view :class="['cursor',{'cursor-act':!money&&bordShow}]"></view>
- <view v-if="!money" class="u-font-50 color-999">璇疯緭鍏ラ噾棰�</view>
+ <view v-if="!money" class="u-font-50 color-999 lh-1">璇疯緭鍏ラ噾棰�</view>
<view :class="['cursor',{'cursor-act':money&&bordShow}]"></view>
</view>
<view class="mask" @click="showBord"></view>
</view>
- <image v-if="isNew&&(this.payWay == 2&&!UNIONID)" @click="toRegister" class="reg-btn" src="/static/register-btn.png" mode=""></image>
- <block v-if="shopInfo.userCouponFlag==1">
- <view class="u-flex u-p-v-24 u-border-bottom">
- <u-icon name="coupon-fill" size="60rpx" color="#D31F28"></u-icon>
+<!-- <image v-if="isNew&&(this.payWay == 2&&!UNIONID)" @click="toRegister" class="reg-btn" src="/static/register-btn.png" mode=""></image>-->
+
+ </view>
+ <block v-if="shopInfo.userCouponFlag==1">
+ <view class="bg-fff u-m-32 u-br-10">
+ <view class="u-flex u-p-24 u-border-bottom">
+<!-- <u-icon name="coupon-fill" size="60rpx" color="#D31F28"></u-icon>-->
<view class="u-font-32 u-flex-1 u-m-h-16">浼樻儬鍒�</view>
<view @click="showCoupon" class="u-flex">
<view v-if="couponInfo.id" class="tag-pain">
婊{ parseFloat((couponInfo.thresholdValue / 100).toFixed(2)) }}鍏冨噺{{ parseFloat((couponInfo.discount / 100).toFixed(2)) }}鍏�
</view>
- <view v-else class="u-font-28 lh-1">璇烽�夋嫨</view>
+ <view v-else class="u-font-28 lh-1 u-tips-color">璇烽�夋嫨</view>
<u-icon class="u-m-l-10" name="arrow-right" color="#999" size="16"></u-icon>
</view>
</view>
- <view v-if="discount" class="u-p-v-30 u-flex u-row-between u-border-bottom">
- <view class="u-font-32 color-333">瀹為檯鎶垫墸</view>
+ <view class="u-font-26 u-tips-color u-p-24">寰俊鎼滅储鎴栫洿鎺ョ偣鍑绘墦寮�
+ <text style="color: #1E8BE0">銆愬唨浼橀偖銆�</text>
+ 灏忕▼搴忥紝浜彈鏇村浼樻儬
+ </view>
+ </view>
+ </block>
+
+
+ <block v-if="shopInfo.userCouponFlag==1&&discount">
+ <view class="u-m-32 u-br-10 bg-fff">
+ <view class="u-p-24 u-flex u-row-between u-border-bottom">
+ <view class="u-font-32 color-333">鎶垫墸閲戦</view>
<view class="color-green">- {{ discount }}</view>
</view>
- <view v-if="discount" class="u-p-v-30 u-flex u-row-between u-border-bottom">
+ <view class="u-p-24 u-flex u-row-between u-br-10 bg-fff">
<view class="u-font-32 color-333">瀹炰粯閲戦</view>
<view class="color-red">
<text class="u-font-26 u-m-r-6">楼</text>
<text class="u-font-34">{{ payMoney }}</text>
</view>
</view>
- </block>
- </view>
+ </view>
+ </block>
<button class="pay-it" @click="pay">浠樻</button>
<!-- 鏁板瓧閿洏 -->
<u-popup :show="bordShow" :overlay="false" @close="bordShow = false">
@@ -57,7 +73,6 @@
<view v-if="checkCoupon.id" class="choose-coupon">
宸查�夋嫨浼樻儬鍒�1寮狅紝鍏辨姷鎵ｏ骏{{ parseFloat((checkCoupon.discount / 100).toFixed(2)) }}
</view>
- <!-- <view class="choose-coupon">閫夋嫨浼樻儬鍒�</view> -->
<scroll-view scroll-y class="u-p-30 coupon-list">
<view @click="clickCoupon(item)" class="u-m-b-24 u-flex coupon" v-for="(item, index) in couponList" :key="index">
<view style="color: #D31F28;" class="u-p-h-28">
@@ -302,7 +317,7 @@
// 閲戦 this.money
uni.showLoading()
const params = {
- money: Number(this.payMoney * 100),
+ money: Number(this.money * 100),
shopId: this.shopInfo.id,
cid: this.cid,
payWay: this.payWay,
@@ -346,9 +361,9 @@
if (res.err_msg == "get_brand_wcpay_request:ok") {
// 浣跨敤浠ヤ笂鏂瑰紡鍒ゆ柇鍓嶇杩斿洖,寰俊鍥㈤槦閮戦噸鎻愮ず锛�
//res.err_msg灏嗗湪鐢ㄦ埛鏀粯鎴愬姛鍚庤繑鍥瀘k锛屼絾骞朵笉淇濊瘉瀹冪粷瀵瑰彲闈犮��
- uni.navigateTo({
+ /*uni.navigateTo({
url: `/pay/paySuccess?orderId=${this.orderId}&youHuiInfo=${JSON.stringify(this.youHuiInfo)}`
- })
+ })*/
} else {
this.closeOrder()
}
@@ -366,8 +381,11 @@
.stringify(this.youHuiInfo)}`
})
// 鏀粯鎴愬姛
- } else if (res.resultCode == 8000 || res.resultCode == 6001) {
+ } else if (res.resultCode == 8000) {
// 姝ｅ湪澶勭悊涓� || 鍙栨秷
+ } else if (res.resultCode == 6001) {
+ // 鍙栨秷
+ this.closeOrder()
} else {
this.closeOrder()
// 鏀粯澶辫触
@@ -387,45 +405,36 @@
<style scoped lang="scss">
.page {
height: calc(100vh - 0px);
- display: flex;
- flex-direction: column;
}
.shop {
- padding: 50rpx 64rpx;
+ padding: 50rpx 32rpx 10px;
}
.avg-img {
- width: 94rpx;
- height: 94rpx;
- border-radius: 10rpx;
+ width: 88rpx;
+ height: 88rpx;
+ border-radius: 44rpx;
background-color: #ffffff;
}
-.content {
- border-radius: 40rpx 40rpx 0 0;
-}
.money {
font-size: 40rpx;
color: #333;
}
-.money-box{
- padding-left: 50rpx;
-}
+
+
.money-icon {
- position: absolute;
- font-size: 50rpx;
- // font-weight: bold;
+ position: relative;
+ bottom: 6rpx;
+ font-size: 42rpx;
color: #666;
- margin-right: 20rpx;
- bottom: 10rpx;
- left: 0;
+ margin-right: 10rpx;
}
.money-num {
- font-size: 96rpx;
- // font-weight: bold;
+ font-size: 72rpx;
}
.pay-it {
@@ -498,8 +507,10 @@
}
.cursor {
+ position: relative;
+ bottom: 10rpx;
width: 1px;
- height: 80rpx;
+ height: 70rpx;
}
.cursor-act {
@@ -632,6 +643,13 @@
background-color: #ffffff;
}
+.remark {
+ color: #1E8BE0
+}
+
+.lh-1 {
+ line-height: 1;
+}
.coupon-btn {
margin: 0 30rpx 30rpx;
--
Gitblit v1.9.1