客服首页改版

app.js

@@ -38,7 +38,7 @@ App({
         // 获取前端配置文件
         commonApi._post("pbservice/Other/getClientConfig", {unique_key: "wechatxcx"}).then(res => {
             let data = JSON.parse(res.data);
-            data.isTest = data.isTest137? true : false;
+            data.isTest = data.isTest139? true : false;
             data.indexSeason = null
             this.globalData.configJson = data
         }).then(() => {

app.json

@@ -182,9 +182,7 @@
     "pages/order/WineSceneOrder/index",
     "pages/order/showOrderNew/index",
     "pages/user/order/showOrderInfo/index",
-    "pages/user/suggest/suggest",
+    "pages/user/suggest/suggest"
-    "pages/list/foodNew/index",
-    "pages/info/foodNew/index"
   ],
   "subpackages": [
     {
@@ -204,7 +202,9 @@
         "goods/oneCardTour/info/index",
         "feiyiNew/CGCIndex/index",
         "feiyiNew/CGCLetter/index",
-        "feiyiNew/CGCTime/index"
+        "feiyiNew/CGCTime/index",
+        "foodListNew/index",
+        "foodNew/index"
       ]
     },
     {

pages/component/kefu/index.js

@@ -0,0 +1,58 @@
+// pages/component/kefu/index.js
+import commonApi from "../../../utils/https/common.js"
+Component({
+
+  /**
+   * 组件的属性列表
+   */
+  properties: {
+    
+  },
+  data: {
+      show: false,
+      showPhone: false,
+      info: "",
+      phones: []
+  },
+  lifetimes: {
+    attached() {
+      console.log('组件已挂载到页面');
+      this.initData();
+    }
+  },
+  /**
+   * 组件的初始数据
+   */
+
+
+
+  /**
+   * 组件的方法列表
+   */
+  methods: {
+    initData () {
+        commonApi._post("kefu_tips/getTips", {platform:'miniapp'}).then(res=>{
+            if (res.data) {
+                this.setData({
+                    showPhone: res.data.is_online,
+                    info: res.data.content,
+                    phones: res.data.emergency_phones
+                })
+            }
+        })
+    },
+
+    hideModal: function () {
+        this.setData({
+            show: false,
+        })
+        this.triggerEvent('hideModal');
+    },
+    phoneCall:function(e){
+        let phone = e.currentTarget.dataset.phone;
+        wx.makePhoneCall({
+          phoneNumber: phone,
+        })
+    },
+  }
+})

pages/component/kefu/index.json

@@ -0,0 +1,4 @@
+{
+  "component": true,
+  "usingComponents": {}
+}

pages/component/kefu/index.wxml

@@ -0,0 +1,24 @@
+<wxs src="../../../utils/filter.wxs" module="tool" />
+<view class="bg">
+    <view class="modal-mask" bindtap="hideModal" catchtouchmove="preventTouchMove"></view>
+    <view class="modal-dialog">
+        <view class="iconfont icon-close" bindtap="hideModal">
+            <image src="https://static.ticket.sz-trip.com/uploads/20250929/75f708ed1c580afdefd3aed82d53f94a.png"></image>
+        </view>
+        <view class="modal-content">
+            
+            <rich-text style="width: 100%;word-break: break-all;"
+            nodes="{{tool.formateRichText(info)}}"></rich-text>
+        
+            <view class="phone-container" wx:for="{{phones}}" wx:if="{{showPhone}}">
+                <view bind:tap="phoneCall" data-phone="{{item}}">{{item}}</view>
+            </view>
+        </view>
+
+        <view class="modal-footer">
+            <view  class="btn-confirms two" style="border-right: 1px solid #D8D8D8;" bindtap="hideModal">取消</view>
+            <button class="btn-confirms"
+            open-type="contact" bindcontact="handleContact">确定</button>
+        </view>
+    </view>
+</view>

pages/component/kefu/index.wxss

@@ -0,0 +1,88 @@
+.bg{
+    width: 100%;
+    height: 100%;
+    position: fixed;
+    top: 0;
+    left: 0;
+    overflow: hidden;
+    box-sizing: border-box;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+}
+.modal-mask {
+    width: 100%;
+    height: 100%;
+    position: fixed;
+    top: 0;
+    left: 0;
+    background: #000;
+    opacity: 0.5;
+    overflow: hidden;
+    z-index: 200;
+    color: #fff;
+}
+
+.modal-dialog {
+    width: 540rpx;
+    overflow: hidden;
+    position: relative;
+    z-index: 9999;
+    background: #FFFFFF;
+    border-radius: 20rpx;
+}
+.modal-content{
+    padding: 38rpx 26rpx;
+}
+
+
+.modal-footer {
+    display: flex;
+    flex-direction: row;
+    height: 112rpx;
+    border-top: 1px solid #dedede;
+    
+    
+    color: #000000;
+    padding:  30rpx 0;
+    box-sizing: border-box;
+}
+
+
+
+
+.btn-confirms {
+    flex: 1;
+    text-align: center;
+    font-weight: normal !important;
+    box-sizing: border-box;
+    width: 50% !important;
+    padding: 0 !important;
+    line-height: 50rpx;
+    background: none;
+    color: #0C898F;
+    font-weight: 500;
+    font-size: 32rpx;
+}
+.btn-confirms.two {
+    color: #000000;
+}
+
+.icon-close{
+    position: absolute;
+    width: 27.33rpx;
+    height: 27.33rpx;
+    top: 39rpx;
+    right: 26rpx;
+}
+.icon-close image{
+    width: 100%;
+    height: 100%;
+}
+.phone-container{
+    text-align: center;
+    font-weight: 500;
+font-size: 27rpx;
+color: #0C898F;
+line-height: 1.8;
+}

pages/index/index.js

@@ -7,6 +7,7 @@ import commonApi from "../../utils/https/common"
 import userApi from "../../utils/https/user"
 import util from "../../utils/util"
 import https from "../../utils/https.js"
+import { unix } from "dayjs"
 
 Page({
 	data: {
@@ -1050,7 +1051,13 @@ Page({
         if (app.globalData.innerAudioContext) {
             app.globalData.innerAudioContext.stop()
         }
-	},
+    },
+    
+    goAIUrl () {
+        wx.switchTab({
+          url: '/pages/pbService/aiHelpYou/index',
+        })
+    },
 
 	/**
 	 * 用户点击右上角分享

pages/index/index.wxml

@@ -52,7 +52,6 @@
                 </block>
             </swiper> -->
             <view class="top-icons no-scrollbar">
-            
                 <view bindtap="mainNavClick" class="top-icon-item" data-item="{{item}}" wx:for="{{mainTypeList}}" wx:key="index">
                     <image lazy-load src="{{item.icon}}" mode="aspectFill" class="{{(mainNavIndex+2)==index?'active':''}}"></image>
                     <view class="top-icon-text">{{item.menu_name}}</view>
@@ -85,10 +84,14 @@
             </view>
 
             <!-- 限时特惠--新版-->
-            <view class="sale-road-boxes xpth" style="margin-bottom: 18.67rpx;margin-top: 0;padding-top: 0;" wx:if="{{func_data.hot_deals}}">
+            <view class="sale-road-boxes" style="margin-top:0;" wx:if="{{func_data.hot_deals}}">
+                <image lazy-load class="common-header-img" mode="widthFix" src="{{indexSeason.hotBac}}"></image>
+                <!-- <image lazy-load class="common-header-img" mode="widthFix" src="https://static.ticket.sz-trip.com/uploads/20250929/49cb17e72c8841c9a72f2d109901de83.png"></image> -->
+                
+            </view>
                 <!-- 上方标题部分 -->
-                <view class="xsth-title">
+                <!-- <view class="xsth-title">
-                    <view class="xsth-left" style="display: flex;">
+                     <view class="xsth-left" style="display: flex;">
                         <image lazy-load  wx:if="{{xpthIndex==0}}" mode="widthFix" class="common-header-img" src="{{indexSeason.hotBac}}"></image>
                         <image lazy-load   wx:else="" bindtap="changeXpthIndex" data-value="{{0}}" mode="widthFix" class="common-header-img" src="{{indexSeason.hotBacImg}}"></image>
                         
@@ -96,11 +99,12 @@
                             <image lazy-load  wx:if="{{xpthIndex==0}}" bindtap="changeXpthIndex" data-value="{{1}}" mode="widthFix" class="common-header-img" src="{{indexSeason.xpthBacImg}}"></image>
                             <image lazy-load   wx:else  mode="widthFix" class="common-header-img" src="{{indexSeason.xpthBac}}"></image>
                         </view>
-                        
                     </view>
-                </view>
+                </view> -->
+       
+            <view style="margin-top: -38rpx;" wx:if="{{func_data.hot_deals}}">
                 <!-- 热门 -->
-                <view style="width: 100%;" wx:if="{{xpthIndex==0}}">
+                <view style="width: 100%;" wx:if="{{false}}">
                     <scroll-view scroll-x style="height:372rpx;padding-top: 25rpx;">
                         <view class="season-hot">
                             <view class="season-item" wx:for="{{list}}" wx:key="index" bind:tap="productGotoDetail" data-item="{{item}}" data-source="当季热门">
@@ -121,7 +125,7 @@
                 </view>
 
                 <!-- 显示特惠 -->
-                <view class="xpth-product" wx:else="">
+                <view class="xpth-product" wx:if="{{false}}">
                     <!-- 左边的2个产品 -->
                     <view class="xpth-left">
                         <view class="xpth-item" wx:for="{{xpth.list}}" bindtap="productGotoDetail" data-item="{{item}}" wx:key="id" data-source="限时特惠">
@@ -152,6 +156,26 @@
                         </view> -->
                     </view>
                 </view>
+
+                <view class="hot-prod-new">
+
+                    <view class="hot-prod-left" bindtap="productGotoDetail" data-item="{{list[0]}}" wx:key="id" data-source="当季热门">
+                        <image lazy-load class="prod-img" src="{{list[0].headimg}}" mode="aspectFill" />
+                        <view class="xpth-item-title">{{list[0].subtitle}}</view>
+                    </view>
+
+                    <view class="hot-prod-right">
+                        <view class="hot-right-item hot-prod-left" bindtap="productGotoDetail" data-item="{{list[1]}}" wx:key="id" data-source="当季热门">
+                            <image lazy-load class="prod-img" src="{{list[1].headimg}}" mode="aspectFill" />
+                            <view class="xpth-item-title">{{list[1].subtitle}}</view>
+                        </view>
+                        <view class="hot-right-item hot-prod-left" bindtap="productGotoDetail" data-item="{{list[2]}}" wx:key="id" data-source="当季热门">
+                            <image lazy-load class="prod-img" src="{{list[2].headimg}}" mode="aspectFill" />
+                            <view class="xpth-item-title">{{list[2].subtitle}}</view>
+                        </view>
+                    </view>
+                </view>
+
             </view>
 
             <view class="small-swiper-box"  wx:if="{{xiaobanner.length>0 && func_data.banner_mini}}">
@@ -332,6 +356,9 @@
         </view>
     </view>
 
+
+    <!-- 底部AI伴你游 -->
+    <image class="ai-fix" bind:tap="goAIUrl" mode="widthFix" src="https://static.ticket.sz-trip.com/uploads/20250929/6f29f557e80a331e84f01f2a5083d933.gif"></image>
 </view>
 
 

pages/index/index.wxss

@@ -7,6 +7,7 @@
     overflow-y: auto;
     background-size: 100% 100%;
     background-repeat: no-repeat;
+    padding-bottom: 220rpx;
     /* background-color:#E8F9FA; */
 
 }
@@ -1038,4 +1039,67 @@
     margin-top: 20rpx;
     margin-left: -6rpx;
     margin-right: 0rpx;
+  }
+
+  .ai-fix{
+      position: fixed;
+      width: 150.33rpx;
+      height: 200rpx;
+      bottom: 30rpx;
+      right: 24rpx;
+      z-index: 100;
+  }
+  .hot-prod-new{
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    width: 100%;
+  }
+  .hot-prod-left{
+      width: 400rpx;
+      height: 350rpx;
+      position: relative;
+  }
+  .hot-prod-left .prod-img{
+      width: 100%;
+      height: 100%;
+      border-radius: 20rpx;
+  }
+  .hot-prod-left .xpth-item-title{
+      position: absolute;
+      width: 100%;
+      font-weight: 500;
+      font-size: 28rpx;
+      color: #FFFFFF;
+      bottom: 0;
+      left: 0;
+      right: 0;
+      top: 0;
+      height: 100%;
+      width: 100%;
+      background: linear-gradient(to bottom, rgba(0,0,0,0),rgba(0,0,0,0.5)) ;
+      display: flex;
+      border-radius: 20rpx;
+      padding: 0 8rpx 6rpx;
+      box-sizing: border-box;
+      overflow: hidden;
+      align-items: flex-end;
+  }
+
+  .hot-prod-right{
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    height: 350rpx;
+    align-items: flex-end;
+    flex: 1;
+    width: 100rpx;
+    padding-left: 14rpx;
+  }
+
+  .hot-prod-right .hot-right-item{
+      
+      height: 167rpx;
+      width: 100%;
+
   }

pages/info/foodProductInfo/index.js

@@ -62,12 +62,12 @@ Page({
             id: options.id
         })
         // 获取购物车按钮的位置
-        // wx.createSelectorQuery().select('#cart').boundingClientRect(function (res) {
+        wx.createSelectorQuery().select('#cart').boundingClientRect(function (res) {
-        //     console.log(res)
+            console.log(res)
-        //     that.setData({
+            that.setData({
-        //         cartTop: res.top
+                cartTop: res.top
-        //     })
+            })
-        // }).exec()
+        }).exec()
         if (options.ZTPoint) {
             this.setData({
                 ZTPoint: options.ZTPoint
@@ -141,8 +141,8 @@ Page({
             console.log(swiperRange)
             this.setData({
                 info: resData,
-                supplierId: res.data.supplier_id,
+                supplierId: res.data.scene_id,
-                iShop: res.data.supplier_id ? true : false,
+                iShop: res.data.scene_id ? true : false,
                 swiperRange: swiperRange,
             })
 

pages/info/foodProductInfo/index.wxml

@@ -1,7 +1,7 @@
 <!--pages/info/hotelProductInfo/index.wxml-->
 <wxs src="../../../utils/filter.wxs" module="tool" />
 <title title="产品详情"></title>
-<view class="share-icon" bindtap="share"></view>
+<!-- <view class="share-icon" bindtap="share"></view> -->
 <image lazy-load wx:for="{{info.sku}}" style="{{aniSkuIndex==index?('top:'+cartTop+'px;'):('top:'+top+'px;'+cartImgInfo)}}" class="headimg{{aniSkuIndex==index?' active':''}}" src="{{info.headimg}}" mode="aspectFill"></image>
 <view style="position: relative;">
     <swiper class="swiper" wx:if="{{info}}" autoplay="{{autoPlay}}" current="{{swiperCurrent}}"
@@ -127,7 +127,7 @@
 <view style="height:140rpx"></view>
 <view class="fixed-bottom">
 <view class="['left-img',{{!iShop?'no-shop':''}}]">
-  <navigator wx:if="{{iShop}}" url="/pages/info/foodNew/index?id={{supplierId}}" catchtap="pagePoint" data-event='product_customservice' class="shop-box">
+  <navigator wx:if="{{iShop}}" url="/subPackages/foodNew/index?id={{supplierId}}" catchtap="pagePoint" data-event='product_customservice' class="shop-box">
   <view class="shop-box">
     <image lazy-load class="icon-shop" src="https://static.ticket.sz-trip.com/uploads/20230220/cc7bfaf50dccd354c56a1ad40d730b2e.png" mode="aspectFill"/>
     <view>店铺</view>
@@ -146,16 +146,16 @@
 
 
   <view class="btns">
-    <!-- <view class="btn" bindtap="showCart">加入购物车</view> -->
+    <view class="btn" bindtap="order">加入购物车</view>
-    <view class="btn" bindtap="order" data-type="order" wx:if="{{info && info.flag==1}}" style="background:#D62828;border-radius: 39rpx;" >立即购买</view>
+    <view class="btn" bindtap="order" data-type="order" wx:if="{{info && info.flag==1}}" >立即购买</view>
     <view class="btn disable" wx:elif="{{info}}" style="border-radius: 39rpx;">该商品已下架</view>
   </view>
 </view>
 <!-- 购物车悬浮框 -->
-<!-- <navigator url="/pages/user/cartlist/list" catchtap="pagePoint" data-event='product_cart_click' class="cart-box" id="cart">
+<navigator url="/pages/user/cartlist/list" catchtap="pagePoint" data-event='product_cart_click' class="cart-box" id="cart">
   <image lazy-load src="https://static.ticket.sz-trip.com/xcxImages/info/cart.png" mode="widthFix"></image>
   <view class="cart-num">{{cartCount}}</view>
-</navigator> -->
+</navigator>
 <view class="mask" wx:if="{{skuFlag}}">
   <view class="mask-bg" bindtap="hideSku"></view>
   <view class="mask-content">

pages/map/index.wxml

@@ -24,18 +24,23 @@
       <image lazy-load class="menu-item-img" src="{{type==2?'https://static.ticket.sz-trip.com/uploads/20240123/021858cdaa954dab5eb8180303f33143.png':'https://static.ticket.sz-trip.com/uploads/20240123/c6c46566f32eeb8b9663a6be2ef0ae08.png'}}" mode="aspectFill"/>
       <text class="text">场馆</text>
     </view>
-    <view class="menu-item{{type==3?' active':''}}" bindtap="changeType" data-title="酒店" data-type="3">
+    <!-- <view class="menu-item{{type==3?' active':''}}" bindtap="changeType" data-title="酒店" data-type="3">
       <image lazy-load class="menu-item-img" src="{{type==3?'https://static.ticket.sz-trip.com/uploads/20240123/bf35245fe360ee8ff7194deff26285e5.png':'https://static.ticket.sz-trip.com/uploads/20240123/8e81faa85e98a7bee269ef9fdbfd6628.png'}}" mode="aspectFill"/>
       <text class="text">酒店</text>
-    </view>
+    </view> -->
     <!-- <view class="menu-item{{type==4?' active':''}}" bindtap="changeType" data-title="公共自行车" data-type="4">
       <image lazy-load class="menu-item-img" src="{{type==4?'https://static.ticket.sz-trip.com/uploads/20240123/8a953d4354ce4fd6b63832d00ba1d93a.png':'https://static.ticket.sz-trip.com/uploads/20240123/47a1dc475686ef5a080ba2a297dd78d8.png'}}" mode="aspectFill"/>
       <text class="text">公共自行车</text>
     </view> -->
+    <view class="menus-item{{type==10?' active':''}}" bindtap="changeType" data-title="行李寄存" data-type="10">
+      <image lazy-load class="menu-item-img" src="{{type==10?'https://static.ticket.sz-trip.com/uploads/20240123/4288a56bbb7d333e4c007baa68c5e02f.png':'https://static.ticket.sz-trip.com/uploads/20240123/fdd743af95af2679f2dd60229fe06bd0.png'}}" mode="aspectFill"/>
+      <text class="text">行李寄存</text>
+    </view>
     <view class="menus-item{{type==7?' active':''}}" bindtap="changeType" data-title="运河十景" data-type="7">
       <image lazy-load class="menu-item-img" src="{{type==7?'https://static.ticket.sz-trip.com/uploads/20240123/c57bfbb67fe73593904e92188399ea10.png':'https://static.ticket.sz-trip.com/uploads/20240123/c99e25679e5c1d5a9e0587ddcb278948.png'}}" mode="aspectFill"/>
       <text class="text">运河十景</text>
     </view>
+
   </view>
 </view>
 <view class="menus2" wx:else>
@@ -59,18 +64,18 @@
       <image lazy-load class="menu-item-img" src="{{type==11?'https://static.ticket.sz-trip.com/uploads/20240123/2f90c0a3be0afbab22ab9c07c6a0eb4c.png':'https://static.ticket.sz-trip.com/uploads/20240123/434433c37b40681d6b6d7e99fe8736f3.png'}}" mode="aspectFill"/>
       <text class="text">游客中心</text>
     </view>
-    <view class="menus-item{{type==3?' active':''}}" bindtap="changeType" data-title="酒店" data-type="3">
+    <!-- <view class="menus-item{{type==3?' active':''}}" bindtap="changeType" data-title="酒店" data-type="3">
       <image lazy-load class="menu-item-img" src="{{type==3?'https://static.ticket.sz-trip.com/uploads/20240123/bf35245fe360ee8ff7194deff26285e5.png':'https://static.ticket.sz-trip.com/uploads/20240123/8e81faa85e98a7bee269ef9fdbfd6628.png'}}" mode="aspectFill"/>
       <text class="text">酒店</text>
-    </view>
+    </view> -->
     <view class="menus-item{{type==10?' active':''}}" bindtap="changeType" data-title="行李寄存" data-type="10">
       <image lazy-load class="menu-item-img" src="{{type==10?'https://static.ticket.sz-trip.com/uploads/20240123/4288a56bbb7d333e4c007baa68c5e02f.png':'https://static.ticket.sz-trip.com/uploads/20240123/fdd743af95af2679f2dd60229fe06bd0.png'}}" mode="aspectFill"/>
       <text class="text">行李寄存</text>
     </view>
-    <view class="menus-item{{type==12?' active':''}}" bindtap="changeType" data-title="特产" data-type="12">
+    <!-- <view class="menus-item{{type==12?' active':''}}" bindtap="changeType" data-title="特产" data-type="12">
       <image lazy-load class="menu-item-img" src="{{type==12?'https://static.ticket.sz-trip.com/uploads/20240123/8d8bf4cd274617eddc67b7f7bfc600ad.png':'https://static.ticket.sz-trip.com/uploads/20240123/c3fe8b4e3c7b13ff8eeabad48f2784c1.png'}}" mode="aspectFill"/>
       <text class="text">特产</text>
-    </view>
+    </view> -->
     <view class="menus-item{{type==5?' active':''}}" bindtap="changeType" data-title="美食" data-type="5">
       <image lazy-load class="menu-item-img" src="{{type==5?'https://static.ticket.sz-trip.com/uploads/20240123/a1c54d7b95d69646d55a7cb66a5b7ba2.png':'https://static.ticket.sz-trip.com/uploads/20240123/491264b09539365d16c8f625a5c40258.png'}}" mode="aspectFill"/>
       <text class="text">美食</text>

pages/map/index.wxss

@@ -583,7 +583,7 @@
   display: flex;
   /* justify-content: space-around; */
   flex-wrap: wrap;
-  width: calc(170rpx * 7);
+  width: calc(170rpx * 6);
   margin: 0 20rpx;
 }
 

pages/order/components/date/index.wxss

@@ -123,6 +123,7 @@
   right: 0;
   bottom: 0;
   padding-bottom: 50rpx;
+  z-index: 50;
 }
 .short-date {
   font-weight: 500;

pages/order/food/index.js

@@ -116,13 +116,13 @@ Page({
     })
   },
   order:function(){
-    if(!this.data.user){
+    // if(!this.data.user){
-      wx.showToast({
+    //   wx.showToast({
-        title: '请输入联系人',
+    //     title: '请输入联系人',
-        icon: 'none'
+    //     icon: 'none'
-      })
+    //   })
-      return;
+    //   return;
-    }
+    // }
     if(!this.data.tel){
       wx.showToast({
         title: '请输入手机号',

pages/order/food/index.wxml

@@ -19,10 +19,10 @@
     <view class="number-box">{{productNum}}</view>
     <view class="iconfont icon-add-select" bindtap="add"></view>
   </view>
-  <view class="box-title">
+  <!-- <view class="box-title">
     <view style="flex-shrink:0">联系人：</view>
     <input type="text" value="{{user}}" bindinput="userInput" placeholder="输入您的名字"></input>
-  </view>
+  </view> -->
   <view class="box-title">
     <view style="flex-shrink:0">手机号：</view>
     <input type="number" value="{{tel}}" bindinput="telInput" placeholder="请输入手机号"></input>

pages/order/orderList/index.wxml

@@ -37,7 +37,7 @@
 			<view>X{{item.num}}</view>
 		</view>
         <view class="item-box item-title" style="padding-top: 27rpx;">出行人信息</view>
-        <view wx:if="{{item.sku.sku_model.is_authentication != 0}}">
+        <view wx:if="{{item.sku.sku_model.is_authentication}}">
             <view wx:for="{{item.linkmanList}}" style="padding-left: 10rpx;" wx:for-item="items">
                 <view>
                     <view class="text"><view class="text-left">姓名：</view>{{items.name}}</view>

pages/order/scene/index.js

@@ -65,7 +65,7 @@ Page({
 	  ticket_type:app.globalData.product.sku.ticket_type || 1,
       isCar:options.isCar,
       is_need_idcard:app.globalData.product.sku.sku_model.is_need_idcard,
-      is_authentication:app.globalData.product.sku.sku_model.is_authentication,
+      is_authentication:app.globalData.product.sku.sku_model.is_authentication || 0,
       is_real_name:app.globalData.product.sku.sku_model.is_real_name,
       date: app.globalData.product.date,
       time: app.globalData.product.time || {},
@@ -505,6 +505,8 @@ Page({
         remark: remark,
         product_num: app.globalData.product.isGroup == 1 ? 1 : productNum,
         phone:this.data.phone,// 不实名的时候传的手机号参数
+        // 美食预定
+        reserve_mobile: product.product.type=="food"?this.data.phone:"",
       }],
       originate_order_id: this.data.kjId,
       gp_id: app.globalData.gp_id,
@@ -541,8 +543,9 @@ Page({
 	if(app.globalData.list){
     app.globalData.list[app.globalData.index] = this.data.product
     // app.globalData.list[app.globalData.index].linkmanList = this.data.linkmanList
-    if (app.globalData.list[app.globalData.index].sku.sku_model.is_authentication == 0) {
+    if (!app.globalData.list[app.globalData.index].sku.sku_model.is_authentication) {
       app.globalData.list[app.globalData.index].phone = this.data.phone
+    //   app.globalData.list[app.globalData.index].reserve_mobile = this.data.phone
       app.globalData.list[app.globalData.index].linkmanList = []
     }else {
       app.globalData.list[app.globalData.index].linkmanList = this.data.linkmanList

pages/user/order/foodOrderInfo/index.js

@@ -194,7 +194,7 @@ Page({
 
 callPhone :function () {
     wx.makePhoneCall({
-        phoneNumber: this.data.info.order_product_list[0].supplier_info.phone,
+        phoneNumber: this.data.info.order_product_list[0].scene_detail.tel,
     })
 },
 

pages/user/order/foodOrderInfo/index.wxml

@@ -19,8 +19,8 @@
 
 <!-- 美食的 -->
 
-<view class="box" wx:if="{{product_model=='food'}}">
+<view  wx:if="{{product_model=='food'}}">
-  <view wx:if="{{info.order_product_list && info.order_product_list.length>0}}"  wx:for="{{info.order_product_list}}">
+  <view class="box" wx:if="{{info.order_product_list && info.order_product_list.length>0}}"  wx:for="{{info.order_product_list}}">
     <view class="product-info">
     <image lazy-load src="{{item.sku_headimg}}" mode="aspectFill"></image>
     <view class="title-box textOver2">
@@ -39,30 +39,42 @@
     </view>
     <view class="state_text">{{item.state_text}}</view>
 
-    <view class="detail-item">
+    <view class="detail-item" wx:if="{{item.paid_money}}">
-    <text>商品总额：</text>
+        <text>小计</text>
-    <text style="font-weight: bold;color: #111111;">￥{{info.total_money/100}}</text>
+        <text style="color: #DC2525;font-weight: bold;">￥{{item.paid_money/100}}</text>
-  </view>
+    </view>
-  <view class="detail-item" wx:if="{{info.total_post_fee}}">
+
-    <text>运费</text>
+
-    <text style="font-weight: bold;color: #111111;">￥{{info.total_post_fee/100}}</text>
+    <view class="box-title">商家信息</view>
-  </view>
+        <view class=" supplier-mask">
-  <view class="detail-item" wx:if="{{info.preference_money}}">
+            <view class="mask-shop-info">
-    <text>优惠券：</text>
+                <view>{{info.order_product_list[0].supplier_info.shop_name}}</view>
-    <text style="font-weight: bold;color: #111111;">-￥{{info.preference_money/100}}</text>
+                <view class="shop-info-item">
-  </view>
+                    <image class="start-icon" src="https://static.ticket.sz-trip.com/jundaosuzhou/images/food/time.png"></image>
-  <view class="detail-item">
+                    <view>
-    <text>实付金额：</text>
+                        <view>营业时间</view>
-    <view class="price">{{info.paid_money/100}}</view>
+                        <view class="subtitle">{{info.order_product_list[0].supplier_info.business_hours}}</view>
-  </view>
+                    </view>
-  </view>
+                </view>
+                <view class="shop-info-item" style="justify-content: space-between;">
+                    <image class="start-icon" src="https://static.ticket.sz-trip.com/jundaosuzhou/images/food/address.png"></image>
+                    <view style="flex: 1;width: 100rpx;">
+                        <view>{{info.order_product_list[0].supplier_info.address}}</view>
+                        <view class="subtitle" wx:if="{{info.order_product_list[0].supplier_info.distance>0}}">据您约{{info.order_product_list[0].supplier_info.distance}}km</view>
+                    </view>
+                    <image class="icon-phone" catch:tap="callPhone"  src="https://static.ticket.sz-trip.com/uploads/20250926/6d69afa7a2f955f60fd7cd5475e2b119.png"></image>
+                    <image class="icon-phone" catch:tap="gotolocation" src="https://static.ticket.sz-trip.com/uploads/20250926/6ce5e0467e0745e5f1140b6757ada213.png"></image>
+                </view>
+
+            </view>
+        </view>
+    </view>
 
 
   
 </view>
-<view class="box" wx:if="{{info && product_model=='food'}}">
+<!-- <view class="box" wx:if="{{info && product_model=='food'}}">
   <view class="box-title">商家信息</view>
-
   <view class=" supplier-mask">
     <view class="mask-shop-info">
         <view>{{info.order_product_list[0].supplier_info.shop_name}}</view>
@@ -85,7 +97,7 @@
 
     </view>
   </view>
-</view>
+</view> -->
 <view class="box" wx:if="{{info && product_model=='food'}}">
   <view class="box-title">订单信息</view>
 
@@ -102,8 +114,23 @@
   <view class="detail-item" wx:if="{{info.pay_method}}">
     <text>支付方式：{{pay_methods[info.pay_method]}}</text>
   </view>
+  <view class="detail-item">
+    <text>商品总额：￥{{info.total_money/100}}</text>
+  </view>
+  <view class="detail-item" wx:if="{{info.total_post_fee}}">
+    <text>运费：￥{{info.total_post_fee/100}}</text>
+  </view>
+  <view class="detail-item" wx:if="{{info.preference_money}}">
+    <text>优惠券：-￥{{info.preference_money/100}}</text>
+  </view>
+  <view class="detail-item">
+    <text>实付金额：<text>{{info.paid_money/100}}</text></text>
+  </view>
+  <view class="detail-item" style="font-weight: bold;" wx:if="{{info.state=='UNPAID'}}">
+    <text>剩余时间：00:{{minute}}:{{second}}</text>
+  </view>
   <view class="btns" style="border-top:1rpx solid #ccc" wx:if="{{info.state!='CLOSED'}}">
-    <view class="scene-rest-time" wx:if="{{info.state=='UNPAID'}}">剩余时间：00:{{minute}}:{{second}}</view>
+    <!-- <view class="scene-rest-time" wx:if="{{info.state=='UNPAID'}}">剩余时间：00:{{minute}}:{{second}}</view> -->
     <navigator url="/pages/info/foodProductInfo/index?id={{info.order_product_list[0].product_id}}" class="btn">再次购买</navigator>
     <navigator wx:if="{{info.state!='UNPAID'}}" url="../refundInfo/index?id={{info.order_id}}" class="btn" wx:if="{{isRefund}}">退款详情</navigator>
     <view class="btn" wx:if="{{info.state=='PAID'}}" bindtap="refund">取消订单</view>

pages/user/order/list.js

@@ -114,6 +114,11 @@ Page({
           ajaxes.push(ajax);
           indexes.push(index);
         }
+        // 权益卡只展示第一个
+        if (item.is_order_card_product==1) {
+            item.order_product_list = [item.order_product_list[0]]
+        }
+
         item.orderNum = orderNum;
       })
       console.log(ajaxes)
@@ -141,7 +146,7 @@ Page({
   },
   gotoDetail:function(e){
     let item = e.currentTarget.dataset.item;
-    item = this.getChild(item)
+    // item = this.getChild(item)
     util.gotoOrder(item)
   },
   

pages/user/order/postOrderInfo/index.js

@@ -23,7 +23,12 @@ Page({
     pay_methods:app.globalData.pay_methods,
     tjList:[],
     showLoading:true,
-    ids:[]
+    ids:[],
+
+    // 权益卡
+    isCard: false,
+    cardPostList: [],
+    deliveryNum: 0,
   },
 
   /**
@@ -309,11 +314,36 @@ getInfo () {
           state = state + order.state;
           order.contacts_info = order.contacts_info?JSON.parse(order.contacts_info):[]
         })
+
+        // 权益卡 
+        let cardPostList = [];
+        let isCard= false;
+        let deliveryNum = 0;
+        if (res.data.order_product_list.some(v=>v.order_card_product)) {
+            cardPostList = res.data.order_product_list.slice(1)
+            res.data.order_product_list = [res.data.order_product_list[0]]
+            isCard = true;
+            cardPostList.forEach(v=>{
+                console.log(v)
+                if (v.order_card_product) {
+                        v.order_card_product.month = new Date(v.order_card_product.delivery_start_date).getMonth()+1
+                        v.order_card_product.delivery_start_date = v.order_card_product.delivery_start_date.slice(0,10)
+                        v.order_card_product.delivery_end_date = v.order_card_product.delivery_end_date.slice(0,10)
+                }
+                if (['WAIT_DELIVERY', 'WAIT_COMMENT', 'COMPLETED'].includes(v.state)) {
+                    deliveryNum += 1
+                }
+            })
+        }
+
         this.setData({
           isRefund:state.indexOf("REFUND")!=-1,
           info:res.data,
           product_model:res.data.order_product_list[0].product_model,
-          ids: proId.join(",")
+          ids: proId.join(","),
+          cardPostList: cardPostList,
+          isCard: isCard,
+          deliveryNum: deliveryNum
         })
         this.getCodeImg()
       })
@@ -377,12 +407,35 @@ getInfo () {
       } else {
            res.data.is_all_confirm = false;
       }
-
+      // 权益卡 
+      let cardPostList = [];
+      let isCard= false;
+      let deliveryNum = 0;
+      if (res.data.order_product_list.some(v=>v.order_card_product)) {
+          cardPostList = res.data.order_product_list.slice(1)
+          res.data.order_product_list = [res.data.order_product_list[0]]
+          isCard = true;
+          cardPostList.forEach(v=>{
+              console.log(v)
+              if (v.order_card_product) {
+                    v.order_card_product.month = new Date(v.order_card_product.delivery_start_date).getMonth()+1
+                    v.order_card_product.delivery_start_date = v.order_card_product.delivery_start_date.slice(0,10)
+                    v.order_card_product.delivery_end_date = v.order_card_product.delivery_end_date.slice(0,10)
+              }
+              if (['WAIT_DELIVERY', 'WAIT_COMMENT', 'COMPLETED'].includes(v.state)) {
+                deliveryNum += 1
+              }
+          })
+      }
+      console.log(res.data, 'aaa')
       this.setData({
         isRefund:state.indexOf("REFUND")!=-1,
         info:res.data,
         product_model:res.data.order_product_list[0].product_model,
-        ids: proId.join(",")
+        ids: proId.join(","),
+        cardPostList: cardPostList,
+        isCard: isCard,
+        deliveryNum: deliveryNum
       })
       this.getCodeImg()
     })

pages/user/order/postOrderInfo/index.wxml

@@ -120,6 +120,57 @@
             </view>
             <rich-text class="detail-item {{item.showMsg?'':'textOver2'}}" style="display:-webkit-box;padding-bottom: 0;height: auto;" nodes="{{tool.formateRichText(item.sku_model.bookinfo)}}"></rich-text>
         </view>
+
+        <view style="border-top: 1px solid #ccc;margin-top: 12rpx;padding-top: 12rpx;" wx:if="{{isCard&&cardPostList.length>0}}">
+            <view class="box-title" style="position: relative;">
+                物流信息
+                <text bind:tap="expandPost" data-index="{{index}}" class="expand-tip" >{{item.showMore?"收起":"展开"}}</text>
+            </view>
+            <view style="height:{{item.showMore?'auto':'340rpx'}};overflow: hidden;">
+                <view class="detail-item post-line-info">
+                    <text>当前已发：{{deliveryNum}}</text>
+                </view>
+                <view class="detail-item post-line-info" style="margin-bottom: 20rpx;">
+                    <text>当前待发：{{cardPostList.length - deliveryNum}}</text>
+                </view>
+
+
+                <view class="my-shipment-place" style="display: flex;" wx:for="{{cardPostList}}" wx:for-item="shipment" wx:for-index="shipIndex">
+                <view class="line-card">
+                    <view wx:if="{{shipIndex==0}}" class="first-line"></view>
+                    <view wx:if="{{shipIndex==(cardPostList.length-1)}}" class="last-line"></view>
+                    <view class="line-dot ">
+                        <image wx:if="{{shipment.post_detail_list&&shipment.post_detail_list[0]}}" mode="aspectFill" src="https://static.ticket.sz-trip.com/uploads/20250928/397edd1ef1daba7026d2900f1a59ff7d.png"></image>
+                    </view>
+                    <view class="{{shipment.post_detail_list&&shipment.post_detail_list[0]?'completed':''}}">{{shipment.order_card_product.month}}月</view>
+                </view>
+
+                <view class="post-child-item" style="margin-bottom: 0;">
+                    <view class="detail-item post-line-info">
+                        <text class="textOver" style="font-weight: bold;font-size: 27rpx;width: 400rpx;">{{shipment.sku_name}}</text>
+                        <text style="color: #0B898E;">{{shipment.state_text}}</text>
+                    </view>
+                    <view  wx:if="{{shipment.post_detail_list&&shipment.post_detail_list[0]}}">
+                    <view class="detail-item post-line-info">
+                        <text>快递公司：{{shipment.post_detail_list[0].express_name}}</text>
+                    </view>
+                    <view class="detail-item post-line-info">
+                        <text>快递单号：</text>
+                        <view style="flex:1;width: 1rpx;">
+                            {{shipment.post_detail_list[0].courier_number}} <text data-num="{{shipment.post_detail_list[0].courier_number}}" bindtap="copy" style="flex:1;color:#0B898E;margin-left:20rpx">复制</text>
+                        </view>
+                    </view>
+                    </view>
+
+                    <view class="detail-item post-line-info">
+                        <text>发货时间：{{shipment.order_card_product.delivery_start_date}} 至 {{shipment.order_card_product.delivery_end_date}} </text>
+                    </view>
+                </view>
+            </view>
+            </view>
+            
+        </view>
+
     </view>
 </view>
 
@@ -169,6 +220,8 @@
         <!-- <navigator wx:if="{{info.state!='UNPAID'}}" url="/pages/info/postProductInfo/index?id={{info.order_product_list[0].product_id}}" class="btn">再次购买</navigator> -->
         <navigator url="../refundInfo/index?id={{info.order_id}}" class="btn" wx:if="{{isRefund}}">退款详情</navigator>
         <view class="btn" wx:if="{{info.is_all_confirm}}" bind:tap="toConfirmPost">确认收货</view>
+        <view class="btn" wx:if="{{isCard}}" bind:tap="toConfirmPost">确认收货</view>
+
         <view class="btn" wx:if="{{info.state=='PAID'}}" bindtap="refund">申请退款</view>
         <view class="btn" wx:if="{{info.state=='UNPAID'}}" bindtap="close">取消订单</view>
         <navigator url="/pages/order/comment/index?id={{info.order_id}}&proId={{info.order_product_list[0].product_id}}" class="btn active1" wx:if="{{info.state=='WAIT_COMMENT'}}">去评价</navigator>

pages/user/order/postOrderInfo/index.wxss

@@ -371,11 +371,72 @@ color: #333333;
     width: fit-content;
     margin: 0 auto;
     box-sizing: border-box;
-    margin-top: 20rpx;
 }
 .expand-tip{
     position: absolute;
     color: #0B898E;
     right: 0;
     bottom: 0;
+}
+
+.line-card{
+    
+    width: 90rpx;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    flex-shrink: 0;
+    font-weight: bold;
+    font-size: 23rpx;
+    color: #999999;
+    position: relative;
+    /* height: 100%; */
+}
+.line-card .line-dot{
+    width: 33rpx;
+    height: 33rpx;
+    background: #CCCCCC;
+    border-radius: 50%;
+    position: absolute;
+    left: -16.5rpx;
+    top: calc(50% - 16.5rpx);
+    z-index: 3;
+}
+.first-line{
+    height: 50%;
+    position: absolute;
+    top: 0;
+    width: 4rpx;
+    left: -2rpx;
+    z-index: 2;
+    background: white;
+    z-index: 2;
+}
+.last-line{
+    height: 50%;
+    position: absolute;
+    bottom: 0;
+    width: 4rpx;
+    left: -2rpx;
+    z-index: 2;
+    background: white;
+    z-index: 2;
+}
+.my-shipment-place{
+    box-sizing: border-box;
+    margin-left: 20rpx;
+    border-left: 1px solid #ccc;
+    padding-bottom: 20rpx;
+}
+.my-shipment-place:last-of-type{
+    
+    padding-bottom: 0rpx;
+}
+.completed{
+    color: #0b898e;
+}
+.line-dot image{
+    width: 100%;
+    height: 100%;
+    border-radius: 50%;
 }

pages/user/order/sceneOrderInfo/index.wxml

@@ -85,9 +85,9 @@
                 </text>
             </view>
             <view class="post-child" style="padding-top: 12rpx;">
-                <view wx:if="{{item.sku_model.is_authentication == 0}}">
+                <view wx:if="{{!item.sku_model.is_authentication}}">
                     <view class="detail-item">
-                        <text>手机号： {{item.phone}}</text>
+                        <text>手机号： {{item.phone || item.reserve_mobile}}</text>
                     </view>
                 </view>
                 <view wx:else style="overflow: hidden; max-height:{{item.showMore?'100vh':'180rpx'}};">
@@ -122,8 +122,6 @@
 
     </view>
 
-    <view wx:elif=""></view>
-
     <view wx:else>
         <view class="product-info" bindtap="goDetail" data-set='{{item}}'>
             <view class="product-info-top">

pages/user/service/info/index.json

@@ -1,5 +1,6 @@
 {
   "usingComponents": {
-    "title":"/pages/component/TitleHeader"
+    "title":"/pages/component/TitleHeader",
+    "kefuCom": "/pages/component/kefu"
   }
 }

pages/user/service/info/index.wxml

@@ -21,7 +21,7 @@
 </view>
 
 
-<view class="mask" wx:if="{{showPhoneMask}}">
+<!-- <view class="mask" wx:if="{{showPhoneMask}}">
   <view class="mask-bg" bindtap="closePhoneMask"></view>
   <view class="mask-content" style="text-align:center;width:70%;border-radius:10rpx">
     <view class="num-pay-top" style="font-weight: bold;padding: 30rpx 60rpx;font-size: 30rpx;">
@@ -33,4 +33,6 @@
       </view>
     </view>
   </view>
-</view>
+</view> -->
+
+<kefuCom wx:if="{{showPhoneMask}}" bind:hideModal="closePhoneMask"></kefuCom>

pages/user/service/list/index.js

@@ -14,8 +14,7 @@ Page({
     page_no:1,
     keyword:"",
     showModal: false,
-    // 成功
+
-    ses:true,
 
   },
 

pages/user/service/list/index.json

@@ -1,5 +1,6 @@
 {
   "usingComponents": {
-    "title":"/pages/component/TitleHeader"
+    "title":"/pages/component/TitleHeader",
+    "kefuCom": "/pages/component/kefu"
   }
 }

pages/user/service/list/index.wxml

@@ -12,27 +12,6 @@
 <!-- <navigator url="list/index?typeid={{typeId}}" class="more-btn" bindtap="showService">没找到想要的答案？一键呼唤<text>人工客服</text></navigator> -->
 <!-- <button class="more-btn" open-type="contact" bindcontact="handleContact">没找到想要的答案？一键呼唤<text>人工客服</text></button> -->
 <view class="more-btn" bindtap="showDialogBtn">没找到想要的答案？一键呼唤<text>人工客服</text></view>
-<!-- 弹出层 -->
+
-    <view
+
-      class="modal-mask"
+    <kefuCom wx:if="{{showModal}}" bind:hideModal="hideModal"></kefuCom>
-      bindtap="hideModal"
-      catchtouchmove="preventTouchMove"
-      wx:if="{{showModal}}"
-    ></view>
-    <!-- 成功 -->
-    <view class="modal-dialog" wx:if="{{showModal && ses}}">
-      <view class="modal-title"><view class="modal-info">即将跳转人工在线客服
- <view>客服服务时间:9:00-12:00,</view>
- <view>13:00-18:00</view>
-如遇紧急情况可拨打 <view class="green" bindtap="phoneCall"> 0512-66555111 </view><view class="green" bindtap="phoneCall2"> 18915532527 </view></view></view>
-      <view class="modal-footer">
-        <view
-          class="btn-confirms two"
-          bindtap="onConfirm"
-          data-status="confirm"
-          data-name="{{name}}"
-        >取消
-        </view>
-        <button  class="btn-confirms" open-type="contact" bindcontact="handleContact">确定</button>
-      </view>
-    </view>

pages/user/user.json

@@ -1,3 +1,5 @@
 {
-  "usingComponents": {}
+  "usingComponents": {
+    "kefuCom": "/pages/component/kefu"
+  }
 }

pages/user/user.wxml

@@ -131,7 +131,7 @@
     <view>备案号：苏ICP备19064944号-3X@君到苏州</view>
   </view>
 </view>
-<view class="mask" wx:if="{{showModel}}"> 
+<!-- <view class="mask" wx:if="{{showModel}}"> 
   <view class="model">
 
     <view class="model-content">
@@ -148,5 +148,6 @@
         </button>
     </view>
   </view>
-</view>
+</view> -->
+<kefuCom wx:if="{{showModel}}" bind:hideModal="closeModel"></kefuCom>
 <view style="height:20rpx"></view>

project.private.config.json

@@ -7,25 +7,11 @@
     "miniprogram": {
       "list": [
         {
-          "name": "pages/info/postProductInfo/index",
+          "name": "subPackages/foodListNew/index",
-          "pathName": "pages/info/foodProductInfo/index",
+          "pathName": "subPackages/foodListNew/index",
-          "query": "id=464484",
+          "query": "",
           "scene": null,
           "launchMode": "default"
-        },
-        {
-          "name": "pages/activity/huawei/index",
-          "pathName": "pages/activity/huawei/index",
-          "query": "",
-          "launchMode": "default",
-          "scene": null
-        },
-        {
-          "name": "pages/info/roadInfo/index",
-          "pathName": "pages/list/foodNew/index",
-          "query": "",
-          "launchMode": "default",
-          "scene": null
         }
       ]
     }

pages/list/foodNew/index.js → subPackages/foodListNew/index.js

@@ -1,6 +1,6 @@
 // pages/list/theatre/index.js
-import commonApi from "../../../utils/https/common"
+import commonApi from "../../utils/https/common"
-import util from "../../../utils/util"
+import util from "../../utils/util"
 let app = getApp()
 Page({
 
@@ -10,13 +10,13 @@ Page({
   data: {
     list:[],
     tagList: [
-        {id: 9, name: "品苏式面"},
+        {id: 521, name: "品苏式面"},
-        {id: 10, name: "尝农家乐"},
+        {id: 522, name: "尝农家乐"},
         // {id: 11, name: "鉴苏帮菜"},
         // {id: 12, name: "寻夜食堂"},
     ], // 父标签477
     total:1,
-    type:9,
+    type:521,
 
     areas: [],
     areaIndex:0,
@@ -81,7 +81,7 @@ Page({
     //   }
     // },1)
     wx.navigateTo({
-      url: '/pages/info/foodNew/index?id='+item.id,
+      url: '/subPackages/foodNew/index?id='+item.id,
     })
   },
   getList:function(){

pages/list/foodNew/index.wxml → subPackages/foodListNew/index.wxml

@@ -1,5 +1,5 @@
 <!--pages/list/theatre/index.wxml-->
-<wxs src="../../../utils/filter.wxs" module="tool" />
+<wxs src="../../utils/filter.wxs" module="tool" />
 <view class="my-header-search">
     <search bind:onload="search" transparent="1"></search>
     <view class="sale-types no-scrollbar">

pages/info/foodNew/index.js → subPackages/foodNew/index.js

@@ -1,9 +1,9 @@
 // pages/info/roadInfo/index.js
 let device = wx.getSystemInfoSync();
 const ratio = device.windowWidth / 750;
-import commonApi from "../../../utils/https/common"
+import commonApi from "../../utils/https/common"
-import QRCode from '../../../utils/weapp-qrcode.js'
+import QRCode from '../../utils/weapp-qrcode.js'
-import {pagePoint, gotoDetail} from '../../../utils/util'
+import {pagePoint, gotoDetail} from '../../utils/util'
 let app = getApp()
 Page({
 
@@ -50,6 +50,7 @@ Page({
         lat: null,
         scrollLeft: 0,
         windowWidth: 375,
+        prod_phone: "",
     },
 
     /**
@@ -64,12 +65,12 @@ Page({
         let height = (rect.top - device.statusBarHeight) * 2 + rect.height + device.statusBarHeight;
         this.setData({top: height,id: options.id})
         // 获取购物车按钮的位置
-        // wx.createSelectorQuery().select('#cart').boundingClientRect(function (res) {
+        wx.createSelectorQuery().select('#cart').boundingClientRect(function (res) {
-        //     console.log(res)
+            console.log(res)
-        //     that.setData({
+            that.setData({
-        //         cartTop: res.top
+                cartTop: res.top
-        //     })
+            })
-        // }).exec()
+        }).exec()
         if (options.ZTPoint) {
             this.setData({
                 ZTPoint: options.ZTPoint
@@ -153,7 +154,6 @@ Page({
                 if (resData.parameter_tag) {
                     resData.parameter_tag_str = resData.parameter_tag.split(',').join(' | ')
                 }
-
                 if (resData.supplier_headimg) {
                     resData.supplier_headimg = that.showImg(resData.supplier_headimg)
                 }
@@ -168,6 +168,7 @@ Page({
                 info: resData,
                 // swiperRange: swiperRange,
                 shareImg: null,
+                prod_phone: resData.scene_tel
             })
 
             this.drawImg()
@@ -492,7 +493,7 @@ Page({
         let promise3 = new Promise(function (resolve, reject) {
             let userid = wx.getStorageSync('jstrip_userid')
             new QRCode('myQrcode', {
-                text: 'https://m.cloud.sz-trip.com/MailMerchandiseDetail?id=' + that.data.info.id + '&sharedUserId=' + userid + '&channel=-1',
+                text: 'https://m.cloud.sz-trip.com/FoodShopDetail?id=' + that.data.info.id + '&sharedUserId=' + userid + '&channel=-1',
                 width: 500,
                 height: 500,
                 padding: 12, // 生成二维码四周自动留边宽度，不传入默认为0
@@ -685,7 +686,7 @@ Page({
 
     callPhone :function () {
         wx.makePhoneCall({
-            phoneNumber: this.data.supplierInfo.phone,
+            phoneNumber: this.data.prod_phone,
         })
     },
 

pages/info/foodNew/index.json → subPackages/foodNew/index.json

@@ -1,7 +1,6 @@
 {
   "usingComponents": {
     "title":"/pages/component/TitleHeader",
-    "code":"../../order/components/wxqrCode/index"
+    "code":"/pages/order/components/wxqrCode/index"
-
   }
 }

pages/info/foodNew/index.wxml → subPackages/foodNew/index.wxml

@@ -1,5 +1,5 @@
 <!--pages/info/hotelProductInfo/index.wxml-->
-<wxs src="../../../utils/filter.wxs" module="tool" />
+<wxs src="../../utils/filter.wxs" module="tool" />
 <title title="产品详情"></title>
 <view class="shop-info" bindtap="changeSimpleVal" data-keyname="showShopInfo" data-val="{{true}}">
     <image class="supplier-headImg" src="{{supplierInfo.headimg}}" mode="aspectFill"></image>
@@ -7,7 +7,7 @@
         <view style="display: flex;align-items: flex-start;">
             <view class="shop-title shop-com-width  textOver2">{{supplierInfo.shop_name}}</view>
             <image style="height: 25rpx;margin: 10rpx 68rpx 0 13rpx;" mode="heightFix" src="https://static.ticket.sz-trip.com/jundaosuzhou/images/postDetail/rightIcon.png"></image>
-            <image class="icon-phone" catch:tap="callPhone"  src="https://static.ticket.sz-trip.com/uploads/20250926/6d69afa7a2f955f60fd7cd5475e2b119.png"></image>
+            <image wx:if="{{prod_phone}}" class="icon-phone" catch:tap="callPhone"  src="https://static.ticket.sz-trip.com/uploads/20250926/6d69afa7a2f955f60fd7cd5475e2b119.png"></image>
         </view>
         <view class="address" style="display: flex;align-items: center;justify-content: space-between;">
             <view class="shop-com-width textOver" style="padding-right: 98rpx;">{{supplierInfo.address}}</view>
@@ -29,7 +29,7 @@
    
 </scroll-view>
 
-<view class="share-icon" bindtap="share"></view>
+<!-- <view class="share-icon" bindtap="share"></view> -->
 <image lazy-load wx:for="{{info.sku}}" style="{{aniSkuIndex==index?('top:'+cartTop+'px;'):('top:'+top+'px;'+cartImgInfo)}}" class="headimg{{aniSkuIndex==index?' active':''}}" src="{{info.headimg}}" mode="aspectFill"></image>
 <view style="position: relative;">
     <swiper class="swiper" wx:if="{{info}}" autoplay="{{autoPlay}}" current="{{swiperCurrent}}"
@@ -143,16 +143,16 @@
 
 
   <view class="btns">
-    <!-- <view class="btn" bindtap="showCart">加入购物车</view> -->
+    <view class="btn" bindtap="order">加入购物车</view>
-    <view class="btn" bindtap="order" data-type="order" wx:if="{{info && info.flag==1}}" style="background:#D62828;border-radius: 39rpx;" >立即购买</view>
+    <view class="btn" bindtap="order" data-type="order" wx:if="{{info && info.flag==1}}" >立即购买</view>
     <view class="btn disable" wx:elif="{{info}}" style="border-radius: 39rpx;">该商品已下架</view>
   </view>
 </view>
 <!-- 购物车悬浮框 -->
-<!-- <navigator url="/pages/user/cartlist/list" catchtap="pagePoint" data-event='product_cart_click' class="cart-box" id="cart">
+<navigator url="/pages/user/cartlist/list" catchtap="pagePoint" data-event='product_cart_click' class="cart-box" id="cart">
   <image lazy-load src="https://static.ticket.sz-trip.com/xcxImages/info/cart.png" mode="widthFix"></image>
   <view class="cart-num">{{cartCount}}</view>
-</navigator> -->
+</navigator>
 <view class="mask" wx:if="{{skuFlag}}">
   <view class="mask-bg" bindtap="hideSku"></view>
   <view class="mask-content">

subPackages/gwcOrder/index.js

@@ -57,7 +57,7 @@ Page({
 			ticket_type:app.globalData.product.sku.ticket_type || 1,
       isCar:options.isCar,
       is_need_idcard:app.globalData.product.sku.sku_model.is_need_idcard,
-      is_authentication:app.globalData.product.sku.sku_model.is_authentication,
+      is_authentication:app.globalData.product.sku.sku_model.is_authentication || 0,
       is_real_name:app.globalData.product.sku.sku_model.is_real_name,
     })
     console.log('-------',app.globalData.product.sku.sku_model.is_need_idcard);
@@ -396,6 +396,9 @@ Page({
         remark: remark,
         product_num: app.globalData.product.isGroup == 1 ? 1 : productNum,
         phone:this.data.phone,// 不实名的时候传的手机号参数
+        // 美食类型
+        reserve_mobile: product.product.type=='food'?this.data.phone:"",
+
       }],
       originate_order_id: this.data.kjId,
       gp_id: app.globalData.gp_id,
@@ -427,7 +430,7 @@ Page({
 	if(app.globalData.list){
     app.globalData.list[app.globalData.index] = this.data.product
     // app.globalData.list[app.globalData.index].linkmanList = this.data.linkmanList
-    if (app.globalData.list[app.globalData.index].sku.sku_model.is_authentication == 0) {
+    if (!app.globalData.list[app.globalData.index].sku.sku_model.is_authentication) {
       app.globalData.list[app.globalData.index].phone = this.data.phone
       app.globalData.list[app.globalData.index].linkmanList = []
     }else {

subPackages/gwcOrder/index.wxml

@@ -15,13 +15,14 @@
   </view>
   <view class="box">
     <view class="box-title">
-      <view style="flex:1">{{product && product.isGroup!=1?'购票数量':'预约人数'}}</view>
+      <view style="flex:1">{{product && product.isGroup!=1?'数量':'预约人数'}}</view>
       <view class="iconfont icon-sami-select" wx:if="{{!kjId && !gp_id && type!='activity' && !product.sku.is_compose}}" bindtap="minus"></view>
       <view class="number-box">{{productNum}}</view>
       <view class="iconfont icon-add-select" wx:if="{{!kjId && !gp_id && type!='activity' && !product.sku.is_compose}}" bindtap="add"></view>
     </view>
   </view>
-  <contact wx:if="{{isLogin}}" type="{{type}}" bind:setLinkman="setLinkman" productNum="{{productNum}}" is_authentication="{{is_authentication}}" is_real_name="{{is_real_name}}"></contact>
+  <contact wx:if="{{isLogin}}" type="{{type}}" bind:setLinkman="setLinkman" productNum="{{productNum}}" 
+  is_authentication="{{is_authentication}}" is_real_name="{{is_real_name}}"></contact>
   <!-- 补贴 -->
   <view class="box">
     <view class="box-title allowance" wx:if="{{allowance_price}}">
@@ -63,7 +64,7 @@
   <view class="mask-content1">
       <view class="dialog-top">
         <view class="scene-title">{{product.product.title}}-{{product.sku.sku_name}}</view>
-        <view class="people-message">出行人信息</view>
+        <view class="people-message">{{product.product.type=="food"?'预定人信息':'出行人信息'}}</view>
         <view style="max-height:430rpx;overflow: scroll;" wx:if="{{is_authentication=='1'}}">
           <view class="people" wx:for="{{linkmanList}}">
             <view class="flex">

utils/util.js

@@ -386,12 +386,21 @@ const orderMoreTime = function(item){
   }
 }
 const gotoOrder = function(item){
+
+  // 数量超过两个  购物车下单 跳H5 (小程序二维码没分开)
+  if (item.order_product_list.length>1) {
+    wx.navigateTo({
+        url: "/pages/pbService/web/index?weburl=" + encodeURIComponent("https://m.cloud.sz-trip.com/TicketCartOrderDetail?order_id="+item.order_id),
+      })
+      return;
+  }
   if(item.order_product_list[0].product_model=='ticket'){
     wx.navigateTo({
       url: '/pages/user/order/sceneOrderInfo/index?id='+item.order_id,
     })
     return;
   }
+
   if(item.order_product_list[0].product_model=='food'){
     wx.navigateTo({
       url: '/pages/user/order/foodOrderInfo/index?id='+item.order_id,