Skip to content

U
uni-pdtravel
Commit 0933305d authored by 潘永坪's avatar 潘永坪
Browse files
Options

出租车页面bug修复

parent ac1ba620
Show whitespace changes
Inline Side-by-side
Showing with 649 additions and 630 deletions
components/customer.vue
View file @ 0933305d
<template> <template>
<!-- 客服 --> <!-- 客服 -->
<u-popup v-model="showPop" mode="bottom" border-radius="14" closeable height="85%"> <u-popup v-model="showPop" mode="bottom" border-radius="14" closeable height="75%">
<view class="son-wrap"> <view class="son-wrap">
<view class="title"> <view class="title">
客服电话 客服电话
......
pages.json
View file @ 0933305d
{ {
"pages" : [ "pages": [
//pages数组中第一项表示应用启动页 //pages数组中第一项表示应用启动页
{ {
"path" : "pages/indexs/index/index", "path": "pages/indexs/index/index",
"style" : { "style": {
"navigationBarTitleText" : "首页" "navigationBarTitleText": "首页"
} }
}, },
{ {
"path" : "pages/payment/orderPayment/orderPayment", "path": "pages/payment/orderPayment/orderPayment",
"style" : { "style": {
"navigationBarTitleText" : "订单支付", "navigationBarTitleText": "订单支付",
"enablePullDownRefresh" : false "enablePullDownRefresh": false
} }
}, },
{ {
"path" : "pages/login/login", "path": "pages/login/login",
"style" : { "style": {
"navigationBarTitleText" : "", "navigationBarTitleText": "",
"enablePullDownRefresh" : false "enablePullDownRefresh": false
} }
}, },
{ {
"path" : "pages/payment/paySuccess/paySuccess", "path": "pages/payment/paySuccess/paySuccess",
"style" : { "style": {
"navigationBarTitleText" : "支付成功", "navigationBarTitleText": "支付成功",
"enablePullDownRefresh" : false "enablePullDownRefresh": false
} }
}, },
{ {
"path" : "pages/payment/ourPayment/ourPayment", "path": "pages/payment/ourPayment/ourPayment",
"style" : { "style": {
"navigationBarTitleText" : "订单支付", "navigationBarTitleText": "订单支付",
"enablePullDownRefresh" : false "enablePullDownRefresh": false
} }
}, },
{ {
"path" : "pages/combination/combiChoose/combiChoose", "path": "pages/combination/combiChoose/combiChoose",
"style" : { "style": {
"navigationBarTitleText" : "产品选择", "navigationBarTitleText": "产品选择",
"enablePullDownRefresh" : false "enablePullDownRefresh": false
} }
}, },
{ {
"path" : "pages/my/order/electronicTicket/electronicTicket", "path": "pages/my/order/electronicTicket/electronicTicket",
"style" : { "style": {
"navigationBarTitleText" : "电子门票", "navigationBarTitleText": "电子门票",
"enablePullDownRefresh" : false "enablePullDownRefresh": false
} }
}, },
{ {
"path" : "pages/my/order/productList/productList", "path": "pages/my/order/productList/productList",
"style" : { "style": {
"navigationBarTitleText" : "我的订单", "navigationBarTitleText": "我的订单",
"enablePullDownRefresh" : false "enablePullDownRefresh": false
} }
}, },
{ {
"path" : "pages/combination/sourceCombiChoose/sourceCombiChoose", "path": "pages/combination/sourceCombiChoose/sourceCombiChoose",
"style" : { "style": {
"navigationBarTitleText" : "产品选择", "navigationBarTitleText": "产品选择",
"enablePullDownRefresh" : false "enablePullDownRefresh": false
} }
}, },
{ {
"path" : "pages/combination/distributionCombiChoose/distributionCombiChoose", "path": "pages/combination/distributionCombiChoose/distributionCombiChoose",
"style" : { "style": {
"navigationBarTitleText" : "产品选择", "navigationBarTitleText": "产品选择",
"enablePullDownRefresh" : false "enablePullDownRefresh": false
} }
}, },
{ {
"path" : "pages/scenic/scenicSingleOrder/scenicSingleOrder", "path": "pages/my/order/intelTicket/intelTicket",
"style" : { "style": {
"navigationBarTitleText" : "", "navigationBarTitleText": "",
"enablePullDownRefresh" : false "enablePullDownRefresh": false
}
},
{
"path" : "pages/my/order/intelTicket/intelTicket",
"style" : {
"navigationBarTitleText" : "",
"enablePullDownRefresh" : false
}
},
{
"path" : "pages/combination/combiOrder/combiOrder",
"style" : {
"navigationBarTitleText" : "",
"enablePullDownRefresh" : false
}
},
{
"path" : "pages/scenic/scenicJointOrder/scenicJointOrder",
"style" : {
"navigationBarTitleText" : "",
"enablePullDownRefresh" : false
} }
}, },
{ {
"path" : "pages/my/order/orderList/orderList", "path": "pages/combination/combiOrder/combiOrder",
"style" : { "style": {
"navigationBarTitleText" : "订单列表", "navigationBarTitleText": "",
"enablePullDownRefresh" : false "enablePullDownRefresh": false
} }
}, },
{ {
"path" : "pages/common/coupon/coupon", "path": "pages/my/order/orderList/orderList",
"style" : { "style": {
"navigationBarTitleText" : "领劵中心", "navigationBarTitleText": "订单列表",
"enablePullDownRefresh" : false "enablePullDownRefresh": false
} }
}, },
{ {
"path" : "pages/common/getTicket/getTicket", "path": "pages/common/coupon/coupon",
"style" : { "style": {
"navigationBarTitleText" : "", "navigationBarTitleText": "领劵中心",
"enablePullDownRefresh" : false "enablePullDownRefresh": false
} }
}, },
{ {
"path" : "pages/common/questionConsultation/questionConsultation", "path": "pages/common/getTicket/getTicket",
"style" : { "style": {
"navigationBarTitleText" : "", "navigationBarTitleText": "",
"enablePullDownRefresh" : false "enablePullDownRefresh": false
} }
}, },
{ {
"path" : "pages/scenic/scenicProduct/scenicProduct", "path": "pages/common/questionConsultation/questionConsultation",
"style" : { "style": {
"navigationBarTitleText" : "产品", "navigationBarTitleText": "",
"enablePullDownRefresh" : false "enablePullDownRefresh": false
} }
}, },
{ {
"path" : "pages/indexs/dongjianIndex/dongjianIndex", "path": "pages/indexs/dongjianIndex/dongjianIndex",
"style" : { "style": {
"navigationBarTitleText" : "洞舰", "navigationBarTitleText": "洞舰",
"enablePullDownRefresh" : false "enablePullDownRefresh": false
} }
}, },
{ {
"path" : "pages/my/order/afterSale/applyAfterSale/applyAfterSale", "path": "pages/my/order/afterSale/applyAfterSale/applyAfterSale",
"style" : { "style": {
"navigationBarTitleText" : "售后", "navigationBarTitleText": "售后",
"enablePullDownRefresh" : false "enablePullDownRefresh": false
} }
}, },
{ {
"path" : "pages/indexs/hghgIndex/hghgIndex", "path": "pages/indexs/hghgIndex/hghgIndex",
"style" : { "style": {
"navigationBarTitleText" : "湖广会馆", "navigationBarTitleText": "湖广会馆",
"enablePullDownRefresh" : false "enablePullDownRefresh": false
} }
}, },
{ {
"path" : "pages/my/exchangeCode/exchangeIndex/exchangeIndex", "path": "pages/my/exchangeCode/exchangeIndex/exchangeIndex",
"style" : { "style": {
"navigationBarTitleText" : "兑换", "navigationBarTitleText": "兑换",
"enablePullDownRefresh" : false "enablePullDownRefresh": false
} }
}, },
{ {
"path" : "pages/common/simpleProduct/simpleProduct", "path": "pages/common/simpleProduct/simpleProduct",
"style" : { "style": {
"navigationBarTitleText" : "产品选择", "navigationBarTitleText": "产品选择",
"enablePullDownRefresh" : false
}
}
,{
"path" : "pages/payment/distributionPayment/distributionPayment",
"style" :
{
"navigationBarTitleText": "订单支付",
"enablePullDownRefresh": false "enablePullDownRefresh": false
} }
}, {
} "path": "pages/payment/distributionPayment/distributionPayment",
,{ "style": {
"path" : "pages/indexs/merchantListIndex/merchantListIndex", "navigationBarTitleText": "订单支付",
"style" :
{
"navigationBarTitleText":"商品列表",
"enablePullDownRefresh": false "enablePullDownRefresh": false
} }
} }, {
,{ "path": "pages/indexs/merchantListIndex/merchantListIndex",
"path" : "pages/scenic/scenicChooseProduct/scenicChooseProduct", "style": {
"style" : "navigationBarTitleText": "商品列表",
{
"navigationBarTitleText": "产品选择",
"enablePullDownRefresh": false "enablePullDownRefresh": false
} }
} }
,{ , {
"path" : "pages/hotel/hotelIndex/hotelIndex", "path": "pages/hotel/hotelIndex/hotelIndex",
"style" : "style": {
{
"navigationBarTitleText": "酒店", "navigationBarTitleText": "酒店",
"enablePullDownRefresh": false "enablePullDownRefresh": false
} }
} }, {
,{ "path": "pages/specialProduct/specialIndex/specialIndex",
"path" : "pages/specialProduct/specialIndex/specialIndex", "style": {
"style" :
{
"navigationBarTitleText": "特产", "navigationBarTitleText": "特产",
"enablePullDownRefresh": false "enablePullDownRefresh": false
} }
} }, {
,{ "path": "pages/my/center/center",
"path" : "pages/scenic/scenicIndex/scenicIndex", "style": {
"style" :
{
"navigationBarTitleText": "景区",
"enablePullDownRefresh": false
}
}
,{
"path" : "pages/my/center/center",
"style" :
{
"navigationBarTitleText": "个人中心", "navigationBarTitleText": "个人中心",
"enablePullDownRefresh": false "enablePullDownRefresh": false
} }
} }, {
,{ "path": "pages/my/shopCart/shopCart",
"path" : "pages/my/shopCart/shopCart", "style": {
"style" :
{
"navigationBarTitleText": "购物车", "navigationBarTitleText": "购物车",
"enablePullDownRefresh": false "enablePullDownRefresh": false
} }
} }, {
,{ "path": "pages/my/commonInfo/commonInfo",
"path" : "pages/my/commonInfo/commonInfo", "style": {
"style" :
{
"navigationBarTitleText": "常用信息", "navigationBarTitleText": "常用信息",
"enablePullDownRefresh": false "enablePullDownRefresh": false
} }
} }, {
,{ "path": "pages/my/passCode/codeResult/codeResult",
"path" : "pages/my/passCode/codeResult/codeResult", "style": {
"style" :
{
"navigationBarTitleText": "通行码", "navigationBarTitleText": "通行码",
"enablePullDownRefresh": false "enablePullDownRefresh": false
} }
} }, {
,{ "path": "pages/my/customerService/enterpriseWechat/enterpriseWechat",
"path" : "pages/my/customerService/enterpriseWechat/enterpriseWechat", "style": {
"style" :
{
"navigationBarTitleText": "", "navigationBarTitleText": "",
"enablePullDownRefresh": false "enablePullDownRefresh": false
} }
} }, {
,{ "path": "pages/my/couponCenter/myCouponList/myCouponList",
"path" : "pages/my/couponCenter/myCouponList/myCouponList", "style": {
"style" :
{
"navigationBarTitleText": "我的券列表", "navigationBarTitleText": "我的券列表",
"enablePullDownRefresh": false "enablePullDownRefresh": false
} }
} }, {
,{ "path": "pages/my/travelList/travelList/travelList",
"path" : "pages/my/travelList/travelList/travelList", "style": {
"style" :
{
"navigationBarTitleText": "行程单", "navigationBarTitleText": "行程单",
"enablePullDownRefresh": false "enablePullDownRefresh": false
} }
} }, {
,{ "path": "pages/my/travelNotes/myTravelogue/myTravelogue",
"path" : "pages/my/travelNotes/myTravelogue/myTravelogue", "style": {
"style" :
{
"navigationBarTitleText": "我的行记", "navigationBarTitleText": "我的行记",
"enablePullDownRefresh": false "enablePullDownRefresh": false
} }
} }, {
,{ "path": "pages/my/order/afterSale/afterSaleList/afterSaleList",
"path" : "pages/my/order/afterSale/afterSaleList/afterSaleList", "style": {
"style" :
{
"navigationBarTitleText": "售后列表", "navigationBarTitleText": "售后列表",
"enablePullDownRefresh": false "enablePullDownRefresh": false
} }
...@@ -309,199 +247,223 @@ ...@@ -309,199 +247,223 @@
//分包加载配置，此配置为小程序的分包加载机制。 //分包加载配置，此配置为小程序的分包加载机制。
"subPackages": [ "subPackages": [
{ {
"root": "pages/vlog", //子包的根目录 "root": "pages/scenic", //子包的根目录
"pages": [ "pages": [
{ {
"path" : "vlogIndex/vlogIndex", "path": "scenicJointOrder/scenicJointOrder",
"style" : { "style": {
"navigationBarTitleText" : "欢乐影集", "navigationBarTitleText": "订单填写",
"enablePullDownRefresh" : false, "enablePullDownRefresh": false
"navigationBarBackgroundColor" : "#ffffff",
"navigationBarTextStyle" : "black"
} }
}, },
{ {
"path" : "vlogface/vlogface", "path": "scenicSingleOrder/scenicSingleOrder",
"style" : { "style": {
"navigationBarTitleText" : "扫脸获取视频", "navigationBarTitleText": "订单填写",
"enablePullDownRefresh" : false, "enablePullDownRefresh": false
"navigationBarBackgroundColor" : "#ffffff",
"navigationBarTextStyle" : "black"
} }
}, },
{ {
"path" : "scenicList/scenicList", "path": "scenicProduct/scenicProduct",
"style" : { "style": {
"enablePullDownRefresh" : false, "navigationBarTitleText": "产品",
"backgroundColor" : "#192033" "enablePullDownRefresh": false
} }
}, {
"path": "combinationProduct/combinationProduct",
"style": {
"navigationBarTitleText": "产品选择",
"enablePullDownRefresh": false
}
}, {
"path": "scenicIndex/scenicIndex",
"style": {
"navigationBarTitleText": "景区",
"enablePullDownRefresh": false
}
}
]
}, },
{ {
"path" : "vlogList/vlogList", "root": "pages/vlog",
"style" : { "pages": [{
"navigationBarTitleText" : "我的Vlog集", "path": "vlogIndex/vlogIndex",
"enablePullDownRefresh" : false, "style": {
"backgroundColor" : "#192033" "navigationBarTitleText": "欢乐影集",
"enablePullDownRefresh": false,
"navigationBarBackgroundColor": "#ffffff",
"navigationBarTextStyle": "black"
} }
}, },
{ {
"path" : "share/share", "path": "vlogface/vlogface",
"style" : { "style": {
"navigationBarTitleText" : "Vlog", "navigationBarTitleText": "扫脸获取视频",
"enablePullDownRefresh" : false "enablePullDownRefresh": false,
"navigationBarBackgroundColor": "#ffffff",
"navigationBarTextStyle": "black"
} }
}, },
{ {
"path" : "myVlog/myVlog", "path": "scenicList/scenicList",
"style" : { "style": {
"navigationBarTitleText" : "我的Vlog集", "enablePullDownRefresh": false,
"enablePullDownRefresh" : false, "backgroundColor": "#192033"
"navigationBarBackgroundColor" : "#fff",
"navigationBarTextStyle" : "black"
} }
}, },
{ {
"path" : "product/product", "path": "vlogList/vlogList",
"style" : { "style": {
"navigationBarTitleText" : "产品列表", "navigationBarTitleText": "我的Vlog集",
"enablePullDownRefresh" : false, "enablePullDownRefresh": false,
"navigationBarBackgroundColor" : "#fff", "backgroundColor": "#192033"
"navigationBarTextStyle" : "black"
} }
}, },
{ {
"path" : "productDetails/productDetails", "path": "share/share",
"style" : { "style": {
"navigationBarTitleText" : "产品详情", "navigationBarTitleText": "Vlog",
"enablePullDownRefresh" : false, "enablePullDownRefresh": false
"navigationBarBackgroundColor" : "#fff",
"navigationBarTextStyle" : "black"
} }
}, },
{ {
"path" : "uploadPictures/uploadPictures", "path": "myVlog/myVlog",
"style" : { "style": {
"navigationBarTitleText" : "上传照片", "navigationBarTitleText": "我的Vlog集",
"enablePullDownRefresh" : false, "enablePullDownRefresh": false,
"navigationBarBackgroundColor" : "#fff", "navigationBarBackgroundColor": "#fff",
"navigationBarTextStyle" : "black" "navigationBarTextStyle": "black"
} }
}, },
{ {
"path" : "u-avatar-cropper/u-avatar-cropper", "path": "product/product",
"style" : { "style": {
"navigationBarTitleText" : "照片裁剪", "navigationBarTitleText": "产品列表",
"navigationBarBackgroundColor" : "#000000" "enablePullDownRefresh": false,
"navigationBarBackgroundColor": "#fff",
"navigationBarTextStyle": "black"
} }
}, },
{ {
"path" : "pictureFormat/pictureFormat", "path": "productDetails/productDetails",
"style" : { "style": {
"navigationBarTitleText" : "照片调整", "navigationBarTitleText": "产品详情",
"enablePullDownRefresh" : false, "enablePullDownRefresh": false,
"navigationBarBackgroundColor" : "#ffffff", "navigationBarBackgroundColor": "#fff",
"navigationBarTextStyle" : "black" "navigationBarTextStyle": "black"
} }
}, },
{ {
"path" : "myVlogPhotos/myVlogPhotos", "path": "uploadPictures/uploadPictures",
"style" : { "style": {
"navigationBarTitleText" : "我的vlog照片", "navigationBarTitleText": "上传照片",
"enablePullDownRefresh" : false, "enablePullDownRefresh": false,
"navigationBarBackgroundColor" : "#ffffff", "navigationBarBackgroundColor": "#fff",
"navigationBarTextStyle" : "black" "navigationBarTextStyle": "black"
} }
}, },
{ {
"path" : "orderPay/orderPay", "path": "u-avatar-cropper/u-avatar-cropper",
"style" : { "style": {
"navigationBarTitleText" : "确认订单", "navigationBarTitleText": "照片裁剪",
"enablePullDownRefresh" : false, "navigationBarBackgroundColor": "#000000"
"navigationBarBackgroundColor" : "#ffffff",
"navigationBarTextStyle" : "black"
} }
}, },
{ {
"path" : "shippingAddress/shippingAddress", "path": "pictureFormat/pictureFormat",
"style" : { "style": {
"navigationBarTitleText" : "填写收货地址", "navigationBarTitleText": "照片调整",
"enablePullDownRefresh" : false, "enablePullDownRefresh": false,
"navigationBarBackgroundColor" : "#ffffff", "navigationBarBackgroundColor": "#ffffff",
"navigationBarTextStyle" : "black" "navigationBarTextStyle": "black"
} }
},
{
"path": "myVlogPhotos/myVlogPhotos",
"style": {
"navigationBarTitleText": "我的vlog照片",
"enablePullDownRefresh": false,
"navigationBarBackgroundColor": "#ffffff",
"navigationBarTextStyle": "black"
} }
]
}, },
{ {
"root":"pages/album", "path": "orderPay/orderPay",
"pages": [ "style": {
"navigationBarTitleText": "确认订单",
"enablePullDownRefresh": false,
"navigationBarBackgroundColor": "#ffffff",
"navigationBarTextStyle": "black"
}
},
{ {
"path" : "albumIndex", "path": "shippingAddress/shippingAddress",
"style" : "style": {
"navigationBarTitleText": "填写收货地址",
"enablePullDownRefresh": false,
"navigationBarBackgroundColor": "#ffffff",
"navigationBarTextStyle": "black"
}
}
]
},
{ {
"root": "pages/album",
"pages": [{
"path": "albumIndex",
"style": {
"navigationBarTitleText": "相册首页", "navigationBarTitleText": "相册首页",
"enablePullDownRefresh": false, "enablePullDownRefresh": false,
"navigationStyle": "custom" "navigationStyle": "custom"
} }
}, },
{ {
"path" : "chooseFavorite", "path": "chooseFavorite",
"style" : "style": {
{
"navigationBarTitleText": "景区喜好", "navigationBarTitleText": "景区喜好",
"enablePullDownRefresh": false, "enablePullDownRefresh": false,
"navigationStyle": "custom" "navigationStyle": "custom"
} }
}, },
{ {
"path" : "getPortrait", "path": "getPortrait",
"style" : "style": {
{
"navigationBarTitleText": "获取人像", "navigationBarTitleText": "获取人像",
"enablePullDownRefresh": false, "enablePullDownRefresh": false,
"navigationStyle": "custom" "navigationStyle": "custom"
} }
} }, {
,{ "path": "myPhotoAlbum/myPhotoAlbum",
"path" : "myPhotoAlbum/myPhotoAlbum", "style": {
"style" :
{
"navigationBarTitleText": "我的相册", "navigationBarTitleText": "我的相册",
"enablePullDownRefresh": false "enablePullDownRefresh": false
} }
} }, {
,{ "path": "albumOrderdetail/albumOrderdetail",
"path" : "albumOrderdetail/albumOrderdetail", "style": {
"style" :
{
"navigationBarTitleText": "", "navigationBarTitleText": "",
"enablePullDownRefresh": false "enablePullDownRefresh": false
} }
} }, {
,{ "path": "purchasedPhotoAlbum/purchasedPhotoAlbum",
"path" : "purchasedPhotoAlbum/purchasedPhotoAlbum", "style": {
"style" :
{
"navigationBarTitleText": "我的影集", "navigationBarTitleText": "我的影集",
"enablePullDownRefresh": false "enablePullDownRefresh": false
} }
} }, {
,{ "path": "DIYPurchase/DIYPurchase",
"path" : "DIYPurchase/DIYPurchase", "style": {
"style" :
{
"navigationBarTitleText": "影像DIY", "navigationBarTitleText": "影像DIY",
"enablePullDownRefresh": false "enablePullDownRefresh": false
} }
} }, {
,{ "path": "DIYDetails/DIYDetails",
"path" : "DIYDetails/DIYDetails", "style": {
"style" :
{
"navigationBarTitleText": "我的相片", "navigationBarTitleText": "我的相片",
"enablePullDownRefresh": false "enablePullDownRefresh": false
} }
...@@ -510,11 +472,11 @@ ...@@ -510,11 +472,11 @@
] ]
} }
], ],
"globalStyle" : { "globalStyle": {
"navigationBarTextStyle" : "white", "navigationBarTextStyle": "white",
"navigationBarTitleText" : "", "navigationBarTitleText": "",
"navigationBarBackgroundColor" : "#192033", "navigationBarBackgroundColor": "#192033",
"backgroundColor" : "#F8F8F8" "backgroundColor": "#F8F8F8"
}, },
// 配置tabbar导航栏 // 配置tabbar导航栏
"tabBar": { "tabBar": {
...@@ -528,32 +490,29 @@ ...@@ -528,32 +490,29 @@
"list": [{ "list": [{
"pagePath": "pages/indexs/index/index", "pagePath": "pages/indexs/index/index",
"iconPath": "static/img/index/home.png", "iconPath": "static/img/index/home.png",
"selectedIconPath":"static/img/index/homeChoose.png", "selectedIconPath": "static/img/index/homeChoose.png",
"text": "首页" "text": "首页"
}, { }, {
"pagePath": "pages/my/center/center", "pagePath": "pages/my/center/center",
"iconPath": "static/img/index/my.png", "iconPath": "static/img/index/my.png",
"selectedIconPath":"static/img/index/myChoose.png", "selectedIconPath": "static/img/index/myChoose.png",
"text": "我的" "text": "我的"
}] }]
}, },
"condition" : { "condition": {
//模式配置，仅开发期间生效 //模式配置，仅开发期间生效
"current" : 0, //当前激活的模式(list 的索引项) "current": 0, //当前激活的模式(list 的索引项)
"list" : [ "list": [{
{ "name": "", //模式名称
"name" : "", //模式名称 "path": "", //启动页面，必选
"path" : "", //启动页面，必选 "query": "" //启动参数，在页面的onLoad函数里面得到
"query" : "" //启动参数，在页面的onLoad函数里面得到 }]
}
]
}, },
"easycom" : { "easycom": {
// 下载安装的方式需要前面的"@/"，npm安装的方式无需"@/" // 下载安装的方式需要前面的"@/"，npm安装的方式无需"@/"
// 下载安装方式 // 下载安装方式
"^u-(.*)" : "@/uview-ui/components/u-$1/u-$1.vue" "^u-(.*)": "@/uview-ui/components/u-$1/u-$1.vue"
} }
} }
// npm安装方式 // npm安装方式
// "^u-(.*)": "uview-ui/components/u-$1/u-$1.vue" // "^u-(.*)": "uview-ui/components/u-$1/u-$1.vue"
\ No newline at end of file
pages/indexs/merchantListIndex/merchantListIndex.vue
View file @ 0933305d
...@@ -210,7 +210,7 @@ export default { ...@@ -210,7 +210,7 @@ export default {
//---跳转产品页面 //---跳转产品页面
goProduct(merchantId){ goProduct(merchantId){
uni.navigateTo({ uni.navigateTo({
url:'/pages/scenic/scenicChooseProduct/scenicChooseProduct?merchantId='+merchantId url:'/pages/scenic/combinationProduct/combinationProduct?merchantId='+merchantId
}) })
}, },
//---加载数据 //---加载数据
...@@ -226,7 +226,11 @@ export default { ...@@ -226,7 +226,11 @@ export default {
//如果是点击进行搜索 //如果是点击进行搜索
data.search=this.searchData data.search=this.searchData
} }
uni.showLoading({
title: '加载中'
})
this.$request('scenic/user/merchant/findMerchantList', data).then(res => { this.$request('scenic/user/merchant/findMerchantList', data).then(res => {
uni.hideLoading()
if (res.code == '00') { if (res.code == '00') {
this.scenicList=res.data.list||[] this.scenicList=res.data.list||[]
this.scenicList.forEach((item, index) => { this.scenicList.forEach((item, index) => {
...@@ -238,6 +242,8 @@ export default { ...@@ -238,6 +242,8 @@ export default {
icon: 'none' icon: 'none'
}) })
} }
}).catch(err=>{
uni.hideLoading()
}) })
}, },
//---送券 //---送券
......
pages/scenic/scenicChooseProduct/scenicChooseProduct.vue → pages/scenic/combinationProduct/combinationProduct.vue
View file @ 0933305d
<template> <template>
<view class="wrap"> <view class="wrap">
<scroll-view @scroll="scroll" style="height: 100%;" scroll-y>
<view class="banner"> <view class="banner">
<u-swiper :list="imgList" name="url" mode="number" height="360" indicator-pos="topRight"></u-swiper> <u-swiper :list="imgList" name="url" mode="number" height="400" indicator-pos="topRight"></u-swiper>
</view> </view>
<view class="middle"> <view class="middle">
<view class="tabbar"> <view class="tabbar" :style="tabbarObj">
<text v-for="(item, index) in tabbar" :key="index" @click="tabbarChange(index)" :class="{ on: active == index }"> <text v-for="(item, index) in tabbar" :key="index" @click="tabbarChange(index)" :class="{ on: active == index }">
{{ item }} {{ item }}
</text> </text>
</view> </view>
<swiper :current="active" @animationfinish="animationfinish" class="swiper-box"> <swiper :current="active" @animationfinish="animationfinish" class="swiper-box" :style="{ height: swiperHeight + 'px' }">
<swiper-item class="swiper-item"> <swiper-item class="swiper-item">
<scroll-view scroll-y style="height: 100%; width: 100%"> <checkbox-group @change="checkboxChange" class="checkbox-box">
<checkbox-group @change="checkboxChange">
<view class="merchant" v-for="(item, index) in scenicList" :key="index"> <view class="merchant" v-for="(item, index) in scenicList" :key="index">
<view class="merchant-title"> <view class="merchant-title">
<view class="title-left"> <view class="title-left">
...@@ -79,7 +79,6 @@ ...@@ -79,7 +79,6 @@
</view> </view>
</checkbox-group> </checkbox-group>
<u-empty text="空空如也..." mode="list" v-if="scenicList.length == 0"></u-empty> <u-empty text="空空如也..." mode="list" v-if="scenicList.length == 0"></u-empty>
</scroll-view>
</swiper-item> </swiper-item>
<swiper-item class="swiper-item"> <swiper-item class="swiper-item">
...@@ -126,6 +125,7 @@ ...@@ -126,6 +125,7 @@
<!-- 模态框 --> <!-- 模态框 -->
<u-modal v-model="showModal" @confirm="chooseConfirm" @cancel="chooseCancel" title="提示" content="该产品不支持多选" show-cancel-button="true"> <u-modal v-model="showModal" @confirm="chooseConfirm" @cancel="chooseCancel" title="提示" content="该产品不支持多选" show-cancel-button="true">
</u-modal> </u-modal>
</scroll-view>
</view> </view>
</template> </template>
...@@ -154,7 +154,9 @@ export default { ...@@ -154,7 +154,9 @@ export default {
chooseMerchantProduct: '', //不支持多产品购买时，选中的景区产品 chooseMerchantProduct: '', //不支持多产品购买时，选中的景区产品
groupId: '', //组合Id groupId: '', //组合Id
groupChannelId: '', //组合渠道Id groupChannelId: '', //组合渠道Id
channelType: 0 //渠道类型 channelType: 0, //渠道类型
swiperHeight: 0 ,//swiper高度
tabbarObj:''
} }
}, },
watch: { watch: {
...@@ -237,6 +239,15 @@ export default { ...@@ -237,6 +239,15 @@ export default {
} }
}, },
methods: { methods: {
//---页面滚动事件
scroll(e) {
if(e.detail.scrollTop>200){
//固定导航栏
this.tabbarObj='top:0;position:fixed;border-radius:0'
}else{
this.tabbarObj='top:-40rpx;position:relative;border-radius:16rpx;'
}
},
//---导航栏切换 //---导航栏切换
tabbarChange(index) { tabbarChange(index) {
this.active = index this.active = index
...@@ -259,15 +270,29 @@ export default { ...@@ -259,15 +270,29 @@ export default {
showDetail() { showDetail() {
this.$refs.detail.showPop = true this.$refs.detail.showPop = true
}, },
//计算第一个swiper高度
countSwiper1(){
this.$nextTick(() => {
const query = uni.createSelectorQuery().in(this)
query
.select('.checkbox-box')
.boundingClientRect(data => {
this.swiperHeight = data.height
})
.exec()
})
},
//---展示更多产品 //---展示更多产品
showMoreProduct(item) { showMoreProduct(item) {
item.productListCopy = item.productList item.productListCopy = item.productList
this.$forceUpdate() this.$forceUpdate()
this.countSwiper1()
}, },
//---收起产品 //---收起产品
retractProduct(item) { retractProduct(item) {
item.productListCopy = item.productList.slice(0, 2) item.productListCopy = item.productList.slice(0, 2)
this.$forceUpdate() this.$forceUpdate()
this.countSwiper1()
}, },
//---多选框变化 //---多选框变化
checkboxChange(e) { checkboxChange(e) {
...@@ -337,11 +362,16 @@ export default { ...@@ -337,11 +362,16 @@ export default {
let data = { let data = {
merchantId: this.merchantId, //商户id merchantId: this.merchantId, //商户id
openid: uni.getStorageSync('openid') || '', openid: uni.getStorageSync('openid') || '',
channelType:this.channelType,//渠道类型 channelType: this.channelType, //渠道类型
latitude, latitude,
longitude longitude
} }
this.$request('/scenic/groupGood/getGroupProducts', data).then(res => { uni.showLoading({
title: '加载中'
})
this.$request('/scenic/groupGood/getGroupProducts', data)
.then(res => {
uni.hideLoading()
if (res.code == '00') { if (res.code == '00') {
this.scenicList = res.data.merchantList || [] this.scenicList = res.data.merchantList || []
this.groupId = res.data.groupId || '' this.groupId = res.data.groupId || ''
...@@ -378,6 +408,9 @@ export default { ...@@ -378,6 +408,9 @@ export default {
} }
}) })
}) })
this.$nextTick(() => {
this.countSwiper1()
})
} else { } else {
uni.showToast({ uni.showToast({
title: res.message, title: res.message,
...@@ -385,6 +418,9 @@ export default { ...@@ -385,6 +418,9 @@ export default {
}) })
} }
}) })
.catch(err => {
uni.hideLoading()
})
}, },
//---跳转填写订单页面 //---跳转填写订单页面
goFillorder() { goFillorder() {
...@@ -421,7 +457,8 @@ export default { ...@@ -421,7 +457,8 @@ export default {
let productIdList = this.chooseProduct.map(item => { let productIdList = this.chooseProduct.map(item => {
return item.id return item.id
}) })
let query ='?productIdList=' + JSON.stringify(productIdList) + '&groupId=' + this.groupId + '&groupChannelId=' + this.groupChannelId + '&orderSource=3' let query =
'?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
}) })
...@@ -439,18 +476,27 @@ export default { ...@@ -439,18 +476,27 @@ export default {
background: #fff; background: #fff;
} }
.middle { .middle {
position: relative; padding: 0 24rpx 100rpx 24rpx;
top: -40rpx;
padding: 0 24rpx 60rpx 24rpx;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
flex: 1; // flex: 1;
background: #f7f7f7;
} }
.swiper-box { .swiper-box {
flex: 1; // flex: 1;
position: relative;
top: -40rpx;
} }
.tabbar { .tabbar {
transition:1s;
width: 100%;
left: 0;
z-index: 1;
position: relative;
top: -40rpx;
background: #fff; background: #fff;
box-shadow: 0px 0px 8px 2px rgba(0, 0, 0, 0.08);
border-radius: 16rpx; border-radius: 16rpx;
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
...@@ -458,6 +504,8 @@ export default { ...@@ -458,6 +504,8 @@ export default {
text { text {
padding: 24rpx 32rpx 24rpx 20rpx; padding: 24rpx 32rpx 24rpx 20rpx;
border-radius: 16rpx; border-radius: 16rpx;
width: 33.3%;
text-align: center;
} }
} }
.tabbar .on { .tabbar .on {
...@@ -470,12 +518,18 @@ export default { ...@@ -470,12 +518,18 @@ export default {
.merchant { .merchant {
border-radius: 16rpx; border-radius: 16rpx;
background: #ffffff; background: #ffffff;
box-shadow: 0px 0px 8px 2px rgba(0, 0, 0, 0.08);
margin-top: 24rpx; margin-top: 24rpx;
padding: 24rpx; padding: 24rpx;
} }
.merchant label.off .product { .merchant label.off .product {
background: #f3f3f3; background: #f3f3f3;
color: #999999;
}
.merchant label.off .product-name {
color: #999999;
}
.merchant label.off .product-rule {
color: #999999;
} }
.merchant-title { .merchant-title {
display: flex; display: flex;
......
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