From c8d70ba8e3f14d8cc154da61f2121cadaba0905a Mon Sep 17 00:00:00 2001 From: Myth <981892160@qq.com> Date: Sat, 2 Apr 2022 17:03:39 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app.js | 7 +- pages/index/index.js | 23 ++++ pages/index/index.wxml | 106 ++++++------------ pages/index/index.wxss | 2 +- pages/info/activityInfo/index.js | 4 + pages/info/activityInfo/index.wxml | 2 +- pages/info/cardInfo/index.js | 3 +- pages/info/cardInfo/index.wxml | 3 +- pages/info/cardInfo/index.wxss | 3 + pages/info/foodProductInfo/index.wxml | 3 +- pages/info/foodProductInfo/index.wxss | 3 + pages/info/museumInfo/index.js | 1 + pages/info/museumInfo/index.wxml | 2 +- pages/info/museumInfo/index.wxss | 4 +- pages/info/postProductInfo/index.js | 1 + pages/info/postProductInfo/index.wxml | 6 +- pages/info/postProductInfo/index.wxss | 6 + pages/info/roadInfo/index.js | 3 + pages/info/roadInfo/index.wxml | 5 +- pages/info/roadInfo/index.wxss | 7 +- pages/info/sceneProductInfo/index.js | 1 + pages/info/sceneProductInfo/index.wxml | 2 +- pages/info/sceneProductInfo/index.wxss | 3 + pages/info/showInfo/index.wxml | 3 +- pages/info/showInfo/index.wxss | 3 + pages/list/card/index.js | 2 +- pages/list/feiyi/index.js | 4 + pages/list/feiyi/index.wxml | 2 +- pages/list/hotel/index.js | 2 +- pages/list/movieticket/list/ticket/index.js | 3 + pages/list/movieticket/list/ticket/index.wxml | 2 +- pages/list/museum/index.js | 3 +- pages/list/night/index.js | 2 +- pages/list/scene/index.js | 2 +- pages/list/store/index.js | 4 + pages/list/theatre/index.js | 6 + pages/login/index.js | 13 ++- pages/pbService/index.js | 12 +- pages/pbService/index.wxml | 18 +-- pages/search/index.js | 11 ++ pages/search/index.wxml | 4 +- pages/search/list/index.js | 10 +- pages/user/order/activityOrderInfo/index.wxml | 2 +- pages/user/order/couponOrderInfo/index.wxml | 2 +- pages/user/order/foodOrderInfo/index.wxml | 2 +- pages/user/order/hotelOrderInfo/index.wxml | 2 +- pages/user/order/lineOrderInfo/index.wxml | 2 +- pages/user/order/movieOrderInfo/index.wxml | 2 +- pages/user/order/museumOrderInfo/index.wxml | 2 +- pages/user/order/postOrderInfo/index.wxml | 4 +- pages/user/order/sceneOrderInfo/index.wxml | 2 +- pages/user/service/index.js | 3 +- pages/user/service/info/index.js | 3 + pages/user/service/list/index.js | 3 + utils/https.js | 4 +- utils/util.js | 65 ++++++++++- 56 files changed, 277 insertions(+), 127 deletions(-) diff --git a/app.js b/app.js index d962278..43567cb 100644 --- a/app.js +++ b/app.js @@ -22,7 +22,7 @@ App({ unique_key: "wechatxcx" }).then(res => { let data = JSON.parse(res.data); - data.isTest = data.isTest13?true:false; + data.isTest = data.isTest14?true:false; this.globalData.configJson = data }) @@ -195,6 +195,9 @@ App({ team_id:null, retailId:"", configJson:null, - prizeId:null + prizeId:null, + loginPageEvent:{ + "pages/list/message/index": 'message_login_' + } } }) \ No newline at end of file diff --git a/pages/index/index.js b/pages/index/index.js index 3f8f9e1..7d66ac5 100644 --- a/pages/index/index.js +++ b/pages/index/index.js @@ -35,6 +35,7 @@ Page({ smBannerIndex:0 }, onLoad: function (options) { + if(options.from){ app.globalData.from = options.from; } @@ -246,6 +247,9 @@ Page({ util.gotoDetail(item) }, gotoPath:function(e){ + if(e.currentTarget.dataset.event){ + this.pagePoint({event:e.currentTarget.dataset.event},1) + } if(e.currentTarget.dataset.title=='书香借阅'){ wx.navigateToMiniProgram({ appId: 'wx165d4f1727f6bdb0', @@ -267,6 +271,9 @@ Page({ } }, gotoUrl:function(e){ + if(e.currentTarget.dataset.event){ + this.pagePoint({event:e.currentTarget.dataset.event},1) + } let url = e.currentTarget.dataset.url; app.globalData.weburl = url; wx.navigateTo({ @@ -339,6 +346,11 @@ Page({ }, gotoDetail:function(e){ let item = e.currentTarget.dataset.item; + util.pagePoint({ + event:'recommend_click', + id:item.id, + type:item.type + },1) if(item.type=='travels'){ // 游记做特殊处理 其他都按照原来的来 wx.navigateTo({ @@ -360,6 +372,11 @@ Page({ if(this.data.isTest) return; let item = e.currentTarget.dataset.item; console.log(item) + this.pagePoint({ + event:"banner_click", + type:'banner', + id:item.id + },1) switch(item.jump_type){ case 0: break; @@ -551,6 +568,12 @@ Page({ }) } }, + pagePoint: function(e,type){ + util.pagePoint(e,type) + }, + onShow: function() { + this.pagePoint({event:'home_view'},1) + }, /** * 用户点击右上角分享 diff --git a/pages/index/index.wxml b/pages/index/index.wxml index 9636f6e..267a9ae 100644 --- a/pages/index/index.wxml +++ b/pages/index/index.wxml @@ -7,13 +7,13 @@ {{weather.max_temp}}° {{weather.weather}} - - - + 搜索想要的旅游产品或服务 @@ -40,53 +40,53 @@ --> - + 活动日历 - + 景点门票 - + 酒店住宿 - + 夜游苏州 - + 一卡游苏州 - + 场馆预约 - 非遗专卖 - 剧场演出 - 文创特产 - + 电影购票 - 特惠新品超值商品限时抢购 @@ -104,7 +104,7 @@ - + 精品线路带你轻松玩转苏州 @@ -140,77 +140,37 @@ - - + - - + - 更多 + 更多 - + 景区舒适度 - + 找厕所 - + 停车场 - + 安全服务 - - - - - - @@ -219,7 +179,7 @@ - + 投资导引图 @@ -227,11 +187,11 @@ 非遗传承 - + 文物查询 - + 在线鉴赏 @@ -239,20 +199,20 @@ 文化配送 --> - + 书香借阅 - + 博物馆查询 - + 团体预约 - + 精彩回顾 @@ -261,7 +221,7 @@ 廉洁地图 --> - + 文旅单位 @@ -279,7 +239,7 @@ - diff --git a/pages/index/index.wxss b/pages/index/index.wxss index f5e32f2..28e616b 100644 --- a/pages/index/index.wxss +++ b/pages/index/index.wxss @@ -28,7 +28,7 @@ flex: 1; width: 100%; height: 64rpx; - background: #F4F4F4; + background: rgba(255, 255, 255, 0.6); border-radius: 32rpx; display: flex; align-items: center; diff --git a/pages/info/activityInfo/index.js b/pages/info/activityInfo/index.js index 0137f04..e9e56b2 100644 --- a/pages/info/activityInfo/index.js +++ b/pages/info/activityInfo/index.js @@ -1,6 +1,7 @@ // pages/info/activityInfo/index.js import commonApi from "../../../utils/https/common" let app = getApp() +import util from '../../../utils/util' Page({ /** @@ -33,6 +34,9 @@ Page({ showShareFlag: !this.data.showShareFlag }) }, + pagePoint(e,type) { + util.pagePoint(e,type) + }, // 保存 save() { let url = this.data.shareImg, that = this; diff --git a/pages/info/activityInfo/index.wxml b/pages/info/activityInfo/index.wxml index 597d9b2..2070c7d 100644 --- a/pages/info/activityInfo/index.wxml +++ b/pages/info/activityInfo/index.wxml @@ -34,7 +34,7 @@ + wx:if="{{info && info.scene_data && info.scene_data.id}}" class="scene-box" catchtap="pagePoint" data-event='activity_detail_click' data-id='{{info.scene.data.id}}' data-type='scene'> diff --git a/pages/info/cardInfo/index.js b/pages/info/cardInfo/index.js index 30f80d7..f63926c 100644 --- a/pages/info/cardInfo/index.js +++ b/pages/info/cardInfo/index.js @@ -52,8 +52,6 @@ Page({ id: options.id }).then(res => { res.data.display_tags = (res.data.display_tags ? res.data.display_tags.split(",") : []).splice(0, 2); - - // 如果带有指定skuid的话 那么取指定的sku展示 if (options.skuid) { for (let i = 0; i < res.data.sku.length; i++) { @@ -70,6 +68,7 @@ Page({ item = Number(item); }) }) + res.data.flag = res.data.sku.find(item=>item.flag=='on')?res.data.flag:0 this.setData({ info: res.data }) diff --git a/pages/info/cardInfo/index.wxml b/pages/info/cardInfo/index.wxml index 9046095..a4036b1 100644 --- a/pages/info/cardInfo/index.wxml +++ b/pages/info/cardInfo/index.wxml @@ -51,7 +51,8 @@ ￥{{info.price/100}} - 立即预订 + 立即预订 + 该商品已下架 diff --git a/pages/info/cardInfo/index.wxss b/pages/info/cardInfo/index.wxss index 06f0335..e687f6b 100644 --- a/pages/info/cardInfo/index.wxss +++ b/pages/info/cardInfo/index.wxss @@ -366,6 +366,9 @@ page { border-radius: 39rpx; text-align: center; } +.btn.disable { + background: #ccc; +} .mask-content { position: absolute; diff --git a/pages/info/foodProductInfo/index.wxml b/pages/info/foodProductInfo/index.wxml index 75e7f7f..8465283 100644 --- a/pages/info/foodProductInfo/index.wxml +++ b/pages/info/foodProductInfo/index.wxml @@ -33,7 +33,8 @@ ￥{{item.price/100}}起 - 立即预订 + 立即预订 + 立即预订 diff --git a/pages/info/foodProductInfo/index.wxss b/pages/info/foodProductInfo/index.wxss index fd49a9a..4c609ce 100644 --- a/pages/info/foodProductInfo/index.wxss +++ b/pages/info/foodProductInfo/index.wxss @@ -165,6 +165,9 @@ page { font-weight: 500; width: 176rpx; } +.product-right .btn.disable { + background: #ccc; +} .box .product-item:last-child { border-bottom: none; } diff --git a/pages/info/museumInfo/index.js b/pages/info/museumInfo/index.js index 11417b4..5cf29b8 100644 --- a/pages/info/museumInfo/index.js +++ b/pages/info/museumInfo/index.js @@ -399,6 +399,7 @@ Page({ }) }, order: function () { + if(this.data.product.product.flag!=1 || this.data.product.sku.flag=='off') return; if(this.data.isGroup){ // 如果是团队预约的话 是需要判断是否需要审核的 commonApi.user_post("team_order/is_apply",{ diff --git a/pages/info/museumInfo/index.wxml b/pages/info/museumInfo/index.wxml index 1a77bfb..1a1123a 100644 --- a/pages/info/museumInfo/index.wxml +++ b/pages/info/museumInfo/index.wxml @@ -60,7 +60,7 @@ wx:if="{{info.product_venue && info.product_venue.sku && info.product_venue.sku.length>0}}"> - 参观预约 + 参观预约 diff --git a/pages/info/museumInfo/index.wxss b/pages/info/museumInfo/index.wxss index 0d5a8c1..838c4c4 100644 --- a/pages/info/museumInfo/index.wxss +++ b/pages/info/museumInfo/index.wxss @@ -91,7 +91,9 @@ background-color: #0B898E; border-radius: 0; } - +.fixed-btn .btn.disable { + background: #CCCCCC !important; +} .menu-box { display: flex; align-items: center; diff --git a/pages/info/postProductInfo/index.js b/pages/info/postProductInfo/index.js index 61be271..e5be626 100644 --- a/pages/info/postProductInfo/index.js +++ b/pages/info/postProductInfo/index.js @@ -60,6 +60,7 @@ Page({ let sku = res.data.sku.find(item=>item.id==options.skuid); res.data.sku = [sku]; } + res.data.flag = res.data.sku.find(item=>item.flag=='on')?res.data.flag:0 this.setData({ info:res.data }) diff --git a/pages/info/postProductInfo/index.wxml b/pages/info/postProductInfo/index.wxml index b7a234f..0c54d05 100644 --- a/pages/info/postProductInfo/index.wxml +++ b/pages/info/postProductInfo/index.wxml @@ -80,7 +80,8 @@ 加入购物车 - 立即预订 + 立即预订 + 该商品已下架 @@ -110,7 +111,8 @@ - {{skuFlag=='cart'?'确认':'立即购买'}} + {{skuFlag=='cart'?'确认':'立即购买'}} + 该商品已下架 diff --git a/pages/info/postProductInfo/index.wxss b/pages/info/postProductInfo/index.wxss index a61b3fc..d03a1ea 100644 --- a/pages/info/postProductInfo/index.wxss +++ b/pages/info/postProductInfo/index.wxss @@ -379,6 +379,9 @@ page { .btns .btn:nth-child(2){ border-radius: 0 39rpx 39rpx 0; } +.btns .btn.disable { + background: #ccc; +} .mask-content { position: absolute; left: 0; @@ -500,6 +503,9 @@ page { font-size: 33rpx; font-weight: 500; } +.mask-btn.disable { + background: #ccc; +} /* .icon-xin,.icon-shoucang { position: absolute; right: 20rpx; diff --git a/pages/info/roadInfo/index.js b/pages/info/roadInfo/index.js index 258dfe8..d18a353 100644 --- a/pages/info/roadInfo/index.js +++ b/pages/info/roadInfo/index.js @@ -45,6 +45,7 @@ Page({ id: options.id }).then(res => { res.data.display_tags = (res.data.display_tags ? res.data.display_tags.split(",") : []).splice(0, 2); + if (options.skuid) { let sku = res.data.sku.find(item => item.id == options.skuid); res.data.sku = [sku]; @@ -52,6 +53,8 @@ Page({ retailSkuId: options.skuid }) } + res.data.flag = res.data.sku.find(item=>item.flag=='on')?res.data.flag:0 + this.setData({ info: res.data }) diff --git a/pages/info/roadInfo/index.wxml b/pages/info/roadInfo/index.wxml index d3625c7..dc0b769 100644 --- a/pages/info/roadInfo/index.wxml +++ b/pages/info/roadInfo/index.wxml @@ -85,12 +85,13 @@ 查看全部点评 - + 客服 - 立即预订 + 立即预订 + 该商品已下架 diff --git a/pages/info/roadInfo/index.wxss b/pages/info/roadInfo/index.wxss index 96f30f8..991d6dd 100644 --- a/pages/info/roadInfo/index.wxss +++ b/pages/info/roadInfo/index.wxss @@ -163,6 +163,9 @@ page { text-align: center; margin-top: 20rpx; } +.product-right .btn.disable { + background: #ccc; +} .product-info .subtitle { font-size: 24rpx; line-height: 36rpx; @@ -360,7 +363,9 @@ page { border-radius: 39rpx; text-align: center; } - +.btn.disable { + background: #ccc; +} .mask-content { position: absolute; left: 0; diff --git a/pages/info/sceneProductInfo/index.js b/pages/info/sceneProductInfo/index.js index 76e5ca5..162e8cd 100644 --- a/pages/info/sceneProductInfo/index.js +++ b/pages/info/sceneProductInfo/index.js @@ -182,6 +182,7 @@ Page({ }) }, order: function (e) { + if(e.currentTarget.dataset.disable==1) return; app.globalData.couponInfo = null; app.globalData.retailId = this.data.retailId; // let sku = e.currentTarget.dataset.sku,product = e.currentTarget.dataset.product; diff --git a/pages/info/sceneProductInfo/index.wxml b/pages/info/sceneProductInfo/index.wxml index 2576b75..8f28fee 100644 --- a/pages/info/sceneProductInfo/index.wxml +++ b/pages/info/sceneProductInfo/index.wxml @@ -44,7 +44,7 @@ ￥{{sku.price?sku.price/100:0}}起 - 立即预订 + 立即预订 diff --git a/pages/info/sceneProductInfo/index.wxss b/pages/info/sceneProductInfo/index.wxss index 371522a..a5d86da 100644 --- a/pages/info/sceneProductInfo/index.wxss +++ b/pages/info/sceneProductInfo/index.wxss @@ -153,6 +153,9 @@ page { font-weight: 500; width: 176rpx; } +.product-right .btn.disable { + background: #ccc; +} .box .product-item:last-child { border-bottom: none; } diff --git a/pages/info/showInfo/index.wxml b/pages/info/showInfo/index.wxml index 532cc16..28f7ff5 100644 --- a/pages/info/showInfo/index.wxml +++ b/pages/info/showInfo/index.wxml @@ -27,5 +27,6 @@ - 立即预约 + 立即预约 + 该商品已下架 \ No newline at end of file diff --git a/pages/info/showInfo/index.wxss b/pages/info/showInfo/index.wxss index 17e4bc5..f6bdada 100644 --- a/pages/info/showInfo/index.wxss +++ b/pages/info/showInfo/index.wxss @@ -80,4 +80,7 @@ page { color: #fff; font-size: 31rpx; font-weight: 500; +} +.fixed-bottom .btn.disable { + background: #ccc; } \ No newline at end of file diff --git a/pages/list/card/index.js b/pages/list/card/index.js index eeabe70..0fd23c2 100644 --- a/pages/list/card/index.js +++ b/pages/list/card/index.js @@ -19,7 +19,7 @@ Page({ }, gotoDetail:function(e){ let item = e.currentTarget.dataset.item; - util.gotoDetail(item); + util.gotoDetail(item,1); }, getList:function(){ let list = this.data.list; diff --git a/pages/list/feiyi/index.js b/pages/list/feiyi/index.js index fffbcf6..3743002 100644 --- a/pages/list/feiyi/index.js +++ b/pages/list/feiyi/index.js @@ -1,5 +1,6 @@ // pages/list/feiyi/index.js import commonApi from "../../../utils/https/common" +import util from '../../../utils/util' Page({ /** @@ -16,6 +17,9 @@ Page({ onLoad: function (options) { this.getList() }, + pagePoint(e){ + util.pagePoint(e) + }, getList:function(){ let list = this.data.list; if(list.length>=this.data.total) return; diff --git a/pages/list/feiyi/index.wxml b/pages/list/feiyi/index.wxml index 940a461..b32e695 100644 --- a/pages/list/feiyi/index.wxml +++ b/pages/list/feiyi/index.wxml @@ -1,7 +1,7 @@ - + diff --git a/pages/list/hotel/index.js b/pages/list/hotel/index.js index 304f490..8b539e8 100644 --- a/pages/list/hotel/index.js +++ b/pages/list/hotel/index.js @@ -89,7 +89,7 @@ Page({ }, gotoDetail:function(e){ let item = e.currentTarget.dataset.item; - util.gotoDetail(item); + util.gotoDetail(item,1); }, getList:function(){ let list = this.data.list; diff --git a/pages/list/movieticket/list/ticket/index.js b/pages/list/movieticket/list/ticket/index.js index f852b08..a368215 100644 --- a/pages/list/movieticket/list/ticket/index.js +++ b/pages/list/movieticket/list/ticket/index.js @@ -25,6 +25,9 @@ Page({ /** * 生命周期函数--监听页面加载 */ + pagePoint(e) { + util.pagePoint(e) + }, onLoad: function (options) { this.setData({ id:options.id, diff --git a/pages/list/movieticket/list/ticket/index.wxml b/pages/list/movieticket/list/ticket/index.wxml index 55e4b3c..de209c1 100644 --- a/pages/list/movieticket/list/ticket/index.wxml +++ b/pages/list/movieticket/list/ticket/index.wxml @@ -32,7 +32,7 @@ {{item.distanceText}} - + {{schedule.show_time}} {{schedule.show_version}} ¥{{schedule.price/100}} diff --git a/pages/list/museum/index.js b/pages/list/museum/index.js index 80def5a..10094ef 100644 --- a/pages/list/museum/index.js +++ b/pages/list/museum/index.js @@ -20,8 +20,7 @@ Page({ }, gotoDetail:function(e){ let item = e.currentTarget.dataset.item; - - util.gotoDetail(item); + util.gotoDetail(item,1); }, search:function(e){ this.setData(e.detail); diff --git a/pages/list/night/index.js b/pages/list/night/index.js index bc70a1a..bb6c56b 100644 --- a/pages/list/night/index.js +++ b/pages/list/night/index.js @@ -56,7 +56,7 @@ Page({ }, gotoDetail:function(e){ let item = e.currentTarget.dataset.item; - util.gotoDetail(item); + util.gotoDetail(item,1); }, /** diff --git a/pages/list/scene/index.js b/pages/list/scene/index.js index 2318c38..a7c5971 100644 --- a/pages/list/scene/index.js +++ b/pages/list/scene/index.js @@ -51,7 +51,7 @@ Page({ }, gotoDetail:function(e){ let item = e.currentTarget.dataset.item; - util.gotoDetail(item); + util.gotoDetail(item,1); }, getList:function(){ let list = this.data.list; diff --git a/pages/list/store/index.js b/pages/list/store/index.js index 7f7812e..0c61a70 100644 --- a/pages/list/store/index.js +++ b/pages/list/store/index.js @@ -31,6 +31,10 @@ Page({ }, gotoDetail:function(e){ let item = e.currentTarget.dataset.item; + util.pagePoint({ + event: 'legacy_detail_click', + id:item.id + },1) util.gotoDetail(item); }, getList(){ diff --git a/pages/list/theatre/index.js b/pages/list/theatre/index.js index 7f95cb7..5d90f48 100644 --- a/pages/list/theatre/index.js +++ b/pages/list/theatre/index.js @@ -35,6 +35,12 @@ Page({ }, gotoDetail:function(e){ let item = e.currentTarget.dataset.item; + util.pagePoint({ + event: 'show_detail_click', + param: { + id:item.id + } + },1) util.gotoDetail(item) }, getList:function(){ diff --git a/pages/login/index.js b/pages/login/index.js index 248f073..70ab582 100644 --- a/pages/login/index.js +++ b/pages/login/index.js @@ -1,6 +1,7 @@ // pages/login/index.js import user from "../../utils/https/user.js" import https from "../../utils/https.js" +import util from '../../utils/util' var app = getApp() Page({ @@ -9,7 +10,8 @@ Page({ */ data: { err:null, - canIUseGetUserProfile:false + canIUseGetUserProfile:false, + event: '' }, /** @@ -21,8 +23,17 @@ Page({ canIUseGetUserProfile: true }) } + let page = getCurrentPages().reverse().find(item=>item.route && item.route.indexOf('login/index')==-1); + if(page && page.route && app.globalData.loginPageEvent[page.route]){ + this.setData({ + event:app.globalData.loginPageEvent[page.route] + }) + util.pagePoint({event:app.globalData.loginPageEvent[page.route]+'enter'},1) + } + console.log() }, cancel:function(){ + util.pagePoint({event:this.data.event+'cancel'},1) wx.reLaunch({ url: '/pages/index/index', }) diff --git a/pages/pbService/index.js b/pages/pbService/index.js index 4bc5d05..bd4ac96 100644 --- a/pages/pbService/index.js +++ b/pages/pbService/index.js @@ -1,6 +1,7 @@ // pages/pbService/index.js import commonApi from "../../utils/https/common" let app = getApp() +import util from '../../utils/util' Page({ /** @@ -26,6 +27,9 @@ Page({ }) }, gotoPath:function(e){ + if(e.currentTarget.dataset.event){ + util.pagePoint({event:e.currentTarget.dataset.event},1) + } wx.navigateTo({ url: e.currentTarget.dataset.path, }) @@ -39,14 +43,20 @@ Page({ }) } }, - jiesongji:function(){ + jiesongji:function(e){ if(!this.data.jsj) return; + if(e.currentTarget.dataset.event){ + util.pagePoint({event:e.currentTarget.dataset.event},1) + } wx.navigateToMiniProgram({ appId: this.data.jsj, page:"page/home/webview/webview?hideShare=0&src=https%3A%2F%2Fopen.weixin.qq.com%2Fconnect%2Foauth2%2Fauthorize%3Fappid%3Dwx3827070276e49e30%26redirect_uri%3Dhttps%3A%2F%2Fwx.17u.cn%2Fflight%2Fgetopenid.html%3Furl%3Dhttps%25253A%25252F%25252Fwx.17u.cn%25252Finternalcarrebornwechat%25252Fview%25252Fmain.html%252523%25252FspecialCarIndex%25252FinstantCar%25253Frefid%25253D1563845199%26showwxpaytitle%3D1%26response_type%3Dcode%26scope%3Dsnsapi_base%26state%3D123%26connect_redirect%3D1%23wechat_redirect" }) }, gotoUrl:function(e){ + if(e.currentTarget.dataset.event){ + util.pagePoint({event:e.currentTarget.dataset.event},1) + } let url = e.currentTarget.dataset.url; app.globalData.weburl = url; wx.navigateTo({ diff --git a/pages/pbService/index.wxml b/pages/pbService/index.wxml index 134c168..ac42ddb 100644 --- a/pages/pbService/index.wxml +++ b/pages/pbService/index.wxml @@ -8,23 +8,23 @@ 苏康码 --> - + 安全服务 - + 找厕所 - + 景区舒适度 - + 体育场馆 - + 垃圾分类 @@ -39,19 +39,19 @@ 实时公交 --> - + 停车场 - + 公共自行车 - + 接送机 - + P+R停车场 diff --git a/pages/search/index.js b/pages/search/index.js index 5ca72a5..cb64525 100644 --- a/pages/search/index.js +++ b/pages/search/index.js @@ -1,5 +1,6 @@ // pages/search/index.js import commonApi from "../../utils/https/common" +import util from '../../utils/util' Page({ /** @@ -22,6 +23,9 @@ Page({ }) }) }, + pagePoint: function(e,type){ + util.pagePoint(e,type) + }, inputKeyword:function(e){ this.setData({ keyword:e.detail.value @@ -53,9 +57,16 @@ Page({ searchHot:function(e){ let item = e.currentTarget.dataset.item; this.setHis(item) + this.pagePoint({ + event:e.currentTarget.dataset.event, + param: { + keyword:item + } + },1) wx.navigateTo({ url: 'list/index?keyword='+item, }) + }, // 设置历史记录 setHis:function(keyword){ diff --git a/pages/search/index.wxml b/pages/search/index.wxml index fe5136e..e63f168 100644 --- a/pages/search/index.wxml +++ b/pages/search/index.wxml @@ -10,11 +10,11 @@ 搜索历史 - {{item}} + {{item}} 热门搜索 - + {{index+1}} {{item.name}} diff --git a/pages/search/list/index.js b/pages/search/list/index.js index 42619d1..e14d9c6 100644 --- a/pages/search/list/index.js +++ b/pages/search/list/index.js @@ -86,6 +86,11 @@ Page({ }, gotoDetail:function(e){ let item = e.currentTarget.dataset.item; + this.pagePoint({ + event:'search_result_click', + id:item.ext.id, + type:item.type + },1) if(item.type=='travels'){ // 游记做特殊处理 其他都按照原来的来 wx.navigateTo({ @@ -171,7 +176,10 @@ Page({ * 生命周期函数--监听页面显示 */ onShow: function () { - + this.pagePoint({event:'search_result_view'},1) + }, + pagePoint: function(e,type){ + util.pagePoint(e,type) }, /** diff --git a/pages/user/order/activityOrderInfo/index.wxml b/pages/user/order/activityOrderInfo/index.wxml index 04741d0..fe34272 100644 --- a/pages/user/order/activityOrderInfo/index.wxml +++ b/pages/user/order/activityOrderInfo/index.wxml @@ -3,7 +3,7 @@ -{{productState[info.order_product_list[0].state]}} +{{info.state_text}} diff --git a/pages/user/order/couponOrderInfo/index.wxml b/pages/user/order/couponOrderInfo/index.wxml index 22c7321..3055269 100644 --- a/pages/user/order/couponOrderInfo/index.wxml +++ b/pages/user/order/couponOrderInfo/index.wxml @@ -3,7 +3,7 @@ -{{productState[info.order_product_list[0].state]}} +{{info.state_text}} diff --git a/pages/user/order/foodOrderInfo/index.wxml b/pages/user/order/foodOrderInfo/index.wxml index ba0d726..30ece10 100644 --- a/pages/user/order/foodOrderInfo/index.wxml +++ b/pages/user/order/foodOrderInfo/index.wxml @@ -3,7 +3,7 @@ -{{productState[info.order_product_list[0].state]}} +{{info.state_text}} diff --git a/pages/user/order/hotelOrderInfo/index.wxml b/pages/user/order/hotelOrderInfo/index.wxml index 304d2fa..5d14b9a 100644 --- a/pages/user/order/hotelOrderInfo/index.wxml +++ b/pages/user/order/hotelOrderInfo/index.wxml @@ -3,7 +3,7 @@ -{{orderState[info.state]}} +{{info.state_text}} diff --git a/pages/user/order/lineOrderInfo/index.wxml b/pages/user/order/lineOrderInfo/index.wxml index fa23281..728b55d 100644 --- a/pages/user/order/lineOrderInfo/index.wxml +++ b/pages/user/order/lineOrderInfo/index.wxml @@ -3,7 +3,7 @@ -{{orderState[info.state]}} +{{info.state_text}} diff --git a/pages/user/order/movieOrderInfo/index.wxml b/pages/user/order/movieOrderInfo/index.wxml index e5a57fe..aa385b4 100644 --- a/pages/user/order/movieOrderInfo/index.wxml +++ b/pages/user/order/movieOrderInfo/index.wxml @@ -3,7 +3,7 @@ -{{productState[info.order_product_list[0].state]}} +{{info.state_text}} diff --git a/pages/user/order/museumOrderInfo/index.wxml b/pages/user/order/museumOrderInfo/index.wxml index 9b7d80f..18db481 100644 --- a/pages/user/order/museumOrderInfo/index.wxml +++ b/pages/user/order/museumOrderInfo/index.wxml @@ -3,7 +3,7 @@ -{{info.orderStateText || productState[info.order_product_list[0].state]}} +{{info.state_text}} diff --git a/pages/user/order/postOrderInfo/index.wxml b/pages/user/order/postOrderInfo/index.wxml index f3f0d4c..329d809 100644 --- a/pages/user/order/postOrderInfo/index.wxml +++ b/pages/user/order/postOrderInfo/index.wxml @@ -2,7 +2,7 @@ -{{!isRefund && info.stateNums.WAIT_DELIVERY>0?"已发货":(!isRefund && info.stateNums.WAIT_POST>0?"待发货":orderState[info.state])}} +{{info.state_text}} 您的退款已成功，退款金额预计在1-7个工作日内退还到您支付的账户 您已成功发起退款申请，请耐心等待 @@ -26,7 +26,7 @@ 邮费：{{item.post_fee==0?'包邮':('￥'+item.post_fee/100)}} 实付：￥{{item.paid_money/100}} - {{productState[item.state]}} + {{item.state_text}} 商品总价 diff --git a/pages/user/order/sceneOrderInfo/index.wxml b/pages/user/order/sceneOrderInfo/index.wxml index 969769e..dbaaa16 100644 --- a/pages/user/order/sceneOrderInfo/index.wxml +++ b/pages/user/order/sceneOrderInfo/index.wxml @@ -3,7 +3,7 @@ -{{productState[info.order_product_list[0].state]}} +{{info.state_text}} diff --git a/pages/user/service/index.js b/pages/user/service/index.js index c5656d4..214336e 100644 --- a/pages/user/service/index.js +++ b/pages/user/service/index.js @@ -1,5 +1,6 @@ // pages/user/service/index.js import commonApi from "../../../utils/https/common" +import util from '../../../utils/util' Page({ /** @@ -73,7 +74,7 @@ Page({ * 生命周期函数--监听页面显示 */ onShow: function () { - + }, /** diff --git a/pages/user/service/info/index.js b/pages/user/service/info/index.js index b12d0d6..19f1e03 100644 --- a/pages/user/service/info/index.js +++ b/pages/user/service/info/index.js @@ -29,6 +29,9 @@ Page({ } }, showService:function(){ + util.pagePoint({ + event:'customer_service_human_click' + },1) wx.showModal({ title: '提示', content: '呼叫人工客服\n0512-66555111', diff --git a/pages/user/service/list/index.js b/pages/user/service/list/index.js index fcfc267..8ee49b6 100644 --- a/pages/user/service/list/index.js +++ b/pages/user/service/list/index.js @@ -49,6 +49,9 @@ Page({ this.getList(); }, showService:function(){ + util.pagePoint({ + event:'customer_service_human_click' + },1) wx.showModal({ title: '提示', content: '呼叫人工客服\n0512-66555111', diff --git a/utils/https.js b/utils/https.js index ffc5a32..731bcb7 100644 --- a/utils/https.js +++ b/utils/https.js @@ -1,8 +1,8 @@ var app = getApp(); import util from "../utils/util" // import userApi from "../utils/https/user.js"; -// const baseUrl = "https://test.api.cloud.sz-trip.com/api/"; -const baseUrl = "https://api.cloud.sz-trip.com/api/"; +const baseUrl = "https://test.api.cloud.sz-trip.com/api/"; +// const baseUrl = "https://api.cloud.sz-trip.com/api/"; const orders = ['','weight','distance','sale_number','sale_price','price']; //封装GET请求 function _get(url,data) { diff --git a/utils/util.js b/utils/util.js index 8fc06d8..dbb7b12 100644 --- a/utils/util.js +++ b/utils/util.js @@ -158,46 +158,81 @@ const checkLocation = function(){ }) }) } -const gotoDetail = (item) =>{ +const gotoDetail = (item,isPagePoint) =>{ wx.removeStorageSync('prizeId'); + let pagePointData = { + param: { + id: item.scene_id || item.id, + }, + type: item.type + } switch(item.type){ case "tenscenic": + wx.navigateTo({ url: '/pages/info/foodInfo/index?id='+(item.scene_id || item.id) }) break; case "ticket": // 产品 产品票务 + if(isPagePoint){ + pagePointData.event='ticket_detail_click' + pagePoint(pagePointData) + } wx.navigateTo({ url: '/pages/info/sceneProductInfo/index?id='+(item.scene_id || item.id) }) break; case "hotel": // 产品 酒店 + if(isPagePoint){ + pagePointData.event='hotel_detail_click' + pagePoint(pagePointData) + } wx.navigateTo({ url: '/pages/info/hotelProductInfo/index?id='+(item.scene_id || item.id) }) break; case "post": // 产品 产品发货的 + if(isPagePoint){ + pagePointData.event='legacy_detail_click' + pagePointData.id = item.id + pagePoint(pagePointData) + } wx.navigateTo({ url: '/pages/info/postProductInfo/index?id='+item.id }) break; case "line": // 产品 线路 + if(isPagePoint){ + pagePointData.event='route_detail_click' + pagePointData.id = item.id + pagePoint(pagePointData) + } wx.navigateTo({ url: '/pages/info/roadInfo/index?id='+item.id }) break; case "coupon": // 产品 卡券 + if(isPagePoint){ + pagePointData.event='card_detail_click' + pagePointData.id = item.id + pagePoint(pagePointData) + } wx.navigateTo({ url: '/pages/info/cardInfo/index?id='+item.id }) break; case "show": // 产品 演出 + if(isPagePoint){ + pagePointData.event='show_detail_click' + pagePointData.id = item.id + pagePoint(pagePointData) + } wx.navigateTo({ url: '/pages/info/showInfo/index?id='+item.id }) @@ -228,18 +263,30 @@ const gotoDetail = (item) =>{ break; case "scenic": // 场景 景点 + if(isPagePoint){ + pagePointData.event='ticket_detail_click' + pagePoint(pagePointData) + } wx.navigateTo({ url: '/pages/info/sceneProductInfo/index?id='+(item.scene_id || item.id) }) break; case "room": // 场景 酒店 + if(isPagePoint){ + pagePointData.event='hotel_detail_click' + pagePoint(pagePointData) + } wx.navigateTo({ url: '/pages/info/hotelProductInfo/index?id='+(item.scene_id || item.id) }) break; case "venue": // 场景 场馆 + if(isPagePoint){ + pagePointData.event='museum_detail_click' + pagePoint(pagePointData) + } wx.navigateTo({ url: '/pages/info/museumInfo/index?id='+(item.scene_id || item.id) }) @@ -358,6 +405,19 @@ const goKjOrder = function(item) { }) }) } +const page_point = function(data,type) { + if(type!=1) { + data = data.currentTarget.dataset + } + commonApi._post('browse/page_point',{ + event: data.event, + param: data.param, + id: data.id, + userid: wx.getStorageSync('jstrip_userid'), + type: data.type + }).then(res=>{ + }) +} module.exports = { formatTime: formatTime, formatNumber: formatNumber, @@ -372,5 +432,6 @@ module.exports = { gotoDetail:gotoDetail, gotoOrder:gotoOrder, orderMoreTime:orderMoreTime, - goKjOrder:goKjOrder + goKjOrder:goKjOrder, + pagePoint: page_point }