Browse Source

Merge branch 'master' into dev_subscribe

master
jiazhipeng 7 months ago
parent
commit
78650fefa2
  1. 2
      app.js
  2. 8
      pages/component/proRec/proRec.js
  3. 10
      pages/index/index.js
  4. 2
      pages/index/index.wxml
  5. 11
      pages/index/index.wxss
  6. 11
      pages/info/postProductInfo/index.js
  7. 10
      pages/map/index.wxml
  8. 2
      pages/map/index.wxss
  9. 1
      pages/order/payresult/index.js
  10. 23
      pages/user/order/postOrderInfo/index.wxml
  11. 4
      pages/user/order/sceneOrderInfo/index.js
  12. 2
      pages/user/order/sceneOrderInfo/index.wxml
  13. 1
      pages/user/order/sceneOrderInfo/index.wxss
  14. 98
      utils/util.js

2
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(() => {

8
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({

10
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 相关---------------------------

2
pages/index/index.wxml

@ -170,7 +170,7 @@
<!-- 公共服务 -->
<view class="sale-road-boxes" style="margin-top:0;" wx:if="{{func_data.service_public}}">
<image lazy-load class="common-header-img" mode="heightFix" src="{{indexSeason.ggfw}}"></image>
<navigator url="/pages/pbService/index" catchtap="pagePoint" data-event="public_view" class="title-more">
<navigator url="/pages/pbService/index" catchtap="pagePoint" data-event="public_view" class="title-more" wx:if="{{showMore}}">
<view style="height: 40rpx;line-height: 40rpx;">更多 ></view>
<!-- <image lazy-load style="width: 12rpx;height: 20rpx;margin-left: 8rpx;" src="https://static.ticket.sz-trip.com/uploads/20250526/e6b945c42851563e9672c6992057bd91.png" mode="" /> -->
</navigator>

11
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%;

11
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()

10
pages/map/index.wxml

@ -28,9 +28,13 @@
<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 class="menu-item{{type==4?' active':''}}" bindtap="changeType" data-title="公共自行车" data-type="4">
<!-- <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==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>
@ -71,10 +75,10 @@
<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>
</view>
<view class="menus-item{{type==4?' active':''}}" bindtap="changeType" data-title="公共自行车" data-type="4">
<!-- <view class="menus-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> -->
<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>

2
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;
}

1
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(){

23
pages/user/order/postOrderInfo/index.wxml

@ -93,18 +93,21 @@
<!-- 一次性发货 -->
<view wx:elif="{{item.post_detail_list.length>=1}}">
<view class="detail-item post-line-info">
<text>快递公司:{{item.post_detail_list[0].express_name}}</text>
</view>
<view class="detail-item post-line-info">
<text>快递单号:</text>
<view style="flex:1;width: 1rpx;">
{{item.post_detail_list[0].courier_number}} <text data-num="{{item.post_detail_list[0].courier_number}}" bindtap="copy" style="flex:1;color:#0B898E;margin-left:20rpx">复制</text>
<view class="post-child-item" wx:for="{{item.post_detail_list}}" wx:for-item="shipment" wx:for-index="shipIndex">
<view class="detail-item post-line-info">
<text>快递公司:{{shipment.express_name}}</text>
</view>
<view class="detail-item post-line-info">
<text>快递单号:</text>
<view style="flex:1;width: 1rpx;">
{{shipment.courier_number}} <text data-num="{{shipment.courier_number}}" bindtap="copy" style="flex:1;color:#0B898E;margin-left:20rpx">复制</text>
</view>
</view>
<view class="detail-item post-line-info">
<text>发货时间:{{shipment.post_time}} </text>
</view>
</view>
<view class="detail-item post-line-info">
<text>发货时间:{{item.post_detail_list[0].post_time}} </text>
</view>
</view>
</view>

4
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);

2
pages/user/order/sceneOrderInfo/index.wxml

@ -17,7 +17,7 @@
<view class="code-box box" wx:if="{{info && codeImgs.length>0}}">
<view bindtap="prevCodeImg" class="iconfont icon-you-copy"></view>
<view wx:for="{{codeImgs}}" wx:if="{{index==codeIndex}}" style="position: relative;">
<image lazy-load src="{{item.img}}" mode="widthFix" style="width:300rpx;"></image>
<image lazy-load src="{{item.img}}" mode="widthFix" style="width:300rpx;height: 300rpx;"></image>
<!-- 代表核销后是否继续展示二维码(0否1是) -->
<view class="text-shadow" wx:if="{{item.is_force_display_code != 1 && item.flag != 0}}">
<view class="text-shadow-state">

1
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;

98
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,
}

Loading…
Cancel
Save