From 7a598a03956527e857a80083a60c0e4efa3ca181 Mon Sep 17 00:00:00 2001
From: Enzo <1284707383@qq.com>
Date: Mon, 28 Jun 2021 16:17:23 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9=20?=
=?UTF-8?q?=E6=94=AF=E4=BB=98=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
colorui/main.css | 6 ++++++
pages/order/apply-details.vue | 1 -
pages/order/confirm-order.vue | 12 ++++++++----
pages/order/index.vue | 15 +++++++--------
pages/order/order-details.vue | 2 +-
5 files changed, 22 insertions(+), 14 deletions(-)
diff --git a/colorui/main.css b/colorui/main.css
index ea9cc53..1b52349 100644
--- a/colorui/main.css
+++ b/colorui/main.css
@@ -455,6 +455,7 @@ radio.white.checked .uni-radio-input {
.solid,
.solid-top,
+.solid-top1,
.solid-right,
.solid-bottom,
.solid-left,
@@ -473,6 +474,7 @@ radio.white.checked .uni-radio-input {
.solid::after,
.solid-top::after,
+.solid-top1::after,
.solid-right::after,
.solid-bottom::after,
.solid-left::after,
@@ -509,6 +511,10 @@ radio.white.checked .uni-radio-input {
border-top: 1upx solid rgba(0, 0, 0, 0.1);
}
+.solid-top1::after {
+ border-top: 1upx solid rgba(0, 0, 0, 0.1);
+}
+
.solid-right::after {
border-right: 1upx solid rgba(0, 0, 0, 0.1);
}
diff --git a/pages/order/apply-details.vue b/pages/order/apply-details.vue
index 840a631..cc4e569 100644
--- a/pages/order/apply-details.vue
+++ b/pages/order/apply-details.vue
@@ -48,7 +48,6 @@
-
diff --git a/pages/order/confirm-order.vue b/pages/order/confirm-order.vue
index 804a09e..df976af 100644
--- a/pages/order/confirm-order.vue
+++ b/pages/order/confirm-order.vue
@@ -2,7 +2,6 @@
-
@@ -39,7 +38,7 @@
-
+
优惠
暂无优惠
@@ -59,7 +58,7 @@
请认真阅读并同意《{{orderDetails.agreement.title}}》，在小程序下单购买即表示您已默认同意《{{orderDetails.agreement.title}}》的所有条款。
-
+
应付款：
@@ -97,7 +96,8 @@
ifCheck: true,
type: 0,
order_id: 0,
- ifDo: 1
+ ifDo: 1,
+ ifPay: true
}
},
computed: {
@@ -170,6 +170,8 @@
}
});
}else {
+ if(!this.ifPay) return;
+ this.ifPay = false;
if(this.type == 1){
this.pay();
return;
@@ -188,9 +190,11 @@
signType: res.data.signType,
paySign: res.data.paySign,
success: (res) => {
+ this.ifPay = true
this.$url('/pages/order/pay-success?ifSuccess=1&order_id='+this.order_id,{type: 'redirect'})
},
fail: (err) => {
+ this.ifPay = true
this.$url('/pages/order/pay-success?ifSuccess=2&order_id='+this.order_id,{type: 'redirect'})
},
})
diff --git a/pages/order/index.vue b/pages/order/index.vue
index 567a646..9671c84 100644
--- a/pages/order/index.vue
+++ b/pages/order/index.vue
@@ -8,7 +8,7 @@
-
+
{{item.state_text.text}}
@@ -18,7 +18,7 @@
数量
x {{item.number}}
-
+
￥
{{item.selling_price}}
@@ -34,7 +34,7 @@
{{item.created_at_text}}
-
+
{{item.comment_text}}
@@ -227,7 +227,7 @@
.cu-btn1 {
background-color: white!important;
color: #777!important;
- border: 1px solid #777;
+ border: 1px solid #777!important;
}
.font-400 {
font-weight: 400;
@@ -242,7 +242,7 @@
.title {
font-size: 28rpx;
color: $u-content-color;
- height: 80rpx;
+ height: 98rpx;
}
// tab
@@ -279,10 +279,10 @@
.right {
overflow: hidden;
- width: 64%;
+ width: 67%;
.title {
- margin: 0rpx 20rpx 10rpx 0;
+ margin: 0rpx 20rpx 0rpx 0;
color: #222222;
font-size: 32rpx;
}
@@ -312,7 +312,6 @@
.price {
overflow: hidden;
color: #FF0000;
- margin-top: 10rpx;
button {
width: 176rpx;
height: 60rpx;
diff --git a/pages/order/order-details.vue b/pages/order/order-details.vue
index c4900bd..11ffc3f 100644
--- a/pages/order/order-details.vue
+++ b/pages/order/order-details.vue
@@ -82,7 +82,7 @@
{{orderDetails.confirm_code_text}}
-
+
实付款