zhanghui il y a 2 ans
Parent
commit
62359eb29e

+ 3 - 3
orderPages/bookService/index.vue

@@ -19,9 +19,9 @@
 					</view>
 				</u-grid-item>
 			</u-grid>
-			<view class="serobReminder">
-				<text>同一服务对象在同一时间只能有一个服务订单</text>
-			</view>
+<!--			<view class="serobReminder">-->
+<!--				<text>请注意,一人一号</text>-->
+<!--			</view>-->
 		</view>
 
 		<view class="flex-col group " v-for="(item, index) in orderParam.childService">

+ 6 - 2
orderPages/orderDetail/index.vue

@@ -98,11 +98,15 @@
 								<text class="key">服务时间:</text>
 								<text class="value">{{item.serviceTime || ''}}</text>
 							</view>
-							<view v-if="item.discountAmount > 0">
+							<view class="flex-row" v-if="item.discountAmount > 0">
+								<u-icon name="red-packet" size="16"></u-icon>
+								<text class="key">服务金额:</text>
 								<text  class="projectMoney">¥{{item.payAmount}}</text>
 								<text  class="lineMoney">¥{{item.servicePrice}}</text>
 							</view>
-							<view v-else>
+							<view class="flex-row" v-else>
+								<u-icon name="red-packet" size="16"></u-icon>
+								<text class="key">服务金额:</text>
 								<text  class="projectMoney">¥{{item.servicePrice}}</text>
 							</view>
 						</view>

+ 3 - 3
orderPages/storeService/index.vue

@@ -20,9 +20,9 @@
 					</view>
 				</u-grid-item>
 			</u-grid>
-			<view class="serobReminder">
-				<text>同一服务对象在同一时间只能有一个服务订单</text>
-			</view>
+<!--			<view class="serobReminder">-->
+<!--				<text>同一服务对象在同一时间只能有一个服务订单</text>-->
+<!--			</view>-->
 		</view>
 
 		<view class="flex-col group ">

+ 34 - 27
pages/order/index.vue

@@ -81,43 +81,48 @@
 				</view>
 
 
-				<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">
-							<text>余额支付</text>
-							<text class="balance">可以余额¥{{userInfo.balance || 0}}</text>
+				<view :style="{'height':'380rpx'}">
+
+					<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">
+								<text>余额支付</text>
+								<text class="balance">可以余额¥{{userInfo.balance || 0}}</text>
+							</view>
 						</view>
-					</view>
 
-					<view class="flex-col justify-center">
-						<view v-if="curServiceTab === 1" >
-							<u-icon name="checkmark-circle-fill" color="#38db38" size="25"></u-icon>
-						</view>
-						<view v-else>
-							<u-icon name="/static/order/ud9.png" color="green" size="25"></u-icon>
+						<view class="flex-col justify-center">
+							<view v-if="curServiceTab === 1" >
+								<u-icon name="checkmark-circle-fill" color="#38db38" size="25"></u-icon>
+							</view>
+							<view v-else>
+								<u-icon name="/static/order/ud9.png" color="green" size="25"></u-icon>
+							</view>
 						</view>
-					</view>
-
-				</view>
 
-				<view class="payItem flex-row justify-between" @click="payItem(2)">
-					<view class="flex-row">
-						<u-icon name="weixin-circle-fill" color="#38db38" size="36"></u-icon>
-						<view class="payName flex-col justify-center">
-							<text>微信支付</text>
-						</view>
 					</view>
-					<view class="flex-col justify-center">
-						<view v-if="curServiceTab === 2" >
-							<u-icon name="checkmark-circle-fill" color="#38db38" size="25"></u-icon>
+
+					<view class="payItem flex-row justify-between" @click="payItem(2)">
+						<view class="flex-row">
+							<u-icon name="weixin-circle-fill" color="#38db38" size="36"></u-icon>
+							<view class="payName flex-col justify-center">
+								<text>微信支付</text>
+							</view>
 						</view>
-						<view v-else>
-							<u-icon name="/static/order/ud9.png" color="green" size="25"></u-icon>
+						<view class="flex-col justify-center">
+							<view v-if="curServiceTab === 2" >
+								<u-icon name="checkmark-circle-fill" color="#38db38" size="25"></u-icon>
+							</view>
+							<view v-else>
+								<u-icon name="/static/order/ud9.png" color="green" size="25"></u-icon>
+							</view>
 						</view>
 					</view>
 				</view>
 
+
+
 				<view class="commitBtn" @click="commonGeneralOrder">
 					<text>确定</text>
 				</view>
@@ -267,6 +272,8 @@
 							that.getUserInfo()
 						}
 					});
+				}).catch(err=>{
+					this.requestStatus=false
 				})
 			},