diff --git a/app.js b/app.js index 84b12c6..e95b50c 100644 --- a/app.js +++ b/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 = {} diff --git a/pages/index/index.wxml b/pages/index/index.wxml index 7581b01..982c36c 100644 --- a/pages/index/index.wxml +++ b/pages/index/index.wxml @@ -40,9 +40,9 @@ 酒店住宿 - + - 姑苏八点半 + 夜游苏州 @@ -141,11 +141,11 @@ 更多 - - + + + + 景区舒适度 + 找厕所 @@ -162,7 +162,7 @@ 景区舒适度 --> - + - + - + + + + + + + + + + + 投资导引图 + + + + 非遗传承 + + + + 文物查询 + + + + 在线鉴赏 + + + + 书香借阅 + + + + 博物馆查询 + + + + 文化配送 + + + + 精彩回顾 + + + + 团队预约 + + + + 廉洁地图 - + diff --git a/pages/info/groupOrderInfo/index.js b/pages/info/groupOrderInfo/index.js index b4fe31a..7a46f26 100644 --- a/pages/info/groupOrderInfo/index.js +++ b/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() } }) }, diff --git a/pages/info/groupOrderInfo/index.wxml b/pages/info/groupOrderInfo/index.wxml index 1dd63d2..db15486 100644 --- a/pages/info/groupOrderInfo/index.wxml +++ b/pages/info/groupOrderInfo/index.wxml @@ -8,7 +8,7 @@ 填写信息人数：{{info.list.members_count}} - 立即邀请 + 提交订单 diff --git a/pages/info/groupOrderInfo/index.wxss b/pages/info/groupOrderInfo/index.wxss index e0f799d..69c0f98 100644 --- a/pages/info/groupOrderInfo/index.wxss +++ b/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; diff --git a/pages/info/hotelProductInfo/index.js b/pages/info/hotelProductInfo/index.js index 4ea113d..e805448 100644 --- a/pages/info/hotelProductInfo/index.js +++ b/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 }) diff --git a/pages/list/museum/index.js b/pages/list/museum/index.js index a705821..bbb98e8 100644 --- a/pages/list/museum/index.js +++ b/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){ diff --git a/pages/order/components/contact/index.js b/pages/order/components/contact/index.js index 5756969..15f3032 100644 --- a/pages/order/components/contact/index.js +++ b/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; diff --git a/pages/pbService/index.wxml b/pages/pbService/index.wxml index 0a096ae..993f831 100644 --- a/pages/pbService/index.wxml +++ b/pages/pbService/index.wxml @@ -19,6 +19,14 @@ 景区舒适度 + + + 体育场馆 + + + + 垃圾分类 + @@ -73,15 +81,8 @@ 书香借阅 - - - 体育场馆 - - - - 垃圾分类 - - + + 文化配送 @@ -93,9 +94,13 @@ 精彩回顾 - + + + + 廉洁地图 + \ No newline at end of file diff --git a/pages/user/order/list.js b/pages/user/order/list.js index 4466ccd..489d80b 100644 --- a/pages/user/order/list.js +++ b/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, diff --git a/pages/user/order/team/list.js b/pages/user/order/team/list.js index e09e76d..33eccce 100644 --- a/pages/user/order/team/list.js +++ b/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 { diff --git a/pages/user/profile/index.wxml b/pages/user/profile/index.wxml index a7f1673..96a1e50 100644 --- a/pages/user/profile/index.wxml +++ b/pages/user/profile/index.wxml @@ -50,4 +50,5 @@