From 11f41c8f73d6083723533e98b56977b52c0c046f Mon Sep 17 00:00:00 2001 From: jiazhipeng Date: Wed, 30 Apr 2025 11:17:08 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=B5=E5=BD=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/list/activitynew/index.js | 7 +++--- pages/user/retail/goods/index.js | 6 +++++- subPackages/index/index.js | 9 ++++---- subPackages/indexGQ/index.js | 16 ++++++++------ subPackages/indexs/index.js | 18 ++++++++++------ utils/util.js | 37 ++++++++++++++++++++++++++++++-- 6 files changed, 69 insertions(+), 24 deletions(-) diff --git a/pages/list/activitynew/index.js b/pages/list/activitynew/index.js index 2aef5ab..91e64e3 100644 --- a/pages/list/activitynew/index.js +++ b/pages/list/activitynew/index.js @@ -376,9 +376,10 @@ setCity(e){ gotoDetail: function (e) { let item = e.currentTarget.dataset.item; if (this.data.type == 4 && this.data.movieType != 2) { - wx.navigateTo({ - url: '/pages/list/movieticket/list/info/index?id=' + item.third_id - }) + // wx.navigateTo({ + // url: '/pages/list/movieticket/list/info/index?id=' + item.third_id + // }) + util.goMovieDetail(item.third_id || item.id) } else if (this.data.type == 4) { wx.navigateTo({ url: '/pages/list/movieticket/list/cinema/index?id=' + item.third_id diff --git a/pages/user/retail/goods/index.js b/pages/user/retail/goods/index.js index e0d1b15..33f0a15 100644 --- a/pages/user/retail/goods/index.js +++ b/pages/user/retail/goods/index.js @@ -1,5 +1,6 @@ // pages/user/retail/goods/index.js import spreadApi from "../../../../utils/https/common" +import utils from "../../../../utils/util" Page({ /** @@ -125,7 +126,10 @@ Page({ break; case "movie": // 产品 电影票 - return '/pages/list/movieticket/list/info/index?id='+item.third_id+'&title='+item.title; + let url = utils.goMovieDetail(item.third_id,item.title,true) + + // return '/pages/list/movieticket/list/info/index?id='+item.third_id+'&title='+item.title; + return url; break; case "cinema": // 产品 电影票 diff --git a/subPackages/index/index.js b/subPackages/index/index.js index 0fd2d47..835e1a0 100644 --- a/subPackages/index/index.js +++ b/subPackages/index/index.js @@ -488,10 +488,11 @@ Page({ tagGotoDetail: function(e) { let item = e.currentTarget.dataset.item; if (this.data.indexHot[this.data.hotIndex].type == 'movie') { - wx.navigateTo({ - url: '/pages/list/movieticket/list/info/index?id=' + item.third_id + '&title=' + - item.title, - }) + // wx.navigateTo({ + // url: '/pages/list/movieticket/list/info/index?id=' + item.third_id + '&title=' + + // item.title, + // }) + util.goMovieDetail(item.third_id, item.title) } else { util.gotoDetail(item) } diff --git a/subPackages/indexGQ/index.js b/subPackages/indexGQ/index.js index d5cf101..36eb873 100644 --- a/subPackages/indexGQ/index.js +++ b/subPackages/indexGQ/index.js @@ -335,9 +335,10 @@ Page({ let item = e.currentTarget.dataset.item; let type = this.data.hdrlNavList[this.data.hdrlNavIndex].type if (type == 'movie') { - wx.navigateTo({ - url: '/pages/list/movieticket/list/info/index?id=' + item.third_id - }) + // wx.navigateTo({ + // url: '/pages/list/movieticket/list/info/index?id=' + item.third_id + // }) + util.goMovieDetail(item.third_id) }else { wx.navigateTo({ url: '/pages/info/activityInfo/index?id=' + item.id, @@ -712,10 +713,11 @@ Page({ tagGotoDetail: function(e) { let item = e.currentTarget.dataset.item; if (this.data.indexHot[this.data.hotIndex].type == 'movie') { - wx.navigateTo({ - url: '/pages/list/movieticket/list/info/index?id=' + item.third_id + '&title=' + - item.title, - }) + // wx.navigateTo({ + // url: '/pages/list/movieticket/list/info/index?id=' + item.third_id + '&title=' + + // item.title, + // }) + util.goMovieDetail(item.third_id,item.title) } else { util.gotoDetail(item) } diff --git a/subPackages/indexs/index.js b/subPackages/indexs/index.js index 409e869..98632bd 100644 --- a/subPackages/indexs/index.js +++ b/subPackages/indexs/index.js @@ -311,9 +311,11 @@ Page({ let item = e.currentTarget.dataset.item; let type = this.data.hdrlNavList[this.data.hdrlNavIndex].type if (type == 'movie') { - wx.navigateTo({ - url: '/pages/list/movieticket/list/info/index?id=' + item.third_id - }) + // wx.navigateTo({ + // url: '/pages/list/movieticket/list/info/index?id=' + item.third_id + // }) + util.goMovieDetail(item.third_id) + }else { wx.navigateTo({ url: '/pages/info/activityInfo/index?id=' + item.id, @@ -676,10 +678,12 @@ Page({ tagGotoDetail: function(e) { let item = e.currentTarget.dataset.item; if (this.data.indexHot[this.data.hotIndex].type == 'movie') { - wx.navigateTo({ - url: '/pages/list/movieticket/list/info/index?id=' + item.third_id + '&title=' + - item.title, - }) + // wx.navigateTo({ + // url: '/pages/list/movieticket/list/info/index?id=' + item.third_id + '&title=' + + // item.title, + // }) + util.goMovieDetail(item.third_id,item.title) + } else { util.gotoDetail(item) } diff --git a/utils/util.js b/utils/util.js index 871c27e..f3bb4d6 100644 --- a/utils/util.js +++ b/utils/util.js @@ -291,8 +291,10 @@ const gotoDetail = (item,isPagePoint) =>{ break; case "movie": // 产品 电影票 + let tempUrl = 'https://m.cloud.sz-trip.com'+`/MovieInfo?id=${item.third_id || item.id}`+'&title='+item.title wx.navigateTo({ - url: '/pages/list/movieticket/list/info/index?id='+(item.third_id || item.id)+'&title='+item.title + url: '/pages/pbService/web/index?weburl=' + encodeURIComponent(tempUrl), + // url: '/pages/list/movieticket/list/info/index?id='+(item.third_id || item.id)+'&title='+item.title }) break; case "cinema": @@ -475,6 +477,35 @@ const pagePoint = function(data,type) { }).then(res=>{ }) } + +const goMovieDetail= function(id, title, needReturn) { + let tempUrl = 'https://m.cloud.sz-trip.com'+`/MovieInfo?id=${id}` + if (title) { + tempUrl += +'&title='+item.title + } + let url = '/pages/pbService/web/index?weburl=' + encodeURIComponent(tempUrl) + if (needReturn) { + return url + } + wx.navigateTo({ + url: '/pages/pbService/web/index?weburl=' + encodeURIComponent(tempUrl) + }) + // return '/pages/pbService/web/index?weburl=' + encodeURIComponent(tempUrl) +} + +const goMovieList= function(needReturn) { + let tempUrl = 'https://m.cloud.sz-trip.com'+`/MoviesChangShu` + let url = '/pages/pbService/web/index?weburl=' + encodeURIComponent(tempUrl) + if (needReturn) { + return url + } + wx.navigateTo({ + url: '/pages/pbService/web/index?weburl=' + encodeURIComponent(tempUrl) + }) + // return '/pages/pbService/web/index?weburl=' + encodeURIComponent(tempUrl) +} + + module.exports = { formatTime: formatTime, formatNumber: formatNumber, @@ -492,5 +523,7 @@ module.exports = { goKjOrder:goKjOrder, pagePoint: pagePoint, formatMing:formatMing, - formatHou:formatHou + formatHou:formatHou, + goMovieDetail: goMovieDetail, + goMovieList: goMovieList }