Merge remote-tracking branch 'origin/release' into release

src/components/RoutersSelector/index.vue

@@ -153,7 +153,13 @@ export default {
                         let routerList = []
                         this.openedRouterList.forEach(router => {
                             if(router.transportType == item.value){
-                                const availChannels = this.availChannelList.filter(channel => channel.countryId == router.destCountryId)
+                                let availChannels = []
+                                // 空运相关的，没有可用的渠道则不显示线路
+                                if(item.cssClass === 'channel'){
+                                  availChannels = this.availChannelList.filter(channel => channel.countryId == router.destCountryId)
+                                  if(!availChannels.length) return
+                                }
+
                                 routerList.push(Object.assign({
                                         _merge: item.cssClass == 'channel' ? availChannels.length || 1 : 1,
                                         channel: item.cssClass == 'channel' ? availChannels[0] || { channelId: 0} : {channelId: 0},