From 9306294ef1abae420f4d05473030f853d9c084b3 Mon Sep 17 00:00:00 2001
From: sws <1141121512@qq.com>
Date: Wed, 1 Nov 2023 18:25:26 +0800
Subject: [PATCH] =?UTF-8?q?1.=E6=89=AB=E7=A0=81=E6=94=AF=E4=BB=98=E7=BB=93?=
=?UTF-8?q?=E6=9E=9C=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pages/plugins/scanpay/index/index.css | 3 +++
pages/plugins/scanpay/index/index.vue | 10 ++++------
pages/plugins/scanpay/tips/tips.vue | 25 +++++++++++++++++--------
static/icon/iconfont.css | 6 +++++-
static/icon/iconfont.ttf | Bin 16804 -> 17232 bytes
5 files changed, 29 insertions(+), 15 deletions(-)
diff --git a/pages/plugins/scanpay/index/index.css b/pages/plugins/scanpay/index/index.css
index 3d56adf4..88060241 100644
--- a/pages/plugins/scanpay/index/index.css
+++ b/pages/plugins/scanpay/index/index.css
@@ -105,10 +105,13 @@
font-size: 28rpx;
border: 2rpx #eee solid;
height: 80rpx;
+ line-height: 80rpx;
+ min-height: 80rpx;
padding: 0 20rpx;
border-radius: 10rpx;
color: #555;
background: #F1F1F1;
+ box-sizing: unset !important;
}
.dialog-btn-group {
diff --git a/pages/plugins/scanpay/index/index.vue b/pages/plugins/scanpay/index/index.vue
index c400c736..b8233eff 100644
--- a/pages/plugins/scanpay/index/index.vue
+++ b/pages/plugins/scanpay/index/index.vue
@@ -35,8 +35,7 @@
更多
-
-
+
@@ -52,20 +51,19 @@
-
+
备注
-
+
取消
- 确定
+ 确定
-
diff --git a/pages/plugins/scanpay/tips/tips.vue b/pages/plugins/scanpay/tips/tips.vue
index a0746f3d..5e8d906f 100644
--- a/pages/plugins/scanpay/tips/tips.vue
+++ b/pages/plugins/scanpay/tips/tips.vue
@@ -2,13 +2,13 @@
-
-
-
+
+
+
+
+
+ {{ data.scanpay_info.name }}
- {{ data.scanpay_info.name }}
-
-
订单状态
{{ data.order_info.status == 1 ? '支付成功' : '支付失败' }}
@@ -22,15 +22,23 @@
{{ currency_symbol }}{{ data.order_info.pay_price }}
+
+
+
+
+
+ 支付失败
+
+
-
+
-
+
@@ -92,6 +100,7 @@
dataType: 'json',
success: (res) => {
uni.hideLoading();
+ uni.stopPullDownRefresh();
if (res.data.code == 0) {
this.setData({
data: res.data.data || null,
diff --git a/static/icon/iconfont.css b/static/icon/iconfont.css
index 21a99a92..16b8bcf8 100644
--- a/static/icon/iconfont.css
+++ b/static/icon/iconfont.css
@@ -14,7 +14,11 @@
-moz-osx-font-smoothing: grayscale;
}
-.icon-jianpan-guanbi:before {
+.icon-payment-fail:before {
+ content: "\e6e6";
+}
+
+.icon-keyboard-backspace:before {
content: "\e6e5";
}
diff --git a/static/icon/iconfont.ttf b/static/icon/iconfont.ttf
index d18d587cc9572a0bfeb6ff38d3355b7185014db5..7d55fba9b13f9fadf5d0042132cf8411b93361b2 100644
GIT binary patch
delta 1906
zcmZ9Md2Ccw6vn^T>1^!`-KHH-ifxBZp{3vq($j`39?%x76W9n>@|Bn2G?@fPsKD;;Xzbl
z3d&J|QiL%H51M*u-g!~~2-F~*??`S7CvV=xx^RVc)0kGng=vE9Q(Vj&+OYBpewArzGfvkm!3VcsG86;=T9
zvBFwFsA>~d1wz%Dus)E33M&OUq_Ad?PZd@Va#%rrl*SQ-6@`4Ju(puT6;>JYg~ED6
zzEoIw$X5zA0Qp*>8X!j%>H>01p+X?X6>0_Y4T-X$Y#=8T3J7vip_CxsDijrDK%u-K
zrxXee@|{A-K~5_aALNWe8A8q~6eQ%FLTMr@=Q$u$Ddd7ey+XcMs9eYo3N;M*QK6b4
z7ZvIn@{?j-Lit&t)*-(rR6XR9Lj6N7$6@~MGzJw|*fThaPZh74@nAnhb#2U12vQ^po?49--jxxs_#{s9u+3wuv97?KB
z+MIMfIUG%XG@f0_H_Bjoql?;3kO-Yjoc
zuryp64i)$d{CRep-RAX-GJ=%`hqov4$z;2WCY3(R%8T+UnnH5(mnx1+oyG;jWy`Ex@hC84=A=7mb?8+*3*G#W*P
zHT65|YYU5vibu?@sIZpf8q=t$cQni_m|5eWF>TDW28+QD@yw?KzEPumfrA%(!JzMa
zquXI~H1Y(S!~Jl)jW@@iymQvsJ4VZ#-p0n>9d&v}o$#Q#U3W%tW9Xq-v;DKH$4;;H
z*Ukd^dmY)ZBlj
H;)La2mdM_v
delta 1477
zcmY+^TTEP46vpxYnHgY!VHoc8B2tT3fm*CsYfGWZi|Jz%6Jv}zwiIfBl86SMhNN1X
zXtWVyV&a2o>!lT20d2k1Th(eSRV=6#E7Dq4d@#mFO&T8@zr*syll*3%IcLty-fMk(
zCU*tz3Kj`$wP}Fav5^UyLukpw!Xh}0^-lW>e}wk^w#>SlSlR0
zIa$-K3-NfYTIa{4uDf?&u;{VuANsyuCDF5EOZxFk&(-MpgzoR|O%L`5ckrI>h0oOX
zrF%P5`!cPs!@4*0qh0+w9vGPV{k9I+uoPmC51*!P)R9eq$nmyf+9^YpFAxwhurbWXho1|2`8jO6}7!i^TPHy%@Et~G*|3J
zr&(h!In5t?*=Z%%D^6>|4mhn2JLt4d>{XZ1lCcq|#bd8Il>t*3Ln;V%*r_zws8f-!
zF{g52<4%Rc6qk@nh`s4lOzenLS+S#J!WUFw>@BBSV{bcE9ec;A{+KpGNS(kG=#YAX
zDX<}R2YcVCPuK@e9m76!>K*oxqb{S9<4*m=K6dIX_K8!Eu}_`4jh%4nJNB7V0FF20QH(AM8t~AYorQMGBjA3K#aZQ_Qe4PJzRwoT7(K
zJB1MY#wm`Nc3nupBxB#{jVPnoS*NsO-#g_Nn{i4o_JdQFv2!lmcJ`xFzOh-Sq+>rh
zWgeSzNDlM7Be7W>(0H)9uF_>W-oZeg#(HZBHhgBK#n$WUY?ayD8UeKJO@
zKQ@~)lyf0>EUzhVFz@NSzvG+ZBk^J-H
v`CHX=_2xyX@#ca9EkVcdOxvy$$@{mb`})&;E4v;{_uaRBd}sUVsFuLLQ&E1G