Merge branch 'pd-lx' into develop

main.js

@@ -8,6 +8,7 @@ import commonjs from 'common/common.js'
 
 Vue.prototype.$commonjs = commonjs
 Vue.prototype.$request = request
+Vue.prototype.$wxurl = 'https://lx.pangdly.com/#/'
 Vue.prototype.imageError ='@/static/img/common/pangdingLogo.png'
 Vue.use(uView)
 uni.$u.config.unit = 'rpx'

pages.json

@@ -309,6 +309,14 @@
                     "enablePullDownRefresh": false
                 }
                 
+                },
+                {
+                	"path" : "scenicCombiOrder/scenicCombiOrder",
+                	"style" : 
+                	{
+                		"navigationBarTitleText" : "",
+                		"enablePullDownRefresh" : false
+                	}
                 }
             ]
 		},

pages/combination/combiChoose/combiChoose.vue

@@ -5,65 +5,65 @@
 </template>
 
 <script>
-	export default {
-		data() {
-			return {
-				enterUrl:"",//进入页面路由
-				outUrl:"",//跳出页面路由
-			}
-		},
-		onLoad(option) {
-			//#ifdef MP-WEIXIN
-			this.enterUrl=option.q
-			//#endif
+export default {
+  data() {
+    return {
+      enterUrl:'',//进入页面路由
+      outUrl:'',//跳出页面路由
+    }
+  },
+  onLoad(option) {
+    //#ifdef MP-WEIXIN
+    this.enterUrl=option.q
+    //#endif
 			
-			//#ifdef MP-ALIPAY
-				this.enterUrl=uni.getStorageSync("alipayQrCode")
-			//#endif
+    //#ifdef MP-ALIPAY
+    this.enterUrl=uni.getStorageSync('alipayQrCode')
+    //#endif
 			
-			if(this.enterUrl){//普通二维码扫码进入
-				let channelId=this.getUrlKey("channelId")
-				let companyId=this.getUrlKey("companyId")
-				let merchantId=this.getUrlKey("merchantId")
-				let groupId=this.getUrlKey("groupId")
-				let groupChannelId=this.getUrlKey("groupChannelId")
-				let pageType=this.getUrlKey("pageType")
-				let pdOpenid=uni.getStorageSync("openid")//胖丁小程序openid,临时用，当公众号授权做好之后可以删除
-				let pdToken=uni.getStorageSync("token")
-				let pdCreateUserId=uni.getStorageSync("createUserId")
-				let pdUserId=uni.getStorageSync("userId")
-				let pageCode=this.getUrlKey("pageCode")//赠送优惠券接口参数
-				if(pageType==1){//组合
-					this.outUrl="https://wx.pangdly.com/#/combiChoose?channelId="+channelId+"&merchantId="+merchantId+"&groupId="+groupId+"&groupChannelId="+groupChannelId+"&companyId="+companyId+"&pdOpenid="+pdOpenid+"&pdToken="+pdToken+"&pdCreateUserId="+pdCreateUserId+"&pdUserId="+pdUserId
+    if(this.enterUrl){//普通二维码扫码进入
+      let channelId=this.getUrlKey('channelId')
+      let companyId=this.getUrlKey('companyId')
+      let merchantId=this.getUrlKey('merchantId')
+      let groupId=this.getUrlKey('groupId')
+      let groupChannelId=this.getUrlKey('groupChannelId')
+      let pageType=this.getUrlKey('pageType')
+      let pdOpenid=uni.getStorageSync('openid')//胖丁小程序openid,临时用，当公众号授权做好之后可以删除
+      let pdToken=uni.getStorageSync('token')
+      let pdCreateUserId=uni.getStorageSync('createUserId')
+      let pdUserId=uni.getStorageSync('userId')
+      let pageCode=this.getUrlKey('pageCode')//赠送优惠券接口参数
+      if(pageType==1){//组合
+        this.outUrl=this.$wxurl+'combiChoose?channelId='+channelId+'&merchantId='+merchantId+'&groupId='+groupId+'&groupChannelId='+groupChannelId+'&companyId='+companyId+'&pdOpenid='+pdOpenid+'&pdToken='+pdToken+'&pdCreateUserId='+pdCreateUserId+'&pdUserId='+pdUserId
 					
-				}else{//分销
-					uni.navigateTo({
-						url:"../distributionCombiChoose/distributionCombiChoose?channelId="+channelId+"&merchantId="+merchantId+"&groupId="+groupId+"&groupChannelId="+groupChannelId+"&companyId="+companyId+"&pageCode"+pageCode
-					})
-				}
-			}else{//小程序页面跳转进入
-				let channelId=option.channelId||''
-				let companyId=option.companyId||''
-				let merchantId=option.merchantId||''
-				let groupId=option.groupId||''
-				let groupChannelId=option.groupChannelId||''
-				let thirdOpenid=option.thirdOpenid||''//第三方openid
-				let touristType=option.touristType||''//游客类型
-				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/#/combiChoose?thirdOpenid="+thirdOpenid+"&touristType="+touristType
-				this.outUrl=baseUrl+"&channelId="+channelId+"&merchantId="+merchantId+"&groupId="+groupId+"&groupChannelId="+groupChannelId+"&companyId="+companyId+"&pdOpenid="+pdOpenid+"&pdToken="+pdToken+"&pdCreateUserId="+pdCreateUserId+"&pdUserId="+pdUserId
+      }else{//分销
+        uni.navigateTo({
+          url:'../distributionCombiChoose/distributionCombiChoose?channelId='+channelId+'&merchantId='+merchantId+'&groupId='+groupId+'&groupChannelId='+groupChannelId+'&companyId='+companyId+'&pageCode'+pageCode
+        })
+      }
+    }else{//小程序页面跳转进入
+      let channelId=option.channelId||''
+      let companyId=option.companyId||''
+      let merchantId=option.merchantId||''
+      let groupId=option.groupId||''
+      let groupChannelId=option.groupChannelId||''
+      let thirdOpenid=option.thirdOpenid||''//第三方openid
+      let touristType=option.touristType||''//游客类型
+      let pdOpenid=uni.getStorageSync('openid')||''//胖丁小程序openid,临时用，当公众号授权做好之后可以删除
+      let pdToken=uni.getStorageSync('token')||''
+      let pdCreateUserId=uni.getStorageSync('createUserId')||''
+      let pdUserId=uni.getStorageSync('userId')||''
+      let baseUrl=this.$wxurl+'combiChoose?thirdOpenid='+thirdOpenid+'&touristType='+touristType
+      this.outUrl=baseUrl+'&channelId='+channelId+'&merchantId='+merchantId+'&groupId='+groupId+'&groupChannelId='+groupChannelId+'&companyId='+companyId+'&pdOpenid='+pdOpenid+'&pdToken='+pdToken+'&pdCreateUserId='+pdCreateUserId+'&pdUserId='+pdUserId
 				
-			}
-		},
-		methods: {
-			getUrlKey(name){//---------------------------------------------------------------获取url
-			  return(new RegExp('[?|&]' + name + '=' + '([^&;]+?)(&|#|;|$)').exec(decodeURIComponent(this.enterUrl)) || [, ""])[1].replace(/\+/g, '%20') || "";
-			},
-		}
-	}
+    }
+  },
+  methods: {
+    getUrlKey(name){//---------------------------------------------------------------获取url
+			  return(new RegExp('[?|&]' + name + '=' + '([^&;]+?)(&|#|;|$)').exec(decodeURIComponent(this.enterUrl)) || [, ''])[1].replace(/\+/g, '%20') || ''
+    },
+  }
+}
 </script>
 
 <style>

