Skip to content

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

出租车页面bug修复

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