Merge branch 'test' of https://git.banshouhui.com/lijundan/self-support into test

src/pages/order/document.vue

@@ -14,7 +14,7 @@
 						<u-icon name="arrow-right"></u-icon>
 					</view>
 				</view>
-				<scroll-view scroll-x class="label-content" :scroll-into-view="scrollId[key]">
+				<scroll-view scroll-x="true" class="label-content" :scroll-into-view="scrollId[key]">
 					<view v-for="(label, ind) in item" :key="ind" class="label-item" :id="idText + label.id">
 						<!-- 选中为蓝底，非选中状态为灰底 -->
 						<view :class="['label-normal', {'selected': label.id == selected[key].id}]" @click="handleClick(key, label)">
@@ -368,9 +368,11 @@
 			}
 
 			.label-content {
-				width: 100%;
+				width: 100%;
+                height: 104rpx;
 				white-space: nowrap;
 				.label-item {
+                    overflow: hidden;
 					padding-right: 20rpx;
 					flex-shrink: 0;
 					display: inline-block;
@@ -381,14 +383,15 @@
 						color: #666666;
 						background-color: #FFFFFF;
 						border-radius: 8rpx;
-						padding-left: 30rpx;
-						padding-right: 30rpx;
+						padding-left: 20rpx;
+						padding-right: 20rpx;
 						text-align: center;
 						display: flex;
 						justify-content: center;
 						align-items: center;
 						.label-text {
-							word-break:break-all;
+							word-break:break-all;
+                            white-space: normal !important;
 						}
 						&.selected {
 							color: #FFFFFF;