更新下代码

app.js

@@ -2,7 +2,7 @@
 import commonApi from "./utils/https/common"
 App({
   onLaunch: function (options) {
-    
+    this.updateApp()
     let rect = wx.getSystemInfoSync();
     this.globalData.safeBottom = rect.safeArea?(rect.safeArea.bottom - rect.safeArea.height):0
     // 获取uuid
@@ -44,6 +44,37 @@ App({
     })
     this.getShareCategoryId()
   },
+  // 更新提示
+  updateApp:function(){
+    const updateManager = wx.getUpdateManager()
+    updateManager.onCheckForUpdate(function (res) {
+      // 请求完新版本信息的回调
+      if (res.hasUpdate) {
+        wx.showLoading({
+          title:'更新下载中...',
+        })
+      }
+    })
+    updateManager.onUpdateReady(function () {
+      wx.hideLoading();
+      wx.showModal({
+        title:'更新提示',
+        content:'新版本已经准备好，是否重启应用？',
+        success:function (res) {
+          if (res.confirm) {
+            // 新的版本已经下载好，调用 applyUpdate 应用新版本并重启
+            updateManager.applyUpdate()
+          }
+        }
+      })
+ 
+    })
+    updateManager.onUpdateFailed(function () {
+      // 新的版本下载失败
+      wx.hideLoading();
+      wx.showToast({ title:'下载失败...', icon:"none" });
+    })
+  },
   getShareCategoryId:function(){
     commonApi._post("share/getShareList",{}).then(res=>{
       let CategoryIds = {}

pages/index/index.wxml

@@ -40,9 +40,9 @@
     <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-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 class="top-icon-text">夜游苏州</view>
   </view>
   <view bindtap="gotoPath" 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>
@@ -141,11 +141,11 @@
     <navigator url="/pages/pbService/index" class="title-more">更多<text class="iconfont icon-you"></text> </navigator>
   </view>
   <view style="overflow-x:auto">
-    <view class="pbservice">
-      <!-- <view class="pbservice-item" bindtap="gotoSku">
-        <image src="https://static.ticket.sz-trip.com/xcxImages/index/pb1.png" mode="widthFix"></image>
-        <view>苏康码</view>
-      </view> -->
+    <view class="pbservice" style="width:100%">
+      <view bindtap="gotoPath" data-title="景区舒适度" data-path="/pages/pbService/security/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">
         <image src="https://static.ticket.sz-trip.com/xcxImages/index/pb2.png" mode="widthFix"></image>
         <view>找厕所</view>
@@ -162,7 +162,7 @@
         <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">
+      <!-- <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>
@@ -177,31 +177,78 @@
       <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> -->
       <!-- <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">
+      <!-- <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> -->
       <!-- <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">
+      <!-- <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">
+    <image mode="widthFix" style="width:267rpx" src="https://static.ticket.sz-trip.com/xcxImages/index/title7.png"></image>
+  </view>
+  <view style="overflow-x:auto">
+    <view class="pbservice">
+      <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/newpb1.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/newpb2.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/newpb3.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/newpb4.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/newpb5.png" mode="widthFix"></image>
+        <view>书香借阅</view>
+      </view>
+      <view bindtap="gotoPath" data-title="博物馆查询" data-path="/pages/culture/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/culture/index" class="pbservice-item">
+        <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/activity/index" class="pbservice-item">
+        <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb8.png" mode="widthFix"></image>
+        <view>精彩回顾</view>
+      </view>
+      <view bindtap="gotoPath" 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="gotoUrl" data-title="廉洁地图" data-url="https://www.lianshi.gov.cn:6295/jianchawei/Web/WebChatJCW/Mobile/EduBase/MobileMap.aspx" class="pbservice-item">
+        <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb10.png" mode="widthFix"></image>
+        <view>廉洁地图</view>
       </view>
     </view>
   </view>
   <view class="sale-road-boxes" style="margin-top:0">
-    <image mode="widthFix" style="width:267rpx" src="https://static.ticket.sz-trip.com/xcxImages/index/title3.png"></image>
+    <image mode="widthFix" style="width:267rpx" src="https://static.ticket.sz-trip.com/xcxImages/index/title6.png"></image>
   </view>
   <view class="six-box">
     <image bindtap="gotoPath" 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>

pages/info/groupOrderInfo/index.js

@@ -77,10 +77,7 @@ Page({
       team_id:this.data.info.list.id
     }).then(res=>{
       if(res.code==1){
-        // todo
-        wx.navigateTo({
-          url: '/pages/user/order/groupOrderInfo/index?id='+this.data.id,
-        })
+        this.onShow()
       }
     })
   },

pages/info/groupOrderInfo/index.wxml

@@ -8,7 +8,7 @@
     <view class="line"></view>
     <view class="top-tip">填写信息人数：{{info.list.members_count}}</view>
   </view>
-  <view class="top-btn">立即邀请</view>
+  <button open-type="share" style="width:100%" class="top-btn">立即邀请</button>
   <view class="top-btn full" bindtap="order">提交订单</view>
 </view>
 <view wx:else class="box">

pages/info/groupOrderInfo/index.wxss

@@ -34,7 +34,11 @@ page {
   flex-shrink: 0;
 }
 .top-btn {
+  margin:20rpx 0 !important;
+  padding: 0 !important;
   line-height: 68rpx;
+  height: 68rpx;
+  display: block;
   border: 1rpx solid #0B898E;
   border-radius: 10rpx;
   box-sizing: border-box;

pages/info/hotelProductInfo/index.js

@@ -117,6 +117,12 @@ Page({
       end_date:this.data.endDate,
       real_room_id:e.currentTarget.dataset.id
     }).then(res=>{
+      if(!res.data || res.data.length==0){
+        wx.showToast({
+          title: '该房型暂无房间',
+          icon:'none'
+        })
+      }
       this.setData({
         skuList:res.data
       })

pages/list/museum/index.js

@@ -20,6 +20,13 @@ Page({
   },
   gotoDetail:function(e){
     let item = e.currentTarget.dataset.item;
+    if(item.title.indexOf('博物馆西馆')!=-1){
+      wx.navigateToMiniProgram({
+        appId: 'wxfef80ee1ab7e58a2',
+        path:'pages/inners/main'
+      })
+      return;
+    }
     util.gotoDetail(item);
   },
   search:function(e){

pages/order/components/contact/index.js

@@ -74,6 +74,8 @@ Component({
               item.tel = res.data.tel;
               item.id_number = res.data.id_number;
               item.is_default = res.data.is_default;
+              item.document_type = res.data.document_type;
+              item.document_type_text = res.data.document_type_text;
             }
           })
           linkmanList.map(item=>{
@@ -82,6 +84,8 @@ Component({
               item.tel = res.data.tel;
               item.id_number = res.data.id_number;
               item.is_default = res.data.is_default;
+              item.document_type = res.data.document_type;
+              item.document_type_text = res.data.document_type_text;
             }
             else if(res.data.is_default==1 && item.is_default==1){
               item.is_default = 0;

pages/pbService/index.wxml

@@ -19,6 +19,14 @@
       <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">
+      <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">
+      <image src="https://static.ticket.sz-trip.com/xcxImages/pbservice/pb16.png" mode="widthFix"></image>
+      <view>垃圾分类</view>
+    </view>
   </view>
 </view>
 <view class="pb-box">
@@ -73,15 +81,8 @@
       <image src="https://static.ticket.sz-trip.com/xcxImages/pbservice/pb13.png" mode="widthFix"></image>
       <view>书香借阅</view>
     </view>
-    <view class="pb-item" 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">
-      <image src="https://static.ticket.sz-trip.com/xcxImages/pbservice/pb16.png" mode="widthFix"></image>
-      <view>垃圾分类</view>
-    </view>
-    <view class="pb-item" data-title="博物馆查询" bindtap="gotoPath" data-path="/pages/culture/index">
+    
+    <view class="pb-item" data-title="文化配送" bindtap="gotoPath" data-path="/pages/culture/index">
       <image src="https://static.ticket.sz-trip.com/xcxImages/pbservice/pb20.png" mode="widthFix"></image>
       <view>文化配送</view>
     </view>
@@ -93,9 +94,13 @@
       <image src="https://static.ticket.sz-trip.com/xcxImages/index/pb16.png" mode="widthFix"></image>
       <view>精彩回顾</view>
     </view>
-    <!-- <view class="pb-item" data-title="团队预约" bindtap="gotoPath" data-path="/pages/pbService/group/index">
+    <view class="pb-item" data-title="团队预约" bindtap="gotoPath" data-path="/pages/pbService/group/index">
       <image src="https://static.ticket.sz-trip.com/xcxImages/pbservice/pb21.png" mode="widthFix"></image>
       <view>团队预约</view>
-    </view> -->
+    </view>
+    <view class="pb-item" data-title="廉洁地图" bindtap="gotoUrl" data-url="https://www.lianshi.gov.cn:6295/jianchawei/Web/WebChatJCW/Mobile/EduBase/MobileMap.aspx">
+      <image src="https://static.ticket.sz-trip.com/xcxImages/pbservice/pb22.png" mode="widthFix"></image>
+      <view>廉洁地图</view>
+    </view>
   </view>
 </view>

pages/user/order/list.js

@@ -97,7 +97,7 @@ Page({
             item.orderStateText="出票中"
           }
         })
-        if(item.order_product_list.length==1 && item.order_product_list[0].scene_id && item.state!='UNPAID' && item.state!='CLOSED' && item.state.indexOf("REFUND")==-1){
+        if(item.order_product_list.length==1 && item.order_product_list[0].scene_id && item.state!='UNPAID' && item.state!='CLOSED' && item.state.indexOf("REFUND")==-1 && this.data.lon && this.data.lat){
           let ajax = commonApi.user_post("order/tripplan",{
             point_type: "gd",
             child_order_id:item.order_product_list[0].child_order_id,

pages/user/order/team/list.js

@@ -47,7 +47,7 @@ Page({
   refundInfo:function(e){
     let id = e.currentTarget.dataset.id;
     wx.navigateTo({
-      url: 'refundInfo/index?id='+id,
+      url: '../refundInfo/index?id='+id,
     })
   },
   gotoComment:function(e){
@@ -98,7 +98,7 @@ Page({
             item.orderStateText="出票中"
           }
         })
-        if(item.order_product_list.length==1 && item.order_product_list[0].scene_id && item.state!='UNPAID' && item.state!='CLOSED' && item.state.indexOf("REFUND")==-1){
+        if(item.order_product_list.length==1 && item.order_product_list[0].scene_id && item.state!='UNPAID' && item.state!='CLOSED' && item.state.indexOf("REFUND")==-1 && this.data.lon){
           let ajax = commonApi.user_post("order/tripplan",{
             point_type: "gd",
             child_order_id:item.order_product_list[0].child_order_id,
@@ -167,7 +167,7 @@ Page({
                 title: '已取消',
                 icon:'success'
               })
-              if(that.data.type){
+              if(that.data.type!=-1){
                 list.splice(index,1);
               }
               else {
@@ -198,7 +198,7 @@ Page({
                 title: '已取消',
                 icon:'success'
               })
-              if(that.data.type){
+              if(that.data.type!=-1){
                 list.splice(index,1);
               }
               else {

pages/user/profile/index.wxml

@@ -50,4 +50,5 @@
 </view>
 <view class="cropper-wrapper" wx:if="{{showCropper}}">
   <template is="we-cropper" data="{{...cropperOpt}}"/>
-</view>
+</view>
+<view class="logoff" bindtap="logoff">注销</view>

pages/user/profile/index.wxss

@@ -54,4 +54,15 @@
 .picker {
   width: 100%;
   min-height: 30rpx;
+}
+.logoff {
+  width: 360rpx;
+  line-height: 80rpx;
+  text-align: center;
+  background: #0b898e;
+  color: #ffffff;
+  font-size: 30rpx;
+  border-radius: 40rpx;
+  margin: 0 auto;
+  margin-top: 100rpx;
 }

pages/user/user.wxml

@@ -60,9 +60,9 @@
     <navigator url="verify/index" class="user-box-line" wx:if="{{info && info.name_verification=='UNCERTFIED'}}">
     实名认证
     </navigator>
-    <!-- <navigator url="order/team/list" class="user-box-line">
+    <navigator url="order/team/list" class="user-box-line">
     团队订单
-    </navigator> -->
+    </navigator>
   </view>
   <view class="user-box" style="margin-bottom:0">
     <navigator url="linkman/index" class="user-box-line">

project.private.config.json

@@ -19,8 +19,8 @@
           "scene": null
         },
         {
-          "name": "pages/info/groupOrderInfo/index",
-          "pathName": "pages/info/groupOrderInfo/index",
+          "name": "pages/pbService/group/index",
+          "pathName": "pages/pbService/group/index",
           "query": "id=59532108251510343335",
           "scene": null
         },
@@ -49,9 +49,9 @@
           "scene": null
         },
         {
-          "name": "pages/pbService/web/index",
-          "pathName": "pages/pbService/web/index",
-          "query": "",
+          "name": "pages/order/joinOrder/index",
+          "pathName": "pages/order/joinOrder/index",
+          "query": "oid=59532109231539023692&id=336&uid=24",
           "scene": null
         },
         {

utils/https.js

@@ -171,7 +171,7 @@ function user_post(url,data={}){
             
           }
           if(res.statusCode == 200){
-            if(url.indexOf('order/create')!=-1 && res.data.code==1 && res.data.data){
+            if(url.indexOf('/order/create')!=-1 && res.data.code==1 && res.data.data){
               // 下单成功
               if(res.data.data.pay_status==1){
                 // 0元直接付款成功