diff --git a/package-lock.json b/package-lock.json index 922878f..8d61998 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2,6 +2,11 @@ "requires": true, "lockfileVersion": 1, "dependencies": { + "mobile-calendar-simple": { + "version": "2.4.0", + "resolved": "https://registry.npmmirror.com/mobile-calendar-simple/-/mobile-calendar-simple-2.4.0.tgz", + "integrity": "sha512-67Dg/pxQ7EK2uxGrjv4tLOBx+upIErxdtTC27o+luGFmhBtZ3+k1C2DGIzzJYhAF/YsMG9zkSl9XZY0TEt/HOg==" + }, "ydui-district": { "version": "1.1.0", "resolved": "https://registry.npmmirror.com/ydui-district/-/ydui-district-1.1.0.tgz", diff --git a/package.json b/package.json index e314e1f..7036c3c 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,6 @@ { "dependencies": { + "mobile-calendar-simple": "^2.4.0", "ydui-district": "^1.1.0" } } diff --git a/pages.json b/pages.json index e29fdb8..5ff863b 100644 --- a/pages.json +++ b/pages.json @@ -175,17 +175,15 @@ } }, { - "path" : "travelGuide/travelGuide", - "style" : - { + "path": "travelGuide/travelGuide", + "style": { "navigationBarTitleText": "游记攻略", "navigationStyle": "custom" } }, { - "path" : "travelGuide/detail", - "style" : - { + "path": "travelGuide/detail", + "style": { "navigationBarTitleText": "攻略详情" } }, @@ -214,80 +212,86 @@ } }, { - "path" : "user/privacy", - "style" : { - "navigationBarTitleText" : "隐私管理" - } + "path": "user/privacy", + "style": { + "navigationBarTitleText": "隐私管理" + } }, { - "path" : "user/privacyInfo", - "style" : { - "navigationBarTitleText" : "详情" - } + "path": "user/privacyInfo", + "style": { + "navigationBarTitleText": "详情" + } }, { - "path" : "user/coupon", - "style" : { - "navigationBarTitleText" : "优惠券" - } + "path": "user/coupon", + "style": { + "navigationBarTitleText": "优惠券" + } }, { - "path" : "user/collect", - "style" : { - "navigationBarTitleText" : "个人收藏" - } + "path": "user/collect", + "style": { + "navigationBarTitleText": "个人收藏" + } }, { - "path" : "order/trades", - "style" : { - "navigationBarTitleText" : "全部订单" - } + "path": "order/trades", + "style": { + "navigationBarTitleText": "全部订单" + } }, { - "path" : "order/detail", - "style" : { - "navigationBarTitleText" : "订单状态", + "path": "order/detail", + "style": { + "navigationBarTitleText": "订单状态", "navigationStyle": "custom" - } + } }, { - "path" : "user/bindTel", - "style" : { - "navigationBarTitleText" : "修改姓名" - } + "path": "user/bindTel", + "style": { + "navigationBarTitleText": "修改姓名" + } }, { - "path" : "user/changeNickname", - "style" : { - "navigationBarTitleText" : "修改手机号" - } + "path": "user/changeNickname", + "style": { + "navigationBarTitleText": "修改手机号" + } }, { - "path" : "notice/noticeList", - "style" : { - "navigationBarTitleText" : "公告", + "path": "notice/noticeList", + "style": { + "navigationBarTitleText": "公告", "navigationStyle": "custom" - } + } }, { - "path" : "notice/noticeDetail", - "style" : { - "navigationBarTitleText" : "公告详情", + "path": "notice/noticeDetail", + "style": { + "navigationBarTitleText": "公告详情", "navigationStyle": "custom" - } + } }, { - "path" : "search/search", - "style" : { - "navigationBarTitleText" : "搜索", - "enablePullDownRefresh" : false + "path": "search/search", + "style": { + "navigationBarTitleText": "搜索", + "enablePullDownRefresh": false } }, { - "path" : "search/searchList", - "style" : { - "navigationBarTitleText" : "搜索结果", - "enablePullDownRefresh" : false + "path": "search/searchList", + "style": { + "navigationBarTitleText": "搜索结果", + "enablePullDownRefresh": false + } + }, + { + "path": "hotelHomestay/selectCalendar", + "style": { + "navigationBarTitleText": "选择日期" } } ] diff --git a/pages/index/index.vue b/pages/index/index.vue index e5e04b0..b91db4e 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -79,7 +79,7 @@ 更多 > - + {{item.goods.image_tag}} @@ -121,7 +121,7 @@ - + {{item.image_tag}} @@ -279,6 +279,35 @@ break; } }, + // 活动日历、线路详情 + goCalendarDetail(item,type) { + switch (item.link_type) { + case 0: + // 本小程序 + if(type == 1) { + // 线路 + }else { + uni.navigateTo({ + url:'/subPackages/travelGuide/detail?id='+item.id + }) + } + break; + case 1: + // 外部小程序 + uni.navigateToMiniProgram({ + shortLink: item.ext_link + }) + break; + case 2: + // 外部h5 + uni.navigateTo({ + url: '/subPackages/webPage/webPage?url=' + item.ext_link + }); + break; + default: + break; + } + }, // 天气 getWeather() { this.Post({},'/api/index/weather').then(res => { diff --git a/pages/mall/mall.vue b/pages/mall/mall.vue index 02409e3..c65271f 100644 --- a/pages/mall/mall.vue +++ b/pages/mall/mall.vue @@ -1,7 +1,20 @@ \ No newline at end of file diff --git a/subPackages/order/detail.vue b/subPackages/order/detail.vue index f8abfec..957f325 100644 --- a/subPackages/order/detail.vue +++ b/subPackages/order/detail.vue @@ -6,17 +6,17 @@ {{info.status_text}} - + 订单将在{{info.close_time.slice(-8)}}自动取消 - + 还剩{{remainNum}}张未核销 - - + + {{item.specifications_name}} @@ -24,8 +24,9 @@ 核销码:{{item.child_id}} - - + + 已核销 @@ -36,18 +37,19 @@ - + - + - + 左右滑动核销其他二维码 - + - + @@ -65,10 +67,11 @@ 开放时间:{{info.order_child[0].scenic_data.open_description}} - + - + {{item.specifications_name}} ¥{{item.pay_money / 100}} @@ -76,7 +79,7 @@ - + @@ -90,7 +93,7 @@ - + 出行人 @@ -105,15 +108,15 @@ - + 收货地址 - {{info.order_child[0].consignee.name}} {{info.order_child[0].consignee.tel}} + {{info.order_child[0].consignee.name}} {{info.order_child[0].consignee.tel}} {{info.order_child[0].consignee.address}} - + 商家名称 @@ -127,7 +130,7 @@ - + @@ -141,37 +144,42 @@ - + 自提信息 - + + {{info.order_child[0].contact.name}} {{info.order_child[0].contact.tel}} - - + + {{info.order_child[0].extract.extract_name}} {{info.order_child[0].extract.detail_addr}} - + - + + 电话 - - + + 导航 - + @@ -182,13 +190,14 @@ {{foodInfo.title}} - {{item}} + {{item}} x{{info.order_child[0].num}} - + @@ -202,42 +211,111 @@ - + 商家信息 店铺名称 - + 营业时间 {{merchantInfo.open_time}} - + - + - {{merchantInfo.province_name}}{{merchantInfo.city_name}}{{merchantInfo.district_name}}{{merchantInfo.detail_addr}} - 距您约{{merchantInfo.juli}} + + {{merchantInfo.province_name}}{{merchantInfo.city_name}}{{merchantInfo.district_name}}{{merchantInfo.detail_addr}} + + 距您约{{merchantInfo.juli}} + - + - - + + + + + + + 入住信息 + {{info.order_child[0].goods_title}} + + + + {{(info.order_child[0].start_date).slice(5)}} + {{ShowDateDay(new Date(info.order_child[0].start_date).getDay())}}入住 + + 共{{calDate(info.order_child[0].start_date, info.order_child[0].end_date)}}晚 + + {{info.order_child[0].end_date.slice(5)}} + {{ShowDateDay(new Date(info.order_child[0].end_date).getDay())}}离店 + + + + + + 地址地址地址地址地址地址地址地 址地址地址地址地址地址 + + + 地图 + + + + + 电话 + + + + + {{info.order_child[0].specifications_name}} + + ¥{{info.order_child[0].pay_money / 100}} + x{{info.order_child[0].num}} + + + + + + + 商品总额:¥{{info.money / 100}} + + + 优惠券:-¥{{info.discounts / 100}} + + + 实付金额:¥{{info.pay_money / 100}} + + + + + + 预订信息 + 房间数:{{info.order_child[0].num}}间 + 入住姓名:{{info.reserve_name}} + 联系电话:{{info.reserve_phone}} + + - + 订单信息 @@ -255,13 +333,13 @@ 支付时间:{{info.pay_time}} - + 联系客服 - +