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>
+		<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,22 +230,8 @@ 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'
@@ -248,9 +241,9 @@ export default {
               url: '/pages/my/order/orderList/orderList'
             })
           },1000)
-          
-			    
 			  }else{
+          this.toUploadType  = true
+          uni.hideLoading()
 			    uni.showToast({
 			      title: res.message,
 			      icon: 'none'