From cf44ff0f9ef3678e919534e328efb14147198f3f Mon Sep 17 00:00:00 2001
From: Myth <981892160@qq.com>
Date: Tue, 12 Apr 2022 10:18:00 +0800
Subject: [PATCH] 1
---
app.js | 2 +-
pages/group/index.wxml | 4 +--
pages/group/info/index.wxml | 2 +-
pages/index/index.js | 9 ++++---
pages/index/index.wxml | 14 +++++------
pages/info/cardInfo/index.js | 25 ++++++++++++++++++-
pages/info/postProductInfo/index.js | 23 +++++++++++++++++
pages/info/postProductInfo/index.wxml | 4 +--
pages/info/roadInfo/index.js | 30 +++++++++++++++++++++--
pages/info/roadInfo/index.wxml | 2 +-
pages/info/sceneProductInfo/index.js | 34 +++++++++++++++++++++++---
pages/info/sceneProductInfo/index.wxml | 6 ++---
pages/list/feiyi/index.js | 8 +++++-
pages/list/feiyi/index.wxml | 2 +-
pages/list/road/index.js | 2 +-
pages/list/sale/index.js | 6 +++++
pages/list/store/index.js | 13 ++++++++--
pages/list/store/index.wxml | 2 +-
pages/list/techan/index.js | 9 ++++++-
pages/list/techan/index.wxml | 2 +-
pages/login/index.js | 12 +++++++--
pages/map/index.js | 4 ++-
pages/order/pay/index.js | 33 +++++++++++++++++++------
pages/order/pay/index.wxml | 30 +++++++++++++++++------
pages/order/pay/index.wxss | 9 ++++++-
pages/search/list/index.js | 7 ++++--
pages/user/cartlist/list.js | 8 +++++-
pages/user/service/info/index.js | 5 +++-
pages/user/user.js | 7 ++++++
pages/user/user.wxml | 32 ++++++++++++------------
utils/https.js | 24 ++++++++++++++++--
utils/util.js | 22 ++++++++---------
32 files changed, 306 insertions(+), 86 deletions(-)
diff --git a/app.js b/app.js
index 43567cb..3b05979 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.isTest14?true:false;
+ data.isTest = data.isTest15?true:false;
this.globalData.configJson = data
})
diff --git a/pages/group/index.wxml b/pages/group/index.wxml
index dc768bc..1a17067 100644
--- a/pages/group/index.wxml
+++ b/pages/group/index.wxml
@@ -8,7 +8,7 @@
{{item.title+item.sku_name}}
¥{{item.event_price/100}}
- ¥{{item.price/100}}
+ ¥{{item.price/100}}
@@ -27,7 +27,7 @@
¥{{item.event_price/100}}
- ¥{{item.price/100}}
+ ¥{{item.price/100}}
售罄
团购
diff --git a/pages/group/info/index.wxml b/pages/group/info/index.wxml
index 4034a78..7ca00c5 100644
--- a/pages/group/info/index.wxml
+++ b/pages/group/info/index.wxml
@@ -11,7 +11,7 @@
¥{{info.event_price/100}}
- ¥{{info.price/100}}
+ ¥{{info.price/100}}
详情 >
diff --git a/pages/index/index.js b/pages/index/index.js
index 7d66ac5..9fb3b9d 100644
--- a/pages/index/index.js
+++ b/pages/index/index.js
@@ -348,8 +348,10 @@ Page({
let item = e.currentTarget.dataset.item;
util.pagePoint({
event:'recommend_click',
- id:item.id,
- type:item.type
+ param: {
+ id:item.id,
+ type:item.type
+ }
},1)
if(item.type=='travels'){
// 游记做特殊处理 其他都按照原来的来
@@ -374,8 +376,7 @@ Page({
console.log(item)
this.pagePoint({
event:"banner_click",
- type:'banner',
- id:item.id
+ type:'banner'
},1)
switch(item.jump_type){
case 0:
diff --git a/pages/index/index.wxml b/pages/index/index.wxml
index 267a9ae..43ebed5 100644
--- a/pages/index/index.wxml
+++ b/pages/index/index.wxml
@@ -52,34 +52,34 @@
酒店住宿
-
+
夜游苏州
-
+
一卡游苏州
-
+
场馆预约
-
非遗专卖
-
剧场演出
-
文创特产
-
+
电影购票
diff --git a/pages/info/cardInfo/index.js b/pages/info/cardInfo/index.js
index f63926c..180b45d 100644
--- a/pages/info/cardInfo/index.js
+++ b/pages/info/cardInfo/index.js
@@ -98,6 +98,15 @@ Page({
sku: this.data.info.sku[0]
}
app.globalData.retailId = this.data.retailId;
+ util.pagePoint({
+ event:'product_order',
+ param:{
+ id:this.data.info.id,
+ type:this.data.info.type
+ }
+ },1)
+ wx.setStorageSync('login_from', 'product_order_login')
+ wx.setStorageSync('order_from', 'product_order_submit')
wx.navigateTo({
url: '/pages/order/card/index'
})
@@ -142,6 +151,13 @@ Page({
// 分享
share: function () {
if (!wx.getStorageSync("jstrip_token")) {
+ util.pagePoint({
+ event:'product_share_login',
+ param:{
+ id:this.data.info.id,
+ type:this.data.info.type
+ }
+ },1)
commonApi.user_post("user/getMyInfo", {}).then(res => {
})
@@ -172,8 +188,15 @@ Page({
title: '保存成功',
icon: "success"
})
+ util.pagePoint({
+ event:'product_order',
+ param:{
+ id:that.data.info.id,
+ type:that.data.info.type
+ }
+ },1)
that.setData({
- showShareFlag: !this.data.showShareFlag
+ showShareFlag: !that.data.showShareFlag
})
},
fail(res) {
diff --git a/pages/info/postProductInfo/index.js b/pages/info/postProductInfo/index.js
index e5be626..59e0bd0 100644
--- a/pages/info/postProductInfo/index.js
+++ b/pages/info/postProductInfo/index.js
@@ -3,6 +3,7 @@ let device = wx.getSystemInfoSync();
const ratio = device.windowWidth / 750;
import commonApi from "../../../utils/https/common"
import QRCode from '../../../utils/weapp-qrcode.js'
+import util from '../../../utils/util'
let app = getApp()
Page({
@@ -224,6 +225,15 @@ Page({
},
order:function(){
if(this.data.skuFlag=='order'){
+ util.pagePoint({
+ event:'product_order',
+ param:{
+ id:this.data.info.id,
+ type:this.data.info.type
+ }
+ },1)
+ wx.setStorageSync('login_from', 'product_order_login')
+ wx.setStorageSync('order_from', 'product_order_submit')
app.globalData.couponInfo = null;
// 购买
let product = [{
@@ -277,6 +287,11 @@ Page({
// 分享
share:function(){
if(!wx.getStorageSync("jstrip_token")){
+ util.pagePoint({
+ event:'product_share_login',
+ type:this.data.info.type,
+ id:this.data.info.id
+ },1)
commonApi.user_post("user/getMyInfo",{}).then(res=>{
})
@@ -310,6 +325,11 @@ Page({
that.setData({
showShareFlag:!this.data.showShareFlag
})
+ util.pagePoint({
+ event:'product_share_save',
+ type:that.data.info.type,
+ id:that.data.info.id
+ },1)
},
fail(res){
wx.showToast({
@@ -337,6 +357,9 @@ Page({
}
});
+ },
+ pagePoint: function(e) {
+ util.pagePoint(e)
},
// 绘制海报
drawImg:function(){
diff --git a/pages/info/postProductInfo/index.wxml b/pages/info/postProductInfo/index.wxml
index 0c54d05..5c1896a 100644
--- a/pages/info/postProductInfo/index.wxml
+++ b/pages/info/postProductInfo/index.wxml
@@ -69,7 +69,7 @@
-
+
客服
@@ -85,7 +85,7 @@
-
+
{{cartCount}}
diff --git a/pages/info/roadInfo/index.js b/pages/info/roadInfo/index.js
index d18a353..e65f076 100644
--- a/pages/info/roadInfo/index.js
+++ b/pages/info/roadInfo/index.js
@@ -3,6 +3,7 @@ let device = wx.getSystemInfoSync();
const ratio = device.windowWidth / 750;
import commonApi from "../../../utils/https/common"
import QRCode from '../../../utils/weapp-qrcode.js'
+import util from '../../../utils/util'
let app = getApp()
Page({
@@ -162,14 +163,32 @@ Page({
product: this.data.info
}
app.globalData.retailId = this.data.retailId;
+ util.pagePoint({
+ event:'product_order',
+ param:{
+ id:this.data.info.id,
+ type:this.data.info.type
+ }
+ },1)
+ wx.setStorageSync('login_from', 'product_order_login')
+ wx.setStorageSync('order_from', 'product_order_submit')
wx.navigateTo({
url: '/pages/order/road/index?id=' + this.data.info.id + (this.data.retailSkuId ? ('&skuid=' + this.data.retailSkuId) : '')
})
},
-
+ pagePoint:function(e){
+ util.pagePoint(e)
+ },
// 分享
share: function () {
if (!wx.getStorageSync("jstrip_token")) {
+ util.pagePoint({
+ event:'product_share_login',
+ param:{
+ id:that.data.info.id,
+ type:that.data.info.type
+ }
+ },1)
commonApi.user_post("user/getMyInfo", {}).then(res => {
})
@@ -201,8 +220,15 @@ Page({
icon: "success"
})
that.setData({
- showShareFlag: !this.data.showShareFlag
+ showShareFlag: !that.data.showShareFlag
})
+ util.pagePoint({
+ event:'product_share_save',
+ param:{
+ id:that.data.info.id,
+ type:that.data.info.type
+ }
+ },1)
},
fail(res) {
wx.showToast({
diff --git a/pages/info/roadInfo/index.wxml b/pages/info/roadInfo/index.wxml
index dc0b769..6e11237 100644
--- a/pages/info/roadInfo/index.wxml
+++ b/pages/info/roadInfo/index.wxml
@@ -86,7 +86,7 @@
-
+
客服
diff --git a/pages/info/sceneProductInfo/index.js b/pages/info/sceneProductInfo/index.js
index 162e8cd..5db666a 100644
--- a/pages/info/sceneProductInfo/index.js
+++ b/pages/info/sceneProductInfo/index.js
@@ -86,6 +86,7 @@ Page({
this.setData({
info: res.data
})
+ util.pagePoint({event:'scene_view',param:{type:res.data.type,id:res.data.id}},1)
this.BroswerRecord()
})
// 获取收藏的状态
@@ -175,6 +176,13 @@ Page({
bookingInfo: e.currentTarget.dataset.item.sku_model,
bookingInfoTitle: e.currentTarget.dataset.item.sku_name
})
+ util.pagePoint({
+ event:"scene_notice",
+ param:{
+ type:this.data.info.type,
+ id:this.data.info.id
+ }
+ },1)
},
closeMask: function () {
this.setData({
@@ -183,6 +191,15 @@ Page({
},
order: function (e) {
if(e.currentTarget.dataset.disable==1) return;
+ util.pagePoint({
+ event:'scene_order',
+ param:{
+ type:this.data.info.type,
+ id:this.data.info.id
+ }
+ },1)
+ wx.setStorageSync('login_from', 'scene_order_login')
+ wx.setStorageSync('order_from', 'scene_order_submit')
app.globalData.couponInfo = null;
app.globalData.retailId = this.data.retailId;
// let sku = e.currentTarget.dataset.sku,product = e.currentTarget.dataset.product;
@@ -191,12 +208,21 @@ Page({
url: '/pages/order/scene/index',
})
},
-
+ pagePoint: function(e){
+ util.pagePoint({
+ event:e.currentTarget.dataset.event,
+ param:{
+ type:this.data.info.type,
+ id:this.data.info.id
+ }
+ },1)
+ },
// 分享
share: function () {
if (!wx.getStorageSync("jstrip_token")) {
+ wx.setStorageSync('login_from', 'scene_share_login')
commonApi.user_post("user/getMyInfo", {}).then(res => {
-
+ }).catch(err=>{
})
return;
}
@@ -226,8 +252,9 @@ Page({
icon: "success"
})
that.setData({
- showShareFlag: !this.data.showShareFlag
+ showShareFlag: !that.data.showShareFlag
})
+ util.pagePoint({event:'scene_share_save',param:{type:that.data.info.type,id:that.data.info.id}},1)
},
fail(res) {
wx.showToast({
@@ -478,6 +505,7 @@ Page({
this.onShow()
}, 200)
}
+
},
/**
diff --git a/pages/info/sceneProductInfo/index.wxml b/pages/info/sceneProductInfo/index.wxml
index 8f28fee..df8613a 100644
--- a/pages/info/sceneProductInfo/index.wxml
+++ b/pages/info/sceneProductInfo/index.wxml
@@ -22,7 +22,7 @@
开园时间:{{info.open_time}}
- 优待政策 | 景点介绍
+ 优待政策 | 景点介绍
地址:{{info.address}}
@@ -59,10 +59,10 @@
这里空空如也,快去向大家提问吧!
- 去提问
+ 去提问
-
+
{{item.question_name}}
diff --git a/pages/list/feiyi/index.js b/pages/list/feiyi/index.js
index 3743002..dc2e6c5 100644
--- a/pages/list/feiyi/index.js
+++ b/pages/list/feiyi/index.js
@@ -18,7 +18,13 @@ Page({
this.getList()
},
pagePoint(e){
- util.pagePoint(e)
+ util.pagePoint({
+ event:e.currentTarget.dataset.event,
+ type: supplier,
+ param:{
+ id:e.currentTarget.dataset.id
+ }
+ },1)
},
getList:function(){
let list = this.data.list;
diff --git a/pages/list/feiyi/index.wxml b/pages/list/feiyi/index.wxml
index b32e695..407d87a 100644
--- a/pages/list/feiyi/index.wxml
+++ b/pages/list/feiyi/index.wxml
@@ -22,7 +22,7 @@
{{item.title}}
{{item.price/100}}
-
+ ¥{{item.market_price/100}}
diff --git a/pages/list/road/index.js b/pages/list/road/index.js
index e89911f..e8da960 100644
--- a/pages/list/road/index.js
+++ b/pages/list/road/index.js
@@ -61,7 +61,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/sale/index.js b/pages/list/sale/index.js
index afd00fe..a1ded7c 100644
--- a/pages/list/sale/index.js
+++ b/pages/list/sale/index.js
@@ -96,6 +96,12 @@ Page({
gotoDetail:function(e){
// if(this.data.type!=0) return;
let item = e.currentTarget.dataset.item;
+ util.pagePoint({
+ event:'discount_detail_click',
+ param:{
+ id:item.id
+ }
+ })
if(this.data.type==0){
if(item.sku.product){
util.gotoDetail(item.sku.product)
diff --git a/pages/list/store/index.js b/pages/list/store/index.js
index 0c61a70..a0ba36d 100644
--- a/pages/list/store/index.js
+++ b/pages/list/store/index.js
@@ -10,6 +10,7 @@ Page({
list:[],
total:1,
info:null,
+ event:'legacy_detail_click'
},
/**
@@ -19,6 +20,11 @@ Page({
this.setData({
id:options.id
})
+ if(options.type) {
+ this.setData({
+ event:options.type
+ })
+ }
commonApi._post('supplier/get_supplier_detail',{
supplier_id:options.id
}).then(res=>{
@@ -32,8 +38,11 @@ Page({
gotoDetail:function(e){
let item = e.currentTarget.dataset.item;
util.pagePoint({
- event: 'legacy_detail_click',
- id:item.id
+ event: this.data.event,
+ param:{
+ id:item.id
+ },
+ type:item.type
},1)
util.gotoDetail(item);
},
diff --git a/pages/list/store/index.wxml b/pages/list/store/index.wxml
index cd3d20f..4a0f479 100644
--- a/pages/list/store/index.wxml
+++ b/pages/list/store/index.wxml
@@ -18,7 +18,7 @@
{{item.title}}
- ¥{{item.price/100}}¥{{item.market_price/100}}
+ ¥{{item.price/100}}¥{{item.market_price/100}}
抢购
diff --git a/pages/list/techan/index.js b/pages/list/techan/index.js
index 67e6434..669d3b6 100644
--- a/pages/list/techan/index.js
+++ b/pages/list/techan/index.js
@@ -29,8 +29,15 @@ Page({
},
gotoDetail:function(e){
let id = e.currentTarget.dataset.id;
+ util.pagePoint({
+ event: 'legacy_shop',
+ param:{
+ id:id
+ },
+ type:'supplier'
+ },1)
wx.navigateTo({
- url: '../store/index?id='+id,
+ url: '../store/index?type=specialty_detail&id='+id,
})
},
gotoProduct:function(e){
diff --git a/pages/list/techan/index.wxml b/pages/list/techan/index.wxml
index 6c45695..875b22e 100644
--- a/pages/list/techan/index.wxml
+++ b/pages/list/techan/index.wxml
@@ -25,7 +25,7 @@
{{item.title}}
- ¥{{item.price/100}}{{item.market_price/100}}
+ ¥{{item.price/100}}{{item.market_price/100}}
diff --git a/pages/login/index.js b/pages/login/index.js
index 70ab582..e3b739c 100644
--- a/pages/login/index.js
+++ b/pages/login/index.js
@@ -23,6 +23,12 @@ Page({
canIUseGetUserProfile: true
})
}
+ if(wx.getStorageSync('login_from')){
+ util.pagePoint({
+ event:wx.getStorageSync('login_from')
+ },1)
+ }
+
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({
@@ -119,7 +125,9 @@ Page({
* 生命周期函数--监听页面显示
*/
onShow: function () {
-
+ util.pagePoint({
+ event:'login_view'
+ },1)
},
/**
@@ -133,7 +141,7 @@ Page({
* 生命周期函数--监听页面卸载
*/
onUnload: function () {
-
+ wx.removeStorageSync('login_from')
},
/**
diff --git a/pages/map/index.js b/pages/map/index.js
index 3daa7e7..9d7016d 100644
--- a/pages/map/index.js
+++ b/pages/map/index.js
@@ -518,7 +518,9 @@ Page({
* 生命周期函数--监听页面显示
*/
onShow: function () {
-
+ util.pagePoint({
+ event:'mapshow_view'
+ },1)
},
/**
diff --git a/pages/order/pay/index.js b/pages/order/pay/index.js
index f3e6188..c99612d 100644
--- a/pages/order/pay/index.js
+++ b/pages/order/pay/index.js
@@ -12,7 +12,9 @@ Page({
info:null,
second:"00",
minute:"00",
- payIndex:-1
+ payIndex:-1,
+ numIndex: 0,
+ showNumMask: false
},
/**
@@ -47,6 +49,17 @@ Page({
payIndex:index
})
},
+ changeNumIndex: function(e){
+ let index = e.currentTarget.dataset.index;
+ this.setData({
+ numIndex:index
+ })
+ },
+ hideNumMask: function() {
+ this.setData({
+ showNumMask:false
+ })
+ },
/**
* 生命周期函数--监听页面初次渲染完成
*/
@@ -57,11 +70,11 @@ Page({
* 生命周期函数--监听页面显示
*/
onShow: function () {
- // commonApi.user_post("subwallet.ermb/wallet",{}).then(res=>{
- // this.setData({
- // payList:res.data
- // })
- // })
+ commonApi.user_post("subwallet.ermb/wallet",{}).then(res=>{
+ this.setData({
+ payList:res.data
+ })
+ })
commonApi.user_post("order/query",{
order_id:this.data.id
}).then(res=>{
@@ -99,6 +112,12 @@ Page({
},
pay:function(){
let _this = this;
+ if(this.data.payIndex==1) {
+ this.setData({
+ showNumMask:true
+ })
+ return;
+ }
commonApi.user_post("order/pay",{
order_id:this.data.id,
pay_method:"WEIXIN",
@@ -132,7 +151,7 @@ Page({
},
// 电子钱包支付
walletPay:function(){
- let item = this.data.payList[this.data.payIndex];
+ let item = this.data.payList[this.data.numIndex];
commonApi.user_post("order/pay",{
order_id:this.data.id,
pay_method:"SUBWALLET",
diff --git a/pages/order/pay/index.wxml b/pages/order/pay/index.wxml
index 6e6ba91..7033912 100644
--- a/pages/order/pay/index.wxml
+++ b/pages/order/pay/index.wxml
@@ -15,12 +15,28 @@
微信支付
-
-
-
- {{item.bank_name}}
-
+
+
+ 数字人民币
+
+
-立即付款
-立即付款
\ No newline at end of file
+立即付款
+
+
+
+
+
+ 数字人民币支付
+ ¥{{info.paid_money/100}}
+
+
+
+
+ {{item.bank_name}}
+
+
+ 立即付款
+
+
\ No newline at end of file
diff --git a/pages/order/pay/index.wxss b/pages/order/pay/index.wxss
index 3f738ef..fd3009e 100644
--- a/pages/order/pay/index.wxss
+++ b/pages/order/pay/index.wxss
@@ -32,7 +32,7 @@ page {
justify-content: space-between;
align-items: center;
}
-.tip-price .price {
+.tip-price .price,.num-pay-top .price {
color: #D62828;
font-size: 36rpx;
}
@@ -65,4 +65,11 @@ page {
height: 72rpx;
display: block;
flex-shrink: 0;
+}
+.num-pay-top {
+ text-align: center;
+ font-weight: bold;
+ padding:50rpx 0;
+ color: #000;
+ font-size: 36rpx;
}
\ No newline at end of file
diff --git a/pages/search/list/index.js b/pages/search/list/index.js
index e14d9c6..5cd8b5e 100644
--- a/pages/search/list/index.js
+++ b/pages/search/list/index.js
@@ -88,8 +88,11 @@ Page({
let item = e.currentTarget.dataset.item;
this.pagePoint({
event:'search_result_click',
- id:item.ext.id,
- type:item.type
+ param: {
+ id:item.ext.id,
+ type:item.ext.type
+ },
+ type:item.genre
},1)
if(item.type=='travels'){
// 游记做特殊处理 其他都按照原来的来
diff --git a/pages/user/cartlist/list.js b/pages/user/cartlist/list.js
index 10e262a..e557389 100644
--- a/pages/user/cartlist/list.js
+++ b/pages/user/cartlist/list.js
@@ -5,6 +5,7 @@ console.log(rect)
const width = device.windowWidth // 示例为一个与屏幕等宽的正方形裁剪框
let height = device.windowHeight;
import commonApi from "../../../utils/https/common"
+import util from '../../../utils/util'
let app = getApp()
Page({
@@ -103,6 +104,9 @@ Page({
},
order:function(){
app.globalData.couponInfo = null;
+ util.pagePoint({
+ event:'cart_order'
+ },1)
let list = this.data.list,price=0,product=[];
list.map(item=>{
if(item.checked){
@@ -205,7 +209,9 @@ Page({
* 生命周期函数--监听页面显示
*/
onShow: function () {
-
+ util.pagePoint({
+ event:'cart_view'
+ },1)
},
/**
diff --git a/pages/user/service/info/index.js b/pages/user/service/info/index.js
index 19f1e03..c947c6b 100644
--- a/pages/user/service/info/index.js
+++ b/pages/user/service/info/index.js
@@ -30,7 +30,10 @@ Page({
},
showService:function(){
util.pagePoint({
- event:'customer_service_human_click'
+ event:'customer_service_human_click',
+ param: {
+ id: this.data.info.id
+ }
},1)
wx.showModal({
title: '提示',
diff --git a/pages/user/user.js b/pages/user/user.js
index 9e158a1..f61e938 100644
--- a/pages/user/user.js
+++ b/pages/user/user.js
@@ -1,6 +1,7 @@
import common from "../../utils/https/common";
// pages/user/user.js
import userApi from "../../utils/https/user"
+import util from '../../utils/util'
let app = getApp()
Page({
@@ -69,6 +70,12 @@ Page({
info: res.data
})
})
+ util.pagePoint({
+ event:'mine_view'
+ },1)
+ },
+ pagePoint: function(e){
+ util.pagePoint(e)
},
/**
diff --git a/pages/user/user.wxml b/pages/user/user.wxml
index b6bc936..d808d7c 100644
--- a/pages/user/user.wxml
+++ b/pages/user/user.wxml
@@ -3,7 +3,7 @@
-
+
{{info.nickname}}
-
+
我的订单
全部订单
-
+
待付款
-
+
待发货
-
+
待出行
-
+
待收货
-
+
待评价
-
+
退货/退款
-
+
购物车
-
+
团体订单
-
+
在线客服
-
+
我的卡券
-
+
我的收藏
@@ -76,15 +76,15 @@
-
+
实名认证
-
+
出游人信息
-
+
收货地址
diff --git a/utils/https.js b/utils/https.js
index 731bcb7..9cb9ea0 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) {
@@ -89,6 +89,13 @@ function _post(url,data={}) {
product_name:res.data.data.title,
type:res.data.data.type
})
+ util.pagePoint({
+ event:'product_view',
+ param:{
+ type:res.data.data.type,
+ id:res.data.data.id
+ }
+ },1)
}
resolved(res.data);
}
@@ -231,6 +238,12 @@ function user_post_new(url,data={},type){
url: '/pages/order/pay/index?id='+res.data.data.order_id,
})
}
+ if(wx.getStorageSync('order_from')){
+ util.pagePoint({
+ event:wx.getStorageSync('order_from')
+ },1)
+ }
+ wx.removeStorageSync('order_from')
}
else if(url.indexOf('/order/create')!=-1 && res.data.msg=='您有正在进行中或待支付的拼团,请查看拼团订单'){
setTimeout(() => {
@@ -247,6 +260,13 @@ function user_post_new(url,data={},type){
product_name:res.data.data.title,
type:res.data.data.type
})
+ util.pagePoint({
+ event:'product_view',
+ param:{
+ type:res.data.data.type,
+ id:res.data.data.id
+ }
+ },1)
}
resolved(res.data);
}
diff --git a/utils/util.js b/utils/util.js
index dbb7b12..3fb54d1 100644
--- a/utils/util.js
+++ b/utils/util.js
@@ -177,7 +177,7 @@ const gotoDetail = (item,isPagePoint) =>{
// 产品 产品票务
if(isPagePoint){
pagePointData.event='ticket_detail_click'
- pagePoint(pagePointData)
+ pagePoint(pagePointData,1)
}
wx.navigateTo({
url: '/pages/info/sceneProductInfo/index?id='+(item.scene_id || item.id)
@@ -187,7 +187,7 @@ const gotoDetail = (item,isPagePoint) =>{
// 产品 酒店
if(isPagePoint){
pagePointData.event='hotel_detail_click'
- pagePoint(pagePointData)
+ pagePoint(pagePointData,1)
}
wx.navigateTo({
url: '/pages/info/hotelProductInfo/index?id='+(item.scene_id || item.id)
@@ -198,7 +198,7 @@ const gotoDetail = (item,isPagePoint) =>{
if(isPagePoint){
pagePointData.event='legacy_detail_click'
pagePointData.id = item.id
- pagePoint(pagePointData)
+ pagePoint(pagePointData,1)
}
wx.navigateTo({
url: '/pages/info/postProductInfo/index?id='+item.id
@@ -209,7 +209,7 @@ const gotoDetail = (item,isPagePoint) =>{
if(isPagePoint){
pagePointData.event='route_detail_click'
pagePointData.id = item.id
- pagePoint(pagePointData)
+ pagePoint(pagePointData,1)
}
wx.navigateTo({
url: '/pages/info/roadInfo/index?id='+item.id
@@ -220,7 +220,7 @@ const gotoDetail = (item,isPagePoint) =>{
if(isPagePoint){
pagePointData.event='card_detail_click'
pagePointData.id = item.id
- pagePoint(pagePointData)
+ pagePoint(pagePointData,1)
}
wx.navigateTo({
url: '/pages/info/cardInfo/index?id='+item.id
@@ -231,7 +231,7 @@ const gotoDetail = (item,isPagePoint) =>{
if(isPagePoint){
pagePointData.event='show_detail_click'
pagePointData.id = item.id
- pagePoint(pagePointData)
+ pagePoint(pagePointData,1)
}
wx.navigateTo({
url: '/pages/info/showInfo/index?id='+item.id
@@ -265,7 +265,7 @@ const gotoDetail = (item,isPagePoint) =>{
// 场景 景点
if(isPagePoint){
pagePointData.event='ticket_detail_click'
- pagePoint(pagePointData)
+ pagePoint(pagePointData,1)
}
wx.navigateTo({
url: '/pages/info/sceneProductInfo/index?id='+(item.scene_id || item.id)
@@ -275,7 +275,7 @@ const gotoDetail = (item,isPagePoint) =>{
// 场景 酒店
if(isPagePoint){
pagePointData.event='hotel_detail_click'
- pagePoint(pagePointData)
+ pagePoint(pagePointData,1)
}
wx.navigateTo({
url: '/pages/info/hotelProductInfo/index?id='+(item.scene_id || item.id)
@@ -285,7 +285,7 @@ const gotoDetail = (item,isPagePoint) =>{
// 场景 场馆
if(isPagePoint){
pagePointData.event='museum_detail_click'
- pagePoint(pagePointData)
+ pagePoint(pagePointData,1)
}
wx.navigateTo({
url: '/pages/info/museumInfo/index?id='+(item.scene_id || item.id)
@@ -405,7 +405,7 @@ const goKjOrder = function(item) {
})
})
}
-const page_point = function(data,type) {
+const pagePoint = function(data,type) {
if(type!=1) {
data = data.currentTarget.dataset
}
@@ -433,5 +433,5 @@ module.exports = {
gotoOrder:gotoOrder,
orderMoreTime:orderMoreTime,
goKjOrder:goKjOrder,
- pagePoint: page_point
+ pagePoint: pagePoint
}