Skip to content

U
uni-pdtravel
Commit 24e3e559 authored by 潘永坪's avatar 潘永坪
Browse files
Options

Merge branch 'pd-lx' into develop

parents 72aa26e7 cd96ca24
Hide whitespace changes
Inline Side-by-side
Showing with 543 additions and 743 deletions
main.js
View file @ 24e3e559
......@@ -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
View file @ 24e3e559
......@@ -309,6 +309,14 @@
"enablePullDownRefresh": false
}
},
{
"path" : "scenicCombiOrder/scenicCombiOrder",
"style" :
{
"navigationBarTitleText" : "",
"enablePullDownRefresh" : false
}
}
]
},
......
pages/combination/combiChoose/combiChoose.vue
View file @ 24e3e559
......@@ -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
View file @ 24e3e559
......@@ -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
View file @ 24e3e559
......@@ -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
View file @ 24e3e559
......@@ -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
View file @ 24e3e559
......@@ -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
View file @ 24e3e559
......@@ -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
View file @ 24e3e559
......@@ -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
View file @ 24e3e559
......@@ -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
View file @ 24e3e559
......@@ -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
View file @ 24e3e559
......@@ -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
View file @ 24e3e559
......@@ -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
View file @ 24e3e559
......@@ -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
View file @ 24e3e559
......@@ -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
View file @ 24e3e559
......@@ -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
View file @ 24e3e559
......@@ -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
View file @ 24e3e559
......@@ -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
View file @ 24e3e559
......@@ -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
View file @ 24e3e559
......@@ -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
View file @ 24e3e559
......@@ -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
View file @ 24e3e559
......@@ -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/scenicOrder/scenicOrder-new.vue → pages/scenic/scenicCombiOrder/scenicCombiOrder.vue
View file @ 24e3e559
<template>
<view class="orderBox">
<view class="head"> </view>
<view class="middle">
<view class="middle" v-for="(item,index) in productList" :key='item.id'>
<view class="middle-top">
<!-- --------------------------------------------产品信息部分------------------------------------- -->
<view class="middle-Product" v-for="(item,Index) in productList" :key='item.id'>
<view class="middle-Product">
<view class="merchantName">
<text class="title-text">
{{ item.merchantName || '' }}
......@@ -14,7 +14,7 @@
</text>
</view>
<view @click="showBuyKnow()" class="buyKnow">
<view @click="showBuyKnow(index)" class="buyKnow">
<view>
<text v-if="item.backChangeRule == 0">不可退换</text>
<text v-if="item.backChangeRule == 1">可退</text>
......@@ -28,7 +28,7 @@
</view>
</view>
<!--需要排队并且站点数大于1-->
<view class="middle-place" @click="openArea()" v-if="item.isFetch == 1 && item.productAreaList.length > 1 && showOpenArea">
<view class="middle-place" @click="openArea(index)" v-if="item.isFetch ==1&& item.productAreaList.length >1&&item.areaUp">
<view> 出发站点 </view>
<view>
......@@ -40,7 +40,7 @@
</view>
</view>
<!--需要排队并且为一个站点-->
<!-- <view class="middle-place" v-if="productIfo.isFetch == 1 && productIfo.productAreaList.length == 1 && showOpenArea" @click="getSortInfor()">
<!-- <view class="middle-place" v-if="item.isFetch == 1 && item.productAreaList.length == 1 &&item.areaUp" @click="getSortInfor()">
<view> 获取排队信息 </view>
<view>
......@@ -55,8 +55,8 @@
<view class="middle-Date">
<view class="title-text">游玩日期</view>
<view class="middle-Datelist">
<scroll-view class="date-content" scroll-x="true" :scroll-left="dateScroll" v-if="item.priceStockList.length > 0">
<view class="date-list" v-for="(item2,index2) of item.priceStockList" :class="{ on: active == index2 }" @click="dateChoose(item,item2,index2)" :key="index2">
<scroll-view class="date-content" scroll-x="true" :scroll-left="dateScroll" v-if="item.priceStockList&&item.priceStockList.length > 0">
<view class="date-list" v-for="(item2,index2) of item.priceStockList" :class="{ on:item.dateActive == index2 }" @click="dateChoose(item,item2,index2)" :key="index2">
<view v-if="item2.week">
<text v-if="item2.week != '今天' && item2.week != '明天' && item2.week != '后天'">周</text>
{{ item2.week }}
......@@ -68,13 +68,13 @@
¥<text style="font-weight: bold;">{{ item2.sellingPrice }}</text>
</view>
<view v-if="active == index" class="date-icon">
<view v-if="item.dateActive == index2" class="date-icon">
<u-icon name="checkmark" color="#ffffff"></u-icon>
</view>
</view>
</scroll-view>
<text v-else class="no-date"> 不可购买 </text>
<view class="dateMore" @click="showCalendar()">
<view class="dateMore" @click="showCalendar(index)">
<view class="date-more-content">
<view>更多</view>
<view>日期</view>
......@@ -84,10 +84,10 @@
</view>
</view>
<view class="middle-time" v-if="productIfo.productType == 3">
<view class="middle-time" v-if="item.productType == 3">
<view class="title-text"> 场次 </view>
<view class="middle-timelist">
<scroll-view class="time-content" scroll-x="true" :scroll-left="timeScroll" v-if="item.timeList.length> 0">
<scroll-view class="time-content" scroll-x="true" :scroll-left="timeScroll" v-if="item.timeList&&item.timeList.length> 0">
<view class="time-list" v-for="(item2,index2) of item.timeList" @click="chooseTime(item,item2,index2)" :class="{ on:item.timeActive == index2 }" :key="index2">
<view>
{{ item2.startPlanTime ? item2.startPlanTime.substr(0, 5) : '' }}
......@@ -165,49 +165,6 @@
</template>
<u-icon name="arrow-right" color="#3688FF"></u-icon>
</view>
<!-- --------------------------------------------额外服务部分-------------------------------------------- -->
<view class="extraService" v-if="serviceList.length>0&&showErmai">
<checkbox-group @change="extraChange">
<view v-for="(item,index) of serviceList" :key="item.id">
<label>
<view>
<text>{{item.name}}</text>
<text style="font-size:20rpx;color: #666666;" v-if="item.deposit">(押金：¥{{item.deposit}})</text>
</view>
<view>
<text style="font-size: 24rpx;">¥</text>
<text style="font-size: 32rpx;font-weight: bold;">{{item.sellingPrice}}</text>
<checkbox class="blue" :value="JSON.stringify(item)" style="transform: scale(0.7);position: relative;left: 10rpx;" :checked="item.ifChoose" />
</view>
</label>
</view>
</checkbox-group>
</view>
<!-- -----------------------------------支付之后有额外服务，没有选额外服务的弹窗------------------------- -->
<u-popup :show="showExtraPop" :round="20" @close="showExtraPop = false" closeable>
<view class="extra-wrap">
<view style="font-weight: bold;font-size: 32rpx;">
云智能导览耳机
</view>
<view style="color: #666666;margin:40rpx 0;">
深度了解索道典故由来，周边攻略推荐
</view>
<view>
<text @click="extraNo()" class="btn" style="background: #fff;color: #333;border: 1px solid #c0c0c0;">
不需要
</text>
<text @click="extraYes()" class="btn" style="margin-left: 40rpx;">
需要
</text>
</view>
</view>
</u-popup>
</view>
<view class="middle-divider">
......@@ -227,11 +184,11 @@
<view
class="plus-list"
:class="{on:item.ifChoose}"
v-for="(item, index) of contactTotal.slice(0, 3)"
@click="visitorChoose(index)"
:key="index"
v-for="(item2, index2) of contactTotal.slice(0, 3)"
@click="visitorChoose(index2)"
:key="index2"
>
{{ item.name }}
{{ item2.name }}
<view v-if="item.ifChoose" class="date-icon">
<u-icon name="checkmark" color="#ffffff"></u-icon>
</view>
......@@ -247,9 +204,9 @@
<text style="margin-left:16rpx;">新增</text>
</view>
<view class="visitorEdit" v-show="item.chooseContact.length > 0">
<view class="edit-list" v-for="(item2, index) of item.chooseContact" :key="item.id">
<view @click="delChooseContact(item2, index)">
<view class="visitorEdit" v-show="item.chooseContact&&item.chooseContact.length > 0">
<view class="edit-list" v-for="(item2, index2) of item.chooseContact" :key="item2.id">
<view @click="delChooseContact(item2, index2)">
<u-icon name="close-circle" color="#3688ff" size="40"></u-icon>
</view>
......@@ -268,10 +225,10 @@
</view>
</view>
<!-- <view class="middle-phone" v-if="productIfo.tripTemplateFlag != 2">
<view class="middle-phone" v-if="showTelephone">
<text> 联系电话： </text>
<input type="number" maxlength="11" placeholder="请输入联系电话" v-model.trim="ticketPhone" />
</view> -->
</view>
</view>
<!-- ---------------------------------------------产品押金部分---------------------------------------- -->
<view class="productDeposit" v-if="item.deposit">
......@@ -300,12 +257,11 @@
<view class="bottom-btn" :style="{ background: payBackground }">
<text v-if="orderStatus == 1">已下架</text>
<text v-if="parseInt(maxBookNum) <1" style="background: #c0c0c0">暂无库存</text>
<text v-if="orderStatus!= 1 && parseInt(maxBookNum) >= 1" @click="goPay()">去支付</text>
<text v-if="orderStatus!= 1" @click="goPay()">去支付</text>
</view>
</view>
</view>
<calendar ref="calendar" @dateConfig="dateConfig" :dateList="dateList" v-if="dateList.length > 0"></calendar>
<calendar ref="calendar" @dateConfig="dateConfig" :dateList="dateList" v-show="dateList.length > 0"></calendar>
<buyKnow ref="buyKnow" :buyKnowData="buyKnowData"></buyKnow>
<detail
ref="detail"
......@@ -319,13 +275,13 @@
:chooseCouponObj="chooseCouponObj"
></detail>
<chooseArea
v-if="showArea"
v-if="showChooseArea"
:areaList="productIfo.productAreaList"
@areaSure="areaSure"
:sortArr="sortArr"
:defaultAreaCode="defaultAreaCode"
></chooseArea>
<times ref="times" :chooseTimeList="timeList" @timeConfig="timeConfig" :chooseTimeData="chooseTimeData" :timeActive="timeActive"></times>
<times ref="times" :chooseTimeList="chooseTimeList" @timeConfig="timeConfig" :chooseTimeData="chooseTimeData" :timeActive="timeActive"></times>
<editContacts ref="editContacts" :editContact="editContact" :contactTotal="contactTotal"></editContacts>
<contactList
ref="contactList"
......@@ -387,37 +343,26 @@ export default {
},
data() {
return {
groupId:'',//组合Id
groupChannelId:'',//组合渠道Id
orderSource: '', //订单来源 1公众号平台、2公众号组合页面1、3公众号组合页面2、4胖丁伙伴app、5第三方自助机、6第三方票房窗口
thirdOpenid: '', //第三方openid
companyId: '', //公司Id
productList:[],//初始化产品数据
productIdList:[],//产品id列表入参
sortArr: [], //多个站点排号信息列表
sortIfo: '', //单个站点排号信息
sortInforPop: false, //一个站点时获取排队信息弹窗
showErmai: true, //临时的，选择了南站不显示耳麦
showArea: false, //控制选择站点显示隐藏
showOpenArea: false, //是否可以显示选择站点
chooseDate: '', //选择的日期
showChooseArea: false, //控制选择站点弹窗显示隐藏
timeActive: 10000, //时间下标，默认不选中
buyKnowData: '', //购买须知数据
editContact: '', //编辑联系人传值对象
merchantId: '', //商户Id
ticketPhone: '', //联系电话
interfaceCode: '', //接口编号
productCode: '', //产品code
chooseContact: [], //选中的游客信息列表
cruisePlanId: '', //班次Id
timeNumber: '', //当前时间转化为数字
startPlayTime: '', //开始时间
endPlayTime: '', //结束时间
templateList: [], //该产品联系人必须要填写的信息
timeFlag: '', //setTimeout函数
savedMoney: 0, //优惠价格
serviceList: [], //所有额外服务
chooseService: [], //选中的额外服务
extraPrice: 0, //额外服务总价格
showExtraPop: false, //控制支付时有额外服务，没有选中额外服务的弹窗显示隐藏
orderProductList: [], //额外服务，儿童票等入参
productDepositTotal: 0, //产品总押金
orderSource: '', //订单来源 1公众号平台、2公众号组合页面1、3公众号组合页面2、4胖丁伙伴app、5第三方自助机、6第三方票房窗口
thirdOpenid: '', //第三方openid
companyId: '', //公司Id
docQuery: '', //元素变量
payBackground: '', //支付按钮背景颜色
dateScroll: '', //日期滚动值
......@@ -426,84 +371,85 @@ export default {
couponData:[], //所有劵数据
chooseCouponObj: '', //默认选中最优价格优惠券
ableConpon: '', //没有可用优惠券时，达到一定条件可用，显示达到的条件
productIdList:[],//产品id列表入参
productList:[],//初始化产品数据
orderStatus:'',//上下架状态，任何一个产品状态为下架，该状态为下架
chooseTimeList:[],//选中产品时间列表
chooseTimeData: '', //选中的时间传给子组件
moreDateIndex:0,//点击的更多日期下标
dateList:[],//点击更多日期时对应的日期列表
showTelephone:true,//用于判断是否显示输入联系人电话号码
areaIndex:0,//选择站点时对应的产品下标
contactTotal: [], //所有联系人列表
}
},
onLoad(option) {
let times = new Date().Format('yyyy-MM-dd hh:mm:ss')
this.timeNumber = parseInt(this.$commonjs.changeTime(times)) //将当前时间转化为数字
this.companyId = option.companyId || ''
this.orderSource = option.orderSource || ''
this.thirdOpenid = option.thirdOpenid || '' //第三方openid
this.merchantId = option.merchantId || ''
let idList=JSON.parse(option.productIdList)
this.groupId=option.groupId||''
this.groupChannelId=option.groupChannelId||''
this.orderSource=option.orderSource||''
this.thirdOpenid=option.thirdOpenid||''
let idList=JSON.parse(option.productIdList)||[]
this.productIdList=idList.map((item)=>{
return {productId:item}
})
console.log(this.productIdList)
let times = new Date().Format('yyyy-MM-dd hh:mm:ss')
this.timeNumber = parseInt(this.$commonjs.changeTime(times)) //将当前时间转化为数字
this.initData() //页面初始化数据
this.docQuery = uni.createSelectorQuery().in(this)
},
computed: {
originalTotal() {
//原价总价
if (this.chooseService.length > 0) {
//额外服务价格和押金总价格
let singleProduct = 0 //单个产品押金
this.extraPrice = 0
this.extraDepositTotal = 0 //总押金
for (let i = 0; i < this.chooseService.length; i++) {
this.extraPrice += parseFloat((this.chooseService[i].sellingPrice * this.buyNum).toFixed(2))
if (this.chooseService[i].depositType == 1) {
//等于1，押金金额跟数量没关系
singleProduct = this.chooseService[i].deposit
} else if (this.chooseService[i].depositType == 2){
//等于2，押金单价乘购买数量
singleProduct = parseFloat((this.chooseService[i].deposit * this.buyNum).toFixed(2))
let savedMoney=0
let original=0
let deposit=0
this.productDepositTotal=0
this.productList.forEach((item)=>{
original+=item.originalPrice*item.buyNum
if(item.chooseCouponObj){
if(item.chooseCouponObj.slaveList&&item.chooseCouponObj.slaveList.length>0){
savedMoney+=item.chooseCouponObj.slaveList[0].savedMoney
}else{
savedMoney+=item.chooseCouponObj.savedMoney
}
}
if(item.depositType==1){//等于1，押金金额跟数量没关系
deposit=item.deposit
}else if(item.depositType==2){//等于2，押金单价乘购买数量
deposit=item.deposit*item.buyNum
}
this.productDepositTotal+=deposit
})
return parseFloat((original+this.productDepositTotal).toFixed(2))||0 //产品总价+产品押金
},
sellTotal() {
let savedMoney=0
let sell=0
let deposit=0
this.productDepositTotal=0
this.productList.forEach((item)=>{
sell+=item.sellingPrice*item.buyNum
if(item.chooseCouponObj){
if(item.chooseCouponObj.slaveList&&item.chooseCouponObj.slaveList.length>0){
savedMoney+=item.chooseCouponObj.slaveList[0].savedMoney
}else{
savedMoney+=item.chooseCouponObj.savedMoney
}
this.extraDepositTotal += singleProduct
}
} else {
this.extraPrice = 0
this.extraDepositTotal = 0
}
if (this.productIfo.deposit) {
//如果有押金
if (this.productIfo.depositType == 1) {
//等于1，押金金额跟数量没关系
this.productDepositTotal = this.productIfo.deposit
} else if (this.productIfo.depositType == 2) {
//等于2，押金单价乘购买数量
this.productDepositTotal = parseFloat((this.productIfo.deposit * this.buyNum).toFixed(2))
if(item.depositType==1){//等于1，押金金额跟数量没关系
deposit=item.deposit
}else if(item.depositType==2){//等于2，押金单价乘购买数量
deposit=item.deposit*item.buyNum
}
} else {
this.productDepositTotal = 0
}
return parseFloat((this.originalPrice * this.buyNum + this.productDepositTotal + this.extraPrice + this.extraDepositTotal).toFixed(2)) //产品总价+产品押金+额外产品总价+额外产品押金-优惠价格
},
sellTotal() {
//卖价总价
if (this.chooseService.length == 0) {
this.extraPrice = 0
this.extraDepositTotal = 0
}
return parseFloat(
(this.sellingPrice * this.buyNum + this.productDepositTotal + this.extraPrice + this.extraDepositTotal - this.savedMoney).toFixed(2)
) //产品总价+产品押金+额外产品总价+额外产品押金-优惠价格
this.productDepositTotal+=deposit
})
return parseFloat((sell+this.productDepositTotal-savedMoney).toFixed(2))||0
}
},
methods: {
//---获取排号信息
getSortInfor() {
//---获取排号信息---暂时未使用
getSortInfor(merchantCode) {
let data = {
areaCode: this.areaObj.areaCode,
merchantCode: this.merchantCode //商户code
merchantCode //商户code
}
uni.showLoading({
title: '加载中',
......@@ -522,45 +468,41 @@ export default {
}
})
},
//---获取子组件的传值
//---获取子组件的传值---已修改
areaSure(data) {
this.areaObj = data
if (this.areaObj.areaCode == 'cjsd_project_0001') {
//选择了南站不显示耳麦
this.showErmai = false
this.chooseService = []
//多选框状态设置成未选中
this.serviceList.forEach(item=>{
item.ifChoose=false
})
} else {
this.showErmai = true
}
this.productList[this.areaIndex].areaObj=data
},
//---展示选择站点
openArea() {
this.showArea = true
//---展示选择站点---已修改
openArea(index) {
this.areaIndex=index
this.showChooseArea = true
},
//---关闭选择站点
//---关闭选择站点---已修改
closeArea() {
this.showArea = false
this.showChooseArea = false
},
//---展示详情弹窗
//---展示详情弹窗---已修改
showDetail() {
this.$refs.detail.showPop = true
},
//---展示日历
showCalendar() {
this.$refs.calendar.show = true
//---展示日历---已修改
showCalendar(index) {
// if(!this.productList[index].chooseDate){//没有选择时，默认第一个日期
// this.productList[index].chooseDate=this.productList[index].priceStockList[0].startTime.substr(0,10)
// }
this.$refs.calendar.setDefaultDate(this.productList[index].chooseDate)//日历组件选中日期
this.moreDateIndex=index
this.dateList=this.productList[index].priceStockList
this.$refs.calendar.showPop = true
},
//---日期选择---已改
dateChoose(item,item2,index) {
item.active=index//修改选中样式
item.dateActive=index//修改选中样式
item.maxBookNum=Math.min(item2.maxBookNum,item2.surplus) //剩余量变化
item.originalPrice=item2.originalPrice//产品原价为当前选中日期的原价
item.sellingPrice=item2.sellingPrice//产品卖价为当前选中日期的卖价
item.chooseDate=item2.startTime.substr(0,10)
this.$refs.calendar.getDefaultDate(item.chooseDate)//日历组件选中日期
this.$refs.calendar.setDefaultDate(item.chooseDate)//日历组件选中日期
item.endDate=item2.endTime//开始日期
item.startDate=item2.startTime//结束日期
this.chooseTimeData=''//清除之前选中的时间
......@@ -569,38 +511,25 @@ export default {
item.cruisePlanId=''
item.timeActive=10000
this.timeActive=10000
this.getTimeStock(item)
uni.$u.throttle(this.getTimeStock(item), 3000)
}
// this.computedPrice()
// this.initCoupon(Item.id,Item.buyNum,Item.sellingPrice,Item.merchantId,Index)
// this.$forceUpdate()
//下面是单票代码
// this.active = index //修改选中样式
// this.maxBookNum = Math.min(this.dateList[index].surplus, this.productIfo.maxBookNum) //剩余量变化
// this.originalPrice = this.dateList[index].originalPrice //原价变化
// this.sellingPrice = this.dateList[index].sellingPrice //卖家变化
// this.chooseDate = this.dateList[index].startTime.substr(0, 10) //日历组件选中日期
// this.endDate = this.dateList[index].endTime //开始日期
// this.startDate = this.dateList[index].startTime //结束日期
// this.$refs.calendar.defaultDate = this.chooseDate
// if (this.productIfo.productType == 3) {
// //如果为班次票，点击时，请求班次票接口
// this.cruisePlanId = '' //清空班次id
// this.timeActive = 10000
// uni.$u.throttle(this.getTimeStock, 3000)
// }
// this.initCoupon()
//解决点击日期无反应的情况
this.$forceUpdate()
},
//---日历确认事件
//---日历确认事件---还未改完
dateConfig(data) {
let index = this.dateList.findIndex(item => {
return item.startTime.substr(0, 10) == data
let index=this.moreDateIndex
let index2=this.productList[index].priceStockList.findIndex(item=>{
return item.startTime.substr(0,10)==data
})
this.dateChoose(index) //选中确认的日期
this.docQuery.selectAll('.date-list').boundingClientRect(data => {
this.dateScroll = (data[index].width + 4) * index
}).exec()
let item=this.productList[index]
let item2=item.priceStockList[index2]
this.dateChoose(item,item2,index) //选中确认的日期
//下面需要处理
// this.docQuery.selectAll('.date-list').boundingClientRect(data => {
// this.dateScroll = (data[index].width + 4) * index
// }).exec()
},
//---展示更多时间---已改好
showTime(item,index) {
......@@ -659,33 +588,6 @@ export default {
showContacts() {
this.$refs.contactList.showPop = true
},
//---计算价格
computedPrice(){
let savedMoney=0
let original=0
let sell=0
let deposit=0
this.productDepositTotal=0
this.productList.forEach((item)=>{
original+=item.originalPrice*item.buyNum
sell+=item.sellingPrice*item.buyNum
if(item.chooseCouponObj){
if(item.chooseCouponObj.slaveList&&item.chooseCouponObj.slaveList.length>0){
savedMoney+=item.chooseCouponObj.slaveList[0].savedMoney
}else{
savedMoney+=item.chooseCouponObj.savedMoney
}
}
if(item.depositType==1){//等于1，押金金额跟数量没关系
deposit=item.deposit
}else if(item.depositType==2){//等于2，押金单价乘购买数量
deposit=item.deposit*item.buyNum
}
this.productDepositTotal+=deposit
})
this.originalTotal=parseFloat((original+this.productDepositTotal).toFixed(2))||0 //产品总价+产品押金
this.sellTotal=parseFloat((sell+this.productDepositTotal-savedMoney).toFixed(2))||0
},
//---游客选择
visitorChoose(i) {
let chooseList = this.chooseContact
......@@ -704,7 +606,8 @@ export default {
})
chooseList.splice(index, 1) //删除数组
}
this.$forceUpdate()
//先注释
// this.$forceUpdate()
},
//---订单数量变化
buyNumChange(e) {
......@@ -742,11 +645,12 @@ export default {
this.initCoupon()
}, 1500)
},
//---展示购票须知
showBuyKnow() {
//---展示购票须知---已修改
showBuyKnow(index) {
this.buyKnowData=this.productList[index]
this.$refs.buyKnow.showPop = true
},
//---页面初始化数据，获取产品基本信息
//---页面初始化数据，获取产品基本信息---已修改
initData() {
let data={
productList:this.productIdList,//产品id列表
......@@ -764,6 +668,10 @@ export default {
for(let i=0;i<this.productList.length;i++){
let item=this.productList[i]
//任何一个产品需要填写游客信息，下面的联系电话必须填写
if(item.tripTemplateFlag!=2){
this.showTelephone=true
}
if(item.defaultAreaCode){
item.areaObj={}
item.areaObj.areaCode=item.areaCode
......@@ -771,7 +679,7 @@ export default {
}else{
item.areaObj={}
}
item.active=0//默认选中第一个日期
item.dateActive=0//默认选中第一个日期
item.buyNum=1,//默认为1
item.contactTotal=[]//选中的游客信息列表
item.contactNum=1//需要选择几位联系人数量
......@@ -788,11 +696,10 @@ export default {
}
this.getPriceList()
// this.getDiscountPrice() //获取优惠价格
//---待处理
// if (this.productIfo.tripTemplateFlag != 2) {
// //等于2时不需要填写联系人信息和手机号码
// this.getContactList()
// }
if (this.showTelephone) {
//需要填写联系人信息和手机号码
this.getContactList()
}
} else {
uni.showToast({
title: res.message,
......@@ -801,7 +708,7 @@ export default {
}
})
},
//---获取产品价格库存列表
//---获取产品价格库存列表---已部分修改
getPriceList() {
let data={
productIds:this.productIdList,//产品id集合
......@@ -810,15 +717,15 @@ export default {
if (res.code == '00') {
//所有产品的价格库存列表
let stockList=res.data
this.productList.forEach(item=>{
//待处理
// if(item.isFetch==1&&item.productAreaList.length>1){
// this.areaIndex=index
// this.merchantCode=this.productList[index].merchantVo.code
// this.sortUpDown()
//}else if(item.isFetch==1&&item.productAreaList.length==1){
// item.areaObj=item.productAreaList[0]
// }
this.productList.forEach((item,index)=>{
if(item.isFetch==1&&item.productAreaList.length>1){
//多个排号点
this.areaIndex=index
this.sortUpDown(item.merchantVo.code)
}else if(item.isFetch==1&&item.productAreaList.length==1){
//只有一个排号点
item.areaObj=item.productAreaList[0]
}
//把价格列表合并到对应的产品上面
stockList.forEach(item2=>{
if(item.id==item2.productId){
......@@ -843,7 +750,7 @@ export default {
item.priceStockList.forEach((item2, index) => {
//价格上面时间小于当前时间加上需预定天数之后的需删除
let date = new Date()
date.setDate(date.getDate() + item2.beforeBookDays)
date.setDate(date.getDate() + item.beforeBookDays)
let newDate = date.Format('yyyy-MM-dd')
let priceTime = this.$commonjs.changeTime(item2.endTime.substr(0, 10))
let newTime = this.$commonjs.changeTime(newDate)
......@@ -885,6 +792,8 @@ export default {
this.payBackground = '#C0C0C0'
}
})
//解决初始化日期不显示的情况
this.$forceUpdate()
// this.dateList = res.data //日期列表
// if (this.dateList.length > 0) {
......@@ -915,7 +824,7 @@ export default {
// title: '没有库存',
// icon: 'none'
// })
// this.showArea = false
// this.showChooseArea = false
// this.payBackground = '#C0C0C0'
// return
// }
......@@ -945,7 +854,7 @@ export default {
// title: '没有库存',
// icon: 'none'
// })
// this.showArea = false
// this.showChooseArea = false
// this.payBackground = '#C0C0C0'
// }
// let today = this.$commonjs.today() //今天
......@@ -971,10 +880,10 @@ export default {
}
})
},
//---排号是否上下架
sortUpDown() {
//---排号是否上下架---已修改
sortUpDown(merchantCode) {
let data = {
merchantCode: this.merchantCode //商户code
merchantCode //商户code
}
uni.showLoading({
title: '加载中',
......@@ -984,27 +893,31 @@ export default {
if (res.code == '00') {
this.sortArr = res.data.data
let data = res.data
if (this.productIfo.productAreaList.length > 1) {
//有库存并且需要选择两个站点以上的票种，显示区域组件
for (let item in data.main) {
if (data.main[item].sceneSortStatus == '1'){
this.showArea = true
this.showOpenArea = true
}
}
} else if (this.productIfo.productAreaList.length == 1) {
//只有一个站点时，直接选中站点(现目前还没有一个站点的景区)
for (let item in data.main) {
if (data.main[item].sceneSortStatus == '1') {
this.areaObj = this.productIfo.productAreaList[0]
this.showOpenArea = true
}
}
}
this.productList.forEach(item=>{
if(item.productAreaList.length>1){
//有库存并且需要选择两个站点以上的票种，显示区域组件
for (let item2 in data.main) {
if (data.main[item2].sceneSortStatus == '1'){
//暂时下面只适应长江索道
this.showChooseArea = true
//上架
item.areaUp = true
}
}
}else if (item.productAreaList.length == 1) {
//只有一个站点时，直接选中站点(现目前还没有一个站点的景区)
for (let item in data.main) {
if (data.main[item].sceneSortStatus == '1') {
item.areaObj = item.productAreaList[0]
item.areaUp = true
}
}
}
})
}
})
},
//---获取班次票
//---获取班次票---已修改
getTimeStock(item) {
let data = {
endDate: item.endDate, //结束日期
......@@ -1033,7 +946,8 @@ export default {
item2.copyLast='售罄'
}
})
// this.$forceUpdate()
//解决初始化班次不显示的情况
this.$forceUpdate()
} else {
uni.showToast({
title: res.message,
......@@ -1174,124 +1088,20 @@ export default {
showCoupon() {
this.$refs.orderCoupon.showPop=true
},
//---额外服务多选框变化
extraChange(e) {
this.chooseService=[]
//解决数据修改之后，多选框未选中bug
this.serviceList.forEach(item=>{
item.ifChoose=false
})
let value=e.detail.value
value.forEach(item=>{
this.chooseService.push(JSON.parse(item))
})
//获取选中的多选框为选中状态
this.serviceList.forEach(item=>{
this.chooseService.forEach(item2=>{
if(item.id==item2.id){
item.ifChoose=true
}
})
})
},
//---不需要享受耳麦服务
extraNo() {
this.showExtraPop = false
this.placeOrder()
},
//---需要享受耳麦服务
extraYes() {
this.showExtraPop = false
this.serviceList.forEach(item=>{
item.ifChoose=true
})
this.chooseService = this.serviceList
this.placeOrder()
},
//---点击去支付
//---下单---正在修改
goPay() {
if (this.serviceList.length == 0) {
//没有额外服务，直接支付
this.placeOrder()
}
if (this.serviceList.length > 0) {
//有额外服务，并且选择了额外服务的，直接支付
if (this.chooseService.length > 0) {
this.placeOrder()
}
}
if (this.serviceList.length > 0) {
//有额外服务，没有选中额外服务的，弹出提示框
if (this.productIfo.tripTemplateFlag != 2) {
if (!this.$commonjs.phoneReg().test(this.ticketPhone)) {
//未填写正确手机号码
uni.showToast({
title: '请填写正确的手机号码',
icon: 'none'
})
return
}
}
if (this.productIfo.tripTemplateFlag == 1) {
//实名制
if (this.chooseContact.length != this.buyNum) {
uni.showToast({
title: '需要添加' + this.buyNum + '位出行人',
icon: 'none'
})
return
}
} else if (this.productIfo.tripTemplateFlag == 0) {
//非实名制
if (this.chooseContact.length < 1) {
uni.showToast({
title: '需要添加一位出行人',
icon: 'none'
})
return
}
}
if (this.productIfo.productType == 3) {
//如果为班次票，需要选择班次
if (this.cruisePlanId == '') {
uni.showToast({
title: '该票为班次票,请选择游玩时间',
icon: 'none'
})
return
}
}
if (this.productIfo.isFetch == 1 && this.showOpenArea) {
//需要选择站点的票种，必须选择站点
if (!this.areaObj.areaCode) {
uni.showToast({
title: '请选择站点',
icon: 'none'
})
return
}
}
if (this.chooseService.length == 0 && this.showErmai) {
//没有购买额外服务，并且选择的北站，跳出弹窗
this.showExtraPop = true
}
if (this.chooseService.length == 0 && !this.showErmai) {
//没有购买额外服务，并且选择的南站，直接购买
this.placeOrder()
}
}
},
//---下单
placeOrder() {
if (this.dateList.length == 0) {
//价格库存为空时，点击无效
return
}
if (this.productIfo.status == 1) {
if (this.orderStatus == 1) {
//下架状态，点击无效
return
}
if (this.productIfo.tripTemplateFlag != 2) {
for(let i=0;i<this.productList.length;i++){
let item=this.productList[i]
//没有库存情况
if(!item.priceStockList||item.priceStockList.length==0){
return
}
}
if (this.showTelephone) {
//需要填写电话号码
if (!this.$commonjs.phoneReg().test(this.ticketPhone) && this.productIfo.tripTemplateFlag != 2) {
//未填写正确手机号码
......@@ -1302,141 +1112,129 @@ export default {
return
}
}
if (!this.startDate || !this.endDate) {
uni.showToast({
title: '请选择游玩日期',
icon: 'none'
})
return
}
if (this.productIfo.tripTemplateFlag == 1) {
//实名制
if (this.chooseContact.length != this.buyNum) {
uni.showToast({
title: '需要添加' + this.buyNum + '位出行人',
icon: 'none'
})
return
}
} else if (this.productIfo.tripTemplateFlag == 0) {
//非实名制
if (this.chooseContact.length < 1) {
uni.showToast({
title: '需要添加一位出行人',
icon: 'none'
})
return
// if (!this.startDate || !this.endDate) {
// uni.showToast({
// title: '请选择游玩日期',
// icon: 'none'
// })
// return
// }
//循环判断联系人数量，班次,站点是否填写完善
for(let i=0;i<this.productList.length;i++){
let item=this.productList[i]
if(item.tripTemplateFlag==1){//实名制
if(item.orderTouristList.length!=item.buyNum){
uni.showToast({
title: item.merchantName+'需要添加'+item.buyNum+'位出行人',
icon: 'none'
})
return
}
}
if(item.tripTemplateFlag==0){//非实名制
if(item.orderTouristList.length<1){
uni.showToast({
title: item.merchantName+'需要添加一位出行人',
icon: 'none'
})
return
}
}
}
if (this.productIfo.productType == 3) {
//如果为班次票，需要选择班次
if (this.cruisePlanId == '') {
uni.showToast({
title: '该票为班次票,请选择游玩时间',
icon: 'none'
})
return
if(item.productType==3){//如果为班次票，需要选择班次
if(!item.cruisePlanId){
uni.showToast({
title: '请选择'+item.merchantName+'游玩时间',
icon: 'none'
})
return
}
}
}
if (this.productIfo.isFetch == 1 && this.showOpenArea) {
//需要选择站点的票种，必须选择站点
if (!this.areaObj.areaCode) {
uni.showToast({
title: '请选择站点',
icon: 'none'
})
return
if (item.isFetch == 1 && item.areaUp) {
//需要选择站点的票种，必须选择站点
if (!item.areaObj.areaCode) {
uni.showToast({
title: '请选择站点',
icon: 'none'
})
return
}
}
}
}
this.preOrder()
},
//---预下单
preOrder() {
//参数游客信息组装
let orderTouristList = this.chooseContact.map((item) => {
//获取游客信息参数
// let orderTouristList = this.chooseContact.map((item) => {
// return {
// category: 0,
// name: item.name,
// credentialNumber: item.credentialNumber
// }
// })
//获取券参数
this.productList.forEach(item=>{
if(item.chooseCouponObj){
//有从券取值从券，没有从券取值主劵
if(item.chooseCouponObj.slaveList.length>0){
item.couponList=[//券列表
{
couponId:item.chooseCouponObj.slaveCouponId,//券id
isMerchant:item.chooseCouponObj.slaveCreateSource,//是否是商户的券
myCouponId:item.chooseCouponObj.slaveId,//领取人编号
couponType:item.chooseCouponObj.couponType,//券类型
couponPrice:item.chooseCouponObj.savedMoney,//券价格
}
]
}else{
item.couponList=[
{
couponId:item.chooseCouponObj.couponId,//券id
isMerchant:item.chooseCouponObj.createSource,//是否是商户的券
myCouponId:item.chooseCouponObj.id,//领取人编号
couponType:item.chooseCouponObj.couponType,//券类型
couponPrice:item.chooseCouponObj.savedMoney,//券价格
}
]
}
}else{
item.couponList=[]
}
})
//额外服务不为空，联票购买不为空，带有儿童票，组合购买不为空，单品购买为空
let orderProductList=this.productList.map((item)=>{
return {
category: 0,
name: item.name,
credentialNumber: item.credentialNumber
extendContent:'{"openid":'+'"'+this.openid+'"'+','+'"zr":'+'"'+this.thirdOpenid+'"'+'}',
buyNum:item.buyNum,//购买数量
cruisePlanId:item.cruisePlanId,//班次Id
playDate:item.startDate.substr(0,10),//开始日期
endPlayDate:item.endDate.substr(0,10),//结束日期
startPlayTime:item.startPlayTime,//开始时间
endPlayTime:item.endPlayTime,//结束时间
isMaster:0,//是否主产品 1 否， 0 是
merchantId:item.merchantId,//商户id
productId:item.id,//产品Id
subOrderType:0,//产品类型，网络
unitPrice:item.sellingPrice,//产品单价
distributionPrice:item.sellingPrice,//临时用
productAreaCode:item.areaObj.areaCode||item.defaultAreaCode,//出发站点
orderTouristList:item.chooseTourist,//游客信息
couponList:item.couponList//优惠券
}
})
let couponList = []
if (this.chooseCouponObj) {
if(this.chooseCouponObj.slaveList.length>0){//有从券取值从券，没有从券取值主劵
couponList=[//券列表
{
couponId:this.chooseCouponObj.slaveCouponId,//券id
isMerchant:this.chooseCouponObj.slaveCreateSource,//是否是商户的券
myCouponId:this.chooseCouponObj.slaveId,//领取人编号
couponType:this.chooseCouponObj.couponType,//券类型
couponPrice:this.chooseCouponObj.savedMoney,//券价格
}
]
}else{
couponList=[
{
couponId:this.chooseCouponObj.couponId,//券id
isMerchant:this.chooseCouponObj.createSource,//是否是商户的券
myCouponId:this.chooseCouponObj.id,//领取人编号
couponType:this.chooseCouponObj.couponType,//券类型
couponPrice:this.chooseCouponObj.savedMoney,//券价格
}
]
}
}
//额外服务不为空，联票购买不为空，带有儿童票，组合购买不为空，单品购买为空
if (this.chooseService.length > 0) {
this.orderProductList = this.chooseService.map((item) => {
return {
distributionPrice: item.sellingPrice, //临时用
productId: item.id, //产品Id
buyNum: this.buyNum, //购买数量
subOrderType: 0, //产品类型，网络
unitPrice: item.sellingPrice, //产品单价
merchantId: item.merchantId, //商户id
orderTouristList, //游客信息
playDate: this.startDate.substr(0, 10), //开始日期
endPlayDate: this.endDate.substr(0, 10), //结束日期
isMaster: 1, //是否主产品 1 否， 0 是
startPlayTime: this.startPlayTime, //开始时间
endPlayTime: this.endPlayTime, //结束时间
}
})
}else{
this.orderProductList=[]
}
let data = {
companyId: this.companyId, //公司Id
buyMethod: 1, // 单品购买，2套票、联票购买，3组合购买
userId: this.openid,//用户id
ticketPhone: this.ticketPhone, //联系电话
cash: 0, //现金红包
orderMoney: this.sellTotal, //订单总价 = 订单原价 - 优惠券价格 - 现金抵扣价格
orderType: 1, //订单类型,景区
let data={
companyId:this.companyId,//公司Id
groupChannelId:this.groupChannelId,//组合渠道编号 ,组合订单必传
groupId:this.groupId,//组合编号 ,组合订单必传
buyMethod:3,// 单品购买，2套票、联票购买，3组合购买
userId:this.openid,//用户id
ticketPhone:this.ticketPhone,//联系电话
cash:0,//现金红包
orderMoney:this.sellTotal,//订单总价 = 订单原价 - 优惠券价格 - 现金抵扣价格
orderType:1,//订单类型,景区
orderSource:this.orderSource||1, //订单来源 1公众号平台、2公众号组合页面1、3公众号组合页面2、4胖丁伙伴app、5第三方自助机、6第三方票房窗口
orderProductList: this.orderProductList, //额外服务不为空，联票购买不为空，带有儿童票，组合购买不为空，单品购买为空
orderProductVo: //产品信息列表
{
bookTime:this.productIfo.bookTime,//最晚预定时间
earlyBookTime:this.productIfo.earlyBookTime,//最早预定时间
extendContent:'{"openid":'+'"'+this.openid+'"'+','+'"zr":'+'"'+this.thirdOpenid+'"'+'}',
productId: this.productId, //产品Id
buyNum: this.buyNum, //购买数量
subOrderType: 0, //产品类型，网络
cruisePlanId: this.cruisePlanId, //班次id
unitPrice: this.sellingPrice, //产品单价
distributionPrice: this.sellingPrice, //临时用
merchantId: this.merchantId, //商户id
orderTouristList, //游客信息
playDate: this.startDate.substr(0, 10), //开始日期
endPlayDate: this.endDate.substr(0, 10), //结束日期
isMaster: 0, //是否主产品 1 否， 0 是
startPlayTime: this.startPlayTime, //开始时间
endPlayTime: this.endPlayTime, //结束时间
productAreaCode:this.areaObj.areaCode, //选择的站点编码
couponList, //券列表
}
orderProductList,//额外服务不为空，联票购买不为空，带有儿童票，组合购买不为空，单品购买为空
}
uni.showLoading({
title:'加载中',
......@@ -1798,27 +1596,6 @@ export default {
justify-content: space-between;
align-items: center;
}
/*额外服务部分*/
.extraService {
padding: 20rpx;
background:#DAE6F6;
margin-top: 30rpx;
border-radius: 10rpx;
}
.extraService label {
width: 100%;
display: flex;
justify-content: space-between;
align-items: center;
font-weight: bold;
color:#f45803;
}
.extra-wrap{
text-align: center;
padding-top: 100rpx;
height: 65vh;
}
/*底部部分*/
.bottom {
height: 100rpx;
......
pages/scenic/scenicComponents/calendar.vue
View file @ 24e3e559
<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
View file @ 24e3e559
......@@ -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
View file @ 24e3e559
......@@ -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
View file @ 24e3e559
......@@ -562,7 +562,7 @@ export default {
},
//---展示日历
showCalendar() {
this.$refs.calendar.show = true
this.$refs.calendar.showPop = true
},
//---日期选择
dateChoose(index) {
......
pages/scenic/scenicProduct/scenicProduct.vue
View file @ 24e3e559
......@@ -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
View file @ 24e3e559
......@@ -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
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment