Skip to content

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

页面还原

parent b3302852
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 2917 additions and 3004 deletions
main.js
View file @ 4540fb8a
......@@ -8,7 +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.$wxurl = 'https://wx.pangdly.com/#/'
Vue.prototype.imageError ='@/static/img/common/pangdingLogo.png'
Vue.use(uView)
uni.$u.config.unit = 'rpx'
......
pages.json
View file @ 4540fb8a
......@@ -116,16 +116,16 @@
"enablePullDownRefresh": false
}
}, {
"path": "pages/indexs/merchantListIndex/merchantListIndex",
"style": {
"navigationBarTitleText": "商品列表",
"enablePullDownRefresh": false
}
}
},
// {
// "path": "pages/indexs/merchantListIndex/merchantListIndex",
// "style": {
// "navigationBarTitleText": "商品列表",
// "enablePullDownRefresh": false
// }
, {
// },
{
"path": "pages/hotel/hotelIndex/hotelIndex",
"style": {
"navigationBarTitleText": "酒店",
......@@ -322,15 +322,15 @@
"navigationBarTextStyle": "black"
}
},
{
"path": "vlogface/vlogface",
"style": {
"navigationBarTitleText": "扫脸获取视频",
"enablePullDownRefresh": false,
"navigationBarBackgroundColor": "#ffffff",
"navigationBarTextStyle": "black"
}
},
// {
// "path": "vlogface/vlogface",
// "style": {
// "navigationBarTitleText": "扫脸获取视频",
// "enablePullDownRefresh": false,
// "navigationBarBackgroundColor": "#ffffff",
// "navigationBarTextStyle": "black"
// }
// },
{
"path": "scenicList/scenicList",
"style": {
......@@ -452,14 +452,14 @@
"navigationStyle": "custom"
}
},
{
"path": "getPortrait",
"style": {
"navigationBarTitleText": "获取人像",
"enablePullDownRefresh": false,
"navigationStyle": "custom"
}
},
// {
// "path": "getPortrait",
// "style": {
// "navigationBarTitleText": "获取人像",
// "enablePullDownRefresh": false,
// "navigationStyle": "custom"
// }
// },
{
"path": "myPhotoAlbum/myPhotoAlbum",
"style": {
......
pages/combination/combiChoose/combiChoose - 副本.vue deleted 100644 → 0
View file @ b3302852
<template>
<view>
<web-view :src="outUrl"></web-view>
</view>
</template>
<script>
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
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=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') || ''
},
}
}
</script>
<style>
</style>
pages/combination/combiChoose/combiChoose-new.vue 0 → 100644
View file @ 4540fb8a
<template>
<view>
</view>
</template>
<script>
export default {
data() {
return {
}
},
onLoad(option) {
//由于之前配置了这个页面，暂时进入页面直接跳转页面
this.companyId=this.$commonjs.getCompanyId(option)||''
let merchantId=this.$commonjs.getKey(option,'merchantId')||''
let channelType=this.$commonjs.getKey(option,'channelType')||0
uni.navigateTo({
url:`/pages/combination/distributionCombiChoose/distributionCombiChoose?merchantId=${merchantId}&channelType=${channelType}`
})
},
methods: {
}
}
</script>
<style>
</style>
pages/combination/combiChoose/combiChoose.vue
View file @ 4540fb8a
<template>
<view>
<web-view :src="outUrl"></web-view>
</view>
</template>
......@@ -8,19 +8,60 @@
export default {
data() {
return {
enterUrl:'',//进入页面路由
outUrl:'',//跳出页面路由
}
},
onLoad(option) {
//由于之前配置了这个页面，暂时进入页面直接跳转页面
let merchantId=this.$commonjs.getKey(option,'merchantId')||''
let channelType=this.$commonjs.getKey(option,'channelType')||0
uni.navigateTo({
url:`/pages/combination/distributionCombiChoose/distributionCombiChoose?merchantId=${merchantId}&channelType=${channelType}`
})
//#ifdef MP-WEIXIN
this.enterUrl=option.q
//#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=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=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') || ''
},
}
}
</script>
......
pages/combination/distributionCombiChoose/distributionCombiChoose - 副本.vue deleted 100644 → 0
View file @ b3302852
<template>
<view>
<web-view :src="outUrl"></web-view>
</view>
</template>
<script>
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
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){//组合
uni.navigateTo({
url:'../combiChoose/combiChoose?channelId='+channelId+'&merchantId='+merchantId+'&groupId='+groupId+'&groupChannelId='+groupChannelId+'&companyId='+companyId
})
}else{//分销
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{//小程序页面跳转进入
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 pageCode=option.pageCode||''//赠送优惠券接口参数
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+'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
}
},
methods: {
getUrlKey(name){//---------------------------------------------------------------获取url
return(new RegExp('[?|&]' + name + '=' + '([^&;]+?)(&|#|;|$)').exec(decodeURIComponent(this.enterUrl)) || [, ''])[1].replace(/\+/g, '%20') || ''
}
}
}
</script>
<style>
</style>
pages/indexs/index/index.vue
View file @ 4540fb8a
......@@ -20,18 +20,18 @@
</view>
<view class="banner">
<u-swiper :list="list" @change="e => currentNum = e.current" indicatorStyle="right: 20px" height="300" circular @click='swiperClick(currentNum)'>
<u-swiper :list="swiperList" @change="e => currentNum = e.current" indicatorStyle="right: 20px" height="300" circular @click='swiperClick(currentNum)'>
<view slot="indicator" class="indicator-num">
<text class="indicator-num__text">{{ currentNum + 1 }}/{{ list.length }}</text>
<text class="indicator-num__text">{{ currentNum + 1 }}/{{ swiperList.length }}</text>
</view>
</u-swiper>
</view>
</view>
<view class="list">
<view class="list-wrap" @click="goSuodao()">
<view class="product-list">
<view class="list-wrap" @click="goProduct(item.pageUrl)" v-for="(item,index) in productList" :key='index'>
<view class="list-head">
<image src="http://lx.pangdly.com/img/sodao.1cdf287.jpg" mode="widthFix">
<image :src='item.imgUrl' mode="widthFix">
</image>
<view class="address">
......@@ -42,7 +42,7 @@
<view class="list-bottom">
<view style="font-size: 32rpx;">
长江索道
{{item.merchantName}}
</view>
<view class="bottom-price">
<view class="price-left">
......@@ -50,110 +50,7 @@
¥
</text>
<text>
20
</text>
<text>
起
</text>
</view>
<view>
5分
</view>
</view>
</view>
</view>
<view class="list-wrap" @click="goGuoji()">
<view class="list-head">
<image src="http://lx.pangdly.com/img/yunduan.331a774.jpg" mode="widthFix">
</image>
<view class="address">
<u-icon name="map" color="#ffffff" size="24"></u-icon>
重庆
</view>
</view>
<view class="list-bottom">
<view style="font-size: 32rpx;">
云端之眼
</view>
<view class="bottom-price">
<view class="price-left">
<text>
¥
</text>
<text>
68
</text>
<text>
起
</text>
</view>
<view>
5分
</view>
</view>
</view>
</view>
<view class="list-wrap" @click="goLiangjiang()">
<view class="list-head">
<image src="http://lx.pangdly.com/img/liangjiang.097258e.jpg" mode="widthFix">
</image>
<view class="address">
<u-icon name="map" color="#ffffff" size="24"></u-icon>
重庆
</view>
</view>
<view class="list-bottom">
<view style="font-size: 32rpx;">
两江游金碧系列
</view>
<view class="bottom-price">
<view class="price-left">
<text>
¥
</text>
<text>
138
</text>
<text>
起
</text>
</view>
<view>
5分
</view>
</view>
</view>
</view>
<view class="list-wrap" @click="goHuiguan()">
<view class="list-head">
<image src="http://lx.pangdly.com/img/huiguan.c00da69.jpg" mode="widthFix">
</image>
<view class="address">
<u-icon name="map" color="#ffffff" size="24"></u-icon>
重庆
</view>
</view>
<view class="list-bottom">
<view style="font-size: 32rpx;">
重庆湖广会馆
</view>
<view class="bottom-price">
<view class="price-left">
<text>
¥
</text>
<text>
23
{{item.price}}
</text>
<text>
起
......@@ -174,7 +71,7 @@ export default {
data() {
return {
currentNum:0,//轮播图下标
list: [//轮播图图片
swiperList: [//轮播图图片
{
url: 'http://lx.pangdly.com/img/home1.69efcf8.jpg'
},
......@@ -185,6 +82,32 @@ export default {
url: 'http://lx.pangdly.com/img/home3.df60ec3.jpg'
}
],
productList:[//产品列表
{
merchantName:'长江索道',
pageUrl:'/pages/combination/distributionCombiChoose/distributionCombiChoose?channelId=1&merchantId=z0015605022691a5945bbe463141668c&groupId=z0016038113016708b8ad38c637b2f26&groupChannelId=z00160423712018998e6260ffcaf3369',
imgUrl:'http://lx.pangdly.com/img/sodao.1cdf287.jpg',
price:20
},
{
merchantName:'云端之眼',
pageUrl:'/pages/scenic/scenicProduct/scenicProduct?merchantId=z00160128940329482da6bd94d443a91&channelType=1',
imgUrl:'http://lx.pangdly.com/img/yunduan.331a774.jpg',
price:68
},
{
merchantName:'两江游金碧系列',
pageUrl:'/pages/scenic/scenicProduct/scenicProduct?merchantId=z001578652229233acd0134cf825fdbe',
imgUrl:'http://lx.pangdly.com/img/liangjiang.097258e.jpg',
price:138
},
{
merchantName:'重庆湖广会馆',
pageUrl:'/pages/scenic/scenicProduct/scenicProduct?merchantId=cdd4da5d154a4512bd5f3bec2797557b',
imgUrl:'http://lx.pangdly.com/img/huiguan.c00da69.jpg',
price:23
},
],
iconList:[//图标列表
{
merchantExtendProjectName:'景区名称',
......@@ -253,15 +176,21 @@ export default {
swiperClick(index){
//长江索道
if(index==0){
this.goSuodao()
uni.navigateTo({
url:'/pages/combination/distributionCombiChoose/distributionCombiChoose?channelId=1&merchantId=z0015605022691a5945bbe463141668c&groupId=z0016038113016708b8ad38c637b2f26&groupChannelId=z00160423712018998e6260ffcaf3369'
})
}
//湖广会馆
if(index==1){
this.goHuiguan()
uni.navigateTo({
url:'/pages/scenic/scenicProduct/scenicProduct?merchantId=cdd4da5d154a4512bd5f3bec2797557b'
})
}
//联合国际
if(index==2){
this.goGuoji()
uni.navigateTo({
url:'/pages/scenic/scenicProduct/scenicProduct?merchantId=z00160128940329482da6bd94d443a91&channelType=1'
})
}
},
//---加载图标
......@@ -281,29 +210,12 @@ export default {
url
})
},
//---跳转索道
goSuodao(){
uni.navigateTo({
url:'/pages/combination/distributionCombiChoose/distributionCombiChoose?merchantId=z0015605022691a5945bbe463141668c'
})
},
//---跳转联合国际
goGuoji(){
uni.navigateTo({
url:'/pages/scenic/scenicProduct/scenicProduct?merchantId=z00160128940329482da6bd94d443a91&channelType=1'
})
},
//---跳转两江游
goLiangjiang(){
uni.navigateTo({
url:'/pages/scenic/scenicProduct/scenicProduct?merchantId=z001578652229233acd0134cf825fdbe'
})
},
//---跳转湖广会馆
goHuiguan(){
//---产品跳转
goProduct(url){
uni.navigateTo({
url:'/pages/scenic/scenicProduct/scenicProduct?merchantId=cdd4da5d154a4512bd5f3bec2797557b'
url
// url:'/pages/combination/distributionCombiChoose/distributionCombiChoose?merchantId=z0015605022691a5945bbe463141668c'
})
}
......@@ -356,7 +268,7 @@ export default {
.banner{
margin-top: 20rpx;
}
.list{
.product-list{
display: flex;
flex-wrap: wrap;
justify-content: space-between;
......
pages/scenic/scenicSingleOrder/scenicSingleOrder - 副本.vue deleted 100644 → 0
View file @ b3302852
<template>
<view>
<web-view :src="outUrl"></web-view>
</view>
</template>
<script>
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
if(this.enterUrl){//普通二维码扫码进入
let merchantId=this.getUrlKey('merchantId')
let productId=this.getUrlKey('productId')
let orderSource=this.getUrlKey('orderSource')
let companyId=this.getUrlKey('companyId')
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+'scenicSingleOrder?pdOpenid='+pdOpenid+'&pdToken='+pdToken+'&pdCreateUserId='+pdCreateUserId+'&pdUserId='+pdUserId
let url='&merchantId='+merchantId+'&productId='+productId+'&orderSource='+orderSource+'&companyId='+companyId
this.outUrl=baseUrl+url
}else{//小程序页面跳转进入
let merchantId=option.merchantId||''
let productId=option.productId||''
let orderSource=option.orderSource||''
let companyId=option.companyId||''
let ifyukuaiCode=option.ifyukuaiCode||''//是否是渝快码跳入，渝快码跳入需要在H5端另外走流程
let pdOpenid=uni.getStorageSync('openid')//胖丁小程序openid,临时用，当公众号授权做好之后可以删除
let pdToken=uni.getStorageSync('token')
let pdCreateUserId=uni.getStorageSync('createUserId')
let pdUserId=uni.getStorageSync('userId')
let baseUrl=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
}
},
methods: {
getUrlKey(name){//---------------------------------------------------------------获取url
return(new RegExp('[?|&]' + name + '=' + '([^&;]+?)(&|#|;|$)').exec(decodeURIComponent(this.enterUrl)) || [, ''])[1].replace(/\+/g, '%20') || ''
},
}
}
</script>
<style>
</style>
pages/scenic/scenicSingleOrder/scenicSingleOrder-new.vue 0 → 100644
View file @ 4540fb8a
This diff is collapsed.
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