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 d18d587c..7d55fba9 100644
Binary files a/static/icon/iconfont.ttf and b/static/icon/iconfont.ttf differ