1

4 years ago · cf44ff0f9e
32 changed files with 306 additions and 86 deletions
--- 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
    })
    
--- a/pages/group/index.wxml
+++ b/pages/group/index.wxml
@ -8,7 +8,7 @@
        <view class="hot-title1">{{item.title+item.sku_name}}</view>
        <view class="hot-bottom">
          <text>￥{{item.event_price/100}}</text>
-          <view class="old-price">￥{{item.price/100}}</view>
+          <view class="old-price" wx:if="{{item.price && item.price!=0 && item.price>item.event_price}}">￥{{item.price/100}}</view>
        </view>
      </view>
    </view>
@ -27,7 +27,7 @@
      </view>
      <view class="hot-bottom">
        <text>￥{{item.event_price/100}}</text>
-        <view class="old-price">￥{{item.price/100}}</view>
+        <view class="old-price" wx:if="{{item.price && item.price!=0 && item.price>item.event_price}}">￥{{item.price/100}}</view>
        <view class="btn" style="background:#ccc" wx:if="{{item.left_stock_num<=0}}">售罄</view>
        <view class="btn" wx:else>团购</view>
      </view>
--- a/pages/group/info/index.wxml
+++ b/pages/group/info/index.wxml
@ -11,7 +11,7 @@
      </view>
      <view class="hot-bottom">
        <text>￥{{info.event_price/100}}</text>
-        <view class="old-price">￥{{info.price/100}}</view>
+        <view class="old-price" wx:if="{{info.price && info.price!=0 && info.price>info.event_price}}">￥{{info.price/100}}</view>
      </view>
    </view>
    <view bindtap="gotoInfo" class="info-btn">详情 ></view>
--- 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:
--- a/pages/index/index.wxml
+++ b/pages/index/index.wxml
@ -52,34 +52,34 @@
    <image src="https://static.ticket.sz-trip.com/xcxImages/index/icon4.png" mode="widthFix"></image>
    <view class="top-icon-text">酒店住宿</view>
  </view>
-  <view bindtap="gotoPath" data-event="night_click" data-title="夜游苏州" data-path="/pages/list/night/index" class="top-icon-item">
+  <view bindtap="gotoPath" data-event="night_sz" data-title="夜游苏州" data-path="/pages/list/night/index" class="top-icon-item">
    <image src="https://static.ticket.sz-trip.com/xcxImages/index/icon5.png" mode="widthFix"></image>
    <view class="top-icon-text">夜游苏州</view>
  </view>
-  <view bindtap="gotoPath" data-event="card_click" data-title="一卡游苏州" data-path="/pages/list/card/index" class="top-icon-item">
+  <view bindtap="gotoPath" data-event="card" data-title="一卡游苏州" data-path="/pages/list/card/index" class="top-icon-item">
    <image src="https://static.ticket.sz-trip.com/xcxImages/index/icon2.png" mode="widthFix"></image>
    <view class="top-icon-text">一卡游苏州</view>
  </view>
-  <view bindtap="gotoPath" data-event="museum_click" data-title="场馆预约" data-path="/pages/list/{{isTest?'scene':'museum'}}/index" class="top-icon-item">
+  <view bindtap="gotoPath" data-event="museum" data-title="场馆预约" data-path="/pages/list/{{isTest?'scene':'museum'}}/index" class="top-icon-item">
    <image src="https://static.ticket.sz-trip.com/xcxImages/index/icon6.png" mode="widthFix"></image>
    <view class="top-icon-text">场馆预约</view>
  </view>
-  <view bindtap="gotoPath" data-event="legacy_click" data-title="非遗专卖" data-path="/pages/list/{{isTest?'scene':'feiyi'}}/index"
+  <view bindtap="gotoPath" data-event="legacy" data-title="非遗专卖" data-path="/pages/list/{{isTest?'scene':'feiyi'}}/index"
    class="top-icon-item">
    <image src="https://static.ticket.sz-trip.com/xcxImages/index/icon7.png" mode="widthFix"></image>
    <view class="top-icon-text">非遗专卖</view>
  </view>
