bbnv1
/
test
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

提交

master
shaojing 2 years ago
parent
febc3199f7
commit
22fd7a703f
8 changed files with 98 additions and 56 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 9
      pages/index/index.js
  2. 15
      pages/index/index.wxml
  3. 33
      pages/index/index.wxss
  4. 17
      pages/list/movieticket/list/info/index.js
  5. 7
      pages/list/movieticket/list/info/index.wxml
  6. 1
      pages/order/components/coupon/index.js
  7. 1
      pages/order/movie/index.js
  8. 71
      pages/pbService/web/index.js

9
pages/index/index.js
View File

@ -475,7 +475,8 @@ Page({
let url = e.currentTarget.dataset.url; let url = e.currentTarget.dataset.url;
app.globalData.weburl = url; app.globalData.weburl = url;
wx.navigateTo({ wx.navigateTo({
url: "/pages/pbService/web/index" // url: '/pages/pbService/web/index?weburl='+encodeURIComponent('https://m.cloud.sz-trip.com/Cloudperform2022'),
url: '/pages/pbService/web/index?weburl='+encodeURIComponent(url),
}) })
}, },
gotoMini: function (e) { gotoMini: function (e) {
@ -657,9 +658,11 @@ Page({
//博物馆跳转 直接跳君到苏州H5 //博物馆跳转 直接跳君到苏州H5
goH5:function(e){ goH5:function(e){
console.log(e.currentTarget.dataset.path); console.log(e.currentTarget.dataset.path);
app.globalData.weburl ='https://m.cloud.sz-trip.com/' + e.currentTarget.dataset.path; let weburl = 'https://m.cloud.sz-trip.com/' + e.currentTarget.dataset.path;
// app.globalData.weburl ='https://m.cloud.sz-trip.com/' + e.currentTarget.dataset.path;
wx.navigateTo({ wx.navigateTo({
url: "/pages/pbService/web/index" // url: "/pages/pbService/web/index"
url: '/pages/pbService/web/index?weburl='+encodeURIComponent(weburl),
}) })
}, },
bannerClick2: function (e) { bannerClick2: function (e) {

15
pages/index/index.wxml
View File

@ -171,7 +171,8 @@
bindchange="changeSmBannerIndex"> bindchange="changeSmBannerIndex">
<block wx:for="{{xiaobanner}}" wx:key="*this"> <block wx:for="{{xiaobanner}}" wx:key="*this">
<swiper-item bindtap="bannerClick" data-item="{{item}}"> <swiper-item bindtap="bannerClick" data-item="{{item}}">
<image style="border-radius:77rpx" src="{{item.head_img}}" mode="aspectFill"></image> <!-- 原 圆角77rpx，现改为20rpx -->
<image style="border-radius:20rpx" src="{{item.head_img}}" mode="aspectFill"></image>
</swiper-item> </swiper-item>
</block> </block>
</swiper> </swiper>
@ -186,7 +187,7 @@
<view class="xsth-left" style="display: flex;"> <view class="xsth-left" style="display: flex;">
<image mode="heightFix" style="height:86rpx" src="{{indexSeason.xpth}}"></image> <image mode="heightFix" style="height:86rpx" src="{{indexSeason.xpth}}"></image>
</view> </view>
<view class="time-box"> <view class="time-box" style="z-index: 9;">
倒计时 倒计时
<view class="xsth-time" style="margin-left: 20rpx;">{{djs.h}}</view>: <view class="xsth-time" style="margin-left: 20rpx;">{{djs.h}}</view>:
<view class="xsth-time">{{djs.m}}</view>: <view class="xsth-time">{{djs.m}}</view>:
@ -311,7 +312,7 @@
<!-- <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/syt.png" mode="widthFix"></image> <!-- <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/syt.png" mode="widthFix"></image>
<view>苏影通</view> --> <view>苏影通</view> -->
<!-- 元旦修改 --> <!-- 元旦修改 -->
<image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/springFestival2024/syt.png" mode="widthFix"></image> <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/springFestival2024/syts.png" mode="widthFix"></image>
<view class="text">苏影通</view> <view class="text">苏影通</view>
</view> </view>
@ -320,14 +321,14 @@
<image src="https://static.ticket.sz-trip.com/uploads/20220818/e02af6e8bf9170060ed7295d367d72c1.png" mode="widthFix"></image> <image src="https://static.ticket.sz-trip.com/uploads/20220818/e02af6e8bf9170060ed7295d367d72c1.png" mode="widthFix"></image>
<view>文化配送</view> <view>文化配送</view>
</view> --> </view> -->
<!-- <view bindtap="gotoUrl" data-event="cloud_click" data-title="云上观展" <view bindtap="gotoUrl" data-event="cloud_click" data-title="云上观展"
data-url="https://m.cloud.sz-trip.com/CloudPerform2022" class="pbservice-item"> --> data-url="https://m.cloud.sz-trip.com/CloudPerform2022" class="pbservice-item">
<!-- <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb13.png" mode="widthFix"></image> <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb13.png" mode="widthFix"></image>
<view>云上观展</view> --> <view>云上观展</view> -->
<!-- 元旦修改 --> <!-- 元旦修改 -->
<!-- <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/springFestival2024/ysgz.png" mode="widthFix"></image> <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/springFestival2024/syt.png" mode="widthFix"></image>
<view>云上观展</view> <view>云上观展</view>
</view> --> </view>
<view bindtap="gotoPath" data-event="review_click" data-title="精彩回顾" data-path="/pages/pbService/activity/index" <view bindtap="gotoPath" data-event="review_click" data-title="精彩回顾" data-path="/pages/pbService/activity/index"
class="pbservice-item"> class="pbservice-item">
<!-- <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb8.png" mode="widthFix"></image> <!-- <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb8.png" mode="widthFix"></image>

33
pages/index/index.wxss
View File

@ -2,6 +2,9 @@
/* 元旦修改 */ /* 元旦修改 */
page { page {
background: #8F1D22; background: #8F1D22;
padding-bottom: 36.67rpx;
background-image: url("https://static.ticket.sz-trip.com/jundaosuzhou/images/springFestival2024/indexBg.png");
background-size: 100% 100%;
/* background: #FFF6E8; */ /* background: #FFF6E8; */
} }
.swiper,.swiper image { .swiper,.swiper image {
@ -54,7 +57,8 @@ page {
} }
.top-box .weather-num,.top-box .weather { .top-box .weather-num,.top-box .weather {
flex-shrink: 0; flex-shrink: 0;
color: #333; /* color: #333; */
color: #FFF0DB;
} }
.top-box .weather-num { .top-box .weather-num {
font-size: 29rpx; font-size: 29rpx;
@ -190,7 +194,8 @@ page {
margin: 50rpx 0; margin: 50rpx 0;
width: 100%; width: 100%;
height: 154rpx; height: 154rpx;
border-radius: 77rpx; border-radius: 20rpx;
/* border-radius: 77rpx; */
overflow: hidden; overflow: hidden;
margin-bottom: 63rpx; margin-bottom: 63rpx;
position: relative; position: relative;
@ -376,7 +381,8 @@ page {
width: 337rpx; width: 337rpx;
} }
.hot-item { .hot-item {
background: white; /* background: white; */
background: #F9F1DB;
box-shadow: -1rpx 1rpx 16rpx 0px rgba(6, 0, 1, 0.1); box-shadow: -1rpx 1rpx 16rpx 0px rgba(6, 0, 1, 0.1);
border-radius: 15rpx; border-radius: 15rpx;
margin-bottom: 35rpx; margin-bottom: 35rpx;
@ -513,13 +519,22 @@ page {
} }
.more-btn-text { .more-btn-text {
text-align: center; text-align: center;
color: #0b898e; /* color: #0b898e;
font-size: 27rpx; font-size: 27rpx;
width: 200rpx; width: 200rpx;
line-height: 65rpx; line-height: 65rpx;
border: 1px solid #0b898e; border: 1px solid #0b898e;
border-radius: 33rpx; border-radius: 33rpx; */
margin: 20rpx auto; margin: 20rpx auto;
width: 200rpx;
height: 67rpx;
line-height: 67rpx;
border: 1px solid #FFEEDB;
border-radius: 7rpx;
font-size: 27rpx;
font-family: PingFang SC;
font-weight: 500;
color: #FFEEDB;
} }
.scroll-line { .scroll-line {
/* height: 6rpx; /* height: 6rpx;
@ -791,7 +806,7 @@ page {
height: 462rpx; height: 462rpx;
/* background: linear-gradient(-90deg, #FF9B6A, #D02E25); */ /* background: linear-gradient(-90deg, #FF9B6A, #D02E25); */
border-radius: 20rpx; border-radius: 20rpx;
padding: 22.67rpx 18rpx 15.33rpx; padding: 22.67rpx 18rpx 15.33rpx 0;
position: relative; position: relative;
} }
/* 元旦修改新增样式 */ /* 元旦修改新增样式 */
@ -804,6 +819,7 @@ page {
align-items: center; align-items: center;
height: 37px; height: 37px;
margin-left: -50rpx; margin-left: -50rpx;
z-index: 9;
} }
/* 元旦修改新增样式 */ /* 元旦修改新增样式 */
.xsth-time { .xsth-time {
@ -879,18 +895,19 @@ page {
/* 元旦修改新增样式 */ /* 元旦修改新增样式 */
.xpth-item { .xpth-item {
width: 413rpx; width: 413rpx;
height: 170rpx; height: 160rpx;
/* background: #FFFFFF; */ /* background: #FFFFFF; */
background-image: url("https://static.ticket.sz-trip.com/jundaosuzhou/images/springFestival2024/xpth-hBg.png"); background-image: url("https://static.ticket.sz-trip.com/jundaosuzhou/images/springFestival2024/xpth-hBg.png");
background-size: 100% 100%; background-size: 100% 100%;
border-radius: 20rpx; border-radius: 20rpx;
display: flex; display: flex;
margin-bottom: 10rpx;
/* padding: 5rpx; */ /* padding: 5rpx; */
} }
/* 元旦修改新增样式 */ /* 元旦修改新增样式 */
.xpth-item image { .xpth-item image {
width: 160rpx; width: 160rpx;
height: 170rpx; height: 160rpx;
background: #FFE7C0; background: #FFE7C0;
border-radius: 15rpx 0 0 15rpx; border-radius: 15rpx 0 0 15rpx;
/* margin-right: 15.33rpx; */ /* margin-right: 15.33rpx; */

17
pages/list/movieticket/list/info/index.js
View File

@ -1,5 +1,6 @@
// pages/list/movieticket/list/info/index.js // pages/list/movieticket/list/info/index.js
import commonApi from "../../../../../utils/https/common" import commonApi from "../../../../../utils/https/common"
import userApi from "../../../../../utils/https/user"
let app = getApp() let app = getApp()
Page({ Page({
@ -8,13 +9,20 @@ Page({
*/ */
data: { data: {
info:null, info:null,
showFlag:false showFlag:false,
token:''
}, },
/** /**
* 生命周期函数--监听页面加载 * 生命周期函数--监听页面加载
*/ */
onLoad: function (options) { onLoad: function (options) {
userApi.user_post("user/getMyInfo").then(res=>{
this.setData({
token:res.data.token
})
console.log(this.data.token);
})
commonApi._post("Cinema/getMovieDetail",{ commonApi._post("Cinema/getMovieDetail",{
show_id:options.id show_id:options.id
}).then(res=>{ }).then(res=>{
@ -28,6 +36,13 @@ Page({
console.log(showFlag) console.log(showFlag)
}) })
}, },
gotoWeb:function(e){
let item = e.currentTarget.dataset.item;
// app.globalData.weburl = 'https://m.cloud.sz-trip.com/MovieDetail?id='+item.third_id
wx.navigateTo({
url: '/pages/pbService/web/index?weburl='+encodeURIComponent('https://test.m.cloud.sz-trip.com/MovieDetail?id='+item.third_id+'&token='+this.data.token),
})
},
BroswerRecord:function(){ BroswerRecord:function(){
setTimeout(()=>{ setTimeout(()=>{
if(app.globalData.uuid){ if(app.globalData.uuid){

7
pages/list/movieticket/list/info/index.wxml
View File

@ -24,6 +24,9 @@
<!-- <view class="line"></view> --> <!-- <view class="line"></view> -->
</view> </view>
<view style="height:104rpx" wx:if="{{showFlag}}"></view> <view style="height:104rpx" wx:if="{{showFlag}}"></view>
<navigator url="../ticket/index?id={{info.third_id}}&title={{info.title}}" class="fixed-bottom"> <!-- <navigator url="../ticket/index?id={{info.third_id}}&title={{info.title}}" class="fixed-bottom">
<view class="order-btn">立即购票</view> <view class="order-btn">立即购票</view>
</navigator> </navigator> -->
<view catchtap="gotoWeb" class="fixed-bottom" data-item="{{info}}">
<view class="order-btn">立即购票</view>
</view>

1
pages/order/components/coupon/index.js
View File

@ -62,6 +62,7 @@ Component({
console.log("我用的原来的数据"); console.log("我用的原来的数据");
}else{ }else{
console.log("我用的新的数据"); console.log("我用的新的数据");
console.log('123123132',res.data);
if ( Object.keys(res.data).length!=0) { if ( Object.keys(res.data).length!=0) {
app.globalData.couponInfo = res.data app.globalData.couponInfo = res.data
this.setData({ this.setData({

1
pages/order/movie/index.js
View File

@ -26,6 +26,7 @@ Page({
* 生命周期函数--监听页面加载 * 生命周期函数--监听页面加载
*/ */
onLoad: function (options) { onLoad: function (options) {
console.log(JSON.parse(options));
app.globalData.couponInfo = null app.globalData.couponInfo = null
this.setData({ this.setData({
coupon:app.globalData.couponInfo coupon:app.globalData.couponInfo

71
pages/pbService/web/index.js
View File

@ -16,47 +16,48 @@ Page({
* 生命周期函数--监听页面加载 * 生命周期函数--监听页面加载
*/ */
onLoad: function (options) { onLoad: function (options) {
console.log('options',decodeURIComponent(options.weburl)) console.log('options',decodeURIComponent(options.weburl))
options.weburl = decodeURIComponent(options.weburl) options.weburl = decodeURIComponent(options.weburl)
if(options.weburl.indexOf('m.cloud.sz-trip.com')!=-1){ // if(options.weburl.indexOf('m.cloud.sz-trip.com')!=-1){
userApi.user_post("user/getMyInfo").then(res=>{ // userApi.user_post("user/getMyInfo").then(res=>{
let weburl = options.weburl // let weburl = options.weburl
if(weburl.indexOf('?')!=-1){ // if(weburl.indexOf('?')!=-1){
weburl += '&token='+res.data.token; // weburl += '&token='+res.data.token;
} // }
else { // else {
weburl += '?token='+res.data.token // weburl += '?token='+res.data.token
} // }
this.setData({ // this.setData({
info:res.data, // info:res.data,
webUrl:weburl // webUrl:weburl
}) // })
}) // })
} // }
else if(options.weburl.indexOf('m.jszhwlpt.com')!=-1 || options.weburl.indexOf('wechat.b2c.zj-trip.net')!=-1){ // else if(options.weburl.indexOf('m.jszhwlpt.com')!=-1 || options.weburl.indexOf('wechat.b2c.zj-trip.net')!=-1){
// 如果是去苏心游或者镇江的话 // // 如果是去苏心游或者镇江的话
userApi.user_post("user/getJumpThirdAppCode",{}).then(res=>{ // userApi.user_post("user/getJumpThirdAppCode",{}).then(res=>{
let weburl = options.weburl // let weburl = options.weburl
if(weburl.indexOf('?')!=-1){ // if(weburl.indexOf('?')!=-1){
weburl += '&original_sys_name=jdsz&auth_code='+res.data; // weburl += '&original_sys_name=jdsz&auth_code='+res.data;
} // }
else { // else {
weburl += '?original_sys_name=jdsz&auth_code='+res.data // weburl += '?original_sys_name=jdsz&auth_code='+res.data
} // }
this.setData({ // this.setData({
info:res.data, // info:res.data,
webUrl:weburl // webUrl:weburl
}) // })
}) // })
} // }
else { // else {
this.setData({ this.setData({
webUrl:options.weburl webUrl:options.weburl
}) })
} console.log('打印',this.data.webUrl);
// }
}, },
handleMessage(data) { handleMessage(data) {
console.log(data) console.log(data)
this.setData({ this.setData({
shareTitle:data.shareTitle, shareTitle:data.shareTitle,
shareUrl:data.shareUrl shareUrl:data.shareUrl

Write Preview
Loading…
Cancel
Save