diff --git a/app.js b/app.js index d1c771c..6573851 100644 --- a/app.js +++ b/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.isTest127? true : false; + data.isTest = data.isTest129? true : false; data.indexSeason = null this.globalData.configJson = data }).then(() => { diff --git a/pages/component/proRec/proRec.js b/pages/component/proRec/proRec.js index 0150cb1..854cc8b 100644 --- a/pages/component/proRec/proRec.js +++ b/pages/component/proRec/proRec.js @@ -102,6 +102,14 @@ Component({ type: item.type } }, 1) + + // if (item.goods_jump_type == "changshu" || item.goods_jump_type == "yjks") { + // util.goProdInOtherPlatform(item) + // return + // } + + + if (item.type == 'travels') { // 游记做特殊处理 其他都按照原来的来 wx.navigateTo({ diff --git a/pages/index/index.js b/pages/index/index.js index 34ff738..4ac7827 100644 --- a/pages/index/index.js +++ b/pages/index/index.js @@ -410,6 +410,7 @@ Page({ hotIndex: 0, indexHot: [], weather: null, + showMore: false, // 页面图片 // imageSourceList:imageSource, @@ -462,6 +463,7 @@ Page({ }) this.getUrlToPage() + this.getShowMore() }, showImg (img) { @@ -588,6 +590,14 @@ Page({ }) }, + getShowMore () { + commonApi._post("multimedia/detail", {id: 2462}).then(res => { + this.setData({ + showMore: res.data.company_name ==1?true:false + }) + }) + }, + // --------------------banner 相关--------------------------- diff --git a/pages/index/index.wxml b/pages/index/index.wxml index e2b2a47..7cd195b 100644 --- a/pages/index/index.wxml +++ b/pages/index/index.wxml @@ -170,7 +170,7 @@ - + 更多 > diff --git a/pages/index/index.wxss b/pages/index/index.wxss index 018081a..8f9ea1c 100644 --- a/pages/index/index.wxss +++ b/pages/index/index.wxss @@ -760,15 +760,16 @@ .ggfw-list { - display: flex; - flex-wrap: wrap; + display: grid; + grid-template-columns: repeat(4, 166rpx); + row-gap: 23rpx; justify-content: space-between; } .ggfw-list .ggfw { - width: 220rpx; - height: 106.67rpx; - margin-bottom: 20rpx; + width: 166rpx; + height: 133rpx; + /* margin-bottom: 23rpx; */ } .ggfw image{ width: 100%; diff --git a/pages/info/postProductInfo/index.js b/pages/info/postProductInfo/index.js index f320a6e..5627b5c 100644 --- a/pages/info/postProductInfo/index.js +++ b/pages/info/postProductInfo/index.js @@ -756,11 +756,16 @@ Page({ }) this.drawImg() }) - commonApi.user_post('cart/get_list', {}).then(res => { + // commonApi.user_post('cart/get_list', {}).then(res => { + // this.setData({ + // cartCount: res.data.length + // }) + // }) + commonApi.user_post('cart/get_count', {noLogin: true}).then(res => { this.setData({ - cartCount: res.data.length + cartCount: res.data //1 }) - }) + }) } else { setTimeout(() => { this.onShow() diff --git a/pages/map/index.wxml b/pages/map/index.wxml index 50707e7..1f467da 100644 --- a/pages/map/index.wxml +++ b/pages/map/index.wxml @@ -28,9 +28,13 @@ 酒店 - + + + + 运河十景 @@ -71,10 +75,10 @@ 美食 - + 运河十景 diff --git a/pages/map/index.wxss b/pages/map/index.wxss index 7c6d54b..9faef2f 100644 --- a/pages/map/index.wxss +++ b/pages/map/index.wxss @@ -583,7 +583,7 @@ display: flex; /* justify-content: space-around; */ flex-wrap: wrap; - width: calc(170rpx * 8); + width: calc(170rpx * 7); margin: 0 20rpx; } diff --git a/pages/order/payresult/index.js b/pages/order/payresult/index.js index 79d9fee..6021b75 100644 --- a/pages/order/payresult/index.js +++ b/pages/order/payresult/index.js @@ -47,6 +47,7 @@ Page({ }, gotoDetail:function(e){ let item = e.currentTarget.dataset.item; + // todo 区县跳转 util.gotoDetail(item) }, gotoOrderList:function(){ diff --git a/pages/user/order/postOrderInfo/index.wxml b/pages/user/order/postOrderInfo/index.wxml index 6f0664f..e7e887a 100644 --- a/pages/user/order/postOrderInfo/index.wxml +++ b/pages/user/order/postOrderInfo/index.wxml @@ -93,18 +93,21 @@ - - 快递公司：{{item.post_detail_list[0].express_name}} - - - 快递单号： - - {{item.post_detail_list[0].courier_number}} 复制 + + + 快递公司：{{shipment.express_name}} + + + 快递单号： + + {{shipment.courier_number}} 复制 + + + + 发货时间：{{shipment.post_time}} - - 发货时间：{{item.post_detail_list[0].post_time}} - + diff --git a/pages/user/order/sceneOrderInfo/index.js b/pages/user/order/sceneOrderInfo/index.js index f65c46d..bb8e872 100644 --- a/pages/user/order/sceneOrderInfo/index.js +++ b/pages/user/order/sceneOrderInfo/index.js @@ -108,7 +108,8 @@ Page({ console.log(this.data.codeImgs); }, prevCodeImg:function(){ - let qrcode=this.data.info.order_product_list[0].qrcode,codeIndex = this.data.codeIndex; + let qrcode=this.data.codeImgs,codeIndex = this.data.codeIndex; + console.log(codeIndex) if(codeIndex==0){ this.setData({ codeIndex:qrcode.length-1 @@ -119,6 +120,7 @@ Page({ codeIndex:codeIndex-1 }) } + console.log(codeIndex) }, nextCodeImg:function(){ console.log(this.data.codeImgs); diff --git a/pages/user/order/sceneOrderInfo/index.wxml b/pages/user/order/sceneOrderInfo/index.wxml index 015e2df..a1976d8 100644 --- a/pages/user/order/sceneOrderInfo/index.wxml +++ b/pages/user/order/sceneOrderInfo/index.wxml @@ -17,7 +17,7 @@ - + diff --git a/pages/user/order/sceneOrderInfo/index.wxss b/pages/user/order/sceneOrderInfo/index.wxss index 69d4dcd..4a04db4 100644 --- a/pages/user/order/sceneOrderInfo/index.wxss +++ b/pages/user/order/sceneOrderInfo/index.wxss @@ -210,6 +210,7 @@ page { left: 40rpx; text-align: center; margin-top: 125rpx; + z-index: 5; } .code-box .iconfont.icon-you { left: auto; diff --git a/utils/util.js b/utils/util.js index 1609034..916616f 100644 --- a/utils/util.js +++ b/utils/util.js @@ -635,6 +635,103 @@ const orderByShoppingCart = function (listData, app) { } +// 产品跳转其他小程序 +const goProdInOtherPlatform = function (item) { + let webUrl = "https://m.cloud.sz-trip.com" + let platform = item.goods_jump_type; + console.log(item) + + let appIdObj = { + "changshu": "wxdaf3d5edd07dc7af", + "yjks": "wx8888a3fd0862b4c8" + } + + switch (item.type) { + case 'ticket': // 是产品的 票务 + webUrl+= `/${platform==='yjks' ? 'ScenicDetailKs' : 'ScenicDetail'}?id=${item.scene_id || item.id}` + break; + case 'hotel': // 是产品的 酒店 + webUrl+= `/HotelDetail?id=${item.scene_id || item.id}` + break; + case 'post': // 是产品的 邮寄 + webUrl+= `/${platform==='yjks'? 'MailMerchandiseDetailKs' : 'MailMerchandiseDetail'}?id=${item.id}` + break; + case 'line': // 是产品的 线路 + webUrl+= `/LineDetail?id=${item.id}` + break; + case 'coupon': // 是产品的 卡券 + webUrl+= `/CardDetail?id=${item.id}` + break; + case 'show': // 是产品的 演出 + webUrl+= `/PerformDetail?id=${item.id}` + break; + case 'food': // 是产品的 食品 + webUrl+= `/FoodDetail?id=${item.id}` + break; + case 'activity': // 是产品的 活动 todo 这里要弄成是活动的id去跳转的，特别是从 江苏夜游过去的 + webUrl+= `/ActivityDetail?id=${item.act_calendar_id || item.id}` + break; + case 'calendar': // ai入口活动日历 + webUrl+= `/AppointmentDetail?id=${item.id}` + break; + case 'movie': // 是产品的 电影 + webUrl+= `/MovieInfo?id=${item.third_id || item.id}` + break; + case 'scenic': // 是场景的 景点 + webUrl+= `/${platform===0? 'ScenicDetailKs' : 'ScenicDetail'}?id=${item.scene_id || item.id}` + break; + case 'room': // 是场景的 酒店 + webUrl+= `/HotelDetail?id=${item.scene_id || item.id}` + break; + case 'restaurant': // 是场景 美食 + webUrl+= `/RestaurantDetail?id=${item.id}` + break; + case 'tenscenic': // 是场景 十景 + webUrl+= `/TenScenicDetail?id=${item.id}` + break; + case 'venue': // 是场景的 场馆 + webUrl+= `/PavilionDetail?id=${item.scene_id || item.id}` + break; + case 'cinema': // 是场景的 影院 + webUrl+= `/CinemaDetail?id=${item.third_id || item.id}` + break; + case 'relic': // 文物 + webUrl+= `/ProtectionUnitsInfo?id=${item.id}` + break; + case 'units': // 文化单位 + webUrl+= `/CulturalUnitInfo?id=${item.id}` + break; + case 'red_map': // 红色地图 + webUrl+= `/RedTouristInfo?id=${item.id}` + break; + case 'travels': // 红色地图 + webUrl+= `/TravelNotesIntroductionInfo?id=${item.id}` + break; + } + console.log(appIdObj[platform],webUrl) + + + // 酒景套餐 + if(item.is_package == 1) { + webUrl+= `/${platform==='yjks' ? 'MailMerchandiseDetailKs' : 'MailMerchandiseDetail'}?id=${item.id}` + } + + // 一卡游详情 + if(item.is_package == 2) { + webUrl+= `/OneCardTourDetail?id=${item.scene_id || item.id}` + } + + + wx.navigateToMiniProgram({ + appId: appIdObj[platform], + path: "/subPackages/webPage/webPage?url="+encodeURIComponent(webUrl), + }) + + + // return webUrl; +} + + module.exports = { formatTime: formatTime, formatNumber: formatNumber, @@ -660,4 +757,5 @@ module.exports = { clearGlobalPagePoint: clearGlobalPagePoint, detailPagePoint: detailPagePoint, orderByShoppingCart: orderByShoppingCart, + goProdInOtherPlatform: goProdInOtherPlatform, }