-  <view bindtap="gotoPath" data-event="show_click" data-title="剧场演出" data-path="/pages/list/{{isTest?'activity':'theatre'}}/index"
+  <view bindtap="gotoPath" data-event="show" data-title="剧场演出" data-path="/pages/list/{{isTest?'activity':'theatre'}}/index"
    class="top-icon-item">
    <image src="https://static.ticket.sz-trip.com/xcxImages/index/icon8.png" mode="widthFix"></image>
    <view class="top-icon-text">剧场演出</view>
  </view>
-  <view bindtap="gotoPath" data-event="specialty_click" data-title="文创特产" data-path="/pages/list/{{isTest?'road':'techan'}}/index"
+  <view bindtap="gotoPath" data-event="specialty" data-title="文创特产" data-path="/pages/list/{{isTest?'road':'techan'}}/index"
    class="top-icon-item">
    <image src="https://static.ticket.sz-trip.com/xcxImages/index/icon9.png" mode="widthFix"></image>
    <view class="top-icon-text">文创特产</view>
  </view>
-  <view bindtap="gotoPath" data-event="movie_click" data-title="电影购票" data-path="/pages/list/movieticket/index" class="top-icon-item">
+  <view bindtap="gotoPath" data-event="movie" data-title="电影购票" data-path="/pages/list/movieticket/index" class="top-icon-item">
    <image src="https://static.ticket.sz-trip.com/xcxImages/index/icon10.png" mode="widthFix"></image>
    <view class="top-icon-text">电影购票</view>
  </view>
