修改订单列表

pages/seller/login/register-member.vue

@@ -587,19 +587,23 @@ export default {
 				this.$util.msg('请勾选同意协议', 2000)
 				return
 			}
-			this.isSubLoading = true
-			this.SellerService.SellerClubTemporary(this.params)
-				.then(response => {
-					this.bindId = response.data
-					setTimeout(() => {
-						this.isRegisterStep = false
-						this.GetClubUserInfo(this.bindId)
-					}, 2000)
-				})
-				.catch(error => {
-					this.$util.msg(error.msg, 2000)
-				})
-		},
+			this.sellerClubTemporary(this.params)
+		},
+        async sellerClubTemporary(params){
+            try {
+                this.isSubLoading = true
+                const { data } = await this.SellerService.SellerClubTemporary(params)
+                this.$util.msg('添加成功', 2000, true, 'success')
+                this.bindId = data
+                setTimeout(() => {
+                	this.isRegisterStep = false
+                	this.GetClubUserInfo(data)
+                }, 2000)
+            } catch (error) {
+                this.$util.msg(error.msg, 2000)
+                this.isSubLoading = false
+            }
+        },
 		GetClubUserInfo(id) {
 			this.UserService.UseRregisterTemporaryInfo({ id: id })
 				.then(response => {

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

@@ -20,7 +20,7 @@
 					<view class="tips" v-if="shareCode">分享码：{{ shareCode }}</view> 分享订单
 				</view>
 			</template>
-	<!-- 		<view class="btn btn-color" v-if="btnState.isConfirm" @click.stop="btnConfirm('confirm', order)"
+<!-- 			<view class="btn btn-color" v-if="btnState.isConfirm" @click.stop="btnConfirm('confirm', order)"
 				>确认订单</view
 			> -->
 			<view

pages/seller/order/order-historylist.vue

@@ -8,7 +8,7 @@
 					class="tab-bar-item"
 					:class="[currentTab == index ? 'active' : '']"
 					:data-current="index"
-					@tap.stop="onClickTab(index)"
+					@tap.stop="onClickTab($event)"
 				>
 					<text class="tab-bar-title">{{ item.text }}</text>
 				</view>
@@ -20,7 +20,7 @@
 					class="tab-screen-item"
 					:class="[screenTab == index ? 'active' : '']"
 					:data-current="index"
-					@tap.stop="onClickScreenTab(index)"
+					@tap.stop="onClickScreenTab(index,item.type)"
 					>{{ item.text }}</view
 				>
 			</view>
@@ -68,25 +68,25 @@
 										<text class="tags sv" v-if="order.svipUserFlag == 1">SVIP</text>
 									</view>
 									<view class="order-title-t">
+                                        <text
+                                        	class="bage buss tui-skeleton-fillet"
+                                        	v-if="order.orderSubmitType == 3 || order.orderSubmitType == 4"
+                                        >
+                                        	服务商
+                                        </text>
+                                        <text
+                                        	class="bage auto tui-skeleton-fillet"
+                                        	v-if="
+                                        		order.orderSubmitType == 0 ||
+                                        			order.orderSubmitType == 1 ||
+                                        			order.orderSubmitType == 2
+                                        	"
+                                        >
+                                        	自主
+                                        </text>
 										<view class="order-title-tip tui-skeleton-fillet">
 											{{ order.status | statusFilters }}
 										</view>
-										<text
-											class="bage buss tui-skeleton-fillet"
-											v-if="order.orderSubmitType == 3 || order.orderSubmitType == 4"
-										>
-											服务商
-										</text>
-										<text
-											class="bage auto tui-skeleton-fillet"
-											v-if="
-												order.orderSubmitType == 0 ||
-													order.orderSubmitType == 1 ||
-													order.orderSubmitType == 2
-											"
-										>
-											自主
-										</text>
 										<image
 											class="bage-icon"
 											src="https://static.caimei365.com/app/img/icon/icon-type@3x.png"
@@ -293,7 +293,7 @@ export default {
 	data() {
 		return {
 			orderTabBar: [
-				{ listType: 0, text: '全部订单', orderList: [] },
+				{ listType: 0, text: '全部', orderList: [] },
 				{ listType: 1, text: '待确认', orderList: [] },
 				{ listType: 2, text: '待付款', orderList: [] },
 				{ listType: 3, text: '待发货', orderList: [] },
@@ -301,9 +301,8 @@ export default {
 				{ listType: 5, text: '退货/款', orderList: [] }
 			],
 			screenTabBar: [
-				{ type: 0, text: '全部订单' },
-				{ type: 1, text: '自主订单' },
-				{ type: 2, text: '服务商订单' }
+				{ type: 2, text: '服务商订单' },
+				{ type: 1, text: '自主订单' }
 			],
 			winHeight: '', //窗口高度
 			currentTab: 0, //预设当前项的值
@@ -313,7 +312,7 @@ export default {
 			listQuery:{
 				listType: 0,
 				clubId: 0,
-				orderSubmitType: 0,
+				orderSubmitType: 2,
 				serviceProviderId: 0,
 				pageNum: 1,
 				pageSize: 10
@@ -391,10 +390,9 @@ export default {
 				this.getOrderDatainit(this.currentTab)
 			}
 		},
-		onClickScreenTab(index) {
-			console.log(index)
+		onClickScreenTab(index,type) {
 			this.screenTab = index
-			this.listQuery.orderSubmitType = index
+			this.listQuery.orderSubmitType = type
 			this.pullUpOn = true //切换时隐藏
 			this.loadding = false //切换时隐藏
 			this.nomoreText = ''
@@ -548,7 +546,7 @@ export default {
 <style lang="scss">
 /*tabbar end*/
 page {
-	background: #ffffff;
+	background: #f7f7f7;
 }
 /*tabbar start*/
 ::-webkit-scrollbar {
@@ -570,12 +568,12 @@ page {
 		border-top: 1px solid #f7f7f7;
 		border-bottom: 1px solid #f7f7f7;
 		display: flex;
-		justify-content: center;
+		justify-content: flex-start;
 		justify-items: center;
 		.tab-screen-item {
-			flex: 1;
 			height: 60rpx;
-			border-radius: 10rpx;
+			border-radius: 8rpx;
+            padding: 0 24rpx;
 			background: #f7f7f7;
 			margin-right: 22rpx;
 			line-height: 66rpx;
@@ -640,6 +638,8 @@ page {
 .tui-order-content {
 	width: 100%;
 	height: auto;
+    box-sizing: border-box;
+    padding: 0 20rpx;
 }
 .tui-order-list {
 	width: 100%;
@@ -648,10 +648,13 @@ page {
 .tui-order-item {
 	display: flex;
 	flex-direction: column;
-	width: 702rpx;
-	padding: 0 24rpx;
+	width: 100%;
+	padding: 0rpx 24rpx 0 24rpx;
 	background: #fff;
-	border-bottom: 20rpx solid #f7f7f7;
+    box-sizing: border-box;
+    border-radius: 16rpx;
+    overflow: hidden;
+    margin: 20rpx 0;
 }
 .order-title {
 	width: 100%;
@@ -687,6 +690,7 @@ page {
 		float: left;
 		line-height: 68rpx;
 		position: relative;
+        display: flex;
 		.bage-icon {
 			width: 50rpx;
 			height: 50rpx;
@@ -699,7 +703,7 @@ page {
 			display: inline-block;
 			width: 72rpx;
 			height: 32rpx;
-			margin: 19rpx 10rpx 0 10rpx;
+			margin: 19rpx 10rpx 0 0;
 			border-radius: 4rpx;
 			line-height: 32rpx;
 			font-size: $font-size-22;
@@ -717,8 +721,7 @@ page {
 			}
 		}
 		.order-title-tip {
-			float: left;
-			font-size: $font-size-28;
+			font-size: $font-size-24;
 			line-height: 68rpx;
 			text-align: right;
 			color: #ff2a2a;
@@ -782,6 +785,7 @@ page {
 	width: 100%;
 	height: auto;
 	padding: 24rpx 0;
+    display: flex;
 	.pros-img {
 		float: left;
 		width: 210rpx;

pages/seller/order/order-list.vue

@@ -26,7 +26,7 @@
 						class="tab-bar-item"
 						:class="[currentTab == index ? 'active' : '']"
 						:data-current="index"
-						@tap.stop="onClickTab(event)"
+						@tap.stop="onClickTab($event)"
 					>
 						<text class="tab-bar-title">{{ item.text }}</text>
 					</view>
@@ -38,7 +38,7 @@
 						class="tab-screen-item"
 						:class="[screenTab == index ? 'active' : '']"
 						:data-current="index"
-						@tap.stop="onClickScreenTab(index)"
+						@tap.stop="onClickScreenTab(index,item.type)"
 						>{{ item.text }}</view
 					>
 					<view
@@ -94,26 +94,26 @@
 											>
 										</view>
 										<view class="order-title-t">
+                                            <text
+                                            	class="bage buss tui-skeleton-fillet"
+                                            	v-if="order.orderSubmitType == 3 || order.orderSubmitType == 4"
+                                            >
+                                            	服务商
+                                            </text>
+                                            <text
+                                            	class="bage auto tui-skeleton-fillet"
+                                            	v-if="
+                                            		order.orderSubmitType == 0 ||
+                                            			order.orderSubmitType == 1 ||
+                                            			order.orderSubmitType == 2
+                                            	"
+                                            >
+                                            	自主
+                                            </text>
+                                            <view class="bage ebate" v-if="order.rebateFlag == 1">返佣</view>
 											<view class="order-title-tip tui-skeleton-fillet">
 												{{ order.status | statusFilters }}
 											</view>
-											<view class="bage ebate" v-if="order.rebateFlag == 1">返佣</view>
-											<text
-												class="bage buss tui-skeleton-fillet"
-												v-if="order.orderSubmitType == 3 || order.orderSubmitType == 4"
-											>
-												服务商
-											</text>
-											<text
-												class="bage auto tui-skeleton-fillet"
-												v-if="
-													order.orderSubmitType == 0 ||
-														order.orderSubmitType == 1 ||
-														order.orderSubmitType == 2
-												"
-											>
-												自主
-											</text>
 											<image
 												class="bage-icon"
 												src="https://static.caimei365.com/app/img/icon/icon-type@3x.png"
@@ -336,7 +336,7 @@ export default {
 	data() {
 		return {
 			orderTabBar: [
-				{ listType: 0, text: '全部订单', orderList: [] },
+				{ listType: 0, text: '全部', orderList: [] },
 				{ listType: 1, text: '待确认', orderList: [] },
 				{ listType: 2, text: '待付款', orderList: [] },
 				{ listType: 3, text: '待发货', orderList: [] },
@@ -344,9 +344,8 @@ export default {
 				{ listType: 5, text: '退货/款', orderList: [] }
 			],
 			screenTabBar: [
-				{ type: 0, text: '全部订单(我的)' },
-				{ type: 1, text: '自主订单(我的)' },
-				{ type: 2, text: '服务商订单(我的)' }
+				{ type: 2, text: '服务商订单' },
+				{ type: 1, text: '机构自主订单' }
 			],
 			headerBtnPosi: this.setHeaderBtnPosi(), //获取设备顶部胶囊高度
 			systeminfo: this.setSysteminfo(), //获取设备信息
@@ -368,7 +367,7 @@ export default {
 				groupServiceId: 0,
 				serviceProviderId: 0, //服务商用户ID
 				listType: 0,
-				orderSubmitType: 0
+				orderSubmitType: 2
 			},
 			scrollTop: 0,
 			skeletonShow: true,
@@ -428,8 +427,9 @@ export default {
 			this.getOrderDatainit(this.currentTab, 'tabChange')
 		},
 		// 点击标题切换当前页时改变样式
-		onClickTab(e) {
-			let tabIndex = e.target.dataset.current || e.currentTarget.dataset.current
+		onClickTab(event) {
+            console.log('e',event)
+			let tabIndex = event.target.dataset.current || event.currentTarget.dataset.current
 			if (this.currentTab === tabIndex) {
 				return false
 			} else {
@@ -441,9 +441,9 @@ export default {
 				this.getOrderDatainit(this.currentTab)
 			}
 		},
-		onClickScreenTab(index) {
+		onClickScreenTab(index,type) {
 			this.screenTab = index
-			this.listQuery.orderSubmitType = index
+			this.listQuery.orderSubmitType = type
 			this.pullUpOn = true //切换时隐藏
 			this.loadding = false //切换时隐藏
 			this.nomoreText = ''
@@ -645,7 +645,7 @@ export default {
 
 <style lang="scss">
 page {
-	background-color: #ffffff;
+	background-color: #f7f7f7;
 }
 /*tabbar start*/
 ::-webkit-scrollbar {
@@ -737,6 +737,8 @@ page {
 .tui-order-content {
 	width: 100%;
 	height: auto;
+    box-sizing: border-box;
+    padding: 0 20rpx;
 }
 .tui-order-list {
 	width: 100%;
@@ -745,10 +747,13 @@ page {
 .tui-order-item {
 	display: flex;
 	flex-direction: column;
-	width: 702rpx;
+	width: 100%;
 	padding: 0rpx 24rpx 0 24rpx;
 	background: #fff;
-	border-bottom: 20rpx solid #f7f7f7;
+    box-sizing: border-box;
+    border-radius: 16rpx;
+    overflow: hidden;
+    margin: 20rpx 0;
 }
 .order-title {
 	width: 100%;
@@ -789,6 +794,7 @@ page {
 		float: left;
 		line-height: 68rpx;
 		position: relative;
+        display: flex;
 		.bage-icon {
 			width: 50rpx;
 			height: 50rpx;
@@ -801,7 +807,7 @@ page {
 			display: inline-block;
 			width: 72rpx;
 			height: 32rpx;
-			margin: 19rpx 10rpx 0 10rpx;
+			margin: 19rpx 10rpx 0 0;
 			border-radius: 4rpx;
 			line-height: 32rpx;
 			font-size: $font-size-22;
@@ -822,8 +828,7 @@ page {
 			}
 		}
 		.order-title-tip {
-			float: left;
-			font-size: $font-size-28;
+			font-size: $font-size-24;
 			line-height: 68rpx;
 			text-align: right;
 			color: #ff2a2a;
@@ -880,6 +885,7 @@ page {
 	width: 100%;
 	height: auto;
 	padding: 24rpx 0;
+    display: flex;
 	.pros-img {
 		float: left;
 		width: 180rpx;

pages/seller/order/search-order.vue

@@ -63,24 +63,24 @@
 									<text class="tags sv" v-if="order.svipUserFlag == 1">SVIP</text>
 								</view>
 								<view class="order-title-t">
+                                    <text
+                                    	class="bage buss tui-skeleton-fillet"
+                                    	v-if="order.orderSubmitType == 3 || order.orderSubmitType == 4"
+                                    	>服务商</text
+                                    >
+                                    <text
+                                    	class="bage auto tui-skeleton-fillet"
+                                    	v-if="
+                                    		order.orderSubmitType == 0 ||
+                                    			order.orderSubmitType == 1 ||
+                                    			order.orderSubmitType == 2
+                                    	"
+                                    >
+                                    	自主
+                                    </text>
 									<view class="order-title-tip tui-skeleton-fillet">
 										{{ order.status | statusFilters }}
 									</view>
-									<text
-										class="bage buss tui-skeleton-fillet"
-										v-if="order.orderSubmitType == 3 || order.orderSubmitType == 4"
-										>服务商</text
-									>
-									<text
-										class="bage auto tui-skeleton-fillet"
-										v-if="
-											order.orderSubmitType == 0 ||
-												order.orderSubmitType == 1 ||
-												order.orderSubmitType == 2
-										"
-									>
-										自主
-									</text>
 									<image
 										class="bage-icon"
 										src="https://static.caimei365.com/app/img/icon/icon-type@3x.png"
@@ -700,6 +700,8 @@ page {
 .tui-order-content {
 	width: 100%;
 	height: auto;
+    box-sizing: border-box;
+    padding: 0 20rpx;
 }
 .tui-order-list {
 	width: 100%;
@@ -708,10 +710,13 @@ page {
 .tui-order-item {
 	display: flex;
 	flex-direction: column;
-	width: 702rpx;
-	padding: 20rpx 24rpx 0 24rpx;
+	width: 100%;
+	padding: 0rpx 24rpx 0 24rpx;
 	background: #fff;
-	border-bottom: 20rpx solid #f7f7f7;
+    box-sizing: border-box;
+    border-radius: 16rpx;
+    overflow: hidden;
+    margin: 20rpx 0;
 }
 .order-title {
 	width: 100%;
@@ -747,6 +752,7 @@ page {
 		float: left;
 		line-height: 68rpx;
 		position: relative;
+        display: flex;
 		.bage-icon {
 			width: 50rpx;
 			height: 50rpx;
@@ -759,7 +765,7 @@ page {
 			display: inline-block;
 			width: 72rpx;
 			height: 32rpx;
-			margin: 19rpx 10rpx 0 10rpx;
+			margin: 19rpx 10rpx 0 0;
 			border-radius: 4rpx;
 			line-height: 32rpx;
 			font-size: $font-size-22;
@@ -777,8 +783,7 @@ page {
 			}
 		}
 		.order-title-tip {
-			float: left;
-			font-size: $font-size-28;
+			font-size: $font-size-24;
 			line-height: 68rpx;
 			text-align: right;
 			color: #ff2a2a;

pages/user/order/order-list.vue

@@ -1,5 +1,5 @@
 <template>
-	<view class="container" :style="{ paddingTop: navbarHeight + 'px' }">
+	<view class="container" :style="{ paddingTop: (navbarHeight + 40 ) + 'px' }">
 		<!-- 自定义返回 -->
 		<header-back
 			:systeminfo="systeminfo"
@@ -55,24 +55,24 @@
 									:key="orderIndex"
 								>
 									<view class="order-title">
-										<view class="order-title-t">
+										<view class="order-title-t">
+                                            <text
+                                            	class="bage buss tui-skeleton-fillet"
+                                            	v-if="order.orderSubmitType == 3 || order.orderSubmitType == 4"
+                                            	>协销</text
+                                            >
+                                            <text
+                                            	class="bage auto tui-skeleton-fillet"
+                                            	v-if="
+                                            		order.orderSubmitType == 0 ||
+                                            			order.orderSubmitType == 1 ||
+                                            			order.orderSubmitType == 2
+                                            	"
+                                            	>自主</text
+                                            >
 											<view class="order-title-tip tui-skeleton-fillet">
 												{{ order.status | statusFilters }}
 											</view>
-											<text
-												class="bage buss tui-skeleton-fillet"
-												v-if="order.orderSubmitType == 3 || order.orderSubmitType == 4"
-												>协销</text
-											>
-											<text
-												class="bage auto tui-skeleton-fillet"
-												v-if="
-													order.orderSubmitType == 0 ||
-														order.orderSubmitType == 1 ||
-														order.orderSubmitType == 2
-												"
-												>自主</text
-											>
 											<image
 												class="bage-icon"
 												src="https://static.caimei365.com/app/img/icon/icon-type@3x.png"
@@ -904,22 +904,26 @@ page {
 	height: auto;
 	position: relative;
 }
-.tui-order-content {
-	width: 100%;
-	height: auto;
-}
-.tui-order-list {
-	margin-top: 90rpx;
-	width: 100%;
-	position: relative;
-}
-.tui-order-item {
-	display: flex;
-	flex-direction: column;
-	width: 702rpx;
-	padding: 20rpx 24rpx 0 24rpx;
-	background: #fff;
-	border-bottom: 20rpx solid #f7f7f7;
+.tui-order-content {
+	width: 100%;
+	height: auto;
+    box-sizing: border-box;
+    padding: 0 20rpx;
+}
+.tui-order-list {
+	width: 100%;
+	position: relative;
+}
+.tui-order-item {
+	display: flex;
+	flex-direction: column;
+	width: 100%;
+	padding: 0rpx 24rpx 0 24rpx;
+	background: #fff;
+    box-sizing: border-box;
+    border-radius: 16rpx;
+    overflow: hidden;
+    margin: 20rpx 0;
 }
 .order-title {
 	width: 100%;
@@ -929,7 +933,8 @@ page {
 		height: 68rpx;
 		float: left;
 		line-height: 68rpx;
-		position: relative;
+		position: relative;
+        display: flex;
 		.bage-icon {
 			width: 50rpx;
 			height: 50rpx;
@@ -942,13 +947,13 @@ page {
 			display: inline-block;
 			width: 72rpx;
 			height: 32rpx;
-			margin: 19rpx 10rpx 0 10rpx;
+			margin: 19rpx 10rpx 0 0;
 			border-radius: 4rpx;
 			line-height: 32rpx;
 			font-size: $font-size-22;
 			text-align: center;
-			color: #ffffff;
-			float: right;
+			color: #ffffff;
+            margin-right: 12rpx;
 			&.buss{
 				background: rgb(223, 240, 255);
 				color: rgb(126, 172, 213);
@@ -963,8 +968,7 @@ page {
 			}
 		}
 		.order-title-tip {
-			float: left;
-			font-size: $font-size-28;
+			font-size: $font-size-24;
 			line-height: 68rpx;
 			text-align: right;
 			color: #ff2a2a;
@@ -1014,7 +1018,8 @@ page {
 .goods-pros-t {
 	width: 100%;
 	height: auto;
-	padding: 24rpx 0;
+	padding: 24rpx 0;
+    display: flex;
 	.pros-img {
 		float: left;
 		width: 210rpx;

pages/user/order/search-order.vue

@@ -59,30 +59,24 @@
 							@click.stop="detail(order.shopOrderId)"
 						>
 							<view class="order-title">
-								<view class="order-title-t">
+								<view class="order-title-t">
+                                    <text
+                                    	class="bage buss tui-skeleton-fillet"
+                                    	v-if="order.orderSubmitType == 3 || order.orderSubmitType == 4"
+                                    	>协销</text
+                                    >
+                                    <text
+                                    	class="bage auto tui-skeleton-fillet"
+                                    	v-if="
+                                    		order.orderSubmitType == 0 ||
+                                    			order.orderSubmitType == 1 ||
+                                    			order.orderSubmitType == 2
+                                    	"
+                                    	>自主</text
+                                    >
 									<view class="order-title-tip tui-skeleton-fillet">
 										{{ order.status | statusFilters }}
 									</view>
-									<text
-										class="bage buss tui-skeleton-fillet"
-										v-if="order.orderSubmitType == 3 || order.orderSubmitType == 4"
-										>协销</text
-									>
-									<text
-										class="bage auto tui-skeleton-fillet"
-										v-if="
-											order.orderSubmitType == 0 ||
-												order.orderSubmitType == 1 ||
-												order.orderSubmitType == 2
-										"
-										>自主</text
-									>
-									<image
-										class="bage-icon"
-										src="https://static.caimei365.com/app/img/icon/icon-type@3x.png"
-										mode="widthFix"
-										v-if="order.secondHandOrderFlag == 1"
-									></image>
 								</view>
 							</view>
 							<view
@@ -885,21 +879,26 @@ page {
 	height: auto;
 	position: relative;
 }
-.tui-order-content {
-	width: 100%;
-	height: auto;
-}
-.tui-order-list {
-	width: 100%;
-	position: relative;
-}
-.tui-order-item {
-	display: flex;
-	flex-direction: column;
-	width: 702rpx;
-	padding: 20rpx 24rpx 0 24rpx;
-	background: #fff;
-	border-bottom: 20rpx solid #f7f7f7;
+.tui-order-content {
+	width: 100%;
+	height: auto;
+    box-sizing: border-box;
+    padding: 0 20rpx;
+}
+.tui-order-list {
+	width: 100%;
+	position: relative;
+}
+.tui-order-item {
+	display: flex;
+	flex-direction: column;
+	width: 100%;
+	padding: 0rpx 24rpx 0 24rpx;
+	background: #fff;
+    box-sizing: border-box;
+    border-radius: 16rpx;
+    overflow: hidden;
+    margin: 20rpx 0;
 }
 .order-title {
 	width: 100%;
@@ -909,7 +908,8 @@ page {
 		height: 68rpx;
 		float: left;
 		line-height: 68rpx;
-		position: relative;
+		position: relative;
+        display: flex;
 		.bage-icon {
 			width: 50rpx;
 			height: 50rpx;
@@ -922,13 +922,13 @@ page {
 			display: inline-block;
 			width: 72rpx;
 			height: 32rpx;
-			margin: 19rpx 10rpx 0 10rpx;
+			margin: 19rpx 10rpx 0 0;
 			border-radius: 4rpx;
 			line-height: 32rpx;
 			font-size: $font-size-22;
 			text-align: center;
 			color: #ffffff;
-			float: right;
+            margin-right: 12rpx;
 			&.buss{
 				background: rgb(223, 240, 255);
 				color: rgb(126, 172, 213);
@@ -943,8 +943,7 @@ page {
 			}
 		}
 		.order-title-tip {
-			float: left;
-			font-size: $font-size-28;
+			font-size: $font-size-24;
 			line-height: 68rpx;
 			text-align: right;
 			color: #ff2a2a;