diff --git a/components/payment/payment.vue b/components/payment/payment.vue
index 56207909..9c7dabb0 100644
--- a/components/payment/payment.vue
+++ b/components/payment/payment.vue
@@ -148,6 +148,11 @@
type: Boolean,
default: false,
},
+ // 判断错误时是否需要弹窗提示
+ propIsFailAlert: {
+ type: Boolean,
+ default: true,
+ },
},
components: {
componentPopup,
@@ -609,19 +614,26 @@
to_fail_page_event(msg) {
let to_fail_page = this.propToFailPage;
if (to_fail_page) {
- // 现金支付
- uni.showModal({
- content: msg,
- showCancel: false,
- success(res) {
- if (res.confirm) {
- // 跳转支付页面
- uni.redirectTo({
- url: to_fail_page,
- });
- }
- },
- });
+ if (this.propIsFailAlert) {
+ // 现金支付
+ uni.showModal({
+ content: msg,
+ showCancel: false,
+ success(res) {
+ if (res.confirm) {
+ // 跳转支付页面
+ uni.redirectTo({
+ url: to_fail_page,
+ });
+ }
+ },
+ });
+ } else {
+ // 跳转支付页面
+ uni.redirectTo({
+ url: to_fail_page,
+ });
+ }
} else {
if (msg) {
app.globalData.showToast(msg);
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 8dbf1b2e..45795d02 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -24,11 +24,9 @@
-
- @onicon="search_icon_event" propIcon="icon-mendian-sousuosm" :propIsIconOnEvent="true"
-
- >
+
+
+
diff --git a/pages/plugins/scanpay/index/index.css b/pages/plugins/scanpay/index/index.css
index a64a2857..05f23db5 100644
--- a/pages/plugins/scanpay/index/index.css
+++ b/pages/plugins/scanpay/index/index.css
@@ -68,12 +68,16 @@
font-weight: 400;
}
-.sub-key-content text {
+.sub-key-content .key-num {
transition: all 0.15s ease-in-out;
}
-.sub-key-content text:active {
- background-color: rgba(0, 0, 0, 0.15);
+.sub-key-content .key-num:active {
+ background-color: rgba(0, 0, 0, 0.1) !important;
+}
+
+.sub-key-content .key-num.sub:active {
+ background-color: rgba(230, 67, 64, 0.85) !important;
}
/* 弹框 */
diff --git a/pages/plugins/scanpay/index/index.vue b/pages/plugins/scanpay/index/index.vue
index a52ab1ac..e978039e 100644
--- a/pages/plugins/scanpay/index/index.vue
+++ b/pages/plugins/scanpay/index/index.vue
@@ -68,35 +68,35 @@
- 1
- 2
- 3
-
-
-
+ 1
+ 2
+ 3
+
+
+
- 4
- 5
- 6
+ 4
+ 5
+ 6
- 7
- 8
- 9
+ 7
+ 8
+ 9
- 0
- .
+ 0
+ .
+
+
+
+
+ 支付
-
-
- 支付
-
-
@@ -110,6 +110,7 @@
:prop-pay-price="pay_price"
:prop-payment-id="payment_id"
:propIsRedirectTo="true"
+ :propIsFailAlert="false"
:propToPage="to_page"
:propToFailPage="to_fail_page"
:prop-to-appoint-page="to_appoint_page"
@@ -219,7 +220,7 @@
if (res.data.code == 0) {
var new_form = this.form;
var data = res.data.data || null;
- if(data != null) {
+ if (data != null) {
new_form.payment_id = data.payment_list[0].id;
}
this.setData({
@@ -230,9 +231,9 @@
});
// 标题
- if(data != null && (data.scanpay_info || null) != null) {
+ if (data != null && (data.scanpay_info || null) != null) {
uni.setNavigationBarTitle({
- title: data.scanpay_info.name+'收款'
+ title: data.scanpay_info.name + '收款',
});
}
} else {
@@ -335,7 +336,7 @@
this.concat_string(price + v);
}
}
-
+
// 触感振动
uni.vibrateShort();
},