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>
@@ -654,6 +654,7 @@ export default {
                   }
                 }
               })
+              console.log(this.orderInfo.childs)
             }else{
 					  // 退票规则以主订单为准
               if(orderInfo.orderStatus==2||orderInfo.orderStatus==7){