zhanghui %!s(int64=2) %!d(string=hai) anos
pai
achega
327d25b75d

+ 6 - 0
orderPages/bookService/index.rpx.scss

@@ -28,6 +28,12 @@
   text-align: center;
   position: relative;
 }
+.serobReminder{
+  margin-top: 20rpx;
+  line-height: 40rpx;
+  padding-left: 32rpx;
+  color: red;
+}
 .teachPrice{
   font-size: 24rpx;
   font-weight: 400;

+ 30 - 26
orderPages/bookService/index.vue

@@ -19,6 +19,9 @@
 					</view>
 				</u-grid-item>
 			</u-grid>
+			<view class="serobReminder">
+				<text>请注意,一人一号</text>
+			</view>
 		</view>
 
 		<view class="flex-col group " v-for="(item, index) in orderParam.childService">
@@ -242,6 +245,7 @@
 				if (item.select) {
 					this.orderParam.childService = this.orderParam.childService.filter(selectServiceObject =>
 						selectServiceObject.serviceObjectId !== item.id)
+					item.select = !item.select
 				} else {
 
 					this.$api.getServicePersonTime({
@@ -389,32 +393,32 @@
 					e.select=false
 				})
 				items[index2].select =true // 新选中的时间
-				let selectServiceObject = this.orderParam.childService[index] //旧的时间
-				this.orderParam.childService.forEach(i=>{
-					if (selectServiceObject.serviceUserId === -1){
-						i.serviceTimeList.forEach(t=>{
-							if (t.label == selectServiceObject.serviceStartTime && !t.select ){
-								console.log('-1----------加1')
-								t.total +=1
-							}
-							if (t.label == items[index2].serviceStartTime && i.serviceObjectId != selectServiceObject.serviceObjectId){
-								console.log('-1----------减1')
-								t.total -=1
-							}
-						})
-					}else {
-						if (selectServiceObject.serviceUserId == i.serviceUserId){
-							i.serviceTimeList.forEach(t=>{
-								if (t.label == selectServiceObject.serviceStartTime && !t.select ){
-									t.total +=1
-								}
-								if (t.label == items[index2].serviceStartTime && i.serviceObjectId != selectServiceObject.serviceObjectId){
-									t.total -=1
-								}
-							})
-						}
-					}
-				})
+				// let selectServiceObject = this.orderParam.childService[index] //旧的时间
+				// this.orderParam.childService.forEach(i=>{
+				// 	if (selectServiceObject.serviceUserId === -1){
+				// 		i.serviceTimeList.forEach(t=>{
+				// 			if (t.label == selectServiceObject.serviceStartTime && !t.select ){
+				// 				console.log('-1----------加1')
+				// 				t.total +=1
+				// 			}
+				// 			if (t.label == items[index2].serviceStartTime && i.serviceObjectId != selectServiceObject.serviceObjectId){
+				// 				console.log('-1----------减1')
+				// 				t.total -=1
+				// 			}
+				// 		})
+				// 	}else {
+				// 		if (selectServiceObject.serviceUserId == i.serviceUserId){
+				// 			i.serviceTimeList.forEach(t=>{
+				// 				if (t.label == selectServiceObject.serviceStartTime && !t.select ){
+				// 					t.total +=1
+				// 				}
+				// 				if (t.label == items[index2].serviceStartTime && i.serviceObjectId != selectServiceObject.serviceObjectId){
+				// 					t.total -=1
+				// 				}
+				// 			})
+				// 		}
+				// 	}
+				// })
 				this.orderParam.childService[index].serviceStartTime = items[index2].label
 				this.$forceUpdate()
 			},

+ 2 - 6
orderPages/orderDetail/index.rpx.scss

@@ -26,29 +26,25 @@
 }
 .serviceAttrDesc{
   width: 108rpx;
-  height: 56rpx;
-  background: #FFE05C;
+  background: #fff9de;
   border-radius: 0rpx 0rpx 12rpx 12rpx;
 
   font-size: 24rpx;
   font-family: PingFangSC-Regular, PingFang SC;
   font-weight: 400;
   color: #333333;
-  line-height: 56rpx;
   text-align: center;
 }
 
 .serviceAttrDesc1{
   width: 108rpx;
-  height: 56rpx;
-  background: #E9F6D1;
+  background: #e9f6d1;
   border-radius: 0rpx 0rpx 12rpx 12rpx;
 
   font-size: 24rpx;
   font-family: PingFangSC-Regular, PingFang SC;
   font-weight: 400;
   color: #93D21A;
-  line-height: 56rpx;
   text-align: center;
 }
 

+ 3 - 3
orderPages/orderDetail/index.vue

@@ -18,9 +18,9 @@
 				<text class="key">订单编号:</text>
 				<text class="value">{{order.orderNo}}</text>
 			</view>
-			<view>
-				<text  class="serviceType">{{order.serviceType}}</text>
-			</view>
+<!--			<view>-->
+<!--				<text  class="serviceType">{{order.serviceType}}</text>-->
+<!--			</view>-->
 
 			<view class="flex-row justify-between  jishi">
 				<view class="flex-col ">

+ 6 - 0
orderPages/storeService/index.rpx.scss

@@ -16,6 +16,12 @@
 .marginTop{
   margin-top: 24rpx;
 }
+.serobReminder{
+  margin-top: 20rpx;
+  line-height: 40rpx;
+  padding-left: 32rpx;
+  color: red;
+}
 .textareaView{
   height: 280rpx;
   background: #FAFAFA;

+ 3 - 0
orderPages/storeService/index.vue

@@ -20,6 +20,9 @@
 					</view>
 				</u-grid-item>
 			</u-grid>
+			<view class="serobReminder">
+				<text>请注意,一人一号</text>
+			</view>
 		</view>
 
 		<view class="flex-col group ">

+ 1 - 1
pages/order/module/mescrollUni-item.vue

@@ -125,7 +125,7 @@
 								预约金额:<text class="fontColor"> ¥{{ item.subAmount || 0}}</text>
 							</view>
 							<view class="price">
-								订单总金额:<text class="fontColor"> ¥{{ item.payAmount || 0}}</text>
+								订单总金额:<text class="fontColor"> ¥{{ item.totalAmount || 0}}</text>
 								<text :style="{'text-decoration':'line-through','margin-left':'15rpx', 'font-size':'20rpx'}">¥{{ item.totalAmount || 0}}</text>
 							</view>
 						</view>