From 2311eb1a9b8496782d4769913453a9584d30f800 Mon Sep 17 00:00:00 2001 From: chenkainan Date: Mon, 4 Nov 2024 16:32:17 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- main.js | 2 + manifest.json | 2 +- pages.json | 12 +- pages/index/index.vue | 313 +++++++++++--------- pages/login/login.vue | 10 +- pages/map/map.vue | 23 +- pages/user/user.vue | 28 +- static/font/font.css | 6 + static/font/font.ttf | Bin 0 -> 3417300 bytes static/images/index.png | Bin 11946 -> 10737 bytes static/images/index_HL.png | Bin 12562 -> 0 bytes static/images/map.png | Bin 17542 -> 9144 bytes static/images/map_HL.png | Bin 19411 -> 0 bytes static/images/user.png | Bin 12253 -> 17234 bytes static/images/user_HL.png | Bin 13260 -> 0 bytes subPackages/eventCalendar/eventCalendar.vue | 12 +- subPackages/line/detail.vue | 6 +- subPackages/line/order.vue | 6 +- subPackages/line/orders.vue | 8 +- subPackages/order/detail.vue | 30 +- subPackages/order/trades.vue | 8 +- 21 files changed, 260 insertions(+), 206 deletions(-) create mode 100644 static/font/font.css create mode 100644 static/font/font.ttf delete mode 100644 static/images/index_HL.png delete mode 100644 static/images/map_HL.png delete mode 100644 static/images/user_HL.png diff --git a/main.js b/main.js index 2fd1036..a83dad5 100644 --- a/main.js +++ b/main.js @@ -2,6 +2,8 @@ import App from './App' import store from './store' import '@/static/js/request.js' import '@/static/js/CommonFunction.js' +// 引入字体样式 +import "@/static/font/font.css" import {myMixins} from '@/mixins/myMixins.js' Vue.mixin(myMixins) diff --git a/manifest.json b/manifest.json index d48afa1..1f4e711 100644 --- a/manifest.json +++ b/manifest.json @@ -1,5 +1,5 @@ { - "name" : "yandu_WeChat", + "name" : "tongli_WeChat", "appid" : "__UNI__82C105F", "description" : "", "versionName" : "1.0.0", diff --git a/pages.json b/pages.json index 4969e94..d0721ca 100644 --- a/pages.json +++ b/pages.json @@ -29,7 +29,7 @@ { "path": "pages/login/login", "style": { - "navigationBarTitleText": "盐都文旅" + "navigationBarTitleText": "同里" } } ], @@ -114,7 +114,7 @@ { "path": "eventCalendar/eventCalendar", "style": { - "navigationBarTitleText": "活动日历" + "navigationBarTitleText": "岁时雅集" // "navigationStyle": "custom" } }, @@ -349,7 +349,7 @@ }], "tabBar": { "color": "#666666", - "selectedColor": "#248BAA", + "selectedColor": "#142d3c", "borderStyle": "black", "backgroundColor": "#ffffff", // #ifdef APP-PLUS @@ -360,19 +360,19 @@ "list": [{ "pagePath": "pages/index/index", "iconPath": "/static/images/index.png", - "selectedIconPath": "/static/images/index_HL.png", + "selectedIconPath": "/static/images/index.png", "text": "首页" }, { "pagePath": "pages/map/map", "iconPath": "/static/images/map.png", - "selectedIconPath": "/static/images/map_HL.png", + "selectedIconPath": "/static/images/map.png", "text": "导览" }, { "pagePath": "pages/user/user", "iconPath": "/static/images/user.png", - "selectedIconPath": "/static/images/user_HL.png", + "selectedIconPath": "/static/images/user.png", "text": "我的" } ] diff --git a/pages/index/index.vue b/pages/index/index.vue index a39927c..dee5902 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -18,27 +18,38 @@ - + 同里古镇今日开园 - + {{notice}} - 更多 > + + 更多 + + - - - + + + 门票预订 + 便民快捷购票入口 + + + + 地图导览 + 随时随地发现新旅程 + + - + - + {{item.text}} @@ -46,45 +57,40 @@ - - 更多 > + 景点展览 + 更多 - - {{item.title}} + + + {{item.title}} - - + + - - 更多 > + 精彩推荐 + 更多 - - - {{item.goods.image_tag}} - + + + - + - - + --> - + - + 同里新鲜事 @@ -131,52 +137,51 @@ current: 0, navList: [ { - img: 'https://static.ticket.sz-trip.com/tongli/images/index/lytl.png', - text: '乐游同里', - path: '/subPackages/leyou/index' - }, - { - img: 'https://static.ticket.sz-trip.com/tongli/images/index/hdrl.png', - text: '活动日历', + img: 'syyj', + text: '岁月雅集', path: '/subPackages/eventCalendar/eventCalendar' }, { - img: 'https://static.ticket.sz-trip.com/tongli/images/index/tsty.png', - text: '特色体验', - path: '/subPackages/line/lineList' + img: 'sxly', + text: '膳香留韵', + path: '/subPackages/food/foodList' }, { - img: 'https://static.ticket.sz-trip.com/tongli/images/index/jdms.png', - text: '酒店民宿', + img: 'xjsg', + text: '栖居水阁', path: '/subPackages/hotelHomestay/hotelHomestay' }, { - img: 'https://static.ticket.sz-trip.com/tongli/images/index/zcs.png', - text: '找厕所', - // path: '/subPackages/line/lineList' - path: '/subPackages/webPage/webPage?url='+ encodeURIComponent('https://yandumap.sz-trip.com/lineList'), + img: 'fyty', + text: '风雅体验', + path: '/subPackages/line/lineList' }, { - img: 'https://static.ticket.sz-trip.com/tongli/images/index/tcc.png', - text: '停车场', - path: '/subPackages/webPage/webPage?url='+ encodeURIComponent('https://yandumap.sz-trip.com/'), + img: 'ssfw', + text: '水市风物', + path: '/subPackages/techan/techanList' }, { - img: 'https://static.ticket.sz-trip.com/tongli/images/index/tcwc.png', - text: '特产文创', - path: '/subPackages/techan/techanList' + img: 'yzzn', + text: '游踪指南', + // path: '/subPackages/webPage/webPage?url='+ encodeURIComponent('https://yandumap.sz-trip.com/'), }, { - img: 'https://static.ticket.sz-trip.com/tongli/images/index/tlms.png', - text: '同里美食', - path: '/subPackages/food/foodList' + img: 'shtl', + text: '数绘同里', + // path: '/subPackages/webPage/webPage?url='+ encodeURIComponent('https://yandumap.sz-trip.com/') + }, + { + img: 'lfys', + text: '里坊轶事', + // path: '/subPackages/webPage/webPage?url='+ encodeURIComponent('https://yandumap.sz-trip.com/') } ], scenicList: [], homeUi: {}, month: 0, day: 0, - lineList: [], + eventsList: [], foodList: [], strategyList: [], showMore: true, @@ -193,7 +198,7 @@ this.getScenicByTag() this.getHomeUi() this.getNowDate() - this.getLineList() + this.getEventsList() this.getFoodList() this.getArticleByType() this.getLatest() @@ -203,17 +208,14 @@ swiperChange(e) { this.current = e.detail.current; }, - // 去线路列表 - gotoLineList() { - uni.navigateTo({ - url: '/subPackages/webPage/webPage?url=https://yandumap.sz-trip.com/lineList' - }); - }, - // 去线路详情 + // 去活动详情 goLineDetail(item) { - uni.navigateTo({ - url: '/subPackages/webPage/webPage?url=https://yandumap.sz-trip.com/lineList?id=' + item.id - }); + this.goOtherDetail(item) + if(!item.link_type) { + uni.navigateTo({ + url:'/subPackages/eventCalendar/detail?id='+item.id + }) + } }, // 公告 getLatest() { @@ -313,7 +315,7 @@ // 首页UI getHomeUi() { this.Post({ - type_id: 3 + type_id: 1 },'/api/adv/get_home_ui').then(res => { res.data.content.map(item => { this.homeUi[item.id] = item.image @@ -326,12 +328,15 @@ this.day = now.getDate(); }, // 线路推荐 - getLineList() { + getEventsList() { this.Post({ - type: '', - code: '' - },'/api/emap/getLineByCode').then(res => { - this.lineList = res.data + date: '', + offset: 0, + limit: 5, + type_id: '', + title: '' + },'/api/activity/getActivityCalendar').then(res => { + this.eventsList = res.data }) }, // 盐都美食 @@ -366,7 +371,7 @@ \ No newline at end of file diff --git a/pages/user/user.vue b/pages/user/user.vue index 3990837..95b1c32 100644 --- a/pages/user/user.vue +++ b/pages/user/user.vue @@ -11,7 +11,7 @@ 请登录/注册 > - 个人信息 + 个人信息 @@ -20,7 +20,7 @@ 我的订单 全部订单 - + @@ -52,7 +52,7 @@ @click="gotoUrl(item.path,index)" v-if="item.isShow"> - 立即预订 + 立即购买 @@ -261,7 +261,7 @@ width: 46rpx; height: 6rpx; border-radius: 3rpx; - background: #248BAA; + background: #515150; left: 50%; margin-left: -23rpx; bottom: 0rpx; @@ -323,7 +323,7 @@ .btn { width: 254rpx; height: 77rpx; - background: linear-gradient(270deg, #FC5109, #FC930A); + background: #C3282E; border-radius: 39rpx; text-align: center; line-height: 77rpx; diff --git a/subPackages/line/order.vue b/subPackages/line/order.vue index 69ba045..b5d14d3 100644 --- a/subPackages/line/order.vue +++ b/subPackages/line/order.vue @@ -388,7 +388,7 @@ left: 0; right: 0; height: 8rpx; - background: #248BAA; + background: #515150; border-radius: 4rpx; bottom: 0; } @@ -459,7 +459,7 @@ } .day-item.active { .date-item-in { - background: #248BAA; + background: #515150; color: #fff; border-radius: 7rpx; @@ -564,7 +564,7 @@ width: 293rpx; text-align: center; line-height: 87rpx; - background: linear-gradient(-90deg, #F84A56, #FF9834); + background: #C3282E; border-radius: 43rpx; color: #fff; font-size: 36rpx; diff --git a/subPackages/line/orders.vue b/subPackages/line/orders.vue index b2f3b2c..e7e20f7 100644 --- a/subPackages/line/orders.vue +++ b/subPackages/line/orders.vue @@ -45,7 +45,7 @@ 优惠券 - 请选择 + 选择优惠券 -￥{{coupon.CouponActivity.discounts/100}} @@ -476,7 +476,7 @@ .add-btn { display: flex; - width: 140rpx; + width: 153rpx; height: 57rpx; border: 1rpx solid #333333; border-radius: 29rpx; @@ -682,7 +682,7 @@ .order-btn { width: 293rpx; - background: linear-gradient(90deg, #F84A56, #FF9834); + background: #C3282E; border-radius: 43rpx; text-align: center; line-height: 87rpx; @@ -760,7 +760,7 @@ .add-btn { width: 153rpx; line-height: 40rpx; - background: #EE3E3B; + background: #C3282E; border-radius: 9rpx; text-align: center; font-weight: 500; diff --git a/subPackages/order/detail.vue b/subPackages/order/detail.vue index fb4f6b4..9145d24 100644 --- a/subPackages/order/detail.vue +++ b/subPackages/order/detail.vue @@ -350,7 +350,7 @@ 订单账号：{{info.order_id}} - + 复制 @@ -363,8 +363,8 @@ - - + + 联系客服 @@ -431,7 +431,7 @@ 即将拨打客服电话 服务时间：周一至周五
8:30-11:30，14:30-18:00 - 取消 + 取消 确定 @@ -462,6 +462,14 @@ }, methods: { + // 客服 + openKf(flag) { + if(flag) { + this.$refs.popup.open() + }else { + this.$refs.popup.close() + } + }, // 计算两个日期间的天数 calDate(startDate, endDate) { var start = new Date(startDate); @@ -747,7 +755,7 @@ .top-box { width: 750rpx; height: 414rpx; - background: linear-gradient(180deg, #A2E0DB, #A2E0DB, #A2E0DB, #A2E0DB, #A2E0DB, #A2E0DB, #F7F7F7); + background: linear-gradient(180deg, #E6DED2, #E6DED2, #E6DED2, #E6DED2, #E6DED2, #E6DED2, #F7F7F7); padding: 200rpx 0 0 50rpx; font-weight: bold; font-size: 43rpx; @@ -848,7 +856,7 @@ } .swiper-points { - background: #71B580; + background: #248BAA; } } @@ -1358,10 +1366,10 @@ width: 93rpx; height: 37rpx; border-radius: 11rpx; - border: 1rpx solid #248BAA; + border: 1rpx solid #515150; font-weight: 500; font-size: 22rpx; - color: #248BAA; + color: #515150; margin-left: 30rpx; .copy-img { @@ -1443,7 +1451,7 @@ .pay-btn { height: 73rpx; - background: linear-gradient(270deg, #FD6F34, #F4A61F); + background: rgba(195, 40, 46, 1); border: none; color: #FFFFFF; } @@ -1559,7 +1567,7 @@ } .express-item-icons { - background: #71B580; + background: #248BAA; } .consult-popup { @@ -1588,7 +1596,7 @@ width: 50%; font-weight: bold; font-size: 32rpx; - color: #71B580; + color: #248BAA; line-height: 54rpx; } diff --git a/subPackages/order/trades.vue b/subPackages/order/trades.vue index 1dfa62c..e728378 100644 --- a/subPackages/order/trades.vue +++ b/subPackages/order/trades.vue @@ -376,7 +376,7 @@ .common-type.active { font-size: 31rpx; font-weight: bold; - color: #248BAA; + color: #000; } .common-type.active:after { @@ -390,7 +390,7 @@ right: 0; bottom: 1rpx; height: 4rpx; - background: #248BAA; + background: #C3282E; border-radius: 2rpx; } @@ -509,7 +509,7 @@ padding: 0 20rpx; font-weight: 500; font-size: 24rpx; - color: #248BAA; + color: #C3282E; margin-top: 20rpx; } @@ -573,7 +573,7 @@ .trade-item-btns .pay-btn { color: #FFFFFF; - background: linear-gradient(90deg, #FD6F34, #F4A61F); + background: #C3282E; border: none; padding: 10rpx 16rpx; }