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

pages/my/order/jointElectronicTicket/jointElectronicTicket.vue

@@ -350,7 +350,7 @@
 				申请退票
 			</view>
 			<radio-group @change="radioChange">
-				<label class="subradio" v-if="item.isRefund" v-for="(item,index) in orderInfo.childs" :key="index">
+				<label class="subradio" v-if="item.ifRefund" v-for="(item,index) in orderInfo.childs" :key="index">
 					<text>{{item.productName}}</text>
 					<radio :value="item.id" :checked="refundOrderId==item.id"/>
 				</label>
@@ -582,78 +582,79 @@ export default {
 					  // 退票规则以子订单为准
               this.orderInfo.childs.forEach(item=>{
                 if(item.orderStatus==2||item.orderStatus==7){
-							  //等于2出票成功，7部分退货退款
-							  if(item.isRefund==2){
-							    //随时可退
-								  this.subRefundBtn=true
+                  //等于2出票成功，7部分退货退款
+                  if(item.isRefund==2){
+                    //随时可退
+                    this.subRefundBtn=true
                     //增加字段用于弹窗展示该产品是否可退
                     item.ifRefund=true
-							  }
-							  if(item.isRefund==1){
-							    //1为条件退
-							    item.orderRefundRuleList.forEach(item2=>{
-							      //refundVisitorApply游客是否能自己申请退（0不能1可以）
-									  if(item2.refundVisitorApply==1){
-							        //当前时间戳
-							        let nowTimeNumber=new Date().getTime()
-							        //退票时间戳
-							        let refundTime=''
-							        if(item2.refundDay){
-							          //1使用日期前
-							          if(item2.refundTimeRule==1){
-							            let playDate = this.getNewDate(orderInfo.playDate,-item2.refundDay)
-							            refundTime = playDate+' '+item2.refundTime
-							          }
-							          //2过期后
-							          if(item2.refundTimeRule==2){
-							            let playDate = this.getNewDate(orderInfo.playDate,item2.refundDay)
-							            refundTime = playDate+' '+item2.refundTime
-							          }
-							        }else{
-							          refundTime = orderInfo.playDate+' '+item2.refundTime
-							        }
-							        let refundTimeNumber=new Date(refundTime.replace(/-/g, '/')).getTime()
-							        //refundDateType退款时间0之前1之后2至（用于区间）
-											
-							        if(item2.refundDateType==0){
-							          if(nowTimeNumber<refundTimeNumber){
-												  this.subRefundBtn=true
+                  }
+                  if(item.isRefund==1){
+                    //1为条件退
+                    item.orderRefundRuleList.forEach(item2=>{
+                      //refundVisitorApply游客是否能自己申请退（0不能1可以）
+                      if(item2.refundVisitorApply==1){
+                        //当前时间戳
+                        let nowTimeNumber=new Date().getTime()
+                        //退票时间戳
+                        let refundTime=''
+                        if(item2.refundDay){
+                          //1使用日期前
+                          if(item2.refundTimeRule==1){
+                            let playDate = this.getNewDate(orderInfo.playDate,-item2.refundDay)
+                            refundTime = playDate+' '+item2.refundTime
+                          }
+                          //2过期后
+                          if(item2.refundTimeRule==2){
+                            let playDate = this.getNewDate(orderInfo.playDate,item2.refundDay)
+                            refundTime = playDate+' '+item2.refundTime
+                          }
+                        }else{
+                          refundTime = orderInfo.playDate+' '+item2.refundTime
+                        }
+                        let refundTimeNumber=new Date(refundTime.replace(/-/g, '/')).getTime()
+                        //refundDateType退款时间0之前1之后2至（用于区间）
+												
+                        if(item2.refundDateType==0){
+                          if(nowTimeNumber<refundTimeNumber){
+                            this.subRefundBtn=true
                             //增加字段用于弹窗展示该产品是否可退
                             item.ifRefund=true
-							          }else{
-												  this.subRefundBtn=false
-							          }
-							        }
-							        if(item2.refundDateType==1){
-							          if(nowTimeNumber>refundTimeNumber){
-												  this.subRefundBtn=true
+                          }else{
+                            this.subRefundBtn=false
+                          }
+                        }
+                        if(item2.refundDateType==1){
+                          if(nowTimeNumber>refundTimeNumber){
+                            this.subRefundBtn=true
                             //增加字段用于弹窗展示该产品是否可退
                             item.ifRefund=true
-							          }else{
-												  this.subRefundBtn=false
-							          }
-							        }
-							        if(item2.refundDateType==2){
-							          let refundEndTime=''
-							          if(item2.refundDay){
-												  let playDate = this.getNewDate(orderInfo.playDate,-item2.refundDay)
-												  refundEndTime = playDate+' '+item2.refundEndTime
-							          }else{
-												  refundEndTime = orderInfo.playDate+' '+item2.refundEndTime
-							          }
-							          if(refundTime<nowTime<refundEndTime){
-							            this.subRefundBtn=true
+                          }else{
+                            this.subRefundBtn=false
+                          }
+                        }
+                        if(item2.refundDateType==2){
+                          let refundEndTime=''
+                          if(item2.refundDay){
+                            let playDate = this.getNewDate(orderInfo.playDate,-item2.refundDay)
+                            refundEndTime = playDate+' '+item2.refundEndTime
+                          }else{
+                            refundEndTime = orderInfo.playDate+' '+item2.refundEndTime
+                          }
+                          if(refundTime<nowTime<refundEndTime){
+                            this.subRefundBtn=true
                             //增加字段用于弹窗展示该产品是否可退
                             item.ifRefund=true
-							          }else{
-							            this.subRefundBtn=false
-							          }
-							        }
-									  }
-							    })
-							  }
+                          }else{
+                            this.subRefundBtn=false
+                          }
+                        }
+                      }
+                    })
+                  }
                 }
               })
+              console.log(this.orderInfo.childs)
             }else{
 					  // 退票规则以主订单为准
               if(orderInfo.orderStatus==2||orderInfo.orderStatus==7){