pages/combination/combiOrder/combiOrder.vue

@@ -23,7 +23,7 @@ export default {
     let pdToken=uni.getStorageSync('token')
     let pdCreateUserId=uni.getStorageSync('createUserId')
     let pdUserId=uni.getStorageSync('userId')
-    let baseUrl='https://wx.pangdly.com/#/combiOrder?pdOpenid='+pdOpenid+'&pdToken='+pdToken+'&pdCreateUserId='+pdCreateUserId+'&pdUserId='+pdUserId
+    let baseUrl=this.$wxurl+'combiOrder?pdOpenid='+pdOpenid+'&pdToken='+pdToken+'&pdCreateUserId='+pdCreateUserId+'&pdUserId='+pdUserId
     let url='&groupId='+groupId+'&groupChannelId='+groupChannelId+'&productIdList='+productIdList+'&orderSource='+orderSource+'&companyId='+companyId+'&ifyukuaiCode='+ifyukuaiCode
     this.outUrl=baseUrl+url
   },

pages/combination/distributionCombiChoose/distributionCombiChoose.vue

@@ -38,7 +38,7 @@ export default {
           url:'../combiChoose/combiChoose?channelId='+channelId+'&merchantId='+merchantId+'&groupId='+groupId+'&groupChannelId='+groupChannelId+'&companyId='+companyId
         })
       }else{//分销
-        this.outUrl='https://wx.pangdly.com/#/distributionCombiChooseS?channelId='+channelId+'&merchantId='+merchantId+'&groupId='+groupId+'&groupChannelId='+groupChannelId+'&companyId='+companyId+'&pdOpenid='+pdOpenid+'&pdToken='+pdToken+'&pdCreateUserId='+pdCreateUserId+'&pdUserId='+pdUserId+'&pageCode'+pageCode
+        this.outUrl=this.$wxurl+'distributionCombiChooseS?channelId='+channelId+'&merchantId='+merchantId+'&groupId='+groupId+'&groupChannelId='+groupChannelId+'&companyId='+companyId+'&pdOpenid='+pdOpenid+'&pdToken='+pdToken+'&pdCreateUserId='+pdCreateUserId+'&pdUserId='+pdUserId+'&pageCode'+pageCode
 					
       }
     }else{//小程序页面跳转进入
@@ -54,7 +54,7 @@ export default {
       let pdToken=uni.getStorageSync('token')||''
       let pdCreateUserId=uni.getStorageSync('createUserId')||''
       let pdUserId=uni.getStorageSync('userId')||''
-      let baseUrl='https://wx.pangdly.com/#/distributionCombiChooseS?thirdOpenid='+thirdOpenid+'&touristType='+touristType
+      let baseUrl=this.$wxurl+'distributionCombiChooseS?thirdOpenid='+thirdOpenid+'&touristType='+touristType
       this.outUrl=baseUrl+'&channelId='+channelId+'&merchantId='+merchantId+'&groupId='+groupId+'&groupChannelId='+groupChannelId+'&companyId='+companyId+'&pdOpenid='+pdOpenid+'&pdToken='+pdToken+'&pdCreateUserId='+pdCreateUserId+'&pdUserId='+pdUserId+'&pageCode'+pageCode
     }
 			

pages/combination/sourceCombiChoose/sourceCombiChoose.vue

@@ -6,59 +6,59 @@
 </template>
 
 <script>
-	export default {
-		data() {
-			return {
-				enterUrl:"",//进入页面路由
-				outUrl:"",//跳出页面路由
-			}
-		},
-		onLoad(option) {
-			//#ifdef MP-WEIXIN
-			this.enterUrl=option.q
-			//#endif
+export default {
+  data() {
+    return {
+      enterUrl:'',//进入页面路由
+      outUrl:'',//跳出页面路由
+    }
+  },
+  onLoad(option) {
+    //#ifdef MP-WEIXIN
+    this.enterUrl=option.q
+    //#endif
 			
-			//#ifdef MP-ALIPAY
-				this.enterUrl=uni.getStorageSync("alipayQrCode")
-			//#endif
+    //#ifdef MP-ALIPAY
+    this.enterUrl=uni.getStorageSync('alipayQrCode')
+    //#endif
 			
-			if(this.enterUrl){//普通二维码扫码进入
-				let channelId=this.getUrlKey("channelId")
-				let companyId=this.getUrlKey("companyId")
-				let merchantId=this.getUrlKey("merchantId")
-				let groupId=this.getUrlKey("groupId")
-				let groupChannelId=this.getUrlKey("groupChannelId")
-				let sourceType=this.getUrlKey('sourceType')//资源方类型，景区1，酒店2，餐饮3，特产4，运营车5
-				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/#/sourceCombiChoose?channelId="+channelId+"&merchantId="+merchantId+"&groupId="+groupId+"&groupChannelId="+groupChannelId+"&companyId="+companyId
-				this.outUrl=baseUrl+"&pdOpenid="+pdOpenid+"&pdToken="+pdToken+"&pdCreateUserId="+pdCreateUserId+"&pdUserId="+pdUserId+"&sourceType="+sourceType
+    if(this.enterUrl){//普通二维码扫码进入
+      let channelId=this.getUrlKey('channelId')
+      let companyId=this.getUrlKey('companyId')
+      let merchantId=this.getUrlKey('merchantId')
+      let groupId=this.getUrlKey('groupId')
+      let groupChannelId=this.getUrlKey('groupChannelId')
+      let sourceType=this.getUrlKey('sourceType')//资源方类型，景区1，酒店2，餐饮3，特产4，运营车5
+      let pdOpenid=uni.getStorageSync('openid')//胖丁小程序openid,临时用，当公众号授权做好之后可以删除
+      let pdToken=uni.getStorageSync('token')
+      let pdCreateUserId=uni.getStorageSync('createUserId')
+      let pdUserId=uni.getStorageSync('userId')
+      let baseUrl=this.$wxurl+'sourceCombiChoose?channelId='+channelId+'&merchantId='+merchantId+'&groupId='+groupId+'&groupChannelId='+groupChannelId+'&companyId='+companyId
+      this.outUrl=baseUrl+'&pdOpenid='+pdOpenid+'&pdToken='+pdToken+'&pdCreateUserId='+pdCreateUserId+'&pdUserId='+pdUserId+'&sourceType='+sourceType
 					
-			}else{//小程序页面跳转进入
-				let channelId=option.channelId||''
-				let companyId=option.companyId||''
-				let merchantId=option.merchantId||''
-				let groupId=option.groupId||''
-				let groupChannelId=option.groupChannelId||''
-				let thirdOpenid=option.thirdOpenid||''//第三方openid
-				let sourceType=option.sourceType||''//第三方openid//资源方类型，景区1，酒店2，餐饮3，特产4，运营车5
-				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/#/sourceCombiChoose?thirdOpenid="+thirdOpenid+"&channelId="+channelId+"&merchantId="+merchantId+"&groupId="+groupId+"&sourceType="+sourceType
-				this.outUrl=baseUrl+"&groupChannelId="+groupChannelId+"&companyId="+companyId+"&pdOpenid="+pdOpenid+"&pdToken="+pdToken+"&pdCreateUserId="+pdCreateUserId+"&pdUserId="+pdUserId
+    }else{//小程序页面跳转进入
+      let channelId=option.channelId||''
+      let companyId=option.companyId||''
+      let merchantId=option.merchantId||''
+      let groupId=option.groupId||''
+      let groupChannelId=option.groupChannelId||''
+      let thirdOpenid=option.thirdOpenid||''//第三方openid
+      let sourceType=option.sourceType||''//第三方openid//资源方类型，景区1，酒店2，餐饮3，特产4，运营车5
+      let pdOpenid=uni.getStorageSync('openid')||''//胖丁小程序openid,临时用，当公众号授权做好之后可以删除
+      let pdToken=uni.getStorageSync('token')||''
+      let pdCreateUserId=uni.getStorageSync('createUserId')||''
+      let pdUserId=uni.getStorageSync('userId')||''
+      let baseUrl=this.$wxurl+'sourceCombiChoose?thirdOpenid='+thirdOpenid+'&channelId='+channelId+'&merchantId='+merchantId+'&groupId='+groupId+'&sourceType='+sourceType
+      this.outUrl=baseUrl+'&groupChannelId='+groupChannelId+'&companyId='+companyId+'&pdOpenid='+pdOpenid+'&pdToken='+pdToken+'&pdCreateUserId='+pdCreateUserId+'&pdUserId='+pdUserId
 				
-			}
-		},
-		methods: {
-			getUrlKey(name){//---------------------------------------------------------------获取url
-			  return(new RegExp('[?|&]' + name + '=' + '([^&;]+?)(&|#|;|$)').exec(decodeURIComponent(this.enterUrl)) || [, ""])[1].replace(/\+/g, '%20') || "";
-			},
-		}
-	}
+    }
+  },
+  methods: {
+    getUrlKey(name){//---------------------------------------------------------------获取url
+			  return(new RegExp('[?|&]' + name + '=' + '([^&;]+?)(&|#|;|$)').exec(decodeURIComponent(this.enterUrl)) || [, ''])[1].replace(/\+/g, '%20') || ''
+    },
+  }
+}
 </script>
 
 <style>

pages/hotel/hotelIndex/hotelIndex.vue

@@ -17,7 +17,7 @@ export default {
     let pdToken=uni.getStorageSync('token')||''
     let pdCreateUserId=uni.getStorageSync('createUserId')||''
     let pdUserId=uni.getStorageSync('userId')||''
-    let baseUrl='https://wx.pangdly.com/#/hotelIndex?companyId='
+    let baseUrl=this.$wxurl+'hotelIndex?companyId='
     this.outUrl=baseUrl+companyId+'&pdOpenid='+pdOpenid+'&pdToken='+pdToken+'&pdCreateUserId='+pdCreateUserId+'&pdUserId='+pdUserId
   },
   methods: {

pages/indexs/dongjianIndex/dongjianIndex.vue

@@ -5,20 +5,20 @@
 </template>
 
 <script>
-	export default {
-		data() {
-			return {
-				outUrl:"",//跳出地址
-			}
-		},
-		onLoad(option){
-			let pdOpenid=uni.getStorageSync("openid")//胖丁小程序openid,临时用，当公众号授权做好之后可以删除
-			let pdToken=uni.getStorageSync("token")
-			let pdCreateUserId=uni.getStorageSync("createUserId")
-			let pdUserId=uni.getStorageSync("userId")
-			this.outUrl="https://wx.pangdly.com/#/dongjianIndex?pdOpenid="+pdOpenid+"&pdToken="+pdToken+"&pdCreateUserId="+pdCreateUserId+"&pdUserId="+pdUserId
-		}
-	}
+export default {
+  data() {
+    return {
+      outUrl:'',//跳出地址
+    }
+  },
+  onLoad(option){
+    let pdOpenid=uni.getStorageSync('openid')//胖丁小程序openid,临时用，当公众号授权做好之后可以删除
+    let pdToken=uni.getStorageSync('token')
+    let pdCreateUserId=uni.getStorageSync('createUserId')
+    let pdUserId=uni.getStorageSync('userId')
+    this.outUrl=this.$wxurl+'dongjianIndex?pdOpenid='+pdOpenid+'&pdToken='+pdToken+'&pdCreateUserId='+pdCreateUserId+'&pdUserId='+pdUserId
+  }
+}
 </script>
 
 <style>

pages/indexs/index/index.vue

@@ -31,7 +31,7 @@
 		<view class="list">
 			<view class="list-wrap" @click="goSuodao()">
 				<view class="list-head">
-					<image src="http://wx.pangdly.com/static/img/sodao.1cdf287.jpg" mode="widthFix">
+					<image src="http://lx.pangdly.com/static/img/sodao.1cdf287.jpg" mode="widthFix">
 						
 					</image>
 					<view class="address">
@@ -65,7 +65,7 @@
 			
 			<view class="list-wrap" @click="goGuoji()">
 				<view class="list-head">
-					<image src="http://wx.pangdly.com/static/img/yunduan.331a774.jpg" mode="widthFix">
+					<image src="http://lx.pangdly.com/static/img/yunduan.331a774.jpg" mode="widthFix">
 						
 					</image>
 					<view class="address">
@@ -99,7 +99,7 @@
 			
 			<view class="list-wrap" @click="goLiangjiang()">
 				<view class="list-head">
-					<image src="http://wx.pangdly.com/static/img/liangjiang.097258e.jpg" mode="widthFix">
+					<image src="http://lx.pangdly.com/static/img/liangjiang.097258e.jpg" mode="widthFix">
 						
 					</image>
 					<view class="address">
@@ -134,7 +134,7 @@
 			
 			<view class="list-wrap" @click="goHuiguan()">
 				<view class="list-head">
-					<image src="http://wx.pangdly.com/static/img/huiguan.c00da69.jpg" mode="widthFix">
+					<image src="http://lx.pangdly.com/static/img/huiguan.c00da69.jpg" mode="widthFix">
 						
 					</image>
 					<view class="address">
@@ -176,13 +176,13 @@ export default {
       currentNum:0,//轮播图下标
       list: [//轮播图图片
 			  {
-			    url: 'http://wx.pangdly.com/static/img/home1.69efcf8.jpg'
+			    url: 'http://lx.pangdly.com/static/img/home1.69efcf8.jpg'
 			  },
 			  {
-			    url: 'http://wx.pangdly.com/static/img/home2.2ec1a04.jpg'
+			    url: 'http://lx.pangdly.com/static/img/home2.2ec1a04.jpg'
 			  },
 			  {
-			    url: 'http://wx.pangdly.com/static/img/home3.df60ec3.jpg'
+			    url: 'http://lx.pangdly.com/static/img/home3.df60ec3.jpg'
 			  }
       ],
       iconList:[//图标列表

pages/indexs/merchantListIndex/merchantListIndex.vue

@@ -149,13 +149,13 @@ export default {
       currentNum:0,//轮播图下标
       list: [//轮播图图片
         {
-          url: 'http://wx.pangdly.com/static/img/home1.69efcf8.jpg'
+          url: 'http://lx.pangdly.com/static/img/home1.69efcf8.jpg'
         },
         {
-          url: 'http://wx.pangdly.com/static/img/home2.2ec1a04.jpg'
+          url: 'http://lx.pangdly.com/static/img/home2.2ec1a04.jpg'
         },
         {
-          url: 'http://wx.pangdly.com/static/img/home3.df60ec3.jpg'
+          url: 'http://lx.pangdly.com/static/img/home3.df60ec3.jpg'
         }
       ],
       tabList: [{

pages/my/commonInfo/commonInfo.vue

@@ -17,7 +17,7 @@ export default {
     let pdToken=uni.getStorageSync('token')||''
     let pdCreateUserId=uni.getStorageSync('createUserId')||''
     let pdUserId=uni.getStorageSync('userId')||''
-    let baseUrl='https://wx.pangdly.com/#/commonInfo?companyId='
+    let baseUrl=this.$wxurl+'commonInfo?companyId='
     this.outUrl=baseUrl+companyId+'&pdOpenid='+pdOpenid+'&pdToken='+pdToken+'&pdCreateUserId='+pdCreateUserId+'&pdUserId='+pdUserId
   },
   methods: {

pages/my/couponCenter/myCouponList/myCouponList.vue

@@ -17,7 +17,7 @@ export default {
     let pdToken=uni.getStorageSync('token')||''
     let pdCreateUserId=uni.getStorageSync('createUserId')||''
     let pdUserId=uni.getStorageSync('userId')||''
-    let baseUrl='https://wx.pangdly.com/#/myCoupon?companyId='
+    let baseUrl=this.$wxurl+'myCoupon?companyId='
     this.outUrl=baseUrl+companyId+'&pdOpenid='+pdOpenid+'&pdToken='+pdToken+'&pdCreateUserId='+pdCreateUserId+'&pdUserId='+pdUserId
   },
   methods: {

pages/my/customerService/enterpriseWechat/enterpriseWechat.vue

@@ -17,7 +17,7 @@ export default {
     let pdToken=uni.getStorageSync('token')||''
     let pdCreateUserId=uni.getStorageSync('createUserId')||''
     let pdUserId=uni.getStorageSync('userId')||''
-    let baseUrl='https://wx.pangdly.com/#/enterpriseWechat?companyId='
+    let baseUrl=this.$wxurl+'enterpriseWechat?companyId='
     this.outUrl=baseUrl+companyId+'&pdOpenid='+pdOpenid+'&pdToken='+pdToken+'&pdCreateUserId='+pdCreateUserId+'&pdUserId='+pdUserId
   },
   methods: {

pages/my/exchangeCode/exchangeIndex/exchangeIndex.vue

@@ -5,25 +5,25 @@
 </template>
 
 <script>
-	export default {
-		data() {
-			return {
-				outUrl:"",//跳出页面路由
-			}
-		},
-		onLoad(option) {
-				let merchantId=option.merchantId||''
-				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/#/exchangeIndex?merchantId="+merchantId
-				this.outUrl=baseUrl+"&pdOpenid="+pdOpenid+"&pdToken="+pdToken+"&pdCreateUserId="+pdCreateUserId+"&pdUserId="+pdUserId
-		},
-		methods: {
+export default {
+  data() {
+    return {
+      outUrl:'',//跳出页面路由
+    }
+  },
+  onLoad(option) {
+    let merchantId=option.merchantId||''
+    let pdOpenid=uni.getStorageSync('openid')||''//胖丁小程序openid,临时用，当公众号授权做好之后可以删除
+    let pdToken=uni.getStorageSync('token')||''
+    let pdCreateUserId=uni.getStorageSync('createUserId')||''
+    let pdUserId=uni.getStorageSync('userId')||''
+    let baseUrl=this.$wxurl+'exchangeIndex?merchantId='+merchantId
+    this.outUrl=baseUrl+'&pdOpenid='+pdOpenid+'&pdToken='+pdToken+'&pdCreateUserId='+pdCreateUserId+'&pdUserId='+pdUserId
+  },
+  methods: {
 
-		}
-	}
+  }
+}
 </script>
 
 <style>

pages/my/order/afterSale/afterSaleList/afterSaleList.vue

@@ -17,7 +17,7 @@ export default {
     let pdToken=uni.getStorageSync('token')||''
     let pdCreateUserId=uni.getStorageSync('createUserId')||''
     let pdUserId=uni.getStorageSync('userId')||''
-    let baseUrl='https://wx.pangdly.com/#/afterSalesList?companyId='
+    let baseUrl=this.$wxurl+'afterSalesList?companyId='
     this.outUrl=baseUrl+companyId+'&pdOpenid='+pdOpenid+'&pdToken='+pdToken+'&pdCreateUserId='+pdCreateUserId+'&pdUserId='+pdUserId
   },
   methods: {

pages/my/order/afterSale/applyAfterSale/applyAfterSale - 副本.vue

@@ -12,13 +12,13 @@ export default {
     }
   },
   onLoad(option) {
-		let orderId= option.orderId||''
+    let orderId= option.orderId||''
     let pdOpenid=uni.getStorageSync('openid')//胖丁小程序openid,临时用，当公众号授权做好之后可以删除
     let pdToken=uni.getStorageSync('token')
     let pdCreateUserId=uni.getStorageSync('createUserId')
     let pdUserId=uni.getStorageSync('userId')
     let ifyukuaiCode=option.ifyukuaiCode||''//是否是渝快码跳入，渝快码跳入需要在H5端另外走流程
-    this.outUrl='https://wx.pangdly.com/#/applyAfterSales?id='+orderId+'&pdOpenid='+pdOpenid+'&pdToken='+pdToken+'&pdCreateUserId='+pdCreateUserId+'&pdUserId='+pdUserId+'&ifyukuaiCode='+ifyukuaiCode
+    this.outUrl=this.$wxurl+'applyAfterSales?id='+orderId+'&pdOpenid='+pdOpenid+'&pdToken='+pdToken+'&pdCreateUserId='+pdCreateUserId+'&pdUserId='+pdUserId+'&ifyukuaiCode='+ifyukuaiCode
   },
   methods: {
   }

pages/my/order/intelTicket/intelTicket.vue

@@ -6,58 +6,58 @@
 </template>
 
 <script>
-	export default {
-		data() {
-			return {
-				outUrl:"",//跳出地址
-				Brightness:"",//屏幕亮度
-			}
-		},
-		onShow() {
-			let _this=this
-			uni.getScreenBrightness({
-			success: function(res){
-			// 这里是把获取到的手机屏幕亮度，存储到data里面，方便给到页面生命周期隐藏和卸载方法里面用
-			   _this.Brightness = res.value;
+export default {
+  data() {
+    return {
+      outUrl:'',//跳出地址
+      Brightness:'',//屏幕亮度
+    }
+  },
+  onShow() {
+    let _this=this
+    uni.getScreenBrightness({
+      success: function(res){
+        // 这里是把获取到的手机屏幕亮度，存储到data里面，方便给到页面生命周期隐藏和卸载方法里面用
+			   _this.Brightness = res.value
 			   if(res.value != 1){
-				uni.setScreenBrightness({
+          uni.setScreenBrightness({
 			        value: 1
-				});
+          })
 			   }
-			}
-			})
-		},
-		onHide: function () {
-			uni.setScreenBrightness({// 恢复之前屏幕亮度
-				value: this.Brightness
-			})
-		},
-		onLoad(option) {
-			//#ifdef MP-WEIXIN
-			this.enterUrl=option.q
-			//#endif
+      }
+    })
+  },
+  onHide: function () {
+    uni.setScreenBrightness({// 恢复之前屏幕亮度
+      value: this.Brightness
+    })
+  },
+  onLoad(option) {
+    //#ifdef MP-WEIXIN
+    this.enterUrl=option.q
+    //#endif
 			
-			//#ifdef MP-ALIPAY
-				this.enterUrl=uni.getStorageSync("alipayQrCode")
-			//#endif
+    //#ifdef MP-ALIPAY
+    this.enterUrl=uni.getStorageSync('alipayQrCode')
+    //#endif
 			
-			if(this.enterUrl){//普通二维码扫码进入
-				let pdOpenid=uni.getStorageSync("openid")//胖丁小程序openid,临时用，当公众号授权做好之后可以删除
-				let pdToken=uni.getStorageSync("token")
-				let pdCreateUserId=uni.getStorageSync("createUserId")
-				let pdUserId=uni.getStorageSync("userId")
-				let orderId=this.getUrlKey("orderId")//订单Id
-				let ifNotice=this.getUrlKey("ifNotice")//是否已经扫码
-				this.outUrl="https://wx.pangdly.com/#/intelDetail?orderId="+orderId+"&ifNotice="+ifNotice+"&pdOpenid="+pdOpenid+"&pdToken="+pdToken+"&pdCreateUserId="+pdCreateUserId+"&pdUserId="+pdUserId
-			}
+    if(this.enterUrl){//普通二维码扫码进入
+      let pdOpenid=uni.getStorageSync('openid')//胖丁小程序openid,临时用，当公众号授权做好之后可以删除
+      let pdToken=uni.getStorageSync('token')
+      let pdCreateUserId=uni.getStorageSync('createUserId')
+      let pdUserId=uni.getStorageSync('userId')
+      let orderId=this.getUrlKey('orderId')//订单Id
+      let ifNotice=this.getUrlKey('ifNotice')//是否已经扫码
+      this.outUrl=this.$wxurl+'intelDetail?orderId='+orderId+'&ifNotice='+ifNotice+'&pdOpenid='+pdOpenid+'&pdToken='+pdToken+'&pdCreateUserId='+pdCreateUserId+'&pdUserId='+pdUserId
+    }
 			
-		},
-		methods: {
-			getUrlKey(name){//---获取url
-			  return(new RegExp('[?|&]' + name + '=' + '([^&;]+?)(&|#|;|$)').exec(decodeURIComponent(this.enterUrl)) || [, ""])[1].replace(/\+/g, '%20') || "";
-			},
-		}
-	}
+  },
+  methods: {
+    getUrlKey(name){//---获取url
+			  return(new RegExp('[?|&]' + name + '=' + '([^&;]+?)(&|#|;|$)').exec(decodeURIComponent(this.enterUrl)) || [, ''])[1].replace(/\+/g, '%20') || ''
+    },
+  }
+}
 </script>
 
 <style>

pages/my/passCode/codeResult/codeResult.vue

@@ -17,7 +17,7 @@ export default {
     let pdToken=uni.getStorageSync('token')||''
     let pdCreateUserId=uni.getStorageSync('createUserId')||''
     let pdUserId=uni.getStorageSync('userId')||''
-    let baseUrl='https://wx.pangdly.com/#/codeResult?companyId='
+    let baseUrl=this.$wxurl+'codeResult?companyId='
     this.outUrl=baseUrl+companyId+'&pdOpenid='+pdOpenid+'&pdToken='+pdToken+'&pdCreateUserId='+pdCreateUserId+'&pdUserId='+pdUserId
   },
   methods: {

pages/my/shopCart/shopCart.vue

@@ -17,7 +17,7 @@ export default {
     let pdToken=uni.getStorageSync('token')||''
     let pdCreateUserId=uni.getStorageSync('createUserId')||''
     let pdUserId=uni.getStorageSync('userId')||''
-    let baseUrl='https://wx.pangdly.com/#/shopCart?companyId='
+    let baseUrl=this.$wxurl+'shopCart?companyId='
     this.outUrl=baseUrl+companyId+'&pdOpenid='+pdOpenid+'&pdToken='+pdToken+'&pdCreateUserId='+pdCreateUserId+'&pdUserId='+pdUserId
   },
   methods: {

pages/my/travelList/travelList/travelList.vue

@@ -17,7 +17,7 @@ export default {
     let pdToken=uni.getStorageSync('token')||''
     let pdCreateUserId=uni.getStorageSync('createUserId')||''
     let pdUserId=uni.getStorageSync('userId')||''
-    let baseUrl='https://wx.pangdly.com/#/travelList?companyId='
+    let baseUrl=this.$wxurl+'travelList?companyId='
     this.outUrl=baseUrl+companyId+'&pdOpenid='+pdOpenid+'&pdToken='+pdToken+'&pdCreateUserId='+pdCreateUserId+'&pdUserId='+pdUserId
   },
   methods: {

pages/my/travelNotes/myTravelogue/myTravelogue.vue

@@ -17,7 +17,7 @@ export default {
     let pdToken=uni.getStorageSync('token')||''
     let pdCreateUserId=uni.getStorageSync('createUserId')||''
     let pdUserId=uni.getStorageSync('userId')||''
-    let baseUrl='https://wx.pangdly.com/#/myCenter?companyId='
+    let baseUrl=this.$wxurl+'myCenter?companyId='
     this.outUrl=baseUrl+companyId+'&pdOpenid='+pdOpenid+'&pdToken='+pdToken+'&pdCreateUserId='+pdCreateUserId+'&pdUserId='+pdUserId
   },
   methods: {

pages/scenic/combinationProduct/combinationProduct.vue

@@ -312,6 +312,11 @@ export default {
     this.companyId=this.$commonjs.getCompanyId(option)
     this.channelType = option.channelType || 0
     this.merchantId = option.merchantId || ''
+  },
+  onShow() {
+    //清空之前选中的数据
+    this.detailData=''
+    this.chooseProduct=[]
     let token = uni.getStorageSync('token')
     if (token) {
       uni.getLocation({
@@ -580,7 +585,7 @@ export default {
         })
         let query ='?productIdList=' + JSON.stringify(productIdList) + '&groupId=' + this.groupId + '&groupChannelId=' + this.groupChannelId + '&orderSource=3'
         uni.navigateTo({
-          url: '/pages/scenic/scenicOrder/scenicOrder' + query
+          url: '/pages/scenic/scenicCombiOrder/scenicCombiOrder' + query
         })
       }
     },

pages/scenic/scenicComponents/calendar.vue

 <template>
 		<u-calendar 
-		:show="show" 
+		:show="showPop" 
 		@confirm="onConfirm"
-		@close="show=false"
+		@close="showPop=false"
 		:maxDate="maxDate" 
 		:defaultDate="defaultDate"
 		:formatter='formatter'
@@ -29,7 +29,7 @@ export default {
   },
   data() {
     return {
-      show: false, //控制日历显示隐藏
+      showPop: false, //控制日历显示隐藏
       defaultDate:'', //默认日期
       maxDate:'',//最大日期
     }
@@ -40,7 +40,7 @@ export default {
   methods: {
     //---日期确认事件
     onConfirm(date) { 
-      this.show = false
+      this.showPop = false
       this.$emit('dateConfig', date[0])
     },
     //---时间格式转换
@@ -67,7 +67,16 @@ export default {
       // }
       return day
 			
-    }
+    },
+		 //---设置默认日期
+    setDefaultDate(val) {
+      this.defaultDate=val
+      // let dates = val.split('-')
+      // let year = parseInt(dates[0])
+      // let month = parseInt(dates[1]) - 1
+      // let day = parseInt(dates[2])
+      // this.defaultDate = new Date(year, month, day)
+    },
   }
 }
 </script>

pages/scenic/scenicIndex/scenicIndex.vue

@@ -17,7 +17,7 @@ export default {
     let pdToken=uni.getStorageSync('token')||''
     let pdCreateUserId=uni.getStorageSync('createUserId')||''
     let pdUserId=uni.getStorageSync('userId')||''
-    let baseUrl='https://wx.pangdly.com/#/scenicIndex?companyId='
+    let baseUrl=this.$wxurl+'scenicIndex?companyId='
     this.outUrl=baseUrl+companyId+'&pdOpenid='+pdOpenid+'&pdToken='+pdToken+'&pdCreateUserId='+pdCreateUserId+'&pdUserId='+pdUserId
   },
   methods: {

pages/scenic/scenicJointOrder/scenicJointOrder.vue

@@ -22,7 +22,7 @@ export default {
     let pdToken=uni.getStorageSync('token')
     let pdCreateUserId=uni.getStorageSync('createUserId')
     let pdUserId=uni.getStorageSync('userId')
-    let baseUrl='https://wx.pangdly.com/#/scenicJointOrder?pdOpenid='+pdOpenid+'&pdToken='+pdToken+'&pdCreateUserId='+pdCreateUserId+'&pdUserId='+pdUserId
+    let baseUrl=this.$wxurl+'scenicJointOrder?pdOpenid='+pdOpenid+'&pdToken='+pdToken+'&pdCreateUserId='+pdCreateUserId+'&pdUserId='+pdUserId
     let url='&merchantId='+merchantId+'&productId='+productId+'&orderSource='+orderSource+'&companyId='+companyId+'&ifyukuaiCode='+ifyukuaiCode
     this.outUrl=baseUrl+url
   },

pages/scenic/scenicOrder/scenicOrder.vue

@@ -562,7 +562,7 @@ export default {
     },
     //---展示日历
     showCalendar() {
-      this.$refs.calendar.show = true
+      this.$refs.calendar.showPop = true
     },
     //---日期选择
     dateChoose(index) {

pages/scenic/scenicProduct/scenicProduct.vue

@@ -29,7 +29,7 @@ export default {
       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 baseUrl=this.$wxurl+'scenicProduct?pdOpenid='+pdOpenid+'&pdToken='+pdToken+'&pdCreateUserId='+pdCreateUserId+'&pdUserId='+pdUserId
       let url='&merchantId='+merchantId+'&companyId='+companyId+'&channelType='+channelType
       this.outUrl=baseUrl+url
 					
@@ -42,7 +42,7 @@ export default {
       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 baseUrl=this.$wxurl+'scenicProduct?pdOpenid='+pdOpenid+'&pdToken='+pdToken+'&pdCreateUserId='+pdCreateUserId+'&pdUserId='+pdUserId
       let url='&merchantId='+merchantId+'&companyId='+companyId+'&ifyukuaiCode='+ifyukuaiCode+'&channelType='+channelType
       this.outUrl=baseUrl+url	
     }

pages/scenic/scenicSingleOrder/scenicSingleOrder.vue

@@ -30,7 +30,7 @@ export default {
       let pdToken=uni.getStorageSync('token')
       let pdCreateUserId=uni.getStorageSync('createUserId')
       let pdUserId=uni.getStorageSync('userId')
-      let baseUrl='https://wx.pangdly.com/#/scenicSingleOrder?pdOpenid='+pdOpenid+'&pdToken='+pdToken+'&pdCreateUserId='+pdCreateUserId+'&pdUserId='+pdUserId
+      let baseUrl=this.$wxurl+'scenicSingleOrder?pdOpenid='+pdOpenid+'&pdToken='+pdToken+'&pdCreateUserId='+pdCreateUserId+'&pdUserId='+pdUserId
       let url='&merchantId='+merchantId+'&productId='+productId+'&orderSource='+orderSource+'&companyId='+companyId
       this.outUrl=baseUrl+url
 					
@@ -44,7 +44,7 @@ export default {
       let pdToken=uni.getStorageSync('token')
       let pdCreateUserId=uni.getStorageSync('createUserId')
       let pdUserId=uni.getStorageSync('userId')
-      let baseUrl='https://wx.pangdly.com/#/scenicSingleOrder?pdOpenid='+pdOpenid+'&pdToken='+pdToken+'&pdCreateUserId='+pdCreateUserId+'&pdUserId='+pdUserId
+      let baseUrl=this.$wxurl+'scenicSingleOrder?pdOpenid='+pdOpenid+'&pdToken='+pdToken+'&pdCreateUserId='+pdCreateUserId+'&pdUserId='+pdUserId
       let url='&merchantId='+merchantId+'&productId='+productId+'&orderSource='+orderSource+'&companyId='+companyId+'&ifyukuaiCode='+ifyukuaiCode
       this.outUrl=baseUrl+url	
     }