diff --git a/pages/index/index.js b/pages/index/index.js
index 2a73d54..104a24f 100644
--- a/pages/index/index.js
+++ b/pages/index/index.js
@@ -6,6 +6,7 @@ import userApi from "../../utils/https/user"
import util from "../../utils/util"
Page({
data: {
+ fullAdvTimer: null, // 全屏timer
banner: [],
xiaobanner: [],
height: 0,
@@ -122,6 +123,7 @@ Page({
},
onLoad: function(options) {
//全屏广告
+ let _this = this
commonApi._post("adv/getAdv", {
position: 2,
type_id: 3
@@ -148,26 +150,21 @@ Page({
this.setData({
showTime: true
})
- var timer = setInterval(() => {
- this.setData({
- time: this.data.time - 1
- })
- if (this.data.time === 0) {
- var opacityTimer = setInterval(() => {
- this.setData({
- opacity: this.data.opacity - 0.3
- })
- }, 100)
+ this.data.fullAdvTimer = setInterval(() => {
+ _this.data.time-=0.5
+ if (Number.isInteger(_this.data.time)) {
+ _this.setData({time: _this.data.time})
}
- if (this.data.time == -1) {
- clearInterval(timer)
- clearInterval(opacityTimer)
+ if (_this.data.time <= 0) {
+ // 可以css 优化
+ _this.setData({opacity: 0})
+ }
+ if (_this.data.time <= -1) {
+ clearInterval(_this.data.fullAdvTimer)
wx.showTabBar() //倒计时结束清除定时器显示导航栏
- this.setData({
- showFullAdv: false
- })
+ _this.setData({showFullAdv: false})
}
- }, 1000)
+ }, 500)
} else {
// 视频
}
@@ -461,7 +458,8 @@ Page({
closeFullAdv: function() {
this.setData({
showFullAdv: false
- })
+ })
+ clearInterval(this.data.fullAdvTimer)
if (!this.data.alertSwipeList.length > 0) {
wx.showTabBar({
animation: true,
@@ -759,9 +757,11 @@ Page({
this.setData({
lat: res.latitude,
lon: res.longitude
- })
+ })
this.getList()
- this.getHdrlList()
+ this.getHdrlList()
+ let tempData = JSON.stringify({lat: res.latitude,lon: res.longitude})
+ wx.setStorageSync('lonAndLat', tempData)
},
fail: (err) => {
this.getList()
diff --git a/pages/index/index.wxml b/pages/index/index.wxml
index 78bcb3b..f98c8e3 100644
--- a/pages/index/index.wxml
+++ b/pages/index/index.wxml
@@ -123,7 +123,7 @@
一日游
-
+
户外游
diff --git a/pages/order/pay/index.js b/pages/order/pay/index.js
index ccf51c9..0492ed4 100644
--- a/pages/order/pay/index.js
+++ b/pages/order/pay/index.js
@@ -151,7 +151,7 @@ Page({
info:res.data,
activePay: Object.keys(res.data.coupon_activity).length === 0 ?false:true,
SUBWALLET:res.data.coupon_activity.pay_type.includes('SUBWALLET') || !res.data.coupon_activity.pay_type,
- wxPay:res.data.coupon_activity.pay_type.includes('WEIXIN') || !res.data.coupon_activity.pay_type,
+ wxPay:res.data.coupon_activity.pay_type.includes('ICBC_WECHAT') || !res.data.coupon_activity.pay_type,
payIndex:Object.keys(res.data.coupon_activity).length === 0 ?-1:0,
})
console.log(this.data.wxPay);
diff --git a/pages/pbService/web/index.js b/pages/pbService/web/index.js
index 0731d7d..7b848f7 100644
--- a/pages/pbService/web/index.js
+++ b/pages/pbService/web/index.js
@@ -85,11 +85,43 @@ Page({
} else {
weburl += '?token='+token
}
- }
+ }
+ let _this = this
+ try {
+ let lonAndLat = (wx.getStorageSync('lonAndLat'))
+ if (lonAndLat && JSON.parse(lonAndLat)) {
+ lonAndLat = JSON.parse(lonAndLat)
+ if (Object.keys(webParam).length>0 || token) {
+ weburl+=`&lon=${lonAndLat.lon}&lat=${lonAndLat.lat}`
+ } else {
+ weburl+=`?lon=${lonAndLat.lon}&lat=${lonAndLat.lat}`
+ }
+ this.setUrl(weburl)
+ return
+ } else {
+ wx.getLocation({
+ type: 'gcj02',
+ success: (res) => {
+ let lonAndLat = JSON.stringify({lat: res.latitude,lon: res.longitude})
+ wx.setStorageSync('lonAndLat', lonAndLat)
+ if (Object.keys(webParam).length>0 || token) {
+ weburl+=`&lon=${lonAndLat.lon}&lat=${lonAndLat.lat}`
+ } else {
+ weburl+=`?lon=${lonAndLat.lon}&lat=${lonAndLat.lat}`
+ }
+ _this.setUrl(weburl)
+ },
+ fail: (err) => {
+ _this.setUrl(weburl)
+ }
+ })
+ }
+ } catch(e) {
+ this.setUrl(weburl)
+ }
// this.setData({
// webUrl:weburl
// })
- this.setUrl(weburl)
} else {
// this.setData({
// webUrl:weburl
diff --git a/pages/user/order/movieOrderInfo/index.js b/pages/user/order/movieOrderInfo/index.js
index 62c78fa..f59e2f6 100644
--- a/pages/user/order/movieOrderInfo/index.js
+++ b/pages/user/order/movieOrderInfo/index.js
@@ -34,6 +34,16 @@ Page({
})
},
+ gotoLocation:function(){
+ let info = this.data.info;
+ if(info && info.lat && info.lon){
+ wx.openLocation({
+ latitude: Number(info.lat),
+ longitude: Number(info.lon)
+ })
+ }
+ },
+
getCodeImg:function(){
let that = this,sys =wx.getSystemInfoSync(),radio = sys.screenWidth / 750,qrcode=this.data.info.order_product_list[0].qrcode,codeImgs=[];
qrcode.map((item,index)=>{
diff --git a/pages/user/order/movieOrderInfo/index.wxml b/pages/user/order/movieOrderInfo/index.wxml
index 948f2f2..97deb1d 100644
--- a/pages/user/order/movieOrderInfo/index.wxml
+++ b/pages/user/order/movieOrderInfo/index.wxml
@@ -110,6 +110,8 @@
商家地址：{{info.order_product_list[0].scene_detail.address}}
+
+
@@ -123,8 +125,8 @@
支付时间：{{info.pay_at}}
-
- 支付方式：{{pay_methods[info.pay_method]}}
+
+ 支付方式：{{info.pay_method_text}}
-
-
-
-
-
+
+
-
-
-
- {{weather.max_temp}}°
- {{weather.weather}}
-
-
-
-
-
-
-
-
- 搜索想要的旅游产品或服务
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-
-
-
- 活动日历
-
-
-
- 场馆预约
-
-
-
- 非遗专卖
+
+
+
+ 搜索想要的旅游产品或服务
+
-
-
- 剧场演出
-
-
-
- 文创特产
-
-
-
- 景点门票
-
-
-
- 酒店住宿
-
-
-
-
-
- 水上游
-
-
-
- 一日游
-
-
-
- 户外游
+
+
+
+
-
-
-
- 特惠新品超值商品限时抢购
-
-
-
-
-
-
-
- 限时特惠
- 新品推荐
-
-
- ￥{{saleProduct.price?saleProduct.price/100:0}}起
-
-
-
-
- 精品线路带你轻松玩转苏州
-
-
-
-
-
-
-
- 四季苏州
- 最是江南
-
-
- ￥{{roadProduct.price?roadProduct.price/100:0}}起
+
+
+
+
+
+
+
+
+
+
+ {{item.title}}
+
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-
-
-
-
-
+
+
@@ -148,92 +62,94 @@
-
-
-
+
-
+
-
+
-
-
-
-
- 倒计时
- {{djs.h}}
- :
- {{djs.m}}
- :
- {{djs.s}}
-
-
+
+
+
-
-
-
-
-
- {{item.title}}
-
-
- {{item.price/100}}
-
+
+
+
+
+
+ {{item.title}}
+
+ {{item.price/100}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+ 更多
+
+
+
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+ -->
@@ -307,63 +223,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 更多
-
-
-
-
-
-
-
-
-
- 高峰预警
-
-
-
- 实时路况
-
-
-
- 行李直送
-
-
-
- 行李寄存
-
-
-
- 找厕所
-
-
-
-
@@ -447,56 +306,7 @@
暂无更多推荐
-
-
-
-
-
-
-
- {{prizeInfo.prize_name}}
-
-
-
-
-
-
-
-
-
- {{prizeInfo.prize_name}}
-
-
-
-
-
-
-
-
-
- 您与奖品擦肩而过期待下次参与
-
-
-
-
-
- 我知道了
-
-
-
-
-
-
-
-
-
-
+
@@ -528,15 +338,7 @@
-
+
diff --git a/subPackages/index/index.wxss b/subPackages/index/index.wxss
index 7b46194..78713d2 100644
--- a/subPackages/index/index.wxss
+++ b/subPackages/index/index.wxss
@@ -1,31 +1,22 @@
/**index.wxss**/
/* 元旦修改 */
page {
- /* background: #9DDCF5; */
padding-bottom: 36.67rpx;
-
- /* background-image: url('https://static.ticket.sz-trip.com/uploads/20241225/79918a9171dcf85365935419e4717519.jpg');
- background-repeat: repeat-y;
- background-size: 100% 100%; */
- background: #F3FBFB;
}
.swiper,.swiper image {
- width: 697rpx;
+ width: 100%;
display: block;
- height: 335rpx;
- border-radius: 27rpx;
-}
-.swiper {
- margin: 0 auto;
+ height: 600rpx;
}
+
.top-box {
display: flex;
padding: 10rpx 0;
align-items: center;
- margin: 0 30rpx;
justify-content: flex-start;
- position: relative;
- z-index: 1;
+ position: absolute;
+ left: 30rpx;
+ z-index: 2;
}
.top-box image {
flex-shrink: 0;
@@ -57,35 +48,35 @@ page {
margin-right: 20rpx;
/* color: #72674E; */
}
-.top-box .weather-num,.top-box .weather {
- flex-shrink: 0;
- color: #333;
- /* color: #72674E; */
+
+.banner-main{
+ position: absolute;
+ z-index: 3;
+ width: 100%;
+ left: 0;
+ bottom: 20rpx;
+ right: 0;
+ display: flex;
+ justify-content: space-between;
+ padding: 0 30rpx;
+ box-sizing: border-box;
}
-.top-box .weather-num {
- font-size: 29rpx;
- margin-bottom: 10rpx;
- margin-left: 4rpx;
+.banner-main image{
+ width: 150rpx;
+ height: 100rpx;
}
-.top-box .weather {
- font-size: 19rpx;
- margin-top: 20rpx;
- margin-left: -4rpx;
- margin-right: 30rpx;
+
+.main-content{
+ background: white;
+ margin-top: -10rpx;
+ border-radius: 20rpx;
+ position: relative;
+ z-index: 4;
}
+
.top-icons {
- border-radius: 0 0 27rpx 27rpx;
- width: 697rpx;
- margin: 0 auto;
- position: relative;
- z-index: 0;
display: flex;
- padding: 34rpx 0;
- padding-bottom: 29.33rpx;
- justify-content: space-between;
- flex-wrap: wrap;
- margin-top: -50rpx;
- padding-top: 84rpx;
+ padding: 20rpx;
}
.top-icon-item {
margin-bottom: 20rpx;
@@ -812,40 +803,8 @@ page {
position: relative;
flex-direction: column;
}
-/* 元旦修改新增样式 */
-.time-box {
- font-size: 27rpx;
- font-family: DIN;
- font-weight: 500;
- /* color: #54504D; */
- color: #000000;
- display: flex;
- align-items: center;
- height: 37px;
- margin-left: -50rpx;
- z-index: 9;
- flex-wrap: nowrap;
- position: relative;
- left: -150rpx;
-}
-/* 元旦修改新增样式 */
-.xsth-time {
- /* width: 43rpx; */
- height: 43rpx;
- padding: 0 7rpx;
- line-height: 43rpx;
- border-radius: 13rpx;
- font-size: 27rpx;
- font-family: DIN;
- font-weight: 500;
- color: #D62828;
- text-align: center;
-}
-.time-box text {
- width: 18rpx;
- text-align: center;
-}
+
/* 元旦修改新增样式 */
.xpth-left {
width: 393rpx;
@@ -1030,19 +989,19 @@ page {
}
.ggfw-list {
- justify-content: space-around !important;
-}
-.ggfw-list .pbservice-item{
- margin-right: 0;
- color: #111111;
+ display: flex;
+ flex-wrap: wrap;
+ justify-content: space-between;
}
-.ggfw {
- width: auto;
+
+.ggfw-list .ggfw {
+ width: 30%;
+ height: 70rpx;
+ margin-bottom: 20rpx;
}
.ggfw image{
- margin-bottom: 16.67rpx;
- width: 93rpx !important;
- height: 93rpx !important;
+ width: 100%;
+ height: 100%;
}
.six-box-new {
diff --git a/utils/https.js b/utils/https.js
index fd37f47..67031b4 100644
--- a/utils/https.js
+++ b/utils/https.js
@@ -172,7 +172,7 @@ function user_post_new(url, data = {}, type) {
return new Promise((resolved, rejected) => {
// 判断是否登录
// 没有登录就跳转到登录页面
- if (!token || !userId) {
+ if (!token) {
wx.hideLoading();
// 去登陆
console.log("去登陆去登陆去登陆去登陆去登陆去登陆去登陆")
@@ -330,10 +330,8 @@ const checkLogin = () => {
appData = getApp()
}
console.log(appData,page)
- if(appData.globalData.configJson.isTest) {
-
- return
-
+ if(appData.globalData.configJson&&appData.globalData.configJson.isTest) {
+ return
}