优化

pages/seller/order/order-club-details.vue

@@ -394,31 +394,31 @@ page {
 		width: 72rpx;
 		height: 32rpx;
 		background: radial-gradient(circle, rgba(255, 39, 180, 1) 0%, rgba(193, 77, 245, 1) 100%);
-		border-radius: 6rpx;
+		border-radius: 16rpx 0;
 		line-height: 32rpx;
 		text-align: center;
 		color: #ffffff;
 		float: right;
-		font-size: $font-size-24;
+		font-size: 22rpx;
 	}
 	.bage-auto {
 		display: inline-block;
 		width: 72rpx;
 		height: 32rpx;
-		background: radial-gradient(circle, rgba(255, 180, 39, 1) 0%, rgba(245, 142, 77, 1) 100%);
-		border-radius: 6rpx;
+		background: #7fba4f;
+		color: #ffffff;
+		border-radius: 16rpx 0;
 		line-height: 32rpx;
 		text-align: center;
-		color: #ffffff;
 		float: right;
-		font-size: $font-size-24;
+		font-size: 22rpx;
 	}
 	.bage-name{
 		line-height: 32rpx;
 		display: inline-block;
 		color: #999999;
 		float: right;
-		font-size: $font-size-24;
+		font-size: 22rpx;
 	}
 	.Rebate {
 		display: inline-block;

pages/seller/order/order-details.vue

@@ -642,31 +642,31 @@ page {
 		width: 72rpx;
 		height: 32rpx;
 		background: radial-gradient(circle, rgba(255, 39, 180, 1) 0%, rgba(193, 77, 245, 1) 100%);
-		border-radius: 6rpx;
+		border-radius: 16rpx 0;
 		line-height: 32rpx;
 		text-align: center;
 		color: #ffffff;
 		float: right;
-		font-size: $font-size-24;
+		font-size: 22rpx;
 	}
 	.bage-auto {
 		display: inline-block;
 		width: 72rpx;
 		height: 32rpx;
-		background: radial-gradient(circle, rgba(255, 180, 39, 1) 0%, rgba(245, 142, 77, 1) 100%);
-		border-radius: 6rpx;
+        background: #7fba4f;
+        color: #ffffff;
+		border-radius: 16rpx 0;
 		line-height: 32rpx;
 		text-align: center;
-		color: #ffffff;
 		float: right;
-		font-size: $font-size-24;
+		font-size: 22rpx;
 	}
 	.bage-name {
 		line-height: 32rpx;
 		display: inline-block;
 		color: #999999;
 		float: right;
-		font-size: $font-size-24;
+		font-size: 22rpx;
 	}
 	.Rebate {
 		display: inline-block;

pages/seller/order/order-historylist.vue

@@ -668,7 +668,7 @@ page {
 			display: inline-block;
 			width: 60rpx;
 			height: 32rpx;
-			border-radius: 8rpx;
+			border-radius: 16rpx 0;
 			background: #f0cb72;
 			font-size: $font-size-22;
 			color: #4e4539;
@@ -700,7 +700,7 @@ page {
 			width: 72rpx;
 			height: 32rpx;
 			margin: 19rpx 10rpx 0 10rpx;
-			border-radius: 4rpx;
+			border-radius: 16rpx 0;
 			line-height: 32rpx;
 			font-size: $font-size-22;
 			text-align: center;
@@ -710,7 +710,8 @@ page {
 				background: radial-gradient(circle, rgba(255, 39, 180, 1) 0%, rgba(193, 77, 245, 1) 100%);
 			}
 			&.auto{
-				background: radial-gradient(circle, rgba(255, 180, 39, 1) 0%, rgba(245, 142, 77, 1) 100%);
+				background: #7fba4f;
+				color: #ffffff;
 			}
 		}
 		.order-title-tip {

pages/seller/order/order-list.vue

@@ -767,7 +767,7 @@ page {
 			display: inline-block;
 			width: 60rpx;
 			height: 32rpx;
-			border-radius: 8rpx;
+			border-radius: 16rpx 0;
 			background: #f0cb72;
 			font-size: $font-size-22;
 			color: #4e4539;
@@ -804,7 +804,7 @@ page {
 			width: 72rpx;
 			height: 32rpx;
 			margin: 19rpx 10rpx 0 10rpx;
-			border-radius: 4rpx;
+			border-radius: 16rpx 0;
 			line-height: 32rpx;
 			font-size: $font-size-22;
 			text-align: center;
@@ -814,7 +814,8 @@ page {
 				background: radial-gradient(circle, rgba(255, 39, 180, 1) 0%, rgba(193, 77, 245, 1) 100%);
 			}
 			&.auto{
-				background: radial-gradient(circle, rgba(255, 180, 39, 1) 0%, rgba(245, 142, 77, 1) 100%);
+				background: #7fba4f;
+				color: #ffffff;
 			}
 			&.ebate{
 				background: #ff7a51;

pages/seller/order/search-order.vue

@@ -728,7 +728,7 @@ page {
 			display: inline-block;
 			width: 60rpx;
 			height: 32rpx;
-			border-radius: 8rpx;
+			border-radius: 16rpx 0;
 			background: #f0cb72;
 			font-size: $font-size-22;
 			color: #4e4539;
@@ -760,7 +760,7 @@ page {
 			width: 72rpx;
 			height: 32rpx;
 			margin: 19rpx 10rpx 0 10rpx;
-			border-radius: 4rpx;
+			border-radius: 16rpx 0;
 			line-height: 32rpx;
 			font-size: $font-size-22;
 			text-align: center;
@@ -770,7 +770,8 @@ page {
 				background: radial-gradient(circle, rgba(255, 39, 180, 1) 0%, rgba(193, 77, 245, 1) 100%);
 			}
 			&.auto{
-				background: radial-gradient(circle, rgba(255, 180, 39, 1) 0%, rgba(245, 142, 77, 1) 100%);
+				background: #7fba4f;
+				color: #ffffff;
 			}
 		}
 		.order-title-tip {

pages/user/order/components/cm-details-button.vue

@@ -181,9 +181,9 @@ export default {
 			color: #ffffff;
 		}
 		.btn-pay {
-			background: #f94b4b;
+			background: #07c160;
 			margin-right: 0;
-			border: 2rpx solid #f94b4b;
+			border: 2rpx solid #07c160;
 			color: #fff;
 		}
 		.btn-firm {

pages/user/order/components/cm-list-button.vue

@@ -189,9 +189,9 @@ export default {
 			color: #ffffff;
 		}
 		.btn-pay {
-			background: #f94b4b;
+			background: #07c160;
 			color: #ffffff;
-			border: 2rpx solid #f94b4b;
+			border: 2rpx solid #07c160;
 		}
 		.btn-firm {
 			position: relative;

pages/user/order/components/cm-share-popup.vue

@@ -42,9 +42,9 @@
 				try{
 					const res = await this.OrderService.QueryOrderShareCode({shopOrderId:shopOrderId})
 					this.shareCode = res.data
-					this.$parent.shareCode = this.shareCode;
+					this.$parent.shareCode = this.shareCode
 				}catch(error){
-					this.$parent.isShareModal = false;
+					this.$parent.isShareModal = false
 					this.$util.msg(error.msg, 2000)
 				}
 			},
@@ -140,10 +140,11 @@
 					padding: 0;
 					margin: 0 15rpx;
 					&.btn-cancel{
-						background: $btn-cancel;
+						background: #E1E1E1;
+                        color: #999999;
 					}
 					&.btn-confirm{
-						background: $btn-confirm;
+						background: #07c160;
 					}
 				}
 			}

pages/user/order/order-details.vue

@@ -651,24 +651,26 @@ page {
 		width: 72rpx;
 		height: 32rpx;
 		background: radial-gradient(circle, rgba(255, 39, 180, 1) 0%, rgba(193, 77, 245, 1) 100%);
-		border-radius: 6rpx;
+		border-radius: 16rpx 0;
 		line-height: 32rpx;
 		text-align: center;
 		color: #ffffff;
 		margin-top: 10rpx;
-		float: right;
+		float: right;
+        font-size: 22rpx;
 	}
 	.bage-auto {
 		display: inline-block;
 		width: 72rpx;
 		height: 32rpx;
-		background: radial-gradient(circle, rgba(255, 180, 39, 1) 0%, rgba(245, 142, 77, 1) 100%);
-		border-radius: 6rpx;
+		background: #7fba4f;
+		color: #ffffff;
+		border-radius: 16rpx 0;
 		line-height: 32rpx;
 		text-align: center;
-		color: #ffffff;
 		margin-top: 10rpx;
-		float: right;
+		float: right;
+        font-size: 22rpx;
 	}
 }
 </style>

pages/user/order/order-list.vue

@@ -865,7 +865,7 @@ page {
 			width: 72rpx;
 			height: 32rpx;
 			margin: 19rpx 10rpx 0 10rpx;
-			border-radius: 4rpx;
+			border-radius:16rpx 0;
 			line-height: 32rpx;
 			font-size: $font-size-22;
 			text-align: center;
@@ -875,7 +875,8 @@ page {
 				background: radial-gradient(circle, rgba(255, 39, 180, 1) 0%, rgba(193, 77, 245, 1) 100%);
 			}
 			&.auto{
-				background: radial-gradient(circle, rgba(255, 180, 39, 1) 0%, rgba(245, 142, 77, 1) 100%);
+				background: #7fba4f;
+				color: #ffffff;
 			}
 			&.ebate{
 				background: #ff7a51;

pages/user/order/order-pay-list.vue

@@ -266,7 +266,7 @@ page {
 				width: 160rpx;
 				height: 64rpx;
 				line-height: 64rpx;
-				background: #F94B4B;
+				background: #07c160;
 				font-size: $font-size-26;
 				text-align: center;
 				float: right;
@@ -274,7 +274,7 @@ page {
 				border-radius: 32rpx;
 				margin-left: 20rpx;
 				&.none{
-					background: #FF5B00;
+					background: $btn-confirm;
 				}
 			}
 			.list-msg {

pages/user/order/search-order.vue

@@ -926,7 +926,7 @@ page {
 			width: 72rpx;
 			height: 32rpx;
 			margin: 19rpx 10rpx 0 10rpx;
-			border-radius: 4rpx;
+			border-radius: 16rpx 0;
 			line-height: 32rpx;
 			font-size: $font-size-22;
 			text-align: center;
@@ -936,7 +936,8 @@ page {
 				background: radial-gradient(circle, rgba(255, 39, 180, 1) 0%, rgba(193, 77, 245, 1) 100%);
 			}
 			&.auto{
-				background: radial-gradient(circle, rgba(255, 180, 39, 1) 0%, rgba(245, 142, 77, 1) 100%);
+				background: #7fba4f;
+				color: #ffffff;
 			}
 			&.ebate{
 				background: #ff7a51;

pages/user/pay/card-order.vue

@@ -299,9 +299,7 @@ export default {
 					this.payAmount = this.toFixedFn(this.obligation) // 自定义金额
 					this.balanceAmount = this.obligation - this.payAmount // 计算剩余支付金额
 					// 支付方式配置
-					if(data.onlinePayWays){
-						this.checkPayMode(data.onlinePayWays,data.weChatFlag)
-					}
+                    this.checkPayMode(data.onlinePayWays,data.weChatFlag)
 					setTimeout(() => {
 						this.skeletonShow = false
 					}, 500)

pages/user/pay/mixins/cardMixins.js

@@ -75,19 +75,23 @@ const cardMixins = {
         checkPayMode(range,weChatFlag) {
             // 校验支付模式
             // test range = '4'
-            // 1微信 2支付宝 3个人网银 4企业网银 5快捷支付
-            if(weChatFlag === '2'){
-                this.weChatFlag =  false
-            }else{
-                this.weChatFlag = range.indexOf('1') > -1
-            }
-            this.B2BpayFlag = range.indexOf('4') > -1
-            this.QuickPayFlag = range.indexOf('5') > -1
-            // 设置默认支付方式
-            if(this.QuickPayFlag){
-                this.tabCurrentIndex = 3
-            }else{
-                this.tabCurrentIndex = this.weChatFlag ? 0 : this.B2BpayFlag ? 1 : 2
+            // 1微信 2支付宝 3个人网银 4企业网银 5快捷支付
+            if(range){
+                if(weChatFlag === '2'){
+                    this.weChatFlag =  false
+                }else{
+                    this.weChatFlag = range.indexOf('1') > -1
+                }
+                this.B2BpayFlag = range.indexOf('4') > -1
+                this.QuickPayFlag = range.indexOf('5') > -1
+                // 设置默认支付方式
+                if(this.QuickPayFlag){
+                    this.tabCurrentIndex = 3
+                }else{
+                    this.tabCurrentIndex = this.weChatFlag ? 0 : this.B2BpayFlag ? 1 : 2
+                }
+            }else{
+                this.tabCurrentIndex = 2
             }
             this.tabClick(this.tabCurrentIndex)
         }