bbnv1
/
test
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

优化调整

master
jiazhipeng 7 months ago
parent
3b4c0958fb
commit
9a85f4f88b
8 changed files with 44 additions and 40 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      app.js
  2. 4
      pages/component/proRec/proRec.js
  3. 2
      pages/index/index.js
  4. 25
      pages/index/index.wxml
  5. 2
      pages/order/payresult/index.js
  6. 7
      pages/user/order/sceneOrderInfo/index.js
  7. 2
      pages/user/order/sceneOrderInfo/index.wxml
  8. 40
      utils/util.js

2
app.js
View File

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

4
pages/component/proRec/proRec.js
View File

@ -113,10 +113,10 @@ Component({
if (item.type == 'travels') {
// 游记做特殊处理 其他都按照原来的来
wx.navigateTo({
url: '/pages/info/strategyInfo/index?id=' + item.s_id,
url: '/pages/info/strategyInfo/index?id=' + item.s_id+"&sourceFrom=recommend",
})
} else {
util.gotoDetail(item);
util.gotoDetail(item, false, "&sourceFrom=recommend");
}
},
},

2
pages/index/index.js
View File

@ -523,7 +523,7 @@ Page({
})
} else {
// 小程序是3
commonApi._post("adv/get_home_ui", {type_id: 15}).then(res => {
commonApi._post("adv/get_home_ui", {type_id: 3}).then(res => {
let obj = {};
(res.data.content||[]).forEach(item => {
obj[item.id] = item.image

25
pages/index/index.wxml
View File

@ -15,8 +15,9 @@
<view class="textOver" style="color:#000000">搜索您想要的</view>
</navigator>
</view>
<swiper class="swiper" autoplay="{{false}}" interval="{{3000}}" duration="{{300}}"
bindchange="changeBannerIndex" data-keyname="activeBannerIndex" circular>
<swiper class="swiper" autoplay="{{true}}" interval="{{3000}}" duration="{{300}}"
bindchange="changeBannerIndex" data-keyname="activeBannerIndex" circular
indicator-dots indicator-color="rgba(255, 255, 255, .5)" indicator-active-color="#fff">
<block wx:for="{{banner}}" wx:key="index">
<swiper-item bindtap="bannerClick" data-item="{{item}}">
<image lazy-load src="{{item.head_img}}" mode="scaleToFill"></image>
@ -39,7 +40,7 @@
<view class="main-content" >
<!-- 金刚区 -->
<view style="padding: 0 20rpx;" wx:if="{{mainTypeList.length>0}}">
<!-- <swiper class="top-icons no-scrollbar" autoplay="{{false}}" style="height:180rpx;padding-top: 43rpx;"
<!-- <swiper class="top-icons no-scrollbar" autoplay="{{true}}" style="height:180rpx;padding-top: 43rpx;"
bindchange="changeBannerIndex" data-keyname="mainNavIndex"
display-multiple-items="5" circular
current="0">
@ -69,7 +70,7 @@
<view class="content-box">
<!-- 苏城环游记 todo-->
<view class="small-swiper-box" wx:if="{{ztbanner.length>0 && func_data.tour_guide}}">
<swiper class="small-swiper" autoplay="{{false}}" interval="{{3000}}" duration="{{300}}"
<swiper class="small-swiper" autoplay="{{true}}" interval="{{3000}}" duration="{{300}}"
bindchange="changeBannerIndex" data-keyname="ztBannerIndex">
<block wx:for="{{ztbanner}}" wx:key="index">
<swiper-item bindtap="bannerClick" data-item="{{item}}">
@ -136,7 +137,7 @@
</view>
<!-- 右边的banner -->
<view class="xpth-banner" wx:if="{{xpth&&xpth.adv&&xpth.adv.length>0}}">
<swiper class="xpth-banner-swiper" autoplay="{{false}}" interval="{{3000}}" duration="{{300}}"
<swiper class="xpth-banner-swiper" autoplay="{{true}}" interval="{{3000}}" duration="{{300}}"
bindchange="changeBannerIndex" data-keyname="XPathBannerIndex">
<block wx:for="{{xpth.adv}}" wx:key="index">
<swiper-item bindtap="bannerClick" data-item="{{item}}" data-source="限时特惠">
@ -154,7 +155,7 @@
</view>
<view class="small-swiper-box" wx:if="{{xiaobanner.length>0 && func_data.banner_mini}}">
<swiper class="small-swiper" autoplay="{{false}}" interval="{{3000}}" duration="{{300}}"
<swiper class="small-swiper" autoplay="{{true}}" interval="{{3000}}" duration="{{300}}"
bindchange="changeBannerIndex" data-keyname="smBannerIndex">
<block wx:for="{{xiaobanner}}" wx:key="index">
<swiper-item bindtap="bannerClick" data-item="{{item}}" style="position: relative;">
@ -302,7 +303,7 @@
<!-- 广告弹窗 -->
<view class="zzc" bindtap="closeAdv" wx:if="{{showAdv}}"></view>
<view class="alertavd" wx:if="{{showAdv}}">
<swiper class="alertsp" indicator-dots='{{true}}' indicator-color="rgba(255,255,255,0.5)" autoplay="{{false}}" interval="{{3000}}" duration="{{300}}" indicator-active-color="white">
<swiper class="alertsp" indicator-dots='{{true}}' indicator-color="rgba(255,255,255,0.5)" autoplay="{{true}}" interval="{{3000}}" duration="{{300}}" indicator-active-color="white">
<block wx:for="{{alertSwipeList}}" wx:key="index">
<swiper-item data-item="{{item}}" bindtap="bannerClick">
<image lazy-load src="{{item.head_img}}" style="width: 100%; height:100%; border-radius: 10rpx;" mode="aspectFill"></image>
@ -334,10 +335,10 @@
</view>
<view class="bg" wx:else style="background-image: url({{indexSeason.background}});">
<view class="bg" wx:else style="background-image: url({{indexSeason.background}});background: linear-gradient(165deg, #FF8623 213px, #FFE68A 213px);">
<!-- 顶部banner -->
<view style="position:relative;z-index: 1;">
<swiper class="swiper" autoplay="{{false}}" interval="{{3000}}" duration="{{300}}"
<view style="position:relative;z-index: 1;padding-top: 60rpx;">
<swiper class="swiper" autoplay="{{true}}" interval="{{3000}}" duration="{{300}}"
bindchange="changeBannerIndex" data-keyname="activeBannerIndex" circular>
<block wx:for="{{banner}}" wx:key="index">
<swiper-item data-item="{{item}}">
@ -363,7 +364,7 @@
<view class="content-box">
<!-- 苏城环游记 todo-->
<view class="small-swiper-box" wx:if="{{ztbanner.length>0 && func_data.tour_guide}}">
<swiper class="small-swiper" autoplay="{{false}}" interval="{{3000}}" duration="{{300}}"
<swiper class="small-swiper" autoplay="{{true}}" interval="{{3000}}" duration="{{300}}"
bindchange="changeBannerIndex" data-keyname="ztBannerIndex">
<block wx:for="{{ztbanner}}" wx:key="index">
<swiper-item data-item="{{item}}">
@ -377,7 +378,7 @@
<view class="small-swiper-box" wx:if="{{xiaobanner.length>0 && func_data.banner_mini}}">
<swiper class="small-swiper" autoplay="{{false}}" interval="{{3000}}" duration="{{300}}"
<swiper class="small-swiper" autoplay="{{true}}" interval="{{3000}}" duration="{{300}}"
bindchange="changeBannerIndex" data-keyname="smBannerIndex">
<block wx:for="{{xiaobanner}}" wx:key="index">
<swiper-item data-item="{{item}}" style="position: relative;">

2
pages/order/payresult/index.js
View File

@ -54,7 +54,7 @@ Page({
}
util.gotoDetail(item)
util.gotoDetail(item, false, "&sourceFrom=recommend")
},
gotoOrderList:function(){
if(!this.data.info) return;

7
pages/user/order/sceneOrderInfo/index.js
View File

@ -29,7 +29,9 @@ Page({
sysm2:false,
sysm2Text:'更多',
imgLen:[],
ids:[]
ids:[],
isPost: false, // 有没有邮寄产品
},
/**
@ -316,7 +318,8 @@ Page({
isRefund:state.indexOf("REFUND")!=-1,
info:res.data,
product_model:"ticket"||res.data.order_product_list[0].product_model,
ids: proId.join(",")
ids: proId.join(","),
isPost: res.data.order_product_list.some(x=>x.product_model == 'post'),
})
console.log(res.data);
// debugger

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

@ -246,7 +246,7 @@
<text>商品总价：</text>
<text>￥{{info.total_money/100}}</text>
</view>
<view class="detail-item">
<view class="detail-item" wx:if="{{isPost}}">
<text>运费：</text>
<view>
<text style="padding-right: 56rpx;" wx:if="{{info.total_post_fee&&info.order_product_list[0].is_batch_shipment==1}}">

40
utils/util.js
View File

@ -172,7 +172,7 @@ const checkLocation = function(){
})
})
}
const gotoDetail = (item,isPagePoint) =>{
const gotoDetail = (item,isPagePoint,queryStr="") =>{
wx.removeStorageSync('prizeId');
let pagePointData = {
param: {
@ -183,7 +183,7 @@ const gotoDetail = (item,isPagePoint) =>{
// 组合产品 跳线路
if (item.compose_product_id) {
wx.navigateTo({
url: '/pages/info/roadInfo/index?id='+item.compose_product_id
url: '/pages/info/roadInfo/index?id='+item.compose_product_id+queryStr
})
return
}
@ -191,12 +191,12 @@ const gotoDetail = (item,isPagePoint) =>{
if (item.is_package === 1) {
wx.navigateTo({
url: '/pages/info/postProductInfo/index?id='+item.id,
url: '/pages/info/postProductInfo/index?id='+item.id+queryStr,
})
return
}else if (item.is_package==2) {
wx.navigateTo({
url: '/subPackages/goods/oneCardTour/info/index?id='+item.scene_id
url: '/subPackages/goods/oneCardTour/info/index?id='+item.scene_id+queryStr
});
return
}
@ -207,7 +207,7 @@ const gotoDetail = (item,isPagePoint) =>{
case "tenscenic":
wx.navigateTo({
url: '/pages/info/foodInfo/index?id='+(item.scene_id || item.id)
url: '/pages/info/foodInfo/index?id='+(item.scene_id || item.id)+queryStr
})
break;
case "ticket":
@ -217,7 +217,7 @@ const gotoDetail = (item,isPagePoint) =>{
pagePoint(pagePointData,1)
}
wx.navigateTo({
url: '/pages/info/sceneProductInfo/index?id='+(item.scene_id || item.id)
url: '/pages/info/sceneProductInfo/index?id='+(item.scene_id || item.id)+queryStr
})
break;
case "hotel":
@ -227,7 +227,7 @@ const gotoDetail = (item,isPagePoint) =>{
pagePoint(pagePointData,1)
}
wx.navigateTo({
url: '/pages/info/hotelProductInfo/index?id='+(item.scene_id || item.id)
url: '/pages/info/hotelProductInfo/index?id='+(item.scene_id || item.id)+queryStr
})
break;
case "post":
@ -240,11 +240,11 @@ const gotoDetail = (item,isPagePoint) =>{
try {
if (item.iShop) {
wx.navigateTo({
url: '/pages/info/postProductInfo/index?id='+item.id+'&iShop='+item.iShop+'&supplierId='+item.supplierId
url: '/pages/info/postProductInfo/index?id='+item.id+'&iShop='+item.iShop+'&supplierId='+item.supplierId+queryStr
})
}else{
wx.navigateTo({
url: '/pages/info/postProductInfo/index?id='+item.id
url: '/pages/info/postProductInfo/index?id='+item.id+queryStr
})
}
} catch (error) {
@ -260,7 +260,7 @@ const gotoDetail = (item,isPagePoint) =>{
pagePoint(pagePointData,1)
}
wx.navigateTo({
url: '/pages/info/roadInfo/index?id='+item.id
url: '/pages/info/roadInfo/index?id='+item.id+queryStr
})
break;
case "coupon":
@ -271,7 +271,7 @@ const gotoDetail = (item,isPagePoint) =>{
pagePoint(pagePointData,1)
}
wx.navigateTo({
url: '/pages/info/cardInfo/index?id='+item.id
url: '/pages/info/cardInfo/index?id='+item.id+queryStr
})
break;
case "show":
@ -282,24 +282,24 @@ const gotoDetail = (item,isPagePoint) =>{
pagePoint(pagePointData,1)
}
wx.navigateTo({
url: '/pages/info/showInfo/index?id='+item.id
url: '/pages/info/showInfo/index?id='+item.id+queryStr
})
break;
case "food":
// 产品 美食
wx.navigateTo({
url: '/pages/info/foodProductInfo/index?id='+item.id
url: '/pages/info/foodProductInfo/index?id='+item.id+queryStr
})
break;
case "activity":
// 活动
wx.navigateTo({
url: '/pages/info/activityInfo/index?id='+(item.act_calendar_id || item.id)
url: '/pages/info/activityInfo/index?id='+(item.act_calendar_id || item.id)+queryStr
})
break;
case "movie":
// 产品 电影票
let tempUrl = 'https://m.cloud.sz-trip.com'+`/MovieInfo?id=${item.third_id || item.id}`+'&title='+item.title
let tempUrl = 'https://m.cloud.sz-trip.com'+`/MovieInfo?id=${item.third_id || item.id}`+'&title='+item.title+queryStr
wx.navigateTo({
url: '/pages/pbService/web/index?weburl=' + encodeURIComponent(tempUrl),
// url: '/pages/list/movieticket/list/info/index?id='+(item.third_id || item.id)+'&title='+item.title
@ -308,7 +308,7 @@ const gotoDetail = (item,isPagePoint) =>{
case "cinema":
// 产品 电影票
wx.navigateTo({
url: '/pages/list/movieticket/list/cinema/index?id='+item.third_id+'&title='+item.title
url: '/pages/list/movieticket/list/cinema/index?id='+item.third_id+'&title='+item.title+queryStr
})
break;
case "scenic":
@ -318,7 +318,7 @@ const gotoDetail = (item,isPagePoint) =>{
pagePoint(pagePointData,1)
}
wx.navigateTo({
url: '/pages/info/sceneProductInfo/index?id='+(item.scene_id || item.id)
url: '/pages/info/sceneProductInfo/index?id='+(item.scene_id || item.id)+queryStr
})
break;
case "room":
@ -328,7 +328,7 @@ const gotoDetail = (item,isPagePoint) =>{
pagePoint(pagePointData,1)
}
wx.navigateTo({
url: '/pages/info/hotelProductInfo/index?id='+(item.scene_id || item.id)
url: '/pages/info/hotelProductInfo/index?id='+(item.scene_id || item.id)+queryStr
})
break;
case "venue":
@ -338,7 +338,7 @@ const gotoDetail = (item,isPagePoint) =>{
pagePoint(pagePointData,1)
}
wx.navigateTo({
url: '/pages/info/museumInfo/index?id='+(item.scene_id || item.id)
url: '/pages/info/museumInfo/index?id='+(item.scene_id || item.id)+queryStr
})
break;
}
@ -745,7 +745,7 @@ const goProdInOtherPlatform = function (item) {
webUrl+= `/OneCardTourDetail?id=${item.scene_id || item.id}`
}
webUrl+="&sourceFrom=recommend"
wx.navigateToMiniProgram({
appId: appIdObj[platform],
path: "/subPackages/webPage/webPage?url="+encodeURIComponent(webUrl),

Write Preview
Loading…
Cancel
Save