Merge branch 'develop' of http://git.tbd.yanzuoguang.com/panyongping/uni-pdtravel into develop

pages/album/albumOrderdetail/albumOrderdetail.vue

@@ -96,7 +96,7 @@
 						取片地址：
 					</text>
 					<text>
-						重庆市渝中区新华路151号长江索道南站观景台旁
+						{{extendContent.projectAddress}}
 					</text>
 				</view>
 				
@@ -114,7 +114,7 @@
 						咨询电话：
 					</text>
 					<text>
-						023-68567748
+						{{extendContent.projectPhone}}
 					</text>
 				</view>
 				<view>
@@ -147,6 +147,7 @@ export default {
       orderInfo:'',//订单信息
       imgList:[],//下载图片列表
       downImgNumber:0,//下载图片的数量
+      extendContent:'',//额外信息
     }
   },
   onLoad(option) {
@@ -181,6 +182,7 @@ export default {
       this.$request('order/userOrder/findOrderDetail', data).then(res => {
         if (res.code == '00') {
           this.orderInfo = res.data
+          this.extendContent=JSON.parse(this.orderInfo.extendContent) 
           let imgList=this.orderInfo.orderImgList||[]
           imgList.forEach(item=>{
             this.imgList.push(item.imgUrl)

pages/indexs/index/index.vue

@@ -288,7 +288,7 @@ export default {
     //---跳转联合国际
     goGuoji(){
       uni.navigateTo({
-        url:'/pages/scenic/scenicProduct/scenicProduct?merchantId=z00160128940329482da6bd94d443a91'
+        url:'/pages/scenic/scenicProduct/scenicProduct?merchantId=z00160128940329482da6bd94d443a91&channelType=1'
       })
     },
     //---跳转两江游

pages/indexs/merchantListIndex/merchantListIndex.vue

@@ -171,7 +171,6 @@ export default {
     //获取公司Id,保存到本地，支付等逻辑需要入口companyId
     this.$commonjs.getCompanyId(option)
     let token = uni.getStorageSync('token')||''
-    uni.setStorageSync('companyId',companyId)
     if(token){
       uni.getLocation({
 			 type: 'wgs84',

pages/scenic/scenicProduct/scenicProduct.vue

@@ -24,24 +24,26 @@ export default {
     if(this.enterUrl){//普通二维码扫码进入
       let merchantId=this.getUrlKey('merchantId')
       let companyId=this.getUrlKey('companyId')
+      let channelType=this.getUrlKey('channelType')
       let pdOpenid=uni.getStorageSync('openid')//胖丁小程序openid,临时用，当公众号授权做好之后可以删除
       let pdToken=uni.getStorageSync('token')
       let pdCreateUserId=uni.getStorageSync('createUserId')
       let pdUserId=uni.getStorageSync('userId')
       let baseUrl='https://wx.pangdly.com/#/scenicProduct?pdOpenid='+pdOpenid+'&pdToken='+pdToken+'&pdCreateUserId='+pdCreateUserId+'&pdUserId='+pdUserId
-      let url='&merchantId='+merchantId+'&companyId='+companyId
+      let url='&merchantId='+merchantId+'&companyId='+companyId+'&channelType='+channelType
       this.outUrl=baseUrl+url
 					
     }else{//小程序页面跳转进入
       let merchantId=option.merchantId||''
       let companyId=option.companyId||''
+      let channelType=option.channelType||0
       let ifyukuaiCode=option.ifyukuaiCode||''//是否是渝快码跳入，渝快码跳入需要在H5端另外走流程
       let pdOpenid=uni.getStorageSync('openid')//胖丁小程序openid,临时用，当公众号授权做好之后可以删除
       let pdToken=uni.getStorageSync('token')
       let pdCreateUserId=uni.getStorageSync('createUserId')
       let pdUserId=uni.getStorageSync('userId')
       let baseUrl='https://wx.pangdly.com/#/scenicProduct?pdOpenid='+pdOpenid+'&pdToken='+pdToken+'&pdCreateUserId='+pdCreateUserId+'&pdUserId='+pdUserId
-      let url='&merchantId='+merchantId+'&companyId='+companyId+'&ifyukuaiCode='+ifyukuaiCode
+      let url='&merchantId='+merchantId+'&companyId='+companyId+'&ifyukuaiCode='+ifyukuaiCode+'&channelType='+channelType
       this.outUrl=baseUrl+url	
     }
   },