Commit 87b1d123 authored by qipeng's avatar qipeng

Merge branch 'develop' of http://git.tbd.yanzuoguang.com/panyongping/uni-pdtravel into develop

parents a48db788 ac1ba620
...@@ -48,7 +48,7 @@ ...@@ -48,7 +48,7 @@
} }
}, },
"uniStatistics" : { "uniStatistics" : {
"enable" : true "enable" : false
} }
}, },
/* 快应用特有相关 */ /* 快应用特有相关 */
...@@ -69,42 +69,67 @@ ...@@ -69,42 +69,67 @@
} }
}, },
"uniStatistics" : { "uniStatistics" : {
"enable" : true "enable" : false
}, },
"requiredPrivateInfos" : [ "getLocation" ] "requiredPrivateInfos" : [ "getLocation" ]
}, },
"mp-alipay" : { "mp-alipay" : {
"usingComponents" : true, "usingComponents" : true,
"uniStatistics" : { "uniStatistics" : {
"enable" : true "enable" : false
}, },
"appid" : "2021001194629244" "appid" : "2021001194629244"
}, },
"mp-baidu" : { "mp-baidu" : {
"usingComponents" : true, "usingComponents" : true,
"uniStatistics" : { "uniStatistics" : {
"enable" : true "enable" : false
} }
}, },
"mp-toutiao" : { "mp-toutiao" : {
"usingComponents" : true, "usingComponents" : true,
"uniStatistics" : { "uniStatistics" : {
"enable" : true "enable" : false
} }
}, },
"uniStatistics" : { "uniStatistics" : {
"enable" : true "enable" : false
}, },
"h5" : { "h5" : {
"title" : "uni-pdtravel", "title" : "uni-pdtravel",
"domain" : "www.baidu.com", "domain" : "www.baidu.com",
"uniStatistics" : { "uniStatistics" : {
"enable" : true "enable" : false
} }
}, },
"mp-qq" : { "mp-qq" : {
"uniStatistics" : { "uniStatistics" : {
"enable" : true "enable" : false
}
},
"mp-jd" : {
"uniStatistics" : {
"enable" : false
}
},
"mp-kuaishou" : {
"uniStatistics" : {
"enable" : false
}
},
"mp-lark" : {
"uniStatistics" : {
"enable" : false
}
},
"quickapp-webview-huawei" : {
"uniStatistics" : {
"enable" : false
}
},
"quickapp-webview-union" : {
"uniStatistics" : {
"enable" : false
} }
} }
} }
...@@ -382,11 +382,6 @@ export default { ...@@ -382,11 +382,6 @@ export default {
font-size: 20rpx; font-size: 20rpx;
padding: 2rpx 4rpx; padding: 2rpx 4rpx;
border-radius: 2rpx; border-radius: 2rpx;
width: 110rpx;
display: inline-block;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
} }
.right2 text:not(:last-child){ .right2 text:not(:last-child){
margin-right: 10rpx; margin-right: 10rpx;
......
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
<view class="bottom"> <view class="bottom">
<view class="bottom-left"> <view class="bottom-left">
合计:¥ 合计:¥
<text style="font-size: 36rpx;font-weight: bold;">{{priceTotal}}</text> <text style="font-weight: bold;font-size: 40rpx;">{{priceTotal}}</text>
</view> </view>
<view class="bottom-right"> <view class="bottom-right">
<text class="btn" @click="goFillorder()"> <text class="btn" @click="goFillorder()">
...@@ -138,6 +138,7 @@ export default { ...@@ -138,6 +138,7 @@ export default {
} }
.bottom-left{ .bottom-left{
color:$red; color:$red;
font-size: 32rpx;
} }
.btn{ .btn{
padding: 16rpx 48rpx; padding: 16rpx 48rpx;
......
<template> <template>
<view class="wrap"> <view class="wrap">
<view class="banner"> <view class="banner">
<u-swiper :list="imgList" name="url" mode="number" height="420" indicator-pos="topRight"></u-swiper> <u-swiper :list="imgList" name="url" mode="number" height="360" indicator-pos="topRight"></u-swiper>
</view> </view>
<view class="middle"> <view class="middle">
<view class="tabbar"> <view class="tabbar">
...@@ -53,7 +53,7 @@ ...@@ -53,7 +53,7 @@
</text> </text>
<text class="product-rule"> 无需取票 </text> <text class="product-rule"> 无需取票 </text>
<text @click="showBuyKnow(items)">购买须知</text> <text @click.stop="showBuyKnow(items)">购买须知</text>
<u-icon name="arrow-right"></u-icon> <u-icon name="arrow-right"></u-icon>
</view> </view>
<view> <view>
...@@ -143,7 +143,7 @@ export default { ...@@ -143,7 +143,7 @@ export default {
return { return {
merchantId: '', //商户Id merchantId: '', //商户Id
// tabbar:['热门景点','一日游','摄影/旅拍','文创DIY'],//tabbar标题列表 // tabbar:['热门景点','一日游','摄影/旅拍','文创DIY'],//tabbar标题列表
tabbar: ['热门景点', '一日游', '摄影/旅拍'], //tabbar标题列表 tabbar: ['热门景点', '摄影/旅拍', '一日游'], //tabbar标题列表
active: 0, //导航栏下标 active: 0, //导航栏下标
imgList: [], //图片列表 imgList: [], //图片列表
scenicList: [], //景区数据 scenicList: [], //景区数据
...@@ -421,8 +421,7 @@ export default { ...@@ -421,8 +421,7 @@ export default {
let productIdList = this.chooseProduct.map(item => { let productIdList = this.chooseProduct.map(item => {
return item.id return item.id
}) })
let query = let query ='?productIdList=' + JSON.stringify(productIdList) + '&groupId=' + this.groupId + '&groupChannelId=' + this.groupChannelId + '&orderSource=3'
'?productIdList=' + JSON.stringify(productIdList) + '&groupId=' + this.groupId + '&groupChannelId=' + this.groupChannelId + '&orderSource=3'
uni.navigateTo({ uni.navigateTo({
url: '/pages/combination/combiOrder/combiOrder' + query url: '/pages/combination/combiOrder/combiOrder' + query
}) })
...@@ -462,7 +461,8 @@ export default { ...@@ -462,7 +461,8 @@ export default {
} }
} }
.tabbar .on { .tabbar .on {
background: url('../../../static/img/scenic/tabbar.png') no-repeat; // background: url('../../../static/img/scenic/tabbar.png') no-repeat;
background: $blue;
background-size: 100% 100%; background-size: 100% 100%;
color: #fff; color: #fff;
font-weight: bold; font-weight: bold;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment