Skip to content

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

Merge branch 'develop' into album 

# Conflicts:
#	pages.json
#	pages/indexs/center/center.vue
parents b04c5587 8aacc785
Expand all Show whitespace changes
Inline Side-by-side
Showing with 3306 additions and 463 deletions
pages.json
View file @ ebb83e54
......@@ -54,7 +54,8 @@
"path": "pages/combination/distributionCombiChoose/distributionCombiChoose",
"style": {
"navigationBarTitleText": "产品选择",
"enablePullDownRefresh": false
"enablePullDownRefresh": false,
"navigationStyle": "custom"
}
},
{
......@@ -161,7 +162,7 @@
{
"path": "order/intelTicket/intelTicket",
"style": {
"navigationBarTitleText": "",
"navigationBarTitleText": "电子门票",
"enablePullDownRefresh": false
}
},
......@@ -264,10 +265,20 @@
},
{
<<<<<<< HEAD
"path" : "addressManage/addressManage",
"style" :
{
"navigationBarTitleText" : "地址管理"
=======
"path" : "order/jointElectronicTicket/jointElectronicTicket",
"style" :
{
"navigationBarTitleText" : "电子门票",
"enablePullDownRefresh": false,
"navigationBarTextStyle": "black",
"navigationBarBackgroundColor": "#F7F8FA"
>>>>>>> develop
}
}
]
......
pages/album/getPortrait.vue
View file @ ebb83e54
<template>
<view class="big-box" :style="{'padding-top': statusBarHeight + 'px'}" v-if="statusBarHeight">
<view class="big-box" :style="{'padding-top': statusBarHeight + 'px'}" v-if="showBody">
<view class="nav-bar" :style="{'height': navHeight + 'px'}"></view>
<text class="title">扫脸获取您的照片</text>
<view class="scan">
......@@ -32,16 +32,21 @@
<view>未找到您的照片</view>
<view class="small">请在拍摄点拍摄后重试</view>
</view>
<u-button type="info" size="mini" shape="circle" @click="returnClick">返回</u-button>
<u-button type="info" size="mini" shape="circle" @click="returnClick" v-if="maskCount<=0">返回</u-button>
<view class="overlay-button" v-else>返回</view>
</view>
</u-overlay>
</view>
<view v-else style="padding: 100rpx;text-align: center;font-size: 36rpx;">
升级中...
</view>
</template>
<script>
export default {
data() {
return {
showBody:false,
statusBarHeight: 0,
capsule: 0,
navHeight: 0,
......@@ -58,6 +63,27 @@ export default {
}
},
methods: {
//---加载图标
loadIcon(){
let data={
merchantType:0,//商户类型，其他
}
this.$request('scenic/merchantExtendProject/loadList',data).then((res)=>{
if(res.code=='00'){
let iconList=res.data||[]
let list=[]
iconList.forEach(item=>{
if(item.projectStatus==0){
list.push(item)
}
})
if(list.length>6){
this.showBody=true
this.openCamera()
}
}
})
},
returnClick() {
if(this.maskCount > 0) return
this.maskShow = false
......@@ -243,7 +269,8 @@ export default {
uni.setScreenBrightness({
value: 0.8, //屏幕亮度值，范围 0~1，0 最暗，1 最亮
})
this.openCamera()
this.loadIcon()
}
}
</script>
......@@ -373,5 +400,24 @@ export default {
color: #333;
}
}
.overlay-button{
border-radius: 100px;
color: #323233;
background-color: #ebedf0;
border-color: #ebedf0;
border-width: 1px;
border-style: solid;
height: 22px;
width: 100%;
font-size: 10px;
min-width: 50px;
padding: 0px 8px;
position: relative;
align-items: center;
justify-content: center;
display: flex;
box-sizing: border-box;
flex-direction: row;
}
}
</style>
\ No newline at end of file
pages/indexs/center/center.vue
View file @ ebb83e54
......@@ -142,7 +142,9 @@
<view>
购物车
</view>
</view>
<!-- #ifdef MP-WEIXIN -->
<view class="middle3-list" @click="online()">
<view>
<image src="@/static/img/my/center/customer.png"></image>
......@@ -151,6 +153,7 @@
AI客服
</view>
</view>
<!-- #endif -->
<view class="middle3-list" @click="goTravelNotes()">
<view>
<image src="@/static/img/my/center/mark.png"></image>
......
pages/indexs/hghgIndex/hghgIndex-old.vue 0 → 100644
View file @ ebb83e54
<template>
<view class="wrap">
<image src="../../../static/img/hghg/hghgBg.jpg" class="bgImage"></image>
<view class="btn-wrap">
<view>
<text class="button" @click="goKnow()">购票须知</text>
</view>
<view style="margin-top: 100rpx;">
<text class="button" @click="goBuy()">立即购票</text>
</view>
</view>
<!-- 购票须知 -->
<view class="buy-know" v-if="showKnow" @click="showKnow=false">
<view class="box">
<view class="title">
告游客书
</view>
<view>
尊敬的游客、广大市民：
</view>
<view>
<text>
开放时间：
</text>
{{openTime}}
</view>
<view>
<text>
博物馆开放日多功能设备运行时间：
</text>
09:30 - 12:30；14:30 - 17:30，（根据景区当天实际情况为准）
</view>
<view>
<text>
免费人群：
</text>
需出示身份证及有效证件原件前往检票处登记入园。
</view>
<view>
<text>
退票须知：
</text>
随时可退，过期未核销自动退。
</view>
<view style="margin-top: 48rpx;display: flex;justify-content: center;">
<text class="button" @click.stop="goBuy()">立即购票</text>
</view>
</view>
</view>
</view>
</template>
<script>
export default {
data() {
return {
urlQuery:'',
showKnow:false,
openTime:'',//开放时间
merchantId:'',//商户Id
}
},
onLoad(option) {
let channelId=option.channelId||''
let companyId=option.companyId||''
let groupId=option.groupId||''
let groupChannelId=option.groupChannelId||''
this.merchantId=option.merchantId||''
this.urlQuery=channelId+'&merchantId='+this.merchantId+'&groupId='+groupId+'&groupChannelId='+groupChannelId+'&companyId='+companyId
},
methods: {
//---购票
goBuy(){
uni.navigateTo({
url:'/pages/combination/distributionCombiChoose/distributionCombiChoose?channelId='+this.urlQuery
})
},
//---购票须知
goKnow(){
this.showKnow=true
this.initDetail()
},
//---初始化详情
initDetail(){
let data={
userId:uni.getStorageSync('userId')||'',
openid:uni.getStorageSync('openid')||'',
id:this.merchantId,
isDetail:1,//商户详情
}
this.$request('scenic/user/merchant/findDetailInfo',data).then((res)=>{
if(res.code=='00'){
let data=res.data.merchantTitleData||[]
console.log(data)
data.forEach(item => {
if (item.titleCode == 'scenic_base_info') {
//基本信息
item.merchantChildTitleData.forEach(item2=> {
if (item2.childTitleCode == '101001') {
//开放时间
this.openTime = item2.contentList[0].content
}
})
}
})
}else{
uni.showToast({
title: res.message,
icon: 'none'
})
}
})
},
}
}
</script>
<style scoped>
.wrap{
height: 100%;
font-size: 40rpx;
display: flex;
align-items: center;
justify-content:center;
}
.bgImage{
position: absolute;
top: 0;
left: 0;
width: 100%;
height: 100%;
z-index: -1;
}
.btn-wrap{
position: relative;
top: -160rpx;
}
.button{
width: 520rpx;
height: 112rpx;
display:flex;
align-items: center;
justify-content: center;
background: url('../../../static/img/hghg/bigBtn.png') no-repeat;
background-size: 100% 100%;
}
.buy-know{
padding: 0 48rpx;
display: flex;
align-items: center;
justify-content: center;
position: fixed;
top: 0;
left: 0;
right: 0;
bottom: 0;
background: rgba(0, 0, 0, 0.3);
}
.box{
padding: 60rpx 40rpx;
background: url('../../../static/img/hghg/dialog.png') no-repeat;
background-size: 100% 100%;
color: #000000;
font-size: 28rpx;
}
.box>view{
margin-top: 10rpx;
}
.box view text{
font-weight: bold;
}
.title{
font-weight: bold;
font-size: 40rpx;
text-align: center;
}
.button{
display: flex;
width: 244rpx;
height: 96rpx;
background: url('../../../static/img/hghg/smallBtn.png') no-repeat;
background-size: 100% 100%;
align-items: center;
justify-content: center;
font-size: 32rpx;
}
</style>
pages/indexs/hghgIndex/hghgIndex.vue
View file @ ebb83e54
......@@ -18,31 +18,33 @@
<view>
尊敬的游客、广大市民：
</view>
<view>
<text>
开放时间：
景区开放时间：
</text>
{{openTime}}
{{extendInfo.openingHours}}。
</view>
<view>
<text>
博物馆开放日多功能设备运行时间：
博物馆开放日多媒体设备运行时间：
</text>
09:30 - 12:30；14:30 - 17:30，（根据景区当天实际情况为准）
{{extendInfo.multifunctionalDevice}}。
</view>
<view>
<text>
免费人群：
</text>
需出示身份证及有效证件原件前往检票处登记入园。
{{extendInfo.freeCrowd}}。
</view>
<view>
<text>
退票须知：
</text>
随时可退，过期未核销自动退。
{{extendInfo.noticeOfrefund}}。
</view>
<view style="margin-top: 48rpx;display: flex;justify-content: center;">
<view style="margin-top: 60rpx;display: flex;justify-content: center;">
<text class="button" @click.stop="goBuy()">立即购票</text>
</view>
</view>
......@@ -56,8 +58,8 @@ export default {
return {
urlQuery:'',
showKnow:false,
openTime:'09:00 - 18:00，闭馆前1小时（17:00）停止售票',//开放时间
merchantId:'',//商户Id
extendInfo:'',//扩展信息
}
},
onLoad(option) {
......@@ -90,18 +92,7 @@ export default {
}
this.$request('scenic/user/merchant/findDetailInfo',data).then((res)=>{
if(res.code=='00'){
let data=res.data.merchantTitleData||[]
data.forEach(item => {
if (item.titleCode == 'scenic_base_info') {
//基本信息
item.merchantChildTitleData.forEach(item2=> {
if (item2.childTitleCode == '101001') {
//开放时间
this.openTime = item2.contentList[0].content||'09:00 - 18:00，闭馆前1小时（17:00）停止售票'
}
})
}
})
this.extendInfo=res.data.extendInfo
}else{
uni.showToast({
title: res.message,
......@@ -161,9 +152,12 @@ export default {
background-size: 100% 100%;
color: #000000;
font-size: 28rpx;
width: 100%;
max-height: 90%;
overflow-y: auto;
}
.box>view{
margin-top: 10rpx;
margin-top: 16rpx;
}
.box view text{
font-weight: bold;
......
pages/my/customerService/enterpriseWechat/enterpriseWechat.vue
View file @ ebb83e54
......@@ -23,7 +23,6 @@ export default {
{name:'云端之眼.高空观景台',phone:'023-60339688'},
{name:'两江夜游',phone:'13883372702'},
{name:'礼嘉时光缆车（渝北区）',phone:'023-67687141'},
{name:'清明上河图',phone:'17783002411'},
{name:'重庆湖广会馆',phone:'023-63914697'},
{name:'重庆抗战遗址博物馆',phone:'023-62462447'},
{name:'重庆杜莎夫人蜡像馆',phone:'023-63492828'},
......
pages/my/order/afterSale/applyAfterSale/applyAfterSale.vue
View file @ ebb83e54
......@@ -230,7 +230,7 @@ export default {
}
this.$request('order/userOrder/refundTicket',data).then((res)=>{
if(res.code == '00'){
this.toUploadType = true
//this.toUploadType = true
uni.hideLoading()
uni.showToast({
title: '申请成功',
......@@ -297,7 +297,7 @@ export default {
var playdateTimerNum = this.$commonjs.changeTime(playdateTimer) //游玩时间转化数字
var playdateEndTimer = ''//退票截止时间
var playdateEndTimerNum = '' //截止时间转化数字
if(item.refundDateType!=undefined&&item.refundDateType==2){//refundDateType 退款时间展示文字（0之前1之后2至（用于区间））
if(item.refundDateType!=undefined&&item.refundDateType==1){//refundDateType 退款时间展示文字（0之前1至（用于区间）2之后）
if(item.refundDay!=undefined&&item.refundDay!=0){
var itemDay = -item.refundDay//将天数改为负数
var orderEndPlayDate = this.getNextDate(this.orderInfo.playDate,itemDay)//最迟退票天数
......@@ -307,7 +307,7 @@ export default {
}
playdateEndTimerNum = this.$commonjs.changeTime(playdateEndTimer)
}
if(item.refundDateType!=undefined&&item.refundDateType==2){
if(item.refundDateType!=undefined&&item.refundDateType==1){
if(todayTimerNum>playdateTimerNum&&todayTimerNum<playdateEndTimerNum){
this.orderRefundRuleListShowBtn = true
this.isRefund = true
......
pages/my/order/electronicTicket/electronicTicket.vue
View file @ ebb83e54
......@@ -90,6 +90,7 @@
</view>
</view>
</template>
<!--sceneSortStatus 是否上下架 1是上架-->
<view class="order-queueUp order-allType order-positionTop" v-if="orderInfo.isFetch==1&&sortsInfo&&sortData[0].config.sceneSortStatus==1&&orderInfo.orderStatus==4||orderInfo.isFetch==1&&sortsInfo&&sortData[0].config.sceneSortStatus==1&&orderInfo.orderStatus==2||orderInfo.isFetch==1&&sortsInfo&&sortData[0].config.sceneSortStatus==1&&orderInfo.orderStatus==5||orderInfo.isFetch==1&&sortsInfo&&sortData[0].config.sceneSortStatus==1&&orderInfo.orderStatus==7">
<view class="alltype-title">
<!-- <view class="title-line">
......@@ -660,7 +661,7 @@ export default {
this.ifyukuaiCode = option.ifyukuaiCode||''
//this.id = "z00167956572219584dc15634b62cf75"
this.openId = uni.getStorageSync('openid') //openid oroHZ5FaUQ_SOOC_uQQP92fJpBRE oh2UV1lyYABHMZ1rMlgjhVHyyYDQ
//this.openId = 'oh2UV1lyYABHMZ1rMlgjhVHyyYDQ'//'oh2UV1lyYABHMZ1rMlgjhVHyyYDQ' oroHZ5FaUQ_SOOC_uQQP92fJpBRE
//this.openId = 'oroHZ5FaUQ_SOOC_uQQP92fJpBRE'//'oh2UV1lyYABHMZ1rMlgjhVHyyYDQ' oroHZ5FaUQ_SOOC_uQQP92fJpBRE
this.getDetail()
},
onUnload() {
......@@ -793,8 +794,11 @@ export default {
if(this.orderInfo.subOrderType!=4&&this.orderInfo.subOrderType!=5){
this.$nextTick(() => {
if(this.orderInfo.playDate.substr(0,10)==this.$commonjs.today()&&this.orderInfo.exchangeMode==4||this.orderInfo.playDate.substr(0,10)==this.$commonjs.today()&&this.orderInfo.exchangeMode==5){
if(this.orderInfo.orderStatus==2||this.orderInfo.orderStatus==4||this.orderInfo.orderStatus==5||this.orderInfo.orderStatus==7){ //订单状态==2 4 5 7才调用动态二维码
this.dynamicCode()
this.qrCodeType=true
}
}else if(this.orderInfo.exchangeMode==1){
this.qecode()
this.qrCodeType=false
......@@ -804,6 +808,8 @@ export default {
}
}
if(this.orderInfo.isFetch==1){//isFetch==1需要排队
if(this.orderInfo.orderStatus==2||this.orderInfo.orderStatus==4||this.orderInfo.orderStatus==5||this.orderInfo.orderStatus==7){ //订单状态==2 4 5 7才可以调用排号接口
console.log(this.orderInfo.orderStatus)
this.getSortInfo()
var sortRefresh = new Date().getTime()
this.sortRefreshNew = JSON.parse(JSON.stringify(sortRefresh))
......@@ -815,6 +821,8 @@ export default {
this.getSortInfo()
}
},1000)
}
// this.$once('hook:beforeDestroy',()=>{
// clearInterval(timer)
// })
......@@ -872,13 +880,19 @@ export default {
}
playdateEndTimerNum = this.$commonjs.changeTime(playdateEndTimer)
}
if(item.refundDateType!=undefined&&item.refundDateType==2){
if(item.refundDateType!=undefined&&item.refundDateType==1){//至
if(todayTimerNum>playdateTimerNum&&todayTimerNum<playdateEndTimerNum){
this.orderRefundRuleListShowBtn = true
}else{
this.orderRefundRuleListShowBtn = false
}
}else if(item.refundDateType!=undefined&&item.refundDateType==2){//之后
if(todayTimerNum>playdateTimerNum){
this.orderRefundRuleListShowBtn = true
}else{
this.orderRefundRuleListShowBtn = false
}
}else{//之前
if(todayTimerNum<playdateTimerNum){
this.orderRefundRuleListShowBtn = true
}else{
......
pages/my/order/jointElectronicTicket/jointElectronicTicket.vue 0 → 100644
View file @ ebb83e54
This diff is collapsed.
pages/payment/orderPayment/orderPayment.vue
View file @ ebb83e54
......@@ -188,7 +188,8 @@ export default {
this.errorMessage1 = res.data.errorMessage
this.totalMoney = res.data.totalMoney
this.orderList = res.data.orderList||[]
if (this.orderList.length==0) {
if (this.orderList.length==0||res.data.orderPageShowFlag==0) {
this.orderList=[]
this.orderList.push({
merchantName:res.data.merchantName,
productName:res.data.productName,
......
pages/scenic/scenicCombiOrder/scenicCombiOrder.vue
View file @ ebb83e54
......@@ -84,7 +84,7 @@
</view>
</scroll-view>
<text v-else class="no-date"> 不可购买 </text>
<view class="dateMore" @click="showCalendar(index)">
<view class="dateMore" @click="showCalendar(index)" v-if="item.priceStockList&&item.priceStockList.length > 0">
<view class="date-more-content">
<view>更多</view>
<view>日期</view>
......@@ -416,7 +416,7 @@ export default {
}
},
onLoad(option) {
this.companyId = option.companyId || ''
this.companyId=this.$commonjs.getCompanyId(option)|| ''
this.groupId=option.groupId||''
this.groupChannelId=option.groupChannelId||''
this.orderSource=option.orderSource||''
......
pages/scenic/scenicComponents/chooseArea.vue
View file @ ebb83e54
......@@ -71,15 +71,6 @@
</text>
</view>
</template>
<!-- <view>
<text>
退票规则：
</text>
<text>
不可退
</text>
</view> -->
<view>
返程时，根据现场情况需重新取号
</view>
......@@ -132,15 +123,6 @@
</text>
</view>
<!-- <view>
<text>
退票规则：
</text>
<text>
不可退
</text>
</view> -->
<view>
<image src="../static/scenic/chooseArea.jpg" mode="widthFix"></image>
</view>
......@@ -149,6 +131,9 @@
<a class="btn" @click="closeSon()">确定</a>
</view>
</view>
<view class="number-detail">
长江索道排号详情可在公众号查询
</view>
</view>
</view>
......@@ -338,4 +323,10 @@ export default {
font-weight: bolder;
color:$red;
}
.number-detail{
font-size:32rpx;
color:#FC6703;
text-align: center;
margin-top: 20rpx;
}
</style>
pages/scenic/scenicProduct/scenicProduct.vue
View file @ ebb83e54
......@@ -3,7 +3,7 @@
<view class="banner" v-if="detailData">
<u-swiper :list="detailData.imgList" @change="e => currentNum = e.current" indicatorStyle="right: 20px;bottom:25px" height="400" circular>
<view slot="indicator" class="indicator-num">
<text class="indicator-num__text">{{ currentNum + 1 }}/{{detailData.imgList.length}}</text>
<text class="indicator-num__text">{{ currentNum + 1 }}/{{detailData.imgList.length?detailData.imgList.length:0}}</text>
</view>
</u-swiper>
</view>
......@@ -11,7 +11,7 @@
<view class="middle-introduce" v-if="detailData">
<view class="introduce-one" @click="showDetail()">
<view class="merchantname">
{{detailData.name}}
{{detailData.name||''}}
</view>
<view class="businesstime">
<view style="font-size: 24rpx;">
......@@ -37,7 +37,7 @@
<view class="introduce-three">
<view style="flex: 1;margin-right: 20rpx;">
{{detailData.address}}
{{detailData.address||''}}
</view>
<view class="introduce-icon">
<u-icon name='map-fill' color='#3688ff' size='44' @click="navigation()"></u-icon>
......
pages/scenic/scenicSingleOrder/scenicSingleOrder.vue
View file @ ebb83e54
......@@ -83,7 +83,7 @@
</view>
</scroll-view>
<text v-else class="no-date"> 不可购买 </text>
<view class="dateMore" @click="showCalendar()">
<view class="dateMore" @click="showCalendar()" v-if="dateList.length > 0">
<view class="date-more-content">
<view>更多</view>
<view>日期</view>
......
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