diff --git a/pages/index/imgSource.js b/pages/index/imgSource.js index 8a4e16d..0d29963 100644 --- a/pages/index/imgSource.js +++ b/pages/index/imgSource.js @@ -39,6 +39,7 @@ const imageSource = { // 旅游助手 LVZS: [ "https://static.ticket.sz-trip.com/uploads/20250423/662eb322f8851e04df41fd836c6a88f3.png", + // "https://static.ticket.sz-trip.com/uploads/20250312/ae847f6081edb82a14a75b3e19146eeb.png", "https://static.ticket.sz-trip.com/uploads/20250312/d12ad76fbb7a46c1669c403e66e510ad.png", "https://static.ticket.sz-trip.com/uploads/20250312/3b8941467df369032b70052b60095857.png", "https://static.ticket.sz-trip.com/uploads/20250312/54b2063e28eacfeb220905563e802786.png", diff --git a/pages/order/scene/index.js b/pages/order/scene/index.js index 48ea546..67b9896 100644 --- a/pages/order/scene/index.js +++ b/pages/order/scene/index.js @@ -527,6 +527,41 @@ Page({ url: '/pages/order/orderList/index?flag='+ this.data.flag }) }else{ + // 5442拙政园弹弹框 + if (this.data.product.product.scene_id == 5442) { + wx.showModal({ + content: '节假日期间出票时间可能延迟,请耐心等待,最终出票结果以平台通知为准', + confirmColor:"#0B898E", + success: (res)=>{ + if (res.confirm) { + commonApi.user_post(service, postData).then(res => { + if (app.globalData.kjId) { + this.setData({ + kjId: null + }); + app.globalData.kjId = null; + } + if (app.globalData.gp_id) { + this.setData({ + gp_id: null + }); + app.globalData.gp_id = null; + } + if (res.code == 1 && app.globalData.product.isGroup == 1) { + // 团购跳转到团购详情 + wx.navigateTo({ + url: '/pages/info/groupOrderInfo/index?id=' + res.data.order_id + '&from=order' + }) + } + }) + + } else if (res.cancel) {} + }, + }) + + return + } + commonApi.user_post(service, postData).then(res => { if (app.globalData.kjId) { this.setData({ diff --git a/subPackageCheckPoint/pages/content/index.js b/subPackageCheckPoint/pages/content/index.js index 674c24c..d9964b1 100644 --- a/subPackageCheckPoint/pages/content/index.js +++ b/subPackageCheckPoint/pages/content/index.js @@ -1,2 +1,2 @@ require('../../app.js'); -"use strict";const t=require("../../common/vendor.js"),e=require("../../utils/request.js"),i=require("../../common/assets.js"),o={components:{audioCom:()=>"../../components/audioCom.js"},data:()=>({comDom:!0,tag:"",appInstance:"",currentImgIndex:1,imgList:[],background:["color1","color2","color3"],indicatorDots:!1,autoplay:!0,interval:2e3,duration:500,scopeName:"",addressName:"",description:"",openUrlBtnState:!1,openUrl:"",longitude:0,latitude:0,mapUrl:""}),onLoad(t){this.tag=t.tag,this.appInstance=getApp(),this.initConfig()},onShow(){this.comDom=!0},onHide(){this.comDom=!1},methods:{async initConfig(){let t=await e.request("/contentinfo","get");for(let e=0;e0?(this.openUrlBtnState=!0,this.openUrl=t.mapConfig[e].appUrl):this.openUrlBtnState=!1;for(let i=0;i/^(https?|ftp):\/\/[^\s/$.?#].[^\s]*$/.test(t),isWechatApp:t=>/^#小程序:\/\/.+/.test(t),changeIndicatorDots(t){this.indicatorDots=!this.indicatorDots},changeAutoplay(t){this.autoplay=!this.autoplay},intervalChange(t){this.interval=t.target.value},durationChange(t){this.duration=t.target.value},swiperChange(t){this.currentImgIndex=t.detail.current+1},goShoping(){this.isWechatApp(this.openUrl)?t.wx$1.navigateToMiniProgram({envVersion:"release",shortLink:this.openUrl,success(t){}}):this.isLink(this.openUrl)?t.index.navigateTo({url:`/pages/web/index?url=${this.openUrl}`}):this.openUrl&&t.index.navigateTo({url:this.openUrl})},openMap(){t.wx$1.openLocation({latitude:this.latitude,longitude:this.longitude,name:this.scopeName,scale:18})}}};if(!Array){t.resolveComponent("audio-com")()}const n=t._export_sfc(o,[["render",function(e,o,n,a,s,r){return t.e({a:s.comDom},s.comDom?{b:t.sr("audioCom","3e19c77f-0")}:{},{c:t.f(s.imgList,((t,e,i)=>({a:t,b:e}))),d:s.indicatorDots,e:s.autoplay,f:s.interval,g:s.duration,h:t.o(((...t)=>r.swiperChange&&r.swiperChange(...t))),i:t.t(s.currentImgIndex),j:t.t(s.imgList.length),k:t.t(s.addressName),l:i._imports_0$2,m:t.t(s.scopeName),n:i._imports_1$1,o:t.t(s.description),p:t.o(((...t)=>r.openMap&&r.openMap(...t))),q:s.openUrlBtnState},s.openUrlBtnState?{r:t.o(((...t)=>r.goShoping&&r.goShoping(...t)))}:{})}],["__scopeId","data-v-3e19c77f"]]);wx.createPage(n); +"use strict";const t=require("../../common/vendor.js"),e=require("../../utils/request.js"),i=require("../../common/assets.js"),o={components:{audioCom:()=>"../../components/audioCom.js"},data:()=>({comDom:!0,tag:"",appInstance:"",currentImgIndex:1,imgList:[],background:["color1","color2","color3"],indicatorDots:!1,autoplay:!0,interval:2e3,duration:500,scopeName:"",addressName:"",description:"",openUrlBtnState:!1,openUrl:"",longitude:0,latitude:0,mapUrl:""}),onLoad(t){this.tag=t.tag,this.appInstance=getApp(),this.initConfig()},onShow(){this.comDom=!0},onHide(){this.comDom=!1},methods:{async initConfig(){let t=await e.request("/contentinfo","get");for(let e=0;e0?(this.openUrlBtnState=!0,this.openUrl=t.mapConfig[e].appUrl):this.isLink(t.mapConfig[e].openUrl)||this.isWechatApp(t.mapConfig[e].openUrl)?(this.openUrlBtnState=!0,this.openUrl=t.mapConfig[e].openUrl):this.openUrlBtnState=!1;for(let i=0;i/^(https?|ftp):\/\/[^\s/$.?#].[^\s]*$/.test(t),isWechatApp:t=>/^#小程序:\/\/.+/.test(t),changeIndicatorDots(t){this.indicatorDots=!this.indicatorDots},changeAutoplay(t){this.autoplay=!this.autoplay},intervalChange(t){this.interval=t.target.value},durationChange(t){this.duration=t.target.value},swiperChange(t){this.currentImgIndex=t.detail.current+1},goShoping(){this.isWechatApp(this.openUrl)?t.wx$1.navigateToMiniProgram({envVersion:"release",shortLink:this.openUrl,success(t){}}):this.isLink(this.openUrl)?t.index.navigateTo({url:`/pages/web/index?url=${this.openUrl}`}):this.openUrl&&t.index.navigateTo({url:this.openUrl})},openMap(){t.wx$1.openLocation({latitude:this.latitude,longitude:this.longitude,name:this.scopeName,scale:18})}}};if(!Array){t.resolveComponent("audio-com")()}const n=t._export_sfc(o,[["render",function(e,o,n,a,s,r){return t.e({a:s.comDom},s.comDom?{b:t.sr("audioCom","b48e95cf-0")}:{},{c:t.f(s.imgList,((t,e,i)=>({a:t,b:e}))),d:s.indicatorDots,e:s.autoplay,f:s.interval,g:s.duration,h:t.o(((...t)=>r.swiperChange&&r.swiperChange(...t))),i:t.t(s.currentImgIndex),j:t.t(s.imgList.length),k:t.t(s.addressName),l:i._imports_0$2,m:t.t(s.scopeName),n:i._imports_1$1,o:t.t(s.description),p:t.o(((...t)=>r.openMap&&r.openMap(...t))),q:s.openUrlBtnState},s.openUrlBtnState?{r:t.o(((...t)=>r.goShoping&&r.goShoping(...t)))}:{})}],["__scopeId","data-v-b48e95cf"]]);wx.createPage(n); diff --git a/subPackageCheckPoint/pages/content/index.json b/subPackageCheckPoint/pages/content/index.json index 8110852..e1f28c0 100644 --- a/subPackageCheckPoint/pages/content/index.json +++ b/subPackageCheckPoint/pages/content/index.json @@ -1,5 +1,6 @@ { "navigationBarTitleText": "君到苏州最美打卡点", + "navigationStyle": "default", "usingComponents": { "audio-com": "../../components/audioCom" } diff --git a/subPackageCheckPoint/pages/content/index.wxml b/subPackageCheckPoint/pages/content/index.wxml index 5c37f54..156a968 100644 --- a/subPackageCheckPoint/pages/content/index.wxml +++ b/subPackageCheckPoint/pages/content/index.wxml @@ -1 +1 @@ -/{{j}}{{k}}{{m}}{{o}}前往景点前往购票 \ No newline at end of file +/{{j}}{{k}}{{m}}{{o}}前往景点前往购票 \ No newline at end of file diff --git a/subPackageCheckPoint/pages/content/index.wxss b/subPackageCheckPoint/pages/content/index.wxss index 6e82af8..fc6c398 100644 --- a/subPackageCheckPoint/pages/content/index.wxss +++ b/subPackageCheckPoint/pages/content/index.wxss @@ -1,2 +1,2 @@ @import "../../app.wxss"; -.content.data-v-3e19c77f{width:100vw;height:100vh}span.data-v-3e19c77f{font-size:35rpx}.content .swiperContent.data-v-3e19c77f{position:relative;width:750rpx;height:730rpx;color:#fff}.content .swiperContent .swiperLength.data-v-3e19c77f{position:absolute;right:2vw;bottom:2vw}.swiper.data-v-3e19c77f{width:100%;height:100%}.swiper-item.data-v-3e19c77f{width:750rpx;height:730rpx}.swiper-item>image.data-v-3e19c77f{width:100%;height:100%}.contentDetails.data-v-3e19c77f{width:95vw;margin:0 auto;transform:translate(10rpx)}.contentDetails .detailsTitle.data-v-3e19c77f{font-size:39rpx;color:#001f1f;margin-top:60rpx;background:linear-gradient(to bottom,rgba(255,255,255,0),#5dba85);display:inline-block}.contentDetails .detailsMapPoint.data-v-3e19c77f{display:flex;margin:35rpx 0}.contentDetails .detailsText.data-v-3e19c77f{display:flex}.detailsMapPoint .icoBox.data-v-3e19c77f{width:26rpx;height:35rpx;display:flex;justify-content:center;align-items:center;margin-top:20rpx}.detailsMapPoint .contentText.data-v-3e19c77f{border-bottom:1px solid #d7d7d7;padding:10rpx 0rpx;color:#3e3e3e}.detailsText .icoBox.data-v-3e19c77f{width:32rpx;height:26rpx;display:flex;justify-content:center;align-items:center;margin-top:15rpx}.icoBox>image.data-v-3e19c77f{object-fit:cover;width:100%;height:100%}.contentText.data-v-3e19c77f{width:85%;margin-left:20rpx}.detailsText .contentText.data-v-3e19c77f{letter-spacing:3rpx;line-height:60rpx}.toNewPage.data-v-3e19c77f{width:90%;margin:0 auto;display:flex;justify-content:flex-end}.toNewPage .btn.data-v-3e19c77f{width:145rpx;height:50rpx;background:#5dba85;border-radius:10rpx;color:#fff;display:flex;justify-content:center;align-items:center;font-size:25rpx;margin:30rpx 5rpx} +.content.data-v-b48e95cf{width:100vw;height:100vh}span.data-v-b48e95cf{font-size:35rpx}.content .swiperContent.data-v-b48e95cf{position:relative;width:750rpx;height:730rpx;color:#fff}.content .swiperContent .swiperLength.data-v-b48e95cf{position:absolute;right:2vw;bottom:2vw}.swiper.data-v-b48e95cf{width:100%;height:100%}.swiper-item.data-v-b48e95cf{width:750rpx;height:730rpx}.swiper-item>image.data-v-b48e95cf{width:100%;height:100%}.contentDetails.data-v-b48e95cf{width:95vw;margin:0 auto;transform:translate(10rpx)}.contentDetails .detailsTitle.data-v-b48e95cf{font-size:39rpx;color:#001f1f;margin-top:60rpx;background:linear-gradient(to bottom,rgba(255,255,255,0),#5dba85);display:inline-block}.contentDetails .detailsMapPoint.data-v-b48e95cf{display:flex;margin:35rpx 0}.contentDetails .detailsText.data-v-b48e95cf{display:flex}.detailsMapPoint .icoBox.data-v-b48e95cf{width:26rpx;height:35rpx;display:flex;justify-content:center;align-items:center;margin-top:20rpx}.detailsMapPoint .contentText.data-v-b48e95cf{border-bottom:1px solid #d7d7d7;padding:10rpx 0rpx;color:#3e3e3e}.detailsText .icoBox.data-v-b48e95cf{width:32rpx;height:26rpx;display:flex;justify-content:center;align-items:center;margin-top:15rpx}.icoBox>image.data-v-b48e95cf{object-fit:cover;width:100%;height:100%}.contentText.data-v-b48e95cf{width:85%;margin-left:20rpx}.detailsText .contentText.data-v-b48e95cf{letter-spacing:3rpx;line-height:60rpx}.toNewPage.data-v-b48e95cf{width:90%;margin:0 auto;display:flex;justify-content:flex-end}.toNewPage .btn.data-v-b48e95cf{width:145rpx;height:50rpx;background:#5dba85;border-radius:10rpx;color:#fff;display:flex;justify-content:center;align-items:center;font-size:25rpx;margin:30rpx 5rpx} diff --git a/utils/https.js b/utils/https.js index 0dc3ef0..fd37f47 100644 --- a/utils/https.js +++ b/utils/https.js @@ -331,9 +331,9 @@ const checkLogin = () => { } console.log(appData,page) if(appData.globalData.configJson.isTest) { - if (page[page.length - 1].route != 'pages/user/user') { + return - } + }