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

pages/my/exchangeCode/exchangeChoose/exchangeChoose.vue

@@ -232,7 +232,7 @@ export default {
     },
     distributionCombiChooseFun(){//跳转立即购票
 		  uni.navigateTo({
-			  url: '/pages/combination/distributionCombiChoose/distributionCombiChoose?channelId=1&merchantId=z0015605022691a5945bbe463141668c&groupId=z0016038113016708b8ad38c637b2f26&groupChannelId=z00160423712018998e6260ffcaf3369'
+			  url: '/pages/combination/distributionCombiChoose/distributionCombiChoose?channelId=12&merchantId=z0017038550618849d35383491a21dac&groupId=z00172593875447797ce45420957fb3e&groupChannelId=z001725939359312baaf670bd89b52dd&companyId=z00169924315983082c46a5f28ab5319'
 		  })
     },
   }