diff --git a/colorui/main.css b/colorui/main.css
index 3d190f7..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);
}
@@ -3396,7 +3402,7 @@ scroll-view.cu-steps .cu-item {
float: right;
}
.border {
- border: 1px solid #ccc;
+ border: 1px solid #777!important;
}
/* ==================
@@ -3465,7 +3471,7 @@ scroll-view.cu-steps .cu-item {
.line-gray::after,
.lines-gray::after {
- border-color: #aaaaaa;
+ border-color: #777777!important;
}
.line-black::after,
@@ -3559,7 +3565,7 @@ scroll-view.cu-steps .cu-item {
.bg-white {
background-color: #ffffff;
- color: #666666;
+ color: #777;
}
.bg-shadeTop {
@@ -3980,7 +3986,7 @@ scroll-view.cu-steps .cu-item {
.text-gray,
.line-gray,
.lines-gray {
- color: #777777;
+ color: #777777!important;
}
.text-black,
diff --git a/components/me-tabs/me-tabs.vue b/components/me-tabs/me-tabs.vue
index cdec867..b65a1ae 100644
--- a/components/me-tabs/me-tabs.vue
+++ b/components/me-tabs/me-tabs.vue
@@ -145,7 +145,7 @@
}
.tabs-item {
- margin-left: 4rpx;
+ margin:0 4rpx;
border-radius: 16px;
display: flex;
position: relative;
diff --git a/pages/order/apply-details.vue b/pages/order/apply-details.vue
index 944845e..cc4e569 100644
--- a/pages/order/apply-details.vue
+++ b/pages/order/apply-details.vue
@@ -48,7 +48,6 @@
-
@@ -68,7 +67,7 @@
@@ -80,11 +79,14 @@
-
-
+
@@ -111,6 +113,7 @@
order_id:1,
orderDetails: {},
checkArea: '',
+ checkAreaId: 1,
images: []
}
},
@@ -130,6 +133,7 @@
this.orderDetails = res.data.refund
this.checkArea = res.data.agreement.title
this.images = res.data.refund.images
+ this.checkAreaId = res.data.agreement.article_id
this.skeletonLoading = false
}
diff --git a/pages/order/apply-refund.vue b/pages/order/apply-refund.vue
index 9fbd5de..32ab6ff 100644
--- a/pages/order/apply-refund.vue
+++ b/pages/order/apply-refund.vue
@@ -67,7 +67,7 @@
diff --git a/pages/order/confirm-order.vue b/pages/order/confirm-order.vue
index 54b68ea..993f672 100644
--- a/pages/order/confirm-order.vue
+++ b/pages/order/confirm-order.vue
@@ -2,7 +2,6 @@
-
@@ -39,7 +38,7 @@
-
+
优惠
暂无优惠
@@ -56,10 +55,10 @@
- 请认真阅读并同意《{{orderDetails.agreement.title}}》，在小程序下单购买即表示您已默认同意《{{orderDetails.agreement.title}}》的所有条款。
+ 请认真阅读并同意《{{orderDetails.agreement.title}}》，在小程序下单购买即表示您已默认同意《{{orderDetails.agreement.title}}》的所有条款。
-
+
应付款：
@@ -100,7 +99,8 @@
ifCheck: true,
type: 0,
order_id: 0,
- ifDo: 1
+ ifDo: 1,
+ ifPay: true
}
},
computed: {
@@ -177,6 +177,8 @@
}
});
}else {
+ if(!this.ifPay) return;
+ this.ifPay = false;
if(this.type == 1){
this.pay();
return;
@@ -195,9 +197,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 b9dc3fc..9671c84 100644
--- a/pages/order/index.vue
+++ b/pages/order/index.vue
@@ -8,7 +8,7 @@
-
+
{{item.state_text.text}}
@@ -18,13 +18,14 @@
数量
x {{item.number}}
-
+
￥
{{item.selling_price}}
+
@@ -33,7 +34,7 @@
{{item.created_at_text}}
-
+
{{item.comment_text}}
@@ -223,6 +224,11 @@