Merge branch 'master' of http://8.134.10.79:3000/Leadfyy.co/uniapp-shikongwang

components/me-tabs/me-tabs.vue

@@ -153,16 +153,6 @@
 			padding-bottom: 30rpx; // 撑开高度,再配合me-tabs的overflow-y: hidden,以达到隐藏滚动条的目的
 			box-sizing: border-box;
 
-			&::after {
-				position: absolute;
-				bottom: 31rpx;
-				left: 0;
-				width: 100%;
-				height: 1rpx;
-				content: '';
-				// border-bottom: 1rpx solid rgba(255, 255, 255, 0.2);
-			}
-
 			.tab-item {
 				flex: 1;
 				position: relative;
@@ -177,16 +167,10 @@
 					bottom: 0;
 					width: 100%;
 					height: 32rpx;
-					content: '';
+					// content: '';
 					border-right: 1rpx solid white;
 				}
 
-				&:last-child::after {
-					content: '';
-					display: none;
-				}
-				
-
 				&.active {
 					// font-weight: bold;
 					color: black;
@@ -196,6 +180,7 @@
 					line-height: 26px!important;
 				}
 			}
+			
 		}
 
 		// 平分的方式显示item

pages/order/confirm-order.vue

@@ -68,7 +68,8 @@
 						</view>
 						<button class="cu-btn block bg-orange round shadow" @tap="submit">
 							<text class="cuIcon-loading2 cuIconfont-spin  margin-right-xs text-white" v-if="loading"></text>
-							<text class="lf-font-32 text-white">{{ loading ? '支付中...' : '下单付款' }}</text>
+							<text class="lf-font-32 text-white" v-if="type == 1">{{ loading ? '支付中...' : '立即付款' }}</text>
+							<text class="lf-font-32 text-white" v-else>{{ loading ? '支付中...' : '下单付款' }}</text>
 						</button>
 					</view>
 				</view>