Merge branch 'master' of http://gitlab.oytour.com/zk123/jz_travel into master

pages/jiuzhai/jz_LineDetail.vue

@@ -226,7 +226,7 @@
           </view>
         </view>
       </view>
-      <view class="jz_TripDays">
+      <view class="jz_TripDays" style="display:none;">
         <span style="display: inline-block; position: relative">
           <text
             style="

pages/jiuzhai/jz_Reserve.vue

@@ -308,7 +308,7 @@
       v-for="(subItem, subIndex) in GuestList"
       :key="subIndex"
     >
-      <view style="margin: 10rpx 0 15rpx 0"> 游客：{{ subIndex + 1 }} </view>
+      <view style="margin: 10rpx 0 15rpx 0"> 游客{{ subIndex + 1 }} </view>
       <view class="form-items">
         <view class="label">游客姓名</view>
         <view class="val">
@@ -341,7 +341,7 @@
         </view>
       </view>
       <view class="form-items">
-        <view class="label">学生{{ subItem.IsHightSchool }}</view>
+        <view class="label">学生</view>
         <view class="val" style="margin-top: -20rpx">
           <!-- <u-checkbox-group>
             <u-checkbox v-model="subItem.IsHightSchool"></u-checkbox>

pages/jiuzhai/jz_SureOrder.vue

@@ -179,7 +179,7 @@
 }
 
 .jz_OrderReNow {
-  width: 150rpx;
+  width: 170rpx;
   height: 80rpx;
   background-color: #111111;
   text-align: center;
@@ -202,9 +202,6 @@
   font-size: 28px;
   font-weight: 500;
 }
-.jz_form .form-items:last-child {
-  border-bottom: none;
-}
 .jz_form .form-items .label {
   font-size: 28rpx;
   font-weight: 600;
@@ -324,6 +321,12 @@
   font-weight: 500;
   width: 100%;
 }
+.jz_MyGuestList .label{
+	width:56px;
+}
+.jz_MyGuestList {
+	margin-top:40rpx;
+}
 </style>
 <template>
   <view class="jz_Reserve" v-if="orderData">
@@ -443,19 +446,29 @@
           {{ orderData.model.CreateDate.replace("T", " ") }}
         </view>
       </view>
-      <view class="form-items">
-        <view class="label">游客姓名</view>
-        <view class="jz_SureVal">
-          {{ orderData.model.ContactName }}
-        </view>
-      </view>
-      <view class="form-items">
-        <view class="label">联系电话</view>
-        <view class="jz_SureVal">
-          {{ orderData.model.ContactMobile }}
-        </view>
-      </view>
     </view>
+	<view class="empty-block"></view>
+	<view class="jz_form jz_MyGuestList" v-for="(subItem, subIndex) in orderData.model.GuestList":key="subIndex">
+        <view style="margin: 10rpx 0 20rpx 0"> 游客{{ subIndex + 1 }} </view>
+		<view class="form-items">
+		  <view class="label">游客姓名</view>
+		  <view class="jz_SureVal">{{subItem.SurName}}{{subItem.Name}}</view>
+		</view>
+		<view class="form-items">
+		  <view class="label">联系电话</view>
+		  <view class="jz_SureVal">{{subItem.MobilePhone}}</view>
+		</view>
+		<view class="form-items">
+		  <view class="label">身份证</view>
+		  <view class="jz_SureVal">{{subItem.IdCard}}</view>
+		</view>
+		<view class="form-items">
+		  <view class="label">学生</view>
+		  <view class="jz_SureVal">
+			{{subItem.IsHightSchool==1?'是':'否'}}
+		  </view>
+		</view>
+	</view>
     <view class="empty-block"></view>
     <view style="padding: 50rpx 40rpx">
       <view class="big-title">