Merge branch 'develop' of http://192.168.0.204/panyongping/uni-pdtravel into develop

pages/my/order/afterSale/applyAfterSale/applyAfterSale.vue

@@ -77,12 +77,14 @@
 		<view class="apply-textarea general-Box" v-if="causeNum==5">
 			<u-input v-model="causeInput" type="textarea" placeholder="补充详细退改原因以便商家更快帮您处理" maxlength="200"  />
 		</view>
-		<view class="apply-toButton" v-if="isRefund"  @click="confirm()">
-			退款提交
-		</view>
-		<view class="apply-toButton" v-else>
-			退款时间为{{orderRefundRuleTimer}}-{{orderRefundRuleEndTimer}}
-		</view>
+		<template v-if="toUploadType == true">
+			<view class="apply-toButton" v-if="isRefund"  @click="confirm()">
+				退款提交
+			</view>
+			<view class="apply-toButton" v-else>
+				退款时间为{{orderRefundRuleTimer}}-{{orderRefundRuleEndTimer}}
+			</view>
+		</template>
 		<view class="apply-mask" v-if="orderRefundRuleListShowBtn==false">
 			<view class="mask-box">
 				<view class="box-text">
@@ -169,6 +171,7 @@ export default {
       orderRefundRuleDay:'',//退款天
       orderRefundRuleListShowMessage:[],//退票规则列表
       orderRefundRuleListShowBtn:true,//退票是否超时
+      toUploadType:true,//提交时候隐藏按钮
     }
   },
   onLoad(option) {
@@ -211,6 +214,10 @@ export default {
         })
         return false
       }
+      uni.showLoading({
+        title: '提交中'
+      })
+      this.toUploadType = false
       var data = {
         orderId:this.orderInfo.id,
         userId:this.openId,
@@ -223,34 +230,20 @@ export default {
       }
       this.$request('order/userOrder/refundTicket',data).then((res)=>{
 			  if(res.code == '00'){
-        //   if(res.data.errorMessage!=''&&res.data.errorMessage!=undefined&&res.data.refundStatus!=6){
-        //     uni.showToast({
-        //       title: res.data.errorMessage,
-        //       icon: 'none'
-        //     })
-        //   }else{
-        //     uni.showToast({
-						  // title: '申请成功',
-						  // icon: 'none'
-        //     })
-        //     setTimeout(()=>{
-						  // uni.reLaunch({
-						  //   url: '/pages/my/order/orderList/orderList'
-						  // })
-        //     },1000)
-        //   }
+          this.toUploadType  = true
+          uni.hideLoading()
           uni.showToast({
-					  title: '申请成功',
-					  icon: 'none'
+            title: '申请成功',
+            icon: 'none'
           })
           setTimeout(()=>{
-					  uni.reLaunch({
-					    url: '/pages/my/order/orderList/orderList'
-					  })
+            uni.reLaunch({
+              url: '/pages/my/order/orderList/orderList'
+            })
           },1000)
-          
-			    
 			  }else{
+          this.toUploadType  = true
+          uni.hideLoading()
 			    uni.showToast({
 			      title: res.message,
 			      icon: 'none'

pages/my/order/electronicTicket/electronicTicket.vue

@@ -845,10 +845,10 @@ export default {
             }
           }
           //判断是否在退票时间内
-					var orderRefundRuleListShowType = false
+          var orderRefundRuleListShowType = false
           this.orderRefundRuleListShowMessage.forEach((item,index)=>{
             if(item.refundVisitorApply==1){
-							orderRefundRuleListShowType = true
+              orderRefundRuleListShowType = true
               var todayTimer = this.$commonjs.today()+' '+this.$commonjs.todayTime() //获取今天时间
               var playdateTimer = '' //获取游玩时间开始
               if(item.refundDay!=undefined&&item.refundDay!=0){
@@ -887,11 +887,11 @@ export default {
               }
             }
           })
-					if(orderRefundRuleListShowType == false&&this.orderInfo.isRefund!=0&&this.orderInfo.orderStatus==2||orderRefundRuleListShowType == false&&this.orderInfo.isRefund!=0&&this.orderInfo.orderStatus==7){
-						this.orderRefundRuleListShowBtn = true
-					}else if(orderRefundRuleListShowType == false&&this.orderInfo.isRefund==0){
-						this.orderRefundRuleListShowBtn = false
-					}
+          if(orderRefundRuleListShowType == false&&this.orderInfo.isRefund!=0&&this.orderInfo.orderStatus==2||orderRefundRuleListShowType == false&&this.orderInfo.isRefund!=0&&this.orderInfo.orderStatus==7){
+            this.orderRefundRuleListShowBtn = true
+          }else if(orderRefundRuleListShowType == false&&this.orderInfo.isRefund==0){
+            this.orderRefundRuleListShowBtn = false
+          }
           this.findCouponListFun()
         }else{
           uni.showToast({