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

pages.json

@@ -565,6 +565,8 @@
 				"path":"jz_ActivityList" //活动列表
 			},{
 				"path":"jz_ActiveInfo" //活动详情
+			},{
+				"path":"jz_ActivePaySuccess" //活动下单成功
 			}]
 		},
 

pages/jiuzhai/jz_ActiveInfo.vue

@@ -750,10 +750,14 @@ export default {
         ID: orderId,
         IsGetGuest: 1,
       };
+	  uni.showLoading({
+	  	title: '加载中'
+	  });
       this.apipost(
         "sellorder_post_GetOrderEntity",
         msg,
         (res) => {
+			uni.hideLoading();
           if (res.resultCode == 1) {
             this.orderData = res.data;
             this.formatStatus(

pages/jiuzhai/jz_Activity.vue

@@ -272,13 +272,14 @@
 </style>
 <template>
   <view class="jz_Reserve">
-    <view class="jz_ReserTop">
+    <view class="jz_ReserTop" v-if="currentPriceInfo">
       <view class="o-timer flex">
-        <view class="time-item"
-          >{{ getDate(currentPriceInfo.startDate) }}
-          {{ getWeek(currentPriceInfo.startDate) }}</view
+        <view class="time-item" v-if="currentPriceInfo.startDate">
+		  {{ getDate(currentPriceInfo.startDate) }}
+          {{ getWeek(currentPriceInfo.startDate) }}
+		</view
         >
-        <view class="time-split">
+        <view class="time-split" v-if="currentPriceInfo.dayNum">
           <view>{{ currentPriceInfo.dayNum }}天</view>
         </view>
         <view
@@ -292,7 +293,7 @@
           <text v-if="orderMsg.BabyNum > 0">{{ orderMsg.BabyNum }}婴儿</text>
         </view>
       </view>
-      <view class="jz_ReserTitle">
+      <view class="jz_ReserTitle" v-if="currentPriceInfo.title">
         {{ currentPriceInfo.title }}
       </view>
       <view class="jz_ReserIn" style="margin: 33rpx 0 18rpx 0">
@@ -596,11 +597,14 @@ export default {
     },
     //获取详情
     getDetails(id) {
+	  uni.showLoading({
+		title: '加载中'
+	  });
       this.apipost(
         "b2b_get_GetB2BTravelInfoNoDesV1",
         { tcid: id },
         (res) => {
-			console.log(res,'数据');
+			uni.hideLoading();
           if (res.resultCode == 1) {
             this.tips = res.data.feature.importantTipText;
             this.ltName = res.data.ltName;
@@ -613,9 +617,11 @@ export default {
       );
     },
     getWeek(date) {
-      var weekArray = new Array("日", "一", "二", "三", "四", "五", "六");
-      var week = weekArray[new Date(date).getDay()]; //注意此处必须是先new一个Date
-      return "周" + week;
+	  if(date){
+	    var weekArray = new Array("日", "一", "二", "三", "四", "五", "六");
+	    var week = weekArray[new Date(date).getDay()]; //注意此处必须是先new一个Date
+	    return "周" + week;
+	  }
     },
     getDate(date) {
       if (date) {
@@ -814,7 +820,6 @@ export default {
           },
         },
         (res) => {
-			console.log(res,'数据');
           this.orderInfo = JSON.parse(res.data);
           // this.Pay(OrderId);
           this.subscribeMsg(OrderId);

pages/jiuzhai/jz_Reserve.vue

@@ -590,10 +590,14 @@ export default {
     },
     //获取详情
     getDetails(id) {
+	  uni.showLoading({
+		title: '加载中'
+	  });
       this.apipost(
         "b2b_get_GetB2BTravelInfoNoDesV1",
         { tcid: id },
         (res) => {
+			uni.hideLoading();
           if (res.resultCode == 1) {
             this.tips = res.data.feature.importantTipText;
             this.ltName = res.data.ltName;