From e44c8d26b64408741aef7a3b756d64733f6ea78a Mon Sep 17 00:00:00 2001 From: chenkainan Date: Tue, 22 Oct 2024 17:20:10 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- compoents/contactAdd.vue | 2 +- pages.json | 10 +- pages/index/index.vue | 458 +++++------ pages/user/user.vue | 137 ++-- static/images/index.png | Bin 6273 -> 11946 bytes static/images/index_HL.png | Bin 6516 -> 12562 bytes static/images/mall.png | Bin 10532 -> 0 bytes static/images/mall_HL.png | Bin 18813 -> 0 bytes static/images/map.png | Bin 12816 -> 17542 bytes static/images/map_HL.png | Bin 14692 -> 19411 bytes static/images/user.png | Bin 7169 -> 12253 bytes static/images/user_HL.png | Bin 9308 -> 13260 bytes subPackages/order/detail.vue | 2 +- subPackages/order/trades.vue | 1169 ++++++++++++++------------- subPackages/user/bindTel.vue | 2 +- subPackages/user/changeNickname.vue | 2 +- subPackages/user/myAddressAdd.vue | 2 +- subPackages/user/myContactsAdd.vue | 2 +- subPackages/user/profile.vue | 4 +- subPackages/user/travelerList.vue | 2 +- 20 files changed, 857 insertions(+), 935 deletions(-) delete mode 100644 static/images/mall.png delete mode 100644 static/images/mall_HL.png diff --git a/compoents/contactAdd.vue b/compoents/contactAdd.vue index c96cfa0..5c0fb2e 100644 --- a/compoents/contactAdd.vue +++ b/compoents/contactAdd.vue @@ -250,7 +250,7 @@ .btn { width: 697rpx; height: 80rpx; - background: linear-gradient(90deg, #9EE4FE, #7FD491); + background: #248BAA; border-radius: 40rpx; text-align: center; line-height: 80rpx; diff --git a/pages.json b/pages.json index 29887a8..cd91fc1 100644 --- a/pages.json +++ b/pages.json @@ -304,7 +304,7 @@ }], "tabBar": { "color": "#666666", - "selectedColor": "#71B580", + "selectedColor": "#248BAA", "borderStyle": "black", "backgroundColor": "#ffffff", // #ifdef APP-PLUS @@ -322,13 +322,7 @@ "pagePath": "pages/map/map", "iconPath": "/static/images/map.png", "selectedIconPath": "/static/images/map_HL.png", - "text": "地图" - }, - { - "pagePath": "pages/mall/mall", - "iconPath": "/static/images/mall.png", - "selectedIconPath": "/static/images/mall_HL.png", - "text": "商城" + "text": "导览" }, { "pagePath": "pages/user/user", diff --git a/pages/index/index.vue b/pages/index/index.vue index e7fa306..d507d2c 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -2,73 +2,58 @@ - - - 搜一搜您想要的产品 - + - + + + {{current}}/{{topBanner.length}} + - - - - - - {{notice}} - - - - - - - {{weatherList.low}}~{{weatherList.high}}
{{weatherList.type}} - + + + + 同里古镇今日开园 + + + + + {{notice}} + 更多 > - - - - {{item.text}} - + + + - - - - - - {{scenic.title}} - - - - {{scenic.address}} - - >>> 发现好玩的游览宝地 + + + + + {{item.text}} - - - - 今日共有{{eventCalendarNum}}个活动 >>> - - 活动日历 - - {{day}}日/{{month}}月 - + + + + + 更多 > - - 享受家一般的舒适 >>> - - 盐都美宿 + + + {{item.title}} + @@ -78,7 +63,7 @@ 更多 > - + {{item.goods.image_tag}} @@ -101,7 +86,7 @@ 更多 > - + {{item.goods.image_tag}} @@ -113,29 +98,18 @@ - - + - {{item.image_tag}} {{item.title}} - - - - {{item.author}} - - - - {{item.view}} - - + 同里旅游 @@ -151,51 +125,51 @@ data() { return { topBanner: [], - weatherList: [], + current: 0, navList: [ { - img: 'https://static.ticket.sz-trip.com/yandu/images/index/jdmp.png', - text: '景区门票', + img: 'https://static.ticket.sz-trip.com/tongli/images/index/lytl.png', + text: '乐游同里', path: '/subPackages/ticketBooking/ticketBooking' }, { - img: 'https://static.ticket.sz-trip.com/yandu/images/index/jdms.png', - text: '酒店民宿', + img: 'https://static.ticket.sz-trip.com/tongli/images/index/hdrl.png', + text: '活动日历', path: '/subPackages/hotelHomestay/hotelHomestay' }, { - img: 'https://static.ticket.sz-trip.com/yandu/images/index/cyms.png', - text: '餐饮美食', + img: 'https://static.ticket.sz-trip.com/tongli/images/index/tsty.png', + text: '特色体验', path: '/subPackages/food/foodList' }, { - img: 'https://static.ticket.sz-trip.com/yandu/images/index/wctc.png', - text: '文创特产', + img: 'https://static.ticket.sz-trip.com/tongli/images/index/jdms.png', + text: '酒店民宿', path: '/subPackages/techan/techanList' }, { - img: 'https://static.ticket.sz-trip.com/yandu/images/index/xltj.png', - text: '线路推荐', + 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: 'https://static.ticket.sz-trip.com/yandu/images/index/zhdt.png', - text: '智慧地图', + 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: 'https://static.ticket.sz-trip.com/yandu/images/index/yjgl.png', - text: '游记攻略', + img: 'https://static.ticket.sz-trip.com/tongli/images/index/tcwc.png', + text: '特产文创', path: '/subPackages/travelGuide/travelGuide' }, { - img: 'https://static.ticket.sz-trip.com/yandu/images/index/hdrl.png', - text: '活动日历', + img: 'https://static.ticket.sz-trip.com/tongli/images/index/tlms.png', + text: '同里美食', path: '/subPackages/eventCalendar/eventCalendar' } ], - scenic: {}, + scenicList: [], homeUi: {}, month: 0, day: 0, @@ -204,7 +178,6 @@ strategyList: [], showMore: true, notice: '', - eventCalendarNum: 0 } }, onReady() { @@ -214,7 +187,6 @@ } this.getTopBanner() - this.getWeather() this.getScenicByTag() this.getHomeUi() this.getNowDate() @@ -222,9 +194,12 @@ this.getFoodList() this.getArticleByType() this.getLatest() - this.getEventCalendarNum() }, methods: { + //轮播图左右滑动 + swiperChange(e) { + this.current = e.detail.current; + }, // 去线路列表 gotoLineList() { uni.navigateTo({ @@ -237,12 +212,6 @@ url: '/subPackages/webPage/webPage?url=https://yandumap.sz-trip.com/lineList?id=' + item.id }); }, - // 获取活动日历数量 - getEventCalendarNum() { - this.Post({},'/api/activity/getActivityCalendarCount').then(res => { - this.eventCalendarNum = res.data.count - }) - }, // 公告 getLatest() { this.Post({},'/api/anncmnt/getLatest').then(res => { @@ -328,20 +297,14 @@ } } }, - // 天气 - getWeather() { - this.Post({},'/api/index/weather').then(res => { - this.weatherList = res.data - }) - }, // 景点推荐 getScenicByTag() { this.Post({ tag_id: 48, offset: 0, - limit: 1 + limit: 5 },'/api/scenic/getScenicByTagId').then(res => { - this.scenic = res.data[0] + this.scenicList = res.data }) }, // 首页UI @@ -400,7 +363,7 @@ diff --git a/pages/user/user.vue b/pages/user/user.vue index 6343b7c..ead4376 100644 --- a/pages/user/user.vue +++ b/pages/user/user.vue @@ -1,22 +1,27 @@ + .list-common-empty { + display: flex; + flex-direction: column; + align-items: center; + justify-content: center; + min-height: 50vh; + } + + .list-common-empty img { + width: 483rpx; + height: 254rpx; + } + + .list-common-empty-tip { + margin-top: 61rpx; + + font-size: 29rpx; + font-family: PingFang SC; + font-weight: 500; + color: #8599b5; + } + + .com-flex-tao { + display: flex; + justify-content: space-between; + align-items: center; + } + + .search-box { + width: 697rpx; + height: 67rpx; + background: #f2f2f2; + border-radius: 33rpx; + display: flex; + align-items: center; + justify-content: space-between; + padding: 0 8rpx 0 28rpx; + margin: 0 auto; + margin-bottom: 20rpx; + + .left { + display: flex; + align-items: center; + + image { + width: 28rpx; + height: 30rpx; + } + + input { + margin-left: 20rpx; + font-size: 31rpx; + font-weight: 400; + color: #333; + width: 450rpx; + } + } + + .btn { + width: 107rpx; + height: 53rpx; + background: #71B580; + border-radius: 27rpx; + font-size: 28rpx; + font-weight: 400; + color: #ffffff; + line-height: 53rpx; + text-align: center; + } + } + + .top-bg { + background: #fff; + padding-top: 20rpx; + } + \ No newline at end of file diff --git a/subPackages/user/bindTel.vue b/subPackages/user/bindTel.vue index 9672cee..bd9d1e9 100644 --- a/subPackages/user/bindTel.vue +++ b/subPackages/user/bindTel.vue @@ -157,7 +157,7 @@ text-align: center; width: 333rpx; height: 80rpx; - background: linear-gradient(90deg, #9EE4FE, #7FD491); + background: #248BAA; border-radius: 40rpx; color: #FFFFFF; } diff --git a/subPackages/user/changeNickname.vue b/subPackages/user/changeNickname.vue index d37e3ad..26505cf 100644 --- a/subPackages/user/changeNickname.vue +++ b/subPackages/user/changeNickname.vue @@ -80,7 +80,7 @@ text-align: center; width: 333rpx; height: 80rpx; - background: linear-gradient(90deg, #9EE4FE, #7FD491); + background: #248BAA; border-radius: 40rpx; color: #FFFFFF; } diff --git a/subPackages/user/myAddressAdd.vue b/subPackages/user/myAddressAdd.vue index 5a6d069..4dca43f 100644 --- a/subPackages/user/myAddressAdd.vue +++ b/subPackages/user/myAddressAdd.vue @@ -377,7 +377,7 @@ font-size: 36rpx; width: 697rpx; height: 73rpx; - background: linear-gradient(90deg, #9EE4FE, #7FD491); + background: #248BAA; border-radius: 37rpx; justify-content: center; align-items: center; diff --git a/subPackages/user/myContactsAdd.vue b/subPackages/user/myContactsAdd.vue index 6f59dd4..5564af8 100644 --- a/subPackages/user/myContactsAdd.vue +++ b/subPackages/user/myContactsAdd.vue @@ -232,7 +232,7 @@ .btn { width: 697rpx; height: 80rpx; - background: linear-gradient(90deg, #9EE4FE, #7FD491); + background: #248BAA; border-radius: 40rpx; text-align: center; line-height: 80rpx; diff --git a/subPackages/user/profile.vue b/subPackages/user/profile.vue index b5a8997..0592fb5 100644 --- a/subPackages/user/profile.vue +++ b/subPackages/user/profile.vue @@ -17,7 +17,7 @@ @@ -339,7 +339,7 @@ font-size: 30rpx; width: 697rpx; height: 80rpx; - background: linear-gradient(90deg, #9EE4FE, #7FD491); + background: #248BAA; border-radius: 40rpx; line-height: 80rpx; color: #FFFFFF; diff --git a/subPackages/user/travelerList.vue b/subPackages/user/travelerList.vue index bd74aea..0d65e42 100644 --- a/subPackages/user/travelerList.vue +++ b/subPackages/user/travelerList.vue @@ -315,7 +315,7 @@ .btn { width: 697rpx; line-height: 80rpx; - background: linear-gradient(90deg, #9EE4FE, #7FD491); + background: #248BAA; border-radius: 37rpx; font-weight: 500; font-size: 36rpx; From 5823f946304ef6cbb3d407d404e8c65a99be87bb Mon Sep 17 00:00:00 2001 From: chenkainan Date: Wed, 23 Oct 2024 10:55:05 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- manifest.json | 2 +- pages.json | 4 +-- pages/index/index.vue | 4 +-- pages/user/user.vue | 32 +++++++++-------- static/js/CommonFunction.js | 4 +-- static/js/request.js | 2 +- subPackages/eventCalendar/eventCalendar.vue | 39 +++++++++++++-------- subPackages/user/coupon.vue | 6 ++-- subPackages/user/travelerList.vue | 6 ++-- 9 files changed, 56 insertions(+), 43 deletions(-) diff --git a/manifest.json b/manifest.json index bca1372..d48afa1 100644 --- a/manifest.json +++ b/manifest.json @@ -50,7 +50,7 @@ "quickapp" : {}, /* 小程序特有相关 */ "mp-weixin" : { - "appid" : "wxb8f15afe2765976d", + "appid" : "wxcb555ab174f22ec9", "setting" : { "urlCheck" : false, "es6" : true, diff --git a/pages.json b/pages.json index cd91fc1..b844bcf 100644 --- a/pages.json +++ b/pages.json @@ -102,8 +102,8 @@ { "path": "eventCalendar/eventCalendar", "style": { - "navigationBarTitleText": "活动日历", - "navigationStyle": "custom" + "navigationBarTitleText": "活动日历" + // "navigationStyle": "custom" } }, { diff --git a/pages/index/index.vue b/pages/index/index.vue index d507d2c..d29016a 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -12,7 +12,7 @@ - {{current}}/{{topBanner.length}} + {{current + 1}}/{{topBanner.length}} @@ -135,7 +135,7 @@ { img: 'https://static.ticket.sz-trip.com/tongli/images/index/hdrl.png', text: '活动日历', - path: '/subPackages/hotelHomestay/hotelHomestay' + path: '/subPackages/eventCalendar/eventCalendar' }, { img: 'https://static.ticket.sz-trip.com/tongli/images/index/tsty.png', diff --git a/pages/user/user.vue b/pages/user/user.vue index ead4376..3990837 100644 --- a/pages/user/user.vue +++ b/pages/user/user.vue @@ -48,21 +48,23 @@ - - - - {{item.title}} + + + + + {{item.title}} + + - - @@ -272,8 +274,8 @@ // this.$refs.popup.open('center') // }, gotoUrl(path, index) { - if (index == 3) { - this.$refs.popup.open() + if (index == 2) { + // this.$refs.popup.open() return; } uni.navigateTo({ @@ -555,7 +557,7 @@ color: transparent; cursor: pointer; overflow: hidden; - padding: 0 27rpx; + padding: 0; position: relative; text-align: center; text-decoration: none; diff --git a/static/js/CommonFunction.js b/static/js/CommonFunction.js index f412397..ed75ec9 100644 --- a/static/js/CommonFunction.js +++ b/static/js/CommonFunction.js @@ -91,7 +91,7 @@ Vue.prototype.showImg = img => { if (img.indexOf('https://') != -1 || img.indexOf('http://') != -1) { return img; } else { - return 'https://tongli.sz-trip.com' + img; + return 'https://tlgz.sz-trip.com' + img; } } @@ -115,7 +115,7 @@ Vue.prototype.getHeadImg = type => { { type, }, - '/api/scene/getKumgangHeadImgList' + '/api/public_service/getKumgangHeadImgList' ).then(res => { return res.data[0].image }); diff --git a/static/js/request.js b/static/js/request.js index c40490f..efa6607 100644 --- a/static/js/request.js +++ b/static/js/request.js @@ -1,7 +1,7 @@ import Vue from 'vue' import store from '@/store' -let NEWAPIURL = 'https://tongli.sz-trip.com' +let NEWAPIURL = 'https://tlgz.sz-trip.com' Vue.prototype.Post = (params, apiurl) => { if (uni.getStorageSync('userInfo') && JSON.parse(uni.getStorageSync('userInfo')).token) params.token = JSON.parse(uni.getStorageSync('userInfo')).token diff --git a/subPackages/eventCalendar/eventCalendar.vue b/subPackages/eventCalendar/eventCalendar.vue index fddf277..01b57ac 100644 --- a/subPackages/eventCalendar/eventCalendar.vue +++ b/subPackages/eventCalendar/eventCalendar.vue @@ -1,6 +1,7 @@