--- 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) {
--- 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(){
--- a/pages/info/postProductInfo/index.wxml
+++ b/pages/info/postProductInfo/index.wxml
@ -69,7 +69,7 @@
 </view>
 <view style="height:140rpx"></view>
 <view class="fixed-bottom">
-  <navigator url="/pages/user/service/index" class="kefu-box">
+  <navigator url="/pages/user/service/index" catchtap="pagePoint" data-event='product_customservice' class="kefu-box">
    <view class="iconfont icon-kefu"></view>
    <view>客服</view>
  </navigator>
@ -85,7 +85,7 @@
  </view>
 </view>
 <!-- 购物车悬浮框 -->
-<navigator url="/pages/user/cartlist/list" class="cart-box" id="cart">
+<navigator url="/pages/user/cartlist/list" catchtap="pagePoint" data-event='product_cart_click' class="cart-box" id="cart">
  <image src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/info/cart.png" mode="widthFix"></image>
  <view class="cart-num">{{cartCount}}</view>
 </navigator>
--- 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({
--- a/pages/info/roadInfo/index.wxml
+++ b/pages/info/roadInfo/index.wxml
@ -86,7 +86,7 @@
 </view>
 <view style="height:140rpx"></view>
 <view class="fixed-bottom" wx:if="{{info}}">
-  <navigator url="/pages/user/service/index" class="kefu-box">
+  <navigator catchtap="pagePoint" data-event='product_customservice' url="/pages/user/service/index" class="kefu-box">
    <view class="iconfont icon-kefu"></view>
    <view>客服</view>
  </navigator>
--- 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)
    }
+    
  },

  /**
--- a/pages/info/sceneProductInfo/index.wxml
+++ b/pages/info/sceneProductInfo/index.wxml
@ -22,7 +22,7 @@
  </view>
  <view class="tags-box address-box" style="height:auto">
    <view class="info-address">开园时间：{{info.open_time}}</view>
-    <navigator url="/pages/info/sceneInfo/index?id={{info.id}}" class="iconfont" style="font-size:27rpx;flex-shrink:0">优待政策 | 景点介绍 <text class="iconfont icon-you"  style="font-size:24rpx"></text></navigator>
+    <navigator url="/pages/info/sceneInfo/index?id={{info.id}}" catchtap="pagePoint" data-event="scene_detail" class="iconfont" style="font-size:27rpx;flex-shrink:0">优待政策 | 景点介绍 <text class="iconfont icon-you"  style="font-size:24rpx"></text></navigator>
  </view>
  <view class="tags-box textOver address-box">
    <view class="info-address">地址：{{info.address}}</view>
@ -59,10 +59,10 @@
  </view>
  <view class="empty-box" wx:if="{{!ask || ask.length==0}}">
    <view>这里空空如也，快去向大家提问吧!</view>
-    <navigator url="/pages/ask/index?id={{id}}" class="empty-btn">去提问</navigator>
+    <navigator url="/pages/ask/index?id={{id}}" catchtap="pagePoint" data-event="scene_question" class="empty-btn">去提问</navigator>
  </view>
  <view class="ask-list" wx:else>
-    <navigator url="/pages/ask/info/index?id={{item.id}}" class="ask-item" wx:for="{{ask}}">
+    <navigator url="/pages/ask/info/index?id={{item.id}}" catchtap="pagePoint" data-event="scene_comment" class="ask-item" wx:for="{{ask}}">
      <view class="item-ques">
        <image class="item-icon" src="https://static.ticket.sz-trip.com/xcxImages/ask/ask.png" mode="widthFix"></image>
        <view class="ques">{{item.question_name}}</view>
--- 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;
--- a/pages/list/feiyi/index.wxml
+++ b/pages/list/feiyi/index.wxml
@ -22,7 +22,7 @@
        <view class="product-title">{{item.title}}</view>
        <view class="price-box">
          <text class="now-price">{{item.price/100}}</text>
-          <!-- <text class="old-price">￥{{item.money/100}}</text> -->
+          <text class="old-price" wx:if="{{item.market_price && item.market_price!=0 && item.market_price>item.price}}">￥{{item.market_price/100}}</text>
        </view>
      </view>
    </view>
--- 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;
--- 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)
--- 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);
  },
--- a/pages/list/store/index.wxml
+++ b/pages/list/store/index.wxml
@ -18,7 +18,7 @@
    <view class="info-box">
      <view class="title">{{item.title}}</view>
      <view class="price-box">
-        <view class="price-box-left"><text>¥{{item.price/100}}</text><text wx:if="{{item.market_price}}" class="old-price">¥{{item.market_price/100}}</text></view>
+        <view class="price-box-left"><text>¥{{item.price/100}}</text><text wx:if="{{item.market_price}}" class="old-price" wx:if="{{item.market_price && item.market_price!=0 && item.market_price>item.price}}">¥{{item.market_price/100}}</text></view>
        <view class="btn">抢购</view>
      </view>
    </view>
--- 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){
--- a/pages/list/techan/index.wxml
+++ b/pages/list/techan/index.wxml
@ -25,7 +25,7 @@
      <view data-item="{{item}}" class="product-item" wx:for="{{item.product}}">
        <image src="{{item.headimg}}" mode="aspectFill"></image>
        <view class="product-title textOver2">{{item.title}}</view>
-        <view class="supplier-price"><text>￥</text><text style="font-size:30rpx">{{item.price/100}}</text><text class="market_price">{{item.market_price/100}}</text></view>
+        <view class="supplier-price"><text>￥</text><text style="font-size:30rpx">{{item.price/100}}</text><text class="market_price" wx:if="{{item.market_price && item.market_price!=0 && item.market_price>item.price}}">{{item.market_price/100}}</text></view>
      </view>
    </view>
  </view>
--- 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')
  },

  /**
--- a/pages/map/index.js
+++ b/pages/map/index.js
@ -518,7 +518,9 @@ Page({
   * 生命周期函数--监听页面显示
   */
  onShow: function () {
-
+    util.pagePoint({
+      event:'mapshow_view'
+    },1)
  },

  /**
--- 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",
--- a/pages/order/pay/index.wxml
+++ b/pages/order/pay/index.wxml
@ -15,12 +15,28 @@
    <view class="method-name">微信支付</view>
    <view class="iconfont {{payIndex==-1?'icon-iconfontoptionbutton':'icon-quan'}}"></view>
  </view>
-  <view class="pay-method" wx:for="{{payList}}" style="border-top:1rpx solid #ccc" bindtap="changePayMethod" data-index="{{index}}">
-    <image src="{{item.bank_logo}}" mode="aspectFill"></image>
-    <!-- <view class="iconfont icon-weixin1"></view> -->
-    <view class="method-name">{{item.bank_name}}</view>
-    <view class="iconfont {{payIndex==index?'icon-iconfontoptionbutton':'icon-quan'}}"></view>
+  <view class="pay-method" wx:if="{{payList.length>0}}" style="border-top:1rpx solid #ccc" bindtap="changePayMethod" data-index="1">
+    <image src="https://test.m.cloud.sz-trip.com/static/images/numLogo.png" mode="aspectFill"></image>
+    <view class="method-name">数字人民币</view>
+    <view class="iconfont {{payIndex==1?'icon-iconfontoptionbutton':'icon-quan'}}"></view>
  </view>
+  
 </view>
-<view class="btn" bindtap="pay" wx:if="{{payIndex==-1}}">立即付款</view>
-<view class="btn" bindtap="walletPay" wx:else>立即付款</view>
+<view class="btn" bindtap="pay">立即付款</view>
+<!-- <view class="btn" bindtap="walletPay" wx:else>立即付款</view> -->
+<view class="mask" style="align-items:flex-end" wx:if="{{showNumMask}}">
+  <view class="mask-bg" bindtap="hideNumMask"></view>
+  <view class="mask-content" style="text-align:center;width:100%;border-radius:0">
+    <view class="num-pay-top">
+      <view style="margin-bottom:20rpx">数字人民币支付</view>
+      <view class="price">¥{{info.paid_money/100}}</view>
+    </view>
+    <view style="margin:0 30rpx" class="pay-method" wx:for="{{payList}}" bindtap="changeNumIndex" data-index="{{index}}">
+      <image src="{{item.bank_logo}}" mode="aspectFill"></image>
+      <!-- <view class="iconfont icon-weixin1"></view> -->
+      <view class="method-name">{{item.bank_name}}</view>
+      <view class="iconfont {{numIndex==index?'icon-iconfontoptionbutton':'icon-quan'}}"></view>
+    </view>
+    <view class="btn" bindtap="walletPay" style="margin:25rpx">立即付款</view>
+  </view>
+</view>
--- 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;
 }
--- 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'){
      // 游记做特殊处理 其他都按照原来的来
--- 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)
  },

  /**
--- 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: '提示',
--- 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)
  },

  /**
--- a/pages/user/user.wxml
+++ b/pages/user/user.wxml
@ -3,7 +3,7 @@
  <image class="topbg" style="height:calc({{height}}px + 341rpx)"
    src="https://static.ticket.sz-trip.com/xcxImages/user/topbg.png" mode="aspectFill"></image>
  <view style="height:{{height}}rpx"></view>
-  <navigator url="profile/index" class="top-box" wx:if="{{info}}">
+  <navigator url="profile/index" catchtap="pagePoint" data-event="mine_information" class="top-box" wx:if="{{info}}">
    <image class="headimg" src="{{info.avatar}}" mode="aspectFill"></image>
    <view class="userinfo">
      <view class="username">{{info.nickname}}<image wx:if="{{info.gender==1 || info.gender==2}}" mode="widthFix"
@ -13,55 +13,55 @@
    </view>
  </navigator>
  <view class="user-box" style="padding-bottom:0">
-    <navigator url="order/list" class="user-box-top">
+    <navigator url="order/list" catchtap="pagePoint" data-event="mine_order" class="user-box-top">
      <text>我的订单</text>
      <view class="all-text">全部订单 <text class="iconfont icon-you"></text></view>
    </navigator>
    <view class="user-order-types">
-      <navigator url="order/list?type=WAIT_PAYMENT" class="user-order-type">
+      <navigator url="order/list?type=WAIT_PAYMENT" catchtap="pagePoint" data-event="mine_order" class="user-order-type">
        <image src="https://static.ticket.sz-trip.com/xcxImages/user/dfk.png" mode="aspectFill"></image>
        <view>待付款</view>
      </navigator>
-      <navigator url="order/list?type=WAIT_POST" class="user-order-type">
+      <navigator url="order/list?type=WAIT_POST" catchtap="pagePoint" data-event="mine_order" class="user-order-type">
        <image src="https://static.ticket.sz-trip.com/xcxImages/user/dfh.png" mode="aspectFill"></image>
        <view>待发货</view>
      </navigator>
-      <navigator url="order/list?type=WAIT_USE" class="user-order-type">
+      <navigator url="order/list?type=WAIT_USE" catchtap="pagePoint" data-event="mine_order" class="user-order-type">
        <image src="https://static.ticket.sz-trip.com/xcxImages/user/dcx.png" mode="aspectFill"></image>
        <view>待出行</view>
      </navigator>
-      <navigator url="order/list?type=WAIT_DELIVERY" class="user-order-type">
+      <navigator url="order/list?type=WAIT_DELIVERY" catchtap="pagePoint" data-event="mine_order" class="user-order-type">
        <image src="https://static.ticket.sz-trip.com/xcxImages/user/dsh.png" mode="aspectFill"></image>
        <view>待收货</view>
      </navigator>
-      <navigator url="order/list?type=WAIT_COMMENT" class="user-order-type">
+      <navigator url="order/list?type=WAIT_COMMENT" catchtap="pagePoint" data-event="mine_order" class="user-order-type">
        <image src="https://static.ticket.sz-trip.com/xcxImages/user/ddp.png" mode="aspectFill"></image>
        <view>待评价</view>
      </navigator>
-      <navigator url="order/list?type=NEED_REFUND" class="user-order-type">
+      <navigator url="order/list?type=NEED_REFUND" catchtap="pagePoint" data-event="mine_order" class="user-order-type">
        <image src="https://static.ticket.sz-trip.com/xcxImages/user/th.png" mode="aspectFill"></image>
        <view>退货/退款</view>
      </navigator>
    </view>
  </view>
  <view class="user-box">
-    <navigator url="cartlist/list" class="user-box-line">
+    <navigator url="cartlist/list" class="user-box-line" catchtap="pagePoint" data-event="mine_cart">
      购物车
    </navigator>

-    <navigator url="order/team/list" class="user-box-line">
+    <navigator url="order/team/list" class="user-box-line" catchtap="pagePoint" data-event="mine_teamorder">
      团体订单
    </navigator>
    <!-- <navigator url="videoCoupon/index" class="user-box-line">
    中奖纪录
    </navigator> -->
-    <navigator url="service/index" class="user-box-line">
+    <navigator url="service/index" class="user-box-line" catchtap="pagePoint" data-event="mine_customerservice">
      在线客服
    </navigator>
-    <navigator url="coupon/index" class="user-box-line">
+    <navigator url="coupon/index" class="user-box-line" catchtap="pagePoint" data-event="mine_card">
      我的卡券
    </navigator>
-    <navigator url="likes/index" class="user-box-line">
+    <navigator url="likes/index" class="user-box-line" catchtap="pagePoint" data-event="mine_collection">
      我的收藏
    </navigator>
    <view bindtap="supplier" class="user-box-line">
@ -76,15 +76,15 @@
    <!-- <view bindtap="retail" class="user-box-line">
    我要分销
    </view> -->
-    <navigator url="verify/index" class="user-box-line" wx:if="{{info && info.name_verification=='UNCERTFIED'}}">
+    <navigator url="verify/index" class="user-box-line" catchtap="pagePoint" data-event="mine_verify" wx:if="{{info && info.name_verification=='UNCERTFIED'}}">
      实名认证
    </navigator>
  </view>
  <view class="user-box" style="margin-bottom:0">
-    <navigator url="linkman/index" class="user-box-line">
+    <navigator url="linkman/index" class="user-box-line" catchtap="pagePoint" data-event="mine_travelinfo">
      出游人信息
    </navigator>
-    <navigator url="address/index" class="user-box-line">
+    <navigator url="address/index" class="user-box-line" catchtap="pagePoint" data-event="mine_receiveinfo">
      收货地址
    </navigator>
  </view>
--- 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);
          }
--- 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
 }