大改

orderPages/bookService/index.rpx.scss

@@ -119,17 +119,17 @@
   margin-left: 16rpx;
 }
 .textareaView{
-  height: 280rpx;
-  background: #FAFAFA;
+  min-eight: 280rpx;
+  //background: #FAFAFA;
   border-radius: 16rpx;
-  margin-top: 16rpx;
+  //margin-top: 16rpx;
   margin-bottom: 32rpx;
 
   font-size: 28rpx;
   font-family: PingFangSC-Regular, PingFang SC;
   font-weight: 400;
   color: #999999;
-  padding: 24rpx;
+  padding: 0 24rpx;
 }
 .btnTitle{
   font-size: 24rpx;

orderPages/bookService/index.vue

@@ -20,7 +20,7 @@
 				</u-grid-item>
 			</u-grid>
 			<view class="serobReminder">
-				<text>请注意，一人一号</text>
+				<text>同一服务对象在同一时间只能有一个服务订单</text>
 			</view>
 		</view>
 
@@ -74,11 +74,14 @@
 
 		<view class="flex-col group ">
 			<view class="groupItemKey">
-				<text>服务定制</text>
+				<text>取号规则</text>
 			</view>
-			<view class="textareaView">
-				<textarea v-model="orderParam.remark" placeholder-style="color:#999999;fontSize:28rpx"
-					placeholder="如有其它特殊需求，请在此输入您的需求" />
+			<view class="textareaView ">
+<!--				<textarea v-model="orderParam.remark" placeholder-style="color:#999999;fontSize:28rpx"-->
+<!--					placeholder="如有其它特殊需求，请在此输入您的需求" />-->
+				<view class="serobReminder">
+					<text>请注意，一人一号</text>
+				</view>
 			</view>
 		</view>
 

orderPages/orderDetail/index.vue

@@ -40,15 +40,6 @@
 						<text class="value">{{order.createTime}}</text>
 					</view>
 				</view>
-
-				<view class="flex-col justify-center " v-if="order.serviceAttribute == 1">
-					<view class="planNumber flex-row justify-center">
-						<text>{{order.planNumber}}</text>
-					</view>
-					<view class="plan flex-row justify-center">
-						<text class="plan">排号</text>
-					</view>
-				</view>
 			</view>
 
 
@@ -71,15 +62,6 @@
 						<text class="value">{{order.servicePersonName}}</text>
 					</view>
 				</view>
-
-				<view class="flex-col justify-center ">
-					<view class="planNumber flex-row justify-center">
-						<text>{{order.planNumber}}</text>
-					</view>
-					<view class="plan flex-row justify-center">
-						<text class="plan">预约号</text>
-					</view>
-				</view>
 			</view>
 
 
@@ -104,9 +86,8 @@
 						<text class="projectState">{{item.statusDesc}}</text>
 					</view>
 
-					<view class="box_11">
-						<view class="group_2"></view>
-						<view class="group_3">
+					<view class="flex-row justify-between">
+						<view class="flex-col justify-around">
 							<view class="flex-row">
 								<u-icon name="server-man" size="16"></u-icon>
 								<text class="key">服务人员：</text>
@@ -117,29 +98,42 @@
 								<text class="key">服务时间：</text>
 								<text class="value">{{item.serviceTime || ''}}</text>
 							</view>
+							<view v-if="item.discountAmount > 0">
+								<text  class="projectMoney">¥{{item.payAmount}}</text>
+								<text  class="lineMoney">¥{{item.servicePrice}}</text>
+							</view>
+							<view v-else>
+								<text  class="projectMoney">¥{{item.servicePrice}}</text>
+							</view>
 						</view>
-					</view>
-					<view class="flex-row justify-between">
-						<view v-if="item.discountAmount > 0">
-							<text  class="projectMoney">¥{{item.payAmount}}</text>
-							<text  class="lineMoney">¥{{item.servicePrice}}</text>
-						</view>
-						<view v-else>
-							<text  class="projectMoney">¥{{item.servicePrice}}</text>
-						</view>
+						<view class="flex-col justify-around">
+							<view class="flex-col justify-center ">
+								<view class="planNumber flex-row justify-center">
+									<text>{{order.planNumber}}</text>
+								</view>
+								<view class="plan flex-row justify-center" v-if="order.serviceAttribute == 1">
+									<text class="plan">排号</text>
+								</view>
+								<view class="plan flex-row justify-center" v-if="order.serviceAttribute == 2">
+									<text class="plan">预约号</text>
+								</view>
+
+							</view>
 
-						<view class="flex-row" v-if="item.status === 1" @click="appeal(item.orderServiceId)">
-							<u-icon name="/static/order/ud17.png" color="#93D21A" size="14"></u-icon>
-							<text  class="ss_key">申诉</text>
+							<view class="flex-row justify-center" v-if="item.status === 8" @click="appeal(item.orderServiceId)">
+								<u-icon name="/static/order/ud17.png" color="#93D21A" size="14"></u-icon>
+								<text  class="ss_key">申诉</text>
+							</view>
 						</view>
 					</view>
+
 				</view>
 			</view>
 		</view>
 
 		<view class="bottomHeight"></view>
 
-		<view class="bottom1 flex-col"  v-if="order.orderStatus == 6 ">
+		<view class="bottom1 flex-col"  v-if="order.canPay ">
 			<text class="allMoney"></text>
 			<view class="bottomBtn　flex-row justify-between">
 				<view class=" flex-row">
@@ -150,7 +144,7 @@
 					<!--                        <text  class="priceDetail">价格明细</text>-->
 				</view>
 
-				<view v-if="order.canPay" class="btn" @click="qenPayInfo">
+				<view class="btn" @click="qenPayInfo">
 					<text class="text_33">一键付款</text>
 				</view>
 <!--				<view v-else class="btn" @click="orderFinish">-->

orderPages/storeService/index.rpx.scss

@@ -23,15 +23,15 @@
   color: red;
 }
 .textareaView{
-  height: 280rpx;
-  background: #FAFAFA;
+  min-height: 280rpx;
+  //background: #FAFAFA;
   border-radius: 16rpx;
-  margin-top: 16rpx;
+  //margin-top: 16rpx;
   margin-bottom: 32rpx;
   font-size: 28rpx;
   font-weight: 400;
   color: #999999;
-  padding: 24rpx;
+  padding: 0 24rpx;
 }
 .tabBarLineHeight {
   height: 138rpx;

orderPages/storeService/index.vue

@@ -4,7 +4,7 @@
 			<text>服务日期：{{orderParam.serviceDate}}</text>
 		</view>
 
-		<view class="flex-col group" v-if="serviceObjectList.length > 1">
+		<view class="flex-col group">
 			<view class="serob"><text>服务对象</text></view>
 			<u-grid :border="false" col="4">
 				<u-grid-item v-for="(item,index) in serviceObjectList" :key="index">
@@ -21,20 +21,21 @@
 				</u-grid-item>
 			</u-grid>
 			<view class="serobReminder">
-				<text>请注意，一人一号</text>
+				<text>同一服务对象在同一时间只能有一个服务订单</text>
 			</view>
 		</view>
 
 		<view class="flex-col group ">
 			<view class="groupItemKey">
-				<text>服务定制</text>
+				<text>取号规则</text>
 			</view>
-			<view class="textareaView">
-				<textarea v-model="orderParam.remark" placeholder-style="color:#999999;fontSize:28rpx"
-					placeholder="如有其它特殊需求，请在此输入您的需求" />
+			<view class="serobReminder">
+<!--				<textarea v-model="orderParam.remark" placeholder-style="color:#999999;fontSize:28rpx"-->
+<!--					placeholder="如有其它特殊需求，请在此输入您的需求" />-->
+				<text>请注意，一人一号</text>
 			</view>
 		</view>
-		<view class="tabBarLineHeight "></view>
+<!--		<view class="tabBarLineHeight "></view>-->
 		<view class="tabBarView">
 			<view class="submitButton " @click="commonGeneralOrder">提交</view>
 		</view>

pages/order/index.vue

@@ -81,7 +81,7 @@
 				</view>
 
 
-				<view class="payItem flex-row justify-between" @click="payItem(1)">
+				<view class="payItem flex-row justify-between" v-if="openType!=2" @click="payItem(1)">
 					<view class="flex-row">
 						<u-icon name="/static/me/u701.png" color="#38db38" size="36"></u-icon>
 						<view class="payName flex-col justify-center">