更新

4 years ago · c8d70ba8e3
56 changed files with 277 additions and 127 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.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_'
    }
  }
 })
--- 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)
  },
  /**
   * 用户点击右上角分享
--- a/pages/index/index.wxml
+++ b/pages/index/index.wxml
@ -7,13 +7,13 @@
  <image src="{{weather.icon2}}" style="margin-left:0" mode="aspectFill"></image>
  <view class="weather-num">{{weather.max_temp}}°</view>
  <view class="weather">{{weather.weather}}</view>
-  <image bindtap="gotoPath" style="margin-left:0" data-path="/pages/user/service/index"
+  <image bindtap="gotoPath" style="margin-left:0" data-path="/pages/user/service/index" data-event="customer_service_click"
    src="https://static.ticket.sz-trip.com/xcxImages/spring22/service.png" mode="aspectFill"></image>
-  <image bindtap="gotoPath" data-path="/pages/list/message/index"
+  <image bindtap="gotoPath" data-event="message_click" data-path="/pages/list/message/index"
    src="https://static.ticket.sz-trip.com/xcxImages/spring22/msg.png" mode="aspectFill"></image>
 </view>
 <view class="top-box" style="padding:0;margin-bottom:18rpx">
-  <navigator url="/pages/search/index" class="search-box textOver">
+  <navigator url="/pages/search/index" catchtap="pagePoint" data-event="search_click" class="search-box textOver">
    <view class="iconfont icon-sousuo"></view>
    <view class="textOver">搜索想要的旅游产品或服务</view>
  </navigator>
@ -40,53 +40,53 @@
  </block>
 </swiper> -->
 <view class="top-icons">
-  <view bindtap="gotoPath" data-title="活动日历" data-path="/pages/list/activitynew/index" class="top-icon-item">
+  <view bindtap="gotoPath" data-event="activity_click" data-title="活动日历" data-path="/pages/list/activitynew/index" class="top-icon-item">
    <image src="https://static.ticket.sz-trip.com/xcxImages/index/icon1.png" mode="widthFix"></image>
    <view class="top-icon-text">活动日历</view>
  </view>
-  <view bindtap="gotoPath" data-title="景点门票" data-path="/pages/list/scene/index" class="top-icon-item">
+  <view bindtap="gotoPath" data-event="ticket_click" data-title="景点门票" data-path="/pages/list/scene/index" class="top-icon-item">
    <image src="https://static.ticket.sz-trip.com/xcxImages/index/icon3.png" mode="widthFix"></image>
    <view class="top-icon-text">景点门票</view>
  </view>
-  <view bindtap="gotoPath" data-title="酒店住宿" data-path="/pages/list/hotel/index" class="top-icon-item">
+  <view bindtap="gotoPath" data-event="hotel_click" data-title="酒店住宿" data-path="/pages/list/hotel/index" class="top-icon-item">
    <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-title="夜游苏州" data-path="/pages/list/night/index" class="top-icon-item">
+  <view bindtap="gotoPath" data-event="night_click" 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-title="一卡游苏州" data-path="/pages/list/card/index" class="top-icon-item">
+  <view bindtap="gotoPath" data-event="card_click" 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-title="场馆预约" data-path="/pages/list/{{isTest?'scene':'museum'}}/index" class="top-icon-item">
+  <view bindtap="gotoPath" data-event="museum_click" 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-title="非遗专卖" data-path="/pages/list/{{isTest?'scene':'feiyi'}}/index"
+  <view bindtap="gotoPath" data-event="legacy_click" 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-title="剧场演出" data-path="/pages/list/{{isTest?'activity':'theatre'}}/index"
+  <view bindtap="gotoPath" data-event="show_click" 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-title="文创特产" data-path="/pages/list/{{isTest?'road':'techan'}}/index"
+  <view bindtap="gotoPath" data-event="specialty_click" 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-title="电影购票" data-path="/pages/list/movieticket/index" class="top-icon-item">
+  <view bindtap="gotoPath" data-event="movie_click" 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>
 </view>
 <view class="content">
  <view class="sale-road-boxes">
-    <view class="sale-box" bindtap="gotoPath" data-title="特惠新品"
+    <view class="sale-box" bindtap="gotoPath" data-event="discount_click" data-title="特惠新品"
      data-path="/pages/list/{{isTest==false?'sale':'scene'}}/index">
      <view class="sale-title"><text>特惠新品</text>超值商品限时抢购</view>
      <view class="sale-product">
@ -104,7 +104,7 @@
        </view>
      </view>
    </view>
-    <view class="sale-box" bindtap="gotoPath" data-title="精品线路" data-path="/pages/list/road/index">
+    <view class="sale-box" bindtap="gotoPath" data-event="route_click" data-title="精品线路" data-path="/pages/list/road/index">
      <view class="sale-title"><text>精品线路</text>带你轻松玩转苏州</view>
      <view class="sale-product">
        <view class="sale-product-bg road-product-bg"></view>
@ -140,77 +140,37 @@
    </image>
  </view>
  <view class="pic-list" style="margin-top:20rpx">
-    <image bindtap="gotoPath" data-title="街巷美食" data-path="/pages/list/{{isTest?'road':'food'}}/index"
+    <image bindtap="gotoPath" data-event="food_click" data-title="街巷美食" data-path="/pages/list/{{isTest?'road':'food'}}/index"
      src="https://static.ticket.sz-trip.com/xcxImages/index/pic1.png" mode="aspectFill"></image>
-    <image bindtap="audioGuide" src="https://static.ticket.sz-trip.com/xcxImages/index/pic2.png" mode="aspectFill">
+    <image bindtap="audioGuide" data-event="voice_click" src="https://static.ticket.sz-trip.com/xcxImages/index/pic2.png" mode="aspectFill">
    </image>
-    <image bindtap="gotoPath" data-title="游记攻略" data-path="/pages/list/strategy/index"
+    <image bindtap="gotoPath" data-event="guide_click" data-title="游记攻略" data-path="/pages/list/strategy/index"
      src="https://static.ticket.sz-trip.com/xcxImages/index/pic3.png" mode="aspectFill"></image>
-    <image bindtap="city" src="https://static.ticket.sz-trip.com/xcxImages/index/pic4.png" mode="aspectFill"></image>
+    <image bindtap="city" data-event="city_click" src="https://static.ticket.sz-trip.com/xcxImages/index/pic4.png" mode="aspectFill"></image>
  </view>
  <view class="sale-road-boxes" style="margin-top:0;align-items:center">
    <image mode="widthFix" style="width:403rpx" src="https://static.ticket.sz-trip.com/xcxImages/spring22/title2.png">
    </image>
-    <navigator url="/pages/pbService/index" class="title-more">更多<text class="iconfont icon-you"></text> </navigator>
+    <navigator url="/pages/pbService/index" catchtap="pagePoint" data-event="public_view" class="title-more">更多<text class="iconfont icon-you"></text> </navigator>
  </view>
  <view style="overflow-x:auto">
    <view class="pbservice" style="width:100%">
-      <view bindtap="gotoPath" data-title="景区舒适度" data-path="/pages/pbService/sceneComfort/index" class="pbservice-item">
+      <view bindtap="gotoPath" data-event="comfort_click" data-title="景区舒适度" data-path="/pages/pbService/sceneComfort/index" class="pbservice-item">
        <image src="https://static.ticket.sz-trip.com/xcxImages/pbservice/pb4.png" mode="widthFix"></image>
        <view>景区舒适度</view>
      </view>
-      <view bindtap="gotoPath" data-title="找厕所" data-path="/pages/pbService/bike/index?type=1" class="pbservice-item">
+      <view bindtap="gotoPath" data-event="toilet_home_click" data-title="找厕所" data-path="/pages/pbService/bike/index?type=1" class="pbservice-item">
        <image src="https://static.ticket.sz-trip.com/xcxImages/index/pb2.png" mode="widthFix"></image>
        <view>找厕所</view>
      </view>
-      <view bindtap="gotoPath" data-title="停车场" data-path="/pages/pbService/bike/index?type=2" class="pbservice-item">
+      <view bindtap="gotoPath" data-event="car_park_home_click" data-title="停车场" data-path="/pages/pbService/bike/index?type=2" class="pbservice-item">
        <image src="https://static.ticket.sz-trip.com/xcxImages/index/pb3.png" mode="widthFix"></image>
        <view>停车场</view>
      </view>
-      <view bindtap="gotoPath" data-title="安全服务" data-path="/pages/pbService/security/index" class="pbservice-item">
+      <view bindtap="gotoPath" data-event="security_home_click" data-title="安全服务" data-path="/pages/pbService/security/index" class="pbservice-item">
        <image src="https://static.ticket.sz-trip.com/xcxImages/index/pb4.png" mode="widthFix"></image>
        <view>安全服务</view>
      </view>
      <!-- <view bindtap="gotoPath" data-title="景区舒适度" data-path="/pages/pbService/security/index" class="pbservice-item">
        <image src="https://static.ticket.sz-trip.com/xcxImages/index/pb9.png" mode="widthFix"></image>
        <view>景区舒适度</view>
      </view> -->
      <!-- <view bindtap="gotoPath" data-title="精彩回顾" data-path="/pages/pbService/activity/index" class="pbservice-item">
        <image src="https://static.ticket.sz-trip.com/xcxImages/index/pb16.png" mode="widthFix"></image>
        <view>精彩回顾</view>
      </view>
      <view bindtap="gotoPath" data-title="书香借阅" data-path="/pages/pbService/library/index" class="pbservice-item">
        <image src="https://static.ticket.sz-trip.com/xcxImages/index/pb14.png" mode="widthFix"></image>
        <view>书香借阅</view>
      </view>
      <view bindtap="gotoPath" data-title="非遗传承" data-path="/pages/pbService/feiyi/index" class="pbservice-item">
        <image src="https://static.ticket.sz-trip.com/xcxImages/index/pb5.png" mode="widthFix"></image>
        <view>非遗传承</view>
      </view>
      <view bindtap="gotoUrl" data-title="投资导引图" data-url='https://hot-map.sz-trip.com/' class="pbservice-item">
        <image src="https://static.ticket.sz-trip.com/xcxImages/index/pb15.png" mode="widthFix"></image>
        <view>投资导引图</view>
      </view> -->
      <!-- <view bindtap="gotoPath" data-title="文保单位" data-path="/pages/pbService/wbdw/index" class="pbservice-item">
        <image src="https://static.ticket.sz-trip.com/xcxImages/index/pb6.png" mode="widthFix"></image>
        <view>文保单位</view>
      </view> -->
      <!-- <view bindtap="gotoPath" data-title="文物查询" data-path="/pages/pbService/wwcx/index" class="pbservice-item">
        <image src="https://static.ticket.sz-trip.com/xcxImages/index/pb7.png" mode="widthFix"></image>
        <view>文物查询</view>
      </view>
      <view bindtap="gotoPath" data-title="在线鉴赏" data-path="/pages/pbService/appreciate/index" class="pbservice-item">
        <image src="https://static.ticket.sz-trip.com/xcxImages/index/pb8.png" mode="widthFix"></image>
        <view>在线鉴赏</view>
      </view> -->
      <!-- <view bindtap="gotoPath" data-title="体育场馆" data-path="/pages/pbService/gym/index" class="pbservice-item">
        <image src="https://static.ticket.sz-trip.com/xcxImages/index/pb12.png" mode="widthFix"></image>
        <view>体育场馆</view>
      </view> -->
      <!-- <view bindtap="garbage" data-title="垃圾分类" class="pbservice-item">
        <image src="https://static.ticket.sz-trip.com/xcxImages/index/pb11.png" mode="widthFix"></image>
        <view>垃圾分类</view>
      </view> -->
    </view>
  </view>
  <view class="sale-road-boxes" style="margin-top:0">
@ -219,7 +179,7 @@
  </view>
  <scroll-view scroll-x style="height:360rpx" bindscroll="listenScroll" class="slide-box">
    <view class="pbservice" style="margin-bottom:30rpx">
-      <view bindtap="gotoUrl" data-title="投资导引图" data-url="https://hot-map.sz-trip.com/" class="pbservice-item">
+      <view bindtap="gotoUrl" data-event="investment_click" data-title="投资导引图" data-url="https://hot-map.sz-trip.com/" class="pbservice-item">
        <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb1.png" mode="widthFix"></image>
        <view>投资导引图</view>
      </view>
@ -227,11 +187,11 @@
        <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb2.png" mode="widthFix"></image>
        <view>非遗传承</view>
      </view>
-      <view bindtap="gotoPath" data-title="文物查询" data-path="/pages/pbService/wwcx/index" class="pbservice-item">
+      <view bindtap="gotoPath" data-event="culture_search_click" data-title="文物查询" data-path="/pages/pbService/wwcx/index" class="pbservice-item">
        <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb3.png" mode="widthFix"></image>
        <view>文物查询</view>
      </view>
-      <view bindtap="gotoPath" data-title="在线鉴赏" data-path="/pages/pbService/appreciate/index" class="pbservice-item">
+      <view bindtap="gotoPath" data-event="appreciate_click" data-title="在线鉴赏" data-path="/pages/pbService/appreciate/index" class="pbservice-item">
        <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb4.png" mode="widthFix"></image>
        <view>在线鉴赏</view>
      </view>
@ -239,20 +199,20 @@
        <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb7.png" mode="widthFix"></image>
        <view>文化配送</view>
      </view> -->
-      <view bindtap="gotoPath" data-title="书香借阅" data-path="/pages/pbService/library/index" class="pbservice-item">
+      <view bindtap="gotoPath" data-event="book_click" data-title="书香借阅" data-path="/pages/pbService/library/index" class="pbservice-item">
        <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb5.png" mode="widthFix"></image>
        <view>书香借阅</view>
      </view>
-      <view bindtap="gotoPath" data-title="博物馆查询" data-path="/pages/pbService/museum/index" class="pbservice-item">
+      <view bindtap="gotoPath" data-event="museum_search_click" data-title="博物馆查询" data-path="/pages/pbService/museum/index" class="pbservice-item">
        <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb6.png" mode="widthFix"></image>
        <view>博物馆查询</view>
      </view>
-      <view bindtap="gotoPath" data-title="团体预约" data-path="/pages/pbService/group/index" class="pbservice-item">
+      <view bindtap="gotoPath" data-event="team_click" data-title="团体预约" data-path="/pages/pbService/group/index" class="pbservice-item">
        <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb9.png" mode="widthFix"></image>
        <view>团体预约</view>
      </view>
-      <view bindtap="gotoPath" data-title="精彩回顾" data-path="/pages/pbService/activity/index" class="pbservice-item">
+      <view bindtap="gotoPath" data-event="review_click" data-title="精彩回顾" data-path="/pages/pbService/activity/index" class="pbservice-item">
        <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb8.png" mode="widthFix"></image>
        <view>精彩回顾</view>
      </view>
@ -261,7 +221,7 @@
        <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb10.png" mode="widthFix"></image>
        <view>廉洁地图</view>
      </view> -->
-      <view bindtap="gotoPath" data-title="文旅单位" data-path="/pages/list/culturalUnit/index" class="pbservice-item">
+      <view bindtap="gotoPath" data-event="institution_click" data-title="文旅单位" data-path="/pages/list/culturalUnit/index" class="pbservice-item">
        <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb11.png" mode="widthFix"></image>
        <view>文旅单位</view>
      </view>
@ -279,7 +239,7 @@
    </image>
  </view>
  <view class="six-box">
-    <image bindtap="gotoPath" data-title="苏城六纪" data-path="/pages/list/six/index?area={{area_ids[index]}}"
+    <image bindtap="gotoPath" data-event="{{area_ids[index]}}_click" data-title="苏城六纪" data-path="/pages/list/six/index?area={{area_ids[index]}}"
      wx:for="{{10}}" src="https://static.ticket.sz-trip.com/xcxImages/index/six{{index+1}}.png" mode="widthFix">
    </image>
  </view>
--- 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;
--- 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;
--- a/pages/info/activityInfo/index.wxml
+++ b/pages/info/activityInfo/index.wxml
@ -34,7 +34,7 @@
  <rich-text class="box-content" nodes="{{tool.formateRichText(info.intro)}}"></rich-text>
 </view>
 <navigator url="/pages/info/sceneProductInfo/index?id={{info.scene_data.id}}"
-  wx:if="{{info && info.scene_data && info.scene_data.id}}" class="scene-box">
+  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'>
  <image src="{{info.scene_data.headimg}}" mode="aspectFill"></image>
  <view class="scene-info">
    <view class="scene-title-box">
--- 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
      })
--- a/pages/info/cardInfo/index.wxml
+++ b/pages/info/cardInfo/index.wxml
@ -51,7 +51,8 @@
  <view class="kefu-box">
    ￥{{info.price/100}}
  </view>
-  <view bindtap="order" class="btn">立即预订</view>
+  <view bindtap="order" class="btn" wx:if="{{info.flag==1}}">立即预订</view>
  <view bindtap="order" class="btn disable" wx:else>该商品已下架</view>
 </view>
 <view style="position:absolute;right:0;left:-10000rpx;top:-20000rpx;z-index:-1">
  <canvas canvas-id='imageCanvas' class='imageCanvas' style="width:551rpx;height:643rpx;" disable-scroll='true'>
--- 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;
--- a/pages/info/foodProductInfo/index.wxml
+++ b/pages/info/foodProductInfo/index.wxml
@ -33,7 +33,8 @@
      </view>
      <view class="product-right">
        <view class="price"><text>￥</text><text>{{item.price/100}}</text><text>起</text></view>
-        <view class="btn" data-product="{{info}}" data-sku="{{item}}" bindtap="order">立即预订</view>
+        <view wx:if="{{item.flag=='on'}}" class="btn" data-product="{{info}}" data-sku="{{item}}" bindtap="order">立即预订</view>
        <view wx:else class="btn disable" >立即预订</view>
      </view>
    </view>
  </view>
--- 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;
 }
--- 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",{
--- 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}}"></view>
 </view>
 <view class="fixed-btn" wx:if="{{info.product_venue && info.product_venue.sku && info.product_venue.sku.length>0}}">
-  <view bindtap="order" class="btn {{info && info.team_order && isGroup ? 'team' : ''}}">参观预约</view>
+  <view bindtap="order" class="btn {{info && info.team_order && isGroup ? 'team' : ''}} {{product.product.flag==1 && product.sku.flag=='on'?'':' disable'}}">参观预约</view>
 </view>
 <view style="position:absolute;right:0;left:-10000rpx;top:-20000rpx;z-index:-1">
  <canvas canvas-id='imageCanvas' class='imageCanvas' style="width:551rpx;height:643rpx;" disable-scroll='true'>
--- 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;
--- 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
      })
--- a/pages/info/postProductInfo/index.wxml
+++ b/pages/info/postProductInfo/index.wxml
@ -80,7 +80,8 @@
  <view style="flex:1"></view>
  <view class="btns">
    <view class="btn" bindtap="showCart">加入购物车</view>
-    <view class="btn" bindtap="showOrder">立即预订</view>
+    <view class="btn" bindtap="showOrder" wx:if="{{info && info.flag==1}}">立即预订</view>
    <view class="btn disable" wx:elif="{{info}}">该商品已下架</view>
  </view>
 </view>
 <!-- 购物车悬浮框 -->
@ -110,7 +111,8 @@
    </view>
    <view style="height:138rpx"></view>
    <view class="btn-box">
-      <view class="mask-btn" bindtap="order">{{skuFlag=='cart'?'确认':'立即购买'}}</view>
+      <view class="mask-btn" bindtap="order" wx:if="{{info.sku[skuIndex].flag=='on'}}">{{skuFlag=='cart'?'确认':'立即购买'}}</view>
      <view class="mask-btn disable" wx:else>该商品已下架</view>
    </view>
  </view>
 </view>
--- 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;
--- 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
      })
--- a/pages/info/roadInfo/index.wxml
+++ b/pages/info/roadInfo/index.wxml
@ -85,12 +85,13 @@
  <navigator url="/pages/list/comments/index?productid={{id}}" wx:if="{{comment.length>0}}" class="more-comment-btn">查看全部点评<text class="iconfont icon-you"></text></navigator>
 </view>
 <view style="height:140rpx"></view>
-<view class="fixed-bottom">
+<view class="fixed-bottom" wx:if="{{info}}">
  <navigator url="/pages/user/service/index" class="kefu-box">
    <view class="iconfont icon-kefu"></view>
    <view>客服</view>
  </navigator>
-  <view class="btn" bindtap="order">立即预订</view>
+  <view class="btn" bindtap="order" wx:if="{{info.flag==1}}">立即预订</view>
  <view class="btn disable" wx:else>该商品已下架</view>
 </view>
 <view style="position:absolute;right:0;left:-10000rpx;top:-20000rpx;z-index:-1">
--- 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;
--- 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;
--- a/pages/info/sceneProductInfo/index.wxml
+++ b/pages/info/sceneProductInfo/index.wxml
@ -44,7 +44,7 @@
      </view>
      <view class="product-right">
        <view class="price"><text>￥</text><text>{{sku.price?sku.price/100:0}}</text><text>起</text></view>
-        <view bindtap="order" data-sku="{{sku}}" data-product="{{item}}" class="btn">立即预订</view>
+        <view bindtap="order" data-sku="{{sku}}" data-product="{{item}}" data-disable="{{item.flag==0 || sku.flag=='off'?1:0}}" class="btn{{item.flag==0 || sku.flag=='off'?' disable':''}}">立即预订</view>
      </view>
    </view>
  </view>
--- 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;
 }
--- a/pages/info/showInfo/index.wxml
+++ b/pages/info/showInfo/index.wxml
@ -27,5 +27,6 @@
 <rich-text wx:if="{{info}}" class="detail" nodes="{{tool.formateRichText(info.book_info)}}"></rich-text>
 <view style="height:120rpx"></view>
 <view class="fixed-bottom">
-  <view class="btn" bindtap="order">立即预约</view>
+  <view class="btn" bindtap="order" wx:if="{{info && info.flag==1}}">立即预约</view>
  <view class="btn disable" wx:else>该商品已下架</view>
 </view>
--- a/pages/info/showInfo/index.wxss
+++ b/pages/info/showInfo/index.wxss
@ -81,3 +81,6 @@ page {
  font-size: 31rpx;
  font-weight: 500;
 }
 .fixed-bottom .btn.disable {
  background: #ccc;
 }
--- 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;
--- 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;
--- a/pages/list/feiyi/index.wxml
+++ b/pages/list/feiyi/index.wxml
@ -1,7 +1,7 @@
 <!--pages/list/feiyi/index.wxml-->
 <title title="非遗专卖"></title>
 <image src="https://static.ticket.sz-trip.com/xcxImages/feiyi/feiyinew_02.jpg" mode="widthFix" class="main-img"></image>
-<navigator url="../store/index?id={{item.id}}" wx:for="{{list}}" class="store-item">
+<navigator url="../store/index?id={{item.id}}" wx:for="{{list}}" class="store-item" catchtap="pagePoint" data-id="{{item.id}}" data-event="legacy_shop">
  <image class="top-img" src="https://static.ticket.sz-trip.com/xcxImages/feiyi/feiyi-line_03.png" mode="widthFix"></image>
  <view class="store-in-box">
    <view class="store-item-top">
--- 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;
--- 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,
--- a/pages/list/movieticket/list/ticket/index.wxml
+++ b/pages/list/movieticket/list/ticket/index.wxml
@ -32,7 +32,7 @@
      <view class="ciname-distance" wx:if="{{item.distance}}">{{item.distanceText}}</view>
    </view>
    <view class="tickets-list">
-      <navigator url="../seats/index?schedule_id={{schedule.schedule_id}}&show_id={{schedule.show_id}}&cinema_id={{schedule.cinema_id}}" class="ticket-item" wx:for="{{item.schedules}}" wx:for-item="schedule">
+      <navigator url="../seats/index?schedule_id={{schedule.schedule_id}}&show_id={{schedule.show_id}}&cinema_id={{schedule.cinema_id}}" class="ticket-item" catchtap="pagePoint" data-event="movie_detail_click" wx:for="{{item.schedules}}" wx:for-item="schedule">
        <view style="color:#000;font-size:33rpx">{{schedule.show_time}}</view>
        <view style="margin:10rpx 0">{{schedule.show_version}}</view>
        <view style="color:#D62828">¥{{schedule.price/100}}</view>
--- 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,1);
    util.gotoDetail(item);
  },
  search:function(e){
    this.setData(e.detail);
--- 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);
  },
  /**
--- 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;
--- 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(){
--- 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(){
--- 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',
    })
--- 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({
--- a/pages/pbService/index.wxml
+++ b/pages/pbService/index.wxml
@ -8,23 +8,23 @@
      <image src="https://static.ticket.sz-trip.com/xcxImages/pbservice/pb1.png" mode="widthFix"></image>
      <view>苏康码</view>
    </view> -->
-    <view class="pb-item" data-title="安全服务" bindtap="gotoPath" data-path="/pages/pbService/security/index">
+    <view class="pb-item" data-event="security_public_click" data-title="安全服务" bindtap="gotoPath" data-path="/pages/pbService/security/index">
      <image src="https://static.ticket.sz-trip.com/xcxImages/pbservice/pb2.png" mode="widthFix"></image>
      <view>安全服务</view>
    </view>
-    <view class="pb-item" data-title="找厕所" bindtap="gotoPath" data-path="/pages/pbService/bike/index?type=1">
+    <view class="pb-item" data-event="toilet_public_click" data-title="找厕所" bindtap="gotoPath" data-path="/pages/pbService/bike/index?type=1">
      <image src="https://static.ticket.sz-trip.com/xcxImages/pbservice/pb3.png" mode="widthFix"></image>
      <view>找厕所</view>
    </view>
-    <view class="pb-item" data-title="景区舒适度" bindtap="gotoPath" data-path="/pages/pbService/sceneComfort/index">
+    <view class="pb-item" data-event="comfort_click" data-title="景区舒适度" bindtap="gotoPath" data-path="/pages/pbService/sceneComfort/index">
      <image src="https://static.ticket.sz-trip.com/xcxImages/pbservice/pb4.png" mode="widthFix"></image>
      <view>景区舒适度</view>
    </view>
-    <view class="pb-item" data-title="体育场馆" bindtap="gotoPath" data-path="/pages/pbService/gym/index">
+    <view class="pb-item" data-event="stadium_click" data-title="体育场馆" bindtap="gotoPath" data-path="/pages/pbService/gym/index">
      <image src="https://static.ticket.sz-trip.com/xcxImages/pbservice/pb14.png" mode="widthFix"></image>
      <view>体育场馆</view>
    </view>
-    <view class="pb-item" data-title="垃圾分类" bindtap="garbage">
+    <view class="pb-item" data-event="garbage_click" data-title="垃圾分类" bindtap="garbage">
      <image src="https://static.ticket.sz-trip.com/xcxImages/pbservice/pb16.png" mode="widthFix"></image>
      <view>垃圾分类</view>
    </view>
@ -39,19 +39,19 @@
      <image src="https://static.ticket.sz-trip.com/xcxImages/pbservice/pb6.png" mode="widthFix"></image>
      <view>实时公交</view>
    </view> -->
-    <view class="pb-item" data-title="停车场" bindtap="gotoPath" data-path="/pages/pbService/bike/index?type=2">
+    <view class="pb-item" data-event="car_park_public_click" data-title="停车场" bindtap="gotoPath" data-path="/pages/pbService/bike/index?type=2">
      <image src="https://static.ticket.sz-trip.com/xcxImages/pbservice/pb5.png" mode="widthFix"></image>
      <view>停车场</view>
    </view>
-    <view class="pb-item" data-title="公共自行车" bindtap="gotoPath" data-path="/pages/pbService/bike/index?type=0">
+    <view class="pb-item" data-event="bicycle_click" data-title="公共自行车" bindtap="gotoPath" data-path="/pages/pbService/bike/index?type=0">
      <image src="https://static.ticket.sz-trip.com/xcxImages/pbservice/pb7.png" mode="widthFix"></image>
      <view>公共自行车</view>
    </view>
-    <view class="pb-item" data-title="接送机" bindtap="jiesongji">
+    <view class="pb-item" data-event="passport_click" data-title="接送机" bindtap="jiesongji">
      <image src="https://static.ticket.sz-trip.com/xcxImages/pbservice/pb18.png" mode="widthFix"></image>
      <view>接送机</view>
    </view>
-    <view class="pb-item" data-title="P+R停车场" bindtap="gotoPath" data-path="/pages/pbService/PRpark/index">
+    <view class="pb-item" data-event="prparking_click" data-title="P+R停车场" bindtap="gotoPath" data-path="/pages/pbService/PRpark/index">
      <image src="https://static.ticket.sz-trip.com/xcxImages/pbservice/pb8.png" mode="widthFix"></image>
      <view>P+R停车场</view>
    </view>
--- 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){
--- a/pages/search/index.wxml
+++ b/pages/search/index.wxml
@ -10,11 +10,11 @@
 <view style="height:84rpx"></view>
 <view class="my-title-box"><text>搜索历史</text><text bindtap="delHis" class="iconfont icon-shanchu"></text></view>
 <view class="keywords textOver">
-  <view bindtap="searchHot" data-item="{{item}}" class="keyword textOver" wx:for="{{keywords}}">{{item}}</view>
+  <view bindtap="searchHot" data-item="{{item}}" data-event="search_history_click" class="keyword textOver" wx:for="{{keywords}}">{{item}}</view>
 </view>
 <view class="my-title-box"><text>热门搜索</text></view>
 <view class="hot-list">
-  <view class="hot-item" wx:for="{{hot}}" bindtap="searchHot" data-item="{{item.name}}">
+  <view class="hot-item" wx:for="{{hot}}" bindtap="searchHot" data-event="search_hot_click" data-item="{{item.name}}">
    <view class="hot-num">{{index+1}}</view>
    <view>{{item.name}}</view>
  </view>
--- 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)
  },
  /**
--- a/pages/user/order/activityOrderInfo/index.wxml
+++ b/pages/user/order/activityOrderInfo/index.wxml
@ -3,7 +3,7 @@
 <title title="订单详情"></title>
 <view class="top-bg"></view>
 <canvas wx:for="{{info.order_product_list[0].qrcode}}" class="code-img" style="position:absolute;z-index:-1;" canvas-id="damocode{{index}}"></canvas>
-<view class="state-text" wx:if="{{info}}">{{productState[info.order_product_list[0].state]}}</view>
+<view class="state-text" wx:if="{{info}}">{{info.state_text}}</view>
 <view class="code-box box" wx:if="{{info && codeImgs.length>0}}">
  <view bindtap="prevCodeImg" class="iconfont icon-you-copy"></view>
  <view wx:for="{{info.order_product_list[0].qrcode}}" wx:if="{{codeIndex==index && codeImgs[codeIndex]}}">
--- a/pages/user/order/couponOrderInfo/index.wxml
+++ b/pages/user/order/couponOrderInfo/index.wxml
@ -3,7 +3,7 @@
 <title title="订单详情"></title>
 <view class="top-bg"></view>
 <canvas wx:for="{{info.order_product_list[0].qrcode}}" class="code-img" style="position:absolute;z-index:-1;" canvas-id="damocode{{index}}"></canvas>
-<view class="state-text" wx:if="{{info}}">{{productState[info.order_product_list[0].state]}}</view>
+<view class="state-text" wx:if="{{info}}">{{info.state_text}}</view>
 <view class="code-box box" wx:if="{{info && info.order_product_list[0].state=='WAIT_USE' && codeImgs.length>0}}">
  <view bindtap="prevCodeImg" class="iconfont icon-you-copy"></view>
  <view wx:for="{{info.order_product_list[0].qrcode}}" wx:if="{{codeIndex==index && codeImgs[codeIndex]}}">
--- a/pages/user/order/foodOrderInfo/index.wxml
+++ b/pages/user/order/foodOrderInfo/index.wxml
@ -3,7 +3,7 @@
 <title title="订单详情"></title>
 <view class="top-bg"></view>
 <canvas wx:for="{{info.order_product_list[0].qrcode}}" class="code-img" style="position:absolute;z-index:-1;" canvas-id="damocode{{index}}"></canvas>
-<view class="state-text" wx:if="{{info}}">{{productState[info.order_product_list[0].state]}}</view>
+<view class="state-text" wx:if="{{info}}">{{info.state_text}}</view>
 <view class="code-box box" wx:if="{{info && codeImgs.length>0}}">
  <view bindtap="prevCodeImg" class="iconfont icon-you-copy"></view>
  <view wx:for="{{info.order_product_list[0].qrcode}}" wx:if="{{codeIndex==index && codeImgs[codeIndex]}}">
--- a/pages/user/order/hotelOrderInfo/index.wxml
+++ b/pages/user/order/hotelOrderInfo/index.wxml
@ -3,7 +3,7 @@
 <title title="订单详情"></title>
 <view class="top-bg"></view>
 <canvas wx:for="{{info.order_product_list[0].qrcode}}" class="code-img" style="position:absolute;z-index:-1;" canvas-id="damocode{{index}}"></canvas>
-<view class="state-text" wx:if="{{info}}">{{orderState[info.state]}}</view>
+<view class="state-text" wx:if="{{info}}">{{info.state_text}}</view>
 <view class="code-box box" wx:if="{{info && codeImgs.length>0}}">
  <view bindtap="prevCodeImg" class="iconfont icon-you-copy"></view>
  <view wx:for="{{info.order_product_list[0].qrcode}}" wx:if="{{codeIndex==index && codeImgs[codeIndex]}}">
--- a/pages/user/order/lineOrderInfo/index.wxml
+++ b/pages/user/order/lineOrderInfo/index.wxml
@ -3,7 +3,7 @@
 <title title="订单详情"></title>
 <view class="top-bg"></view>
 <canvas wx:for="{{info.order_product_list[0].qrcode}}" class="code-img" style="position:absolute;z-index:-1;" canvas-id="damocode{{index}}"></canvas>
-<view class="state-text" wx:if="{{info}}">{{orderState[info.state]}}</view>
+<view class="state-text" wx:if="{{info}}">{{info.state_text}}</view>
 <view class="code-box box" wx:if="{{info && codeImgs.length>0}}">
  <view bindtap="prevCodeImg" class="iconfont icon-you-copy"></view>
  <view wx:for="{{info.order_product_list[0].qrcode}}" wx:if="{{codeIndex==index && codeImgs[codeIndex]}}">
--- a/pages/user/order/movieOrderInfo/index.wxml
+++ b/pages/user/order/movieOrderInfo/index.wxml
@ -3,7 +3,7 @@
 <title title="订单详情"></title>
 <view class="top-bg"></view>
 <canvas wx:for="{{info.order_product_list[0].qrcode}}" class="code-img" style="position:absolute;z-index:-1;" canvas-id="damocode{{index}}"></canvas>
-<view class="state-text" wx:if="{{info}}">{{productState[info.order_product_list[0].state]}}</view>
+<view class="state-text" wx:if="{{info}}">{{info.state_text}}</view>
 <view class="code-box box" wx:if="{{info && info.order_product_list[0].state=='WAIT_USE' && codeImgs.length>0}}">
  <view bindtap="prevCodeImg" class="iconfont icon-you-copy"></view>
  <view wx:for="{{info.order_product_list[0].qrcode}}" wx:if="{{codeIndex==index && codeImgs[codeIndex]}}">
--- a/pages/user/order/museumOrderInfo/index.wxml
+++ b/pages/user/order/museumOrderInfo/index.wxml
@ -3,7 +3,7 @@
 <title title="订单详情"></title>
 <view class="top-bg"></view>
 <canvas wx:for="{{info.order_product_list[0].qrcode}}" class="code-img" style="position:absolute;z-index:-1;" canvas-id="damocode{{index}}"></canvas>
-<view class="state-text" wx:if="{{info}}">{{info.orderStateText || productState[info.order_product_list[0].state]}}</view>
+<view class="state-text" wx:if="{{info}}">{{info.state_text}}</view>
 <view class="code-box box" wx:if="{{info && codeImgs.length>0}}">
  <view bindtap="prevCodeImg" class="iconfont icon-you-copy"></view>
  <view wx:for="{{info.order_product_list[0].qrcode}}" wx:if="{{codeIndex==index && codeImgs[codeIndex]}}">
--- a/pages/user/order/postOrderInfo/index.wxml
+++ b/pages/user/order/postOrderInfo/index.wxml
@ -2,7 +2,7 @@
 <wxs src="../../../../utils/filter.wxs" module="tool" />
 <title title="订单详情"></title>
 <view class="top-bg"></view>
-<view class="state-text" wx:if="{{info}}">{{!isRefund && info.stateNums.WAIT_DELIVERY>0?"已发货":(!isRefund && info.stateNums.WAIT_POST>0?"待发货":orderState[info.state])}}</view>
+<view class="state-text" wx:if="{{info}}">{{info.state_text}}</view>
 <view class="box" wx:if="{{info}}" style="color:#333">
  <view class="scene-box-left" wx:if="{{info.state=='REFUND'}}" style="width:100%">您的退款已成功，退款金额预计在1-7个工作日内退还到您支付的账户</view>
  <view class="scene-box-left" wx:elif="{{info.state=='WAIT_REFUND'}}" style="width:100%">您已成功发起退款申请，请耐心等待</view>
@ -26,7 +26,7 @@
      </view>
    </view>
    <view class="product-price">邮费：{{item.post_fee==0?'包邮':('￥'+item.post_fee/100)}} 实付：￥{{item.paid_money/100}}</view>
-    <view class="product-state">{{productState[item.state]}}</view>
+    <view class="product-state">{{item.state_text}}</view>
  </view>
  <view class="detail-item">
    <text>商品总价</text>
--- a/pages/user/order/sceneOrderInfo/index.wxml
+++ b/pages/user/order/sceneOrderInfo/index.wxml
@ -3,7 +3,7 @@
 <title title="订单详情"></title>
 <view class="top-bg"></view>
 <canvas wx:for="{{info.order_product_list[0].qrcode}}" class="code-img" style="position:absolute;z-index:-1;" canvas-id="damocode{{index}}"></canvas>
-<view class="state-text" wx:if="{{info}}">{{productState[info.order_product_list[0].state]}}</view>
+<view class="state-text" wx:if="{{info}}">{{info.state_text}}</view>
 <view class="code-box box" wx:if="{{info && codeImgs.length>0}}">
  <view bindtap="prevCodeImg" class="iconfont icon-you-copy"></view>
  <view wx:for="{{info.order_product_list[0].qrcode}}" wx:if="{{codeIndex==index && codeImgs[codeIndex]}}">
--- 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({
  /**
--- 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',
--- 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',
--- 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://test.api.cloud.sz-trip.com/api/";
-const baseUrl = "https://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) {
--- 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
 }