反馈

src/components/appoint/appoint-time.vue

@@ -6,7 +6,7 @@
 			<view class="appoint-box">
 				<view class="select-date">
 					<view class="u-flex u-row-between ">
-						<view class="txt">选择日期</view>
+						<view class="txt">选择日期：</view>
 						<view class="txt active">{{ dateList[currentDay].day }}</view>
 					</view>
 					<view class="u-m-t-30 u-flex u-row-between date-list">
@@ -23,7 +23,7 @@
 				<!-- weekChange -->
 				<view class="select-time u-p-t-50">
 					<view class="u-flex u-row-between">
-						<view class="txt">选择时间</view>
+						<view class="txt">选择时间：</view>
 						<view class="txt active">{{ currentTimeTxt }}</view>
 					</view>
 					<view class="u-p-t-30 u-flex u-flex-wrap time-list">

src/components/order/index.vue

@@ -78,13 +78,15 @@
 					}
 				}
 			},
-			// waitAccept:待接单、
-			// waitAppointment:待预约、
-			// waitCheckIn:待签到、
-			// waitFinish:待完工、
-			// review: 审核中、
-			// exception：异常单、
-			// finish：已完工
+			/* 订单类型
+			 waitAccept:待接单、
+			 waitAppointment:待预约、
+			 waitCheckIn:待签到、
+			 waitFinish:待完工、
+			 review: 审核中、
+			 exception：异常单、
+			 finish：已完工
+			 */
 			type: String,
 			location: { // 当前坐标
 				type: Array,

src/pages/order/feedback.vue

@@ -20,14 +20,15 @@
 				<u-tabs 
 					:list="tabList" 
 					:current="curTab"
-					height="80"
+					height="60"
 					gutter="89"
 					bar-height="4" 
 					bar-width="44" 
 					bg-color="none"
 					active-color="#FFFFFF"
-					inactive-color="#FFFFFF"
+					inactive-color="#DEDEDE"
 					font-size="32"
+					bold
 					@change="changeTab"
 				></u-tabs>
 			</view>
@@ -35,6 +36,7 @@
 			<!-- <view class="con-box">
 				
 			</view> -->
+			<view class="content-view">
 			<view class="con-box">
 				<view class="title">{{feedback.own.title}}</view>
 				<view class="u-flex u-flex-wrap">
@@ -43,7 +45,7 @@
 						:key="index" 
 						@click="changeOwn(index)"
 						:class="{'txt-item':true,'active': (trace.reasonRelegation == index)}">
-						<text class="txt">{{index}}</text>
+						<text class="txt">{{item}}</text>
 					</view>
 				</view>
 				<u-gap height="30"></u-gap>
@@ -53,16 +55,19 @@
 						v-for="(txt, index) in options[curTab][trace.reasonRelegation]" 
 						:key="index"
 						@click="changeType(txt)"
-						:class="{'txt-item':true,'active': (trace.reason == txt)}">
+						:class="{'txt-item':true,'active': (trace.reason == txt)}" style="width: 306rpx;">
 						<text class="txt">{{txt}}</text>
 					</view>
 				</view>
 				<u-input v-show="showRemark" v-model="trace.remark" class="textarea" height="156" type="textarea" placeholder="请补充详细说明，以便于记录您的接单信用分"></u-input>
 			</view>
+			<view class="time-view">
 			<appoint-time @dateChange="dateChange" @timeChange="timeChange" @weekChange="weekChange"></appoint-time>
+			</view>
+			</view>
 		</view>
-		<view class="u-m-60">
-			<button class="btn" @click="submitForm" :loading="submiting" :disabled="disabledSubmit">确定</button>
+		<view class="bottom-view">
+			<button class="btn, bottom-btn" @click="submitForm" :loading="submiting" :disabled="disabledSubmit"><text class="button-text">确定</text></button>
 		</view>
 	</view>
 </template>
@@ -262,6 +267,8 @@
 		background-repeat: no-repeat;
 	}
 	.feedback-box {
+		display: flex;
+		flex-direction: column;
 		.header {
 			padding: 12rpx 30rpx 40rpx 30rpx;
 			display: flex;
@@ -280,9 +287,43 @@
 	.top-tab{
 		text-align: center;
 	}
+	.content {
+		display: flex;
+		flex-direction: column;
+		overflow: hidden;
+		margin-bottom: 188rpx;
+		.content-view {
+			height: 100%;
+			border-radius: 12rpx;
+			overflow: auto;
+			margin-top:30rpx;
+				
+			.time-view {
+				border-radius: 12rpx;
+				background-color: #FFFFFF;
+				padding-bottom: 20rpx;
+			}
+		}
+	}
+	.bottom-view {
+		position: fixed;
+		bottom: 44rpx;
+		width: 100%;
+	}
+	.bottom-btn {
+		height: 104rpx;
+		width: 600rpx;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		.button-text {
+			font-size: 32rpx;
+			font-weight: bold;
+		}
+	}
+	
 	.con-box{
-		margin-top:30rpx;
-		padding: 30rpx 30rpx 28rpx 30rpx;
+		padding: 30rpx 30rpx 8rpx 30rpx;
 		border-radius: 12rpx;
 		background-color: #FFFFFF;
 		.title{
@@ -297,24 +338,32 @@
 			.txt-item{
 				border-radius: 12rpx;
 				padding:24rpx 38rpx;
-				min-width: 196rpx;
+				width: 196rpx;
+				height: 72rpx;
 				text-align: center;
-				margin-right: 20rpx;
+				margin-right: 22rpx;
 				margin-bottom: 20rpx;
 				background-color: #F4F5F7;
 				&.active{
 					background-color: #2272FF;
 					.txt{
 						color: #fff;
+						text-overflow: ellipsis;
+						    overflow: hidden;
+						    white-space: nowrap;
 					}
 				}
 			}
 		}
+		
 		.txt{
 			display:block;
 			font-size: 26rpx;
 			line-height: 26rpx;
 			color: #333;
+			text-overflow: ellipsis;
+			    overflow: hidden;
+			    white-space: nowrap;
 		}
 		.textarea{
 			

src/pages/order/refuse.vue

@@ -19,7 +19,7 @@
 			</view>
 			<view class="con-box" style="padding-top: 10rpx;">
 				<view class="tit  u-m-b-20">补充说明</view>
-				<u-input v-model="formData.remark" class="textarea" height="156" type="textarea" placeholder="请补充详细说明，以便于记录您的接单信用分"></u-input>
+				<u-input v-model="formData.remark" class="textarea" height="156" type="textarea" placeholder="请补充详细说明，以便于记录您的接单信用分" :clearable="false"></u-input>
 			</view>
 			
 		</view>
@@ -221,7 +221,7 @@
 		width: 100%;
 		padding: 0 80rpx;
 		position: absolute;
-		bottom: 40rpx;
+		bottom: 44rpx;
 		.bottom-btn {
 			height: 104rpx;
 			display: flex;