1

components/long-date/long-date.vue

@@ -8,11 +8,11 @@
 				</picker-view-column>
 
 				<picker-view-column>
-					<view class="long-datetime-item" v-for="(item,index) in hours" :key="index">{{item}}</view>
+					<view class="long-datetime-item" v-for="(item,index) in hours" :key="index">{{item}}时</view>
 				</picker-view-column>
 
 				<picker-view-column>
-					<view class="long-datetime-item" v-for="(item,index) in minutes" :key="index">{{item}}</view>
+					<view class="long-datetime-item" v-for="(item,index) in minutes" :key="index">{{item}}分</view>
 				</picker-view-column>
 
 			</picker-view>

packageA/my/orderList.vue

@@ -1,14 +1,20 @@
 <template>
 	<view class="box flex justify-center align-items flex-column">
 		<view class="con-center flex flex-column justify-center align-items">
-
+			<view class="tabs">
-			<view class="tabs align-items">
+				 <u-tabs :activeStyle="{
+            color: '#303133',
+            fontWeight: 'bold',fontSize: '32rpx'}" :inactiveStyle="{
+            color: '#606266'
+        }" :list="headers" lineColor="#323232" @click="selectheader"></u-tabs>
+			</view>
+			<!-- <view class="tabs align-items">
 				<span class="s-header flex flex-column" v-for="(item, index) in headers" :key="index"
 					:class="{ selected: headerSelected(item.status) }" @click="selectheader(item.status)">
 					{{ item.text }}
 					<span class="lines" :class="{ selected: headerSelected(item.status) }"></span>
 				</span>
-			</view>
+			</view> -->
 
 			<view class="flex align-items justify-start shenhe" v-if="status == 0">
 				<span :class="['span_s', { active: !auth_status }]" @click="toShlist(0)">待审核</span>
@@ -212,35 +218,35 @@
 				sortStyle: ["#ff557f", "#3f3f3f"],
 				headers: [{
 						status: "0",
-						text: "活动审核",
+						name: "活动审核",
 					},
 					{
 						status: "1",
-						text: "未开始",
+						name: "未开始",
 					},
 					{
 						status: "2",
-						text: "报名中",
+						name: "报名中",
 					},
 					{
 						status: "3",
-						text: "待开始",
+						name: "待开始",
 					},
 					{
 						status: "4",
-						text: "进行中",
+						name: "进行中",
 					},
 					{
 						status: "5",
-						text: "已结束",
+						name: "已结束",
 					},
 					{
 						status: "-1",
-						text: "已取消",
+						name: "已取消",
 					},
 					{
 						status: "-2",
-						text: "售后订单",
+						name: "售后订单",
 					}
 				],
 				selected: "0",
@@ -597,7 +603,9 @@
 						this.loadStatus = "loading";
 					});
 			},
-			selectheader(status) {
+			selectheader(index) {
+				console.log(index);
+				var status=index.status;
 				this.selected = status;
 				this.page = 1;
 				this.hotList = [];
@@ -636,55 +644,16 @@
 			background: #f7f7f7;
 
 			.tabs {
-				width: 750rpx;
 				background: #ffffff;
-				display: flex;
-				overflow-x: auto;
-				-webkit-overflow-scrolling: touch;
 				font-family: PingFang SC, PingFang SC;
 				position: fixed;
 				top: 0;
-				z-index: 2;
-				padding-left: 60rpx;
-				.s-header {
-					display: flex;
-					justify-content: center;
-					align-items: center;
-					width: 140rpx;
-					height: 80rpx;
-					font-weight: 400;
-					font-size: 28rpx;
-					color: #9e9e9e;
-					line-height: 26rpx;
-					flex: 0 0 auto;
-					position: relative;
-				}
-
-				.s-header.selected {
-					width: 140rpx;
-					height: 80rpx;
-					background: #ffffff;
-					font-weight: 800;
-					font-size: 32rpx;
-					color: #323232;
-					line-height: 28rpx;
-				}
-
-				.lines {
-					position: absolute;
-					bottom: 0;
-					width: 44rpx;
-				}
-
-				.lines.selected {
-					border-bottom: #323232 solid 8rpx;
-				}
 			}
 
 			.shenhe {
 				width: 94%;
 				position: fixed;
-				top: 80rpx;
+				top: 85rpx;
 				//background: #f7f7f7;
 				background: #f7f7f7;
 				z-index: 100;

pages/center/index.vue

@@ -291,7 +291,7 @@
 				</view>
 				<view style="height: 1px;background-color: #EEEEEE;width: 100%;"></view>
 				<view style="height: 700rpx;">
-					<long-date chooseNum="90" @select="datefirm($event,hdIndex)"></long-date>
+					<long-date v-if="dateShow" chooseNum="90" @select="datefirm($event,hdIndex)"></long-date>
 				</view>
 			</u-popup>
 			
@@ -308,7 +308,7 @@
 				</view>
 				<view style="height: 1px;background-color: #EEEEEE;width: 100%;"></view>
 				<view style="height: 700rpx;">
-					<long-date chooseNum="90" @select="birthConfirm($event,bmIndex)"></long-date>
+					<long-date v-if="birthShow" chooseNum="90" @select="birthConfirm($event,bmIndex)"></long-date>
 				</view>
 			</u-popup>
 			<!-- 活动时间 -->

pages/my/index.vue

@@ -1189,7 +1189,7 @@
 		}
 
 		.botmoney {
-			margin-top: 30rpx;
+			margin-top: 22rpx;
 			margin-left: 30rpx;
 			color: #777777;
 			font-weight: 400;