样式处理

pages/my/order/jointElectronicTicket/jointElectronicTicket.vue

@@ -53,7 +53,10 @@
 							<view class="my-number" >
 								<view>
 									<view>我的排队号</view>
-									<view>{{item2.sortNo}}</view>
+									<view>
+									{{item2.sortNo}} 
+									<text class="my-number-name">({{item2.projectName}})</text>
+									</view>
 								</view>
 								<view>
 									<view>预计进入时间</view>
@@ -61,7 +64,9 @@
 								</view>
 							</view>
 							<view class="current-number">
-								当前排队区间<text>{{item2.showStart}}-{{item2.showEnd}}</text>号
+								当前排队区间
+								<text>{{item2.showStart}}-{{item2.showEnd}}</text>
+								<text>({{item2.projectName}})</text>
 							</view>
 							<view class="number-notice" style="color: #9ed9ba;">
 								<view>
@@ -79,13 +84,18 @@
 							<view class="my-number" v-if="item2.config.paPassedNumEnable==1">
 								<view >
 									<view>我的排队号</view>
-									<view>{{item2.sortNo}}</view>
+									<view>
+										{{item2.sortNo}}
+										<text class="my-number-name">({{item2.projectName}})</text>
+									</view>
 								</view>
 								<view>
 									<view>您排队号已过</view>
 									<view v-show="item2.sortFair==3">
 										<!-- 1为过号提示确定后重新排号 -->
-										<text class="number-btn" v-if="item2.config.paPassedNumTakeType==1" @click="clickSortAgain(item)">重新取号</text>
+										<text class="number-btn" v-if="item2.config.paPassedNumTakeType==1" @click="clickSortAgain(item)">
+											重新取号
+										</text>
 										<!-- 0为过号直接重新排号 -->
 										<text class="number-btn" v-else @click="sortAgain(item)">重新取号</text>
 									</view>
@@ -96,13 +106,17 @@
 								<view>{{item2.config.paPassedNumHint}}</view>
 							</view>
 							<view class="current-number">
-								当前排队区间<text>{{item2.showStart}}-{{item2.showEnd}}</text>号
+								当前排队区间
+								<text>{{item2.showStart}}-{{item2.showEnd}}</text>
+								<text>({{item2.projectName}})</text>
 							</view>
 						</view>
 						<!-- 4-可返程取号(仅胖丁显示),5-第一次取号(仅胖丁显示)-->
 						<view v-else-if="item2.sortFair==4||item2.sortFair==5" style="padding-top: 16rpx;">
 							<view class="current-number">
-								当前排队区间<text style="color: #FE6600;">{{item2.showStart}}-{{item2.showEnd}}</text>号
+								当前排队区间
+								<text style="color: #FE6600;">{{item2.showStart}}-{{item2.showEnd}}</text>
+								<text style="color: #FE6600;">({{item2.projectName}})</text>
 							</view>
 							<!-- 1购票返程允许取号 -->
 							<view v-if="item2.config.paReturnTripNumEnable==1" style="margin-top: 30rpx;" >
@@ -127,7 +141,10 @@
 								<!-- 0显示排队号，1隐藏排队号 -->
 								<view v-if="item2.config.paHideNum!=1">
 									<view>我的排队号</view>
-									<view style="color: #FE6600;">{{item2.sortNo}}</view>
+									<view style="color: #FE6600;">
+										{{item2.sortNo}} 
+										<text class="my-number-name">({{item2.projectName}})</text>
+									</view>
 								</view>
 								<!-- 0显示预计时间，1隐藏预计时间 -->
 								<view v-if="item2.config.paHideEstimatedTime!=1">
@@ -136,7 +153,9 @@
 								</view>
 							</view>
 							<view class="current-number">
-								当前排队区间<text style="color: #FE6600;">{{item2.showStart}}-{{item2.showEnd}}</text>号
+								当前排队区间
+								<text style="color: #FE6600;">{{item2.showStart}}-{{item2.showEnd}}</text>
+								<text style="color: #FE6600;">({{item2.projectName}})</text>
 							</view>
 							<view class="number-notice">
 								<view style="color: #666666;">
@@ -157,7 +176,10 @@
 							<view class="my-number" >
 								<view>
 									<view>我的排队号</view>
-									<view style="color: #FE6600;">{{item2.sortNo}}</view>
+									<view style="color: #FE6600;">
+										{{item2.sortNo}}
+										<text class="my-number-name">({{item2.projectName}})</text>
+									</view>
 								</view>
 								<view>
 									<view>预计进入时间</view>
@@ -165,7 +187,9 @@
 								</view>
 							</view>
 							<view class="current-number">
-								当前排队区间<text style="color: #FE6600;">{{item2.showStart}}-{{item2.showEnd}}</text>号
+								当前排队区间
+								<text style="color: #FE6600;">{{item2.showStart}}-{{item2.showEnd}}</text>
+								<text style="color: #FE6600;">({{item2.projectName}})</text>
 							</view>
 							<view class="number-notice" style="color: #666666;">
 								温馨提示：{{item2.config.paRowNumHint}}
@@ -1038,7 +1062,7 @@ export default {
 	display: flex;
 	justify-content: space-between;
 	padding: 20rpx 32rpx;
-	border-bottom: 1px solid #EDEDED;
+	border-bottom: 1px solid #EBEEF5;
 }
 .product-refund-list view{
 	margin-top: 10rpx;
@@ -1088,6 +1112,8 @@ export default {
 			margin-top: 10rpx;
 			font-size: 52rpx;
 			font-weight: 600;
+			display: flex;
+			align-items: center;
 		}
 	}
 	>view:first-child{
@@ -1097,12 +1123,18 @@ export default {
 		width: 48%;
 	}
 }
+.my-number-name{
+	font-size: 40rpx;
+	margin-left: 10rpx;
+}
 .current-number{
 	margin-top: 10rpx;
+	display: flex;
+	align-items: center;
 	text{
 		font-size: 40rpx;
 		font-weight: 600;
-		margin: 0 4rpx;
+		margin-left: 10rpx;
 	}
 }
 .number-notice{
@@ -1259,6 +1291,7 @@ export default {
 	align-items: center;
 	padding: 0 40rpx;
 	justify-content:flex-end;
+	border-top: 1px solid #EBEEF5;
 	text{
 		display: inline-block;
 		width: 170rpx;