chenkainan
/
tongli_WeChat
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

提交

master
chenkainan 12 months ago
parent
4c90569bbb
commit
2311eb1a9b
21 changed files with 260 additions and 206 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      main.js
  2. 2
      manifest.json
  3. 12
      pages.json
  4. 301
      pages/index/index.vue
  5. 10
      pages/login/login.vue
  6. 23
      pages/map/map.vue
  7. 28
      pages/user/user.vue
  8. 6
      static/font/font.css
  9. BIN
      static/font/font.ttf
  10. BIN
      static/images/index.png
  11. BIN
      static/images/index_HL.png
  12. BIN
      static/images/map.png
  13. BIN
      static/images/map_HL.png
  14. BIN
      static/images/user.png
  15. BIN
      static/images/user_HL.png
  16. 12
      subPackages/eventCalendar/eventCalendar.vue
  17. 6
      subPackages/line/detail.vue
  18. 6
      subPackages/line/order.vue
  19. 8
      subPackages/line/orders.vue
  20. 30
      subPackages/order/detail.vue
  21. 8
      subPackages/order/trades.vue

2
main.js
View File

@ -2,6 +2,8 @@ import App from './App'
import store from './store' import store from './store'
import '@/static/js/request.js' import '@/static/js/request.js'
import '@/static/js/CommonFunction.js' import '@/static/js/CommonFunction.js'
// 引入字体样式
import "@/static/font/font.css"
import {myMixins} from '@/mixins/myMixins.js' import {myMixins} from '@/mixins/myMixins.js'
Vue.mixin(myMixins) Vue.mixin(myMixins)

2
manifest.json
View File

@ -1,5 +1,5 @@
{ {
"name" : "yandu_WeChat", "name" : "tongli_WeChat",
"appid" : "__UNI__82C105F", "appid" : "__UNI__82C105F",
"description" : "", "description" : "",
"versionName" : "1.0.0", "versionName" : "1.0.0",

12
pages.json
View File

@ -29,7 +29,7 @@
{ {
"path": "pages/login/login", "path": "pages/login/login",
"style": { "style": {
"navigationBarTitleText": "盐都文旅" "navigationBarTitleText": "同里"
} }
} }
], ],
@ -114,7 +114,7 @@
{ {
"path": "eventCalendar/eventCalendar", "path": "eventCalendar/eventCalendar",
"style": { "style": {
"navigationBarTitleText": "活动日历" "navigationBarTitleText": "岁时雅集"
// "navigationStyle": "custom" // "navigationStyle": "custom"
} }
}, },
@ -349,7 +349,7 @@
}], }],
"tabBar": { "tabBar": {
"color": "#666666", "color": "#666666",
"selectedColor": "#248BAA", "selectedColor": "#142d3c",
"borderStyle": "black", "borderStyle": "black",
"backgroundColor": "#ffffff", "backgroundColor": "#ffffff",
// #ifdef APP-PLUS // #ifdef APP-PLUS
@ -360,19 +360,19 @@
"list": [{ "list": [{
"pagePath": "pages/index/index", "pagePath": "pages/index/index",
"iconPath": "/static/images/index.png", "iconPath": "/static/images/index.png",
"selectedIconPath": "/static/images/index_HL.png", "selectedIconPath": "/static/images/index.png",
"text": "首页" "text": "首页"
}, },
{ {
"pagePath": "pages/map/map", "pagePath": "pages/map/map",
"iconPath": "/static/images/map.png", "iconPath": "/static/images/map.png",
"selectedIconPath": "/static/images/map_HL.png", "selectedIconPath": "/static/images/map.png",
"text": "导览" "text": "导览"
}, },
{ {
"pagePath": "pages/user/user", "pagePath": "pages/user/user",
"iconPath": "/static/images/user.png", "iconPath": "/static/images/user.png",
"selectedIconPath": "/static/images/user_HL.png", "selectedIconPath": "/static/images/user.png",
"text": "我的" "text": "我的"
} }
] ]

301
pages/index/index.vue
View File

@ -18,27 +18,38 @@
<!-- 资讯 --> <!-- 资讯 -->
<view class="notice-box"> <view class="notice-box">
<image src="https://static.ticket.sz-trip.com/tongli/images/index/noticeImg.png" class="noticeImg"></image> <image src="https://static.ticket.sz-trip.com/tongli/images/index/noticeImgs.png" class="noticeImg"></image>
同里古镇今日开园 同里古镇今日开园
<view class="notice-top flex-between"> <view class="notice-top flex-between">
<view style="display: flex;align-items: center;"> <view style="display: flex;align-items: center;">
<image src="https://static.ticket.sz-trip.com/tongli/images/index/horn.png" mode=""></image> <image src="https://static.ticket.sz-trip.com/tongli/images/index/horns.png" mode=""></image>
<view class="notice-text text-overflow">{{notice}}</view> <view class="notice-text text-overflow">{{notice}}</view>
</view> </view>
<view class="notice-more" @click="gotoPath('/subPackages/notice/noticeList')">更多 ></view> <view class="notice-more" @click="gotoPath('/subPackages/notice/noticeList')">
更多
<image src="https://static.ticket.sz-trip.com/tongli/images/index/rightIcon.png" mode=""></image>
</view>
</view> </view>
<view class="notice-bottom flex-between"> <view class="notice-bottom flex-between" v-if="Object.keys(homeUi).length > 0">
<image src="https://static.ticket.sz-trip.com/tongli/images/index/menpiao.png" mode="" @click="gotoPath('/subPackages/ticketBooking/ticketBooking')"></image> <view :style="{backgroundImage: 'url('+showImg(homeUi['mpyd'])+')'}" @click="gotoPath('/subPackages/ticketBooking/ticketBooking')">
<image src="https://static.ticket.sz-trip.com/tongli/images/index/ditu.png" mode=""></image> <view class="title">门票预订</view>
<view class="subtitle">便民快捷购票入口</view>
<image src="https://static.ticket.sz-trip.com/tongli/images/index/rightIcons1.png" mode=""></image>
</view>
<view :style="{backgroundImage: 'url('+showImg(homeUi['dtdl'])+')'}">
<view class="title">地图导览</view>
<view class="subtitle">随时随地发现新旅程</view>
<image src="https://static.ticket.sz-trip.com/tongli/images/index/rightIcons.png" mode=""></image>
</view>
</view> </view>
</view> </view>
<!-- 金刚区 --> <!-- 金刚区 -->
<view class="nav-box"> <view class="nav-box" v-if="Object.keys(homeUi).length > 0">
<view class="nav-item" v-for="(item,index) in navList" :key="index" @click="gotoPath(item.path)"> <view class="nav-item" v-for="(item,index) in navList" :key="index" @click="gotoPath(item.path)">
<image :src="item.img" mode="" class="nav-img"></image> <image :src="showImg(homeUi[item.img])" mode="" class="nav-img"></image>
<view>{{item.text}}</view> <view>{{item.text}}</view>
</view> </view>
</view> </view>
@ -46,45 +57,40 @@
<!-- 景点展览 --> <!-- 景点展览 -->
<view v-if="scenicList && scenicList.length > 0"> <view v-if="scenicList && scenicList.length > 0">
<view class="title-box flex-between"> <view class="title-box flex-between">
<image :src="showImg(homeUi.ydms)" mode=""></image> 景点展览
<view @click="gotoPath('/subPackages/ticketBooking/ticketBooking')">更多 ></view> <view @click="gotoPath('/subPackages/ticketBooking/ticketBooking')">更多<image src="https://static.ticket.sz-trip.com/tongli/images/index/rightIcon.png" mode=""></image></view>
</view> </view>
<view class="scenic-box"> <view class="scenic-box">
<view v-for="(item,index) in scenicList" :key="index" class="scenic-item" @click="gotoScenic(item)" <view v-for="(item,index) in scenicList" :key="index" @click="gotoScenic(item)">
:style="{backgroundImage: 'url('+showImg(item.image)+')',backgroundSize: 'cover'}"> <image :src="showImg(item.image)" mode="aspectFill" class="scenic-item"></image>
<view class="scenic-title">{{item.title}}</view> <view class="scenic-title text-overflow">{{item.title}}</view>
</view> </view>
</view> </view>
</view> </view>
<!-- 线路推荐 --> <!-- 精彩推荐 -->
<view v-if="lineList && lineList.length > 0"> <view v-if="eventsList && eventsList.length > 0">
<view class="title-box flex-between"> <view class="title-box flex-between">
<image :src="showImg(homeUi.xltj)" mode=""></image> 精彩推荐
<view @click="gotoLineList">更多 ></view> <view @click="gotoPath('/subPackages/eventCalendar/eventCalendar')">更多<image src="https://static.ticket.sz-trip.com/tongli/images/index/rightIcon.png" mode=""></image></view>
</view> </view>
<view> <view class="line-box">
<view v-for="(item,index) in lineList" :key="index" class="line-item" @click="goLineDetail(item)"> <view v-for="(item,index) in eventsList" :key="index" class="line-item" @click="goLineDetail(item)">
<view class="hot flex-center" v-if="item.goods.image_tag">{{item.goods.image_tag}}</view> <image :src="showImg(item.image)" mode="aspectFill" class="line-img"></image>
<image :src="showImg(item.points[0].main_image)" mode="aspectFill" class="line-img"></image>
<view class="line-content"> <!-- <view class="line-content">
<view class="line-title text-overflow">{{item.name}}</view> <view class="line-title text-overflow">{{item.name}}</view>
<view class="line-subtitle text-overflow">{{item.points.length}}个景点</view> <view class="line-subtitle text-overflow">{{item.points.length}}个景点</view>
<!-- <view style="display: flex;" v-if="item.goods.goods_new_tag">
<view class="line-tag" v-for="(tagItem,tagIndex) in item.goods.goods_new_tag.split(',').slice(0,2)" :key="tagIndex">{{tagItem}}</view>
</view> --> </view> -->
<!-- <view class="line-price">{{item.goods.low_money / 100}}</view> -->
</view>
</view> </view>
</view> </view>
</view> </view>
<!-- 盐都美食 --> <!-- 盐都美食 -->
<view v-if="foodList && foodList.length > 0"> <!-- <view v-if="foodList && foodList.length > 0">
<view class="title-box flex-between"> <view class="title-box flex-between">
<image :src="showImg(homeUi.ydms)" mode=""></image> <image :src="showImg(homeUi.ydms)" mode=""></image>
<view @click="gotoPath('/subPackages/food/foodList')">更多 ></view> <view @click="gotoPath('/subPackages/food/foodList')">更多<image src="https://static.ticket.sz-trip.com/tongli/images/index/rightIcon.png" mode=""></image></view>
</view> </view>
<view class="food-box"> <view class="food-box">
<view v-for="(item,index) in foodList" :key="index" class="food-item" :style="{backgroundImage: 'url('+showImg(item.goods.image)+')',backgroundSize: 'cover'}" @click="gotoFood(item.goods)"> <view v-for="(item,index) in foodList" :key="index" class="food-item" :style="{backgroundImage: 'url('+showImg(item.goods.image)+')',backgroundSize: 'cover'}" @click="gotoFood(item.goods)">
@ -95,12 +101,12 @@
</view> </view>
</view> </view>
</view> </view>
</view> </view> -->
<!-- 同里新鲜事 --> <!-- 同里新鲜事 -->
<view> <view>
<view class="title-box flex-between"> <view class="title-box flex-between">
<image :src="showImg(homeUi.yjgl)" mode=""></image> 同里新鲜事
</view> </view>
<view class="strategy-box"> <view class="strategy-box">
@ -131,52 +137,51 @@
current: 0, current: 0,
navList: [ navList: [
{ {
img: 'https://static.ticket.sz-trip.com/tongli/images/index/lytl.png', img: 'syyj',
text: '乐游同里', text: '岁月雅集',
path: '/subPackages/leyou/index'
},
{
img: 'https://static.ticket.sz-trip.com/tongli/images/index/hdrl.png',
text: '活动日历',
path: '/subPackages/eventCalendar/eventCalendar' path: '/subPackages/eventCalendar/eventCalendar'
}, },
{ {
img: 'https://static.ticket.sz-trip.com/tongli/images/index/tsty.png', img: 'sxly',
text: '特色体验', text: '膳香留韵',
path: '/subPackages/line/lineList' path: '/subPackages/food/foodList'
}, },
{ {
img: 'https://static.ticket.sz-trip.com/tongli/images/index/jdms.png', img: 'xjsg',
text: '酒店民宿', text: '栖居水阁',
path: '/subPackages/hotelHomestay/hotelHomestay' path: '/subPackages/hotelHomestay/hotelHomestay'
}, },
{ {
img: 'https://static.ticket.sz-trip.com/tongli/images/index/zcs.png', img: 'fyty',
text: '找厕所', text: '风雅体验',
// path: '/subPackages/line/lineList' path: '/subPackages/line/lineList'
path: '/subPackages/webPage/webPage?url='+ encodeURIComponent('https://yandumap.sz-trip.com/lineList'),
}, },
{ {
img: 'https://static.ticket.sz-trip.com/tongli/images/index/tcc.png', img: 'ssfw',
text: '停车场', text: '水市风物',
path: '/subPackages/webPage/webPage?url='+ encodeURIComponent('https://yandumap.sz-trip.com/'), path: '/subPackages/techan/techanList'
}, },
{ {
img: 'https://static.ticket.sz-trip.com/tongli/images/index/tcwc.png', img: 'yzzn',
text: '特产文创', text: '游踪指南',
path: '/subPackages/techan/techanList' // path: '/subPackages/webPage/webPage?url='+ encodeURIComponent('https://yandumap.sz-trip.com/'),
}, },
{ {
img: 'https://static.ticket.sz-trip.com/tongli/images/index/tlms.png', img: 'shtl',
text: '同里美食', text: '数绘同里',
path: '/subPackages/food/foodList' // 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: [], scenicList: [],
homeUi: {}, homeUi: {},
month: 0, month: 0,
day: 0, day: 0,
lineList: [], eventsList: [],
foodList: [], foodList: [],
strategyList: [], strategyList: [],
showMore: true, showMore: true,
@ -193,7 +198,7 @@
this.getScenicByTag() this.getScenicByTag()
this.getHomeUi() this.getHomeUi()
this.getNowDate() this.getNowDate()
this.getLineList() this.getEventsList()
this.getFoodList() this.getFoodList()
this.getArticleByType() this.getArticleByType()
this.getLatest() this.getLatest()
@ -203,17 +208,14 @@
swiperChange(e) { swiperChange(e) {
this.current = e.detail.current; this.current = e.detail.current;
}, },
// 去线路列表 // 去活动详情
gotoLineList() {
uni.navigateTo({
url: '/subPackages/webPage/webPage?url=https://yandumap.sz-trip.com/lineList'
});
},
// 去线路详情
goLineDetail(item) { goLineDetail(item) {
this.goOtherDetail(item)
if(!item.link_type) {
uni.navigateTo({ uni.navigateTo({
url: '/subPackages/webPage/webPage?url=https://yandumap.sz-trip.com/lineList?id=' + item.id url:'/subPackages/eventCalendar/detail?id='+item.id
}); })
}
}, },
// 公告 // 公告
getLatest() { getLatest() {
@ -313,7 +315,7 @@
// 首页UI // 首页UI
getHomeUi() { getHomeUi() {
this.Post({ this.Post({
type_id: 3 type_id: 1
},'/api/adv/get_home_ui').then(res => { },'/api/adv/get_home_ui').then(res => {
res.data.content.map(item => { res.data.content.map(item => {
this.homeUi[item.id] = item.image this.homeUi[item.id] = item.image
@ -326,12 +328,15 @@
this.day = now.getDate(); this.day = now.getDate();
}, },
// 线路推荐 // 线路推荐
getLineList() { getEventsList() {
this.Post({ this.Post({
type: '', date: '',
code: '' offset: 0,
},'/api/emap/getLineByCode').then(res => { limit: 5,
this.lineList = res.data type_id: '',
title: ''
},'/api/activity/getActivityCalendar').then(res => {
this.eventsList = res.data
}) })
}, },
// 盐都美食 // 盐都美食
@ -366,7 +371,7 @@
<style lang="scss" scoped> <style lang="scss" scoped>
.content { .content {
background: #FFFDF7; background: #f6f6f6;
min-height: 100vh; min-height: 100vh;
overflow-x: hidden; overflow-x: hidden;
position: relative; position: relative;
@ -409,34 +414,33 @@
.notice-box { .notice-box {
width: 697rpx; width: 697rpx;
height: 440rpx; height: 440rpx;
background: linear-gradient(150deg, #FFF9E8, #FFF7E0); background:linear-gradient(180deg,#f7f3ed 0%,#f8f5f1 100%);
border-radius: 20rpx; border-radius: 30rpx;
position: relative; position: relative;
margin: -140rpx auto 0; margin: -140rpx auto 0;
padding: 22rpx 27rpx 0; padding: 22rpx 27rpx 0;
font-family: Source Han Serif CN VF;
font-weight: bold; font-weight: bold;
font-size: 40rpx; font-size: 40rpx;
color: #000000; color: #000000;
.noticeImg { .noticeImg {
width: 340rpx; width: 265rpx;
height: 136rpx; height: 130rpx;
position: absolute; position: absolute;
top: -22rpx; top: -19rpx;
right: 0; right: 0;
} }
.notice-top { .notice-top {
font-weight: 500; font-weight: 500;
font-size: 25rpx; font-size: 25rpx;
color: #097291; color:#100e0e;
margin-top: 25rpx; margin-top: 25rpx;
position: relative; position: relative;
image { image {
width: 33.33rpx; width: 24rpx;
height: 24.67rpx; height: 24rpx;
margin-right: 10rpx; margin-right: 10rpx;
} }
@ -444,27 +448,60 @@
width: 423rpx; width: 423rpx;
font-weight: 500; font-weight: 500;
font-size: 25rpx; font-size: 25rpx;
color: #097291; color:#100e0e;
} }
.notice-more { .notice-more {
width: 92rpx; width: 92rpx;
line-height: 27rpx; line-height: 27rpx;
text-align: right; text-align: right;
border-left: 1rpx solid #097291;
image {
width: 18rpx;
height: 18rpx;
margin-left: 5rpx;
}
} }
} }
.notice-bottom { .notice-bottom {
margin-top: 33rpx; margin-top: 33rpx;
&>view {
width: 369rpx;
height: 268rpx;
background-size: 100% 100%;
padding: 32rpx 0 0 29rpx;
.title {
color: #100e0e;
font-size: 30rpx;
font-weight: bold;
}
.subtitle {
color: #100e0e;
font-size: 24rpx;
margin-top: 3rpx;
font-weight: 500;
}
image { image {
width: 389.33rpx; width: 24rpx;
height: 258.67rpx; height: 24rpx;
} }
}
&>view:first-child {
width: 245rpx;
& image:first-child { .title {
width: 240rpx; color: #ffffff;
}
.subtitle {
color: #cccccc;
}
} }
} }
} }
@ -482,9 +519,9 @@
color: #111111; color: #111111;
.nav-img { .nav-img {
width: 93.33rpx; width: 90rpx;
height: 93.33rpx; height: 90rpx;
margin-bottom: 10rpx; margin-bottom: 1rpx;
} }
} }
.nav-item:nth-child(n+5) { .nav-item:nth-child(n+5) {
@ -493,28 +530,26 @@
} }
.scenic-box { .scenic-box {
margin: 32rpx auto 0; margin: 0 auto;
width: 100%; width: 100%;
height: 280rpx;
padding-left: 26rpx; padding-left: 26rpx;
overflow-x: auto; overflow-x: auto;
display: flex; display: flex;
.scenic-item { .scenic-item {
width: 293rpx; width: 318rpx;
height: 293rpx; height: 318rpx;
border-radius: 20rpx;
margin-right: 20rpx; margin-right: 20rpx;
position: relative;
flex-shrink: 0; flex-shrink: 0;
}
.scenic-title { .scenic-title {
position: absolute; padding: 0 4rpx;
padding: 0 26rpx;
bottom: 20rpx;
font-weight: 500; font-weight: 500;
font-size: 31rpx; color: #100e0e;
color: #FFFFFF; font-size: 28rpx;
} margin-top: 10rpx;
} }
} }
.scenic-box::-webkit-scrollbar { .scenic-box::-webkit-scrollbar {
@ -522,50 +557,44 @@
} }
.title-box { .title-box {
margin-top: 55rpx; margin: 55rpx 0 24rpx;
padding: 0 26rpx 0 42rpx; padding: 0 26rpx 0 42rpx;
font-weight: 400; font-weight: bold;
font-size: 27rpx; color: #100e0e;
color: #000000; font-size: 36rpx;
view {
color: #100e0e;
font-size: 24rpx;
}
image { image {
width: 296rpx; width: 18rpx;
height: 60rpx; height: 18rpx;
margin-left: 5rpx;
} }
} }
.line-box {
overflow-x: auto;
display: flex;
padding-left: 26rpx;
}
.line-box::-webkit-scrollbar {
display: none;
}
.line-item { .line-item {
width: 697rpx; width: 658rpx;
height: 240rpx; height: 294rpx;
background: #FFFFFF; background: #FFFFFF;
border-radius: 20rpx; border-radius: 20rpx;
margin: 0 auto 20rpx; margin-right: 20rpx;
display: flex; flex-shrink: 0;
padding: 6.67rpx 0 6.67rpx 6.67rpx;
position: relative;
.line-img { .line-img {
width: 267rpx; width: 100%;
height: 227rpx; height: 100%;
border-radius: 13rpx; border-radius: 20rpx;
}
.hot {
position: absolute;
left: 180rpx;
top: 6.67rpx;
width: 93rpx;
height: 47rpx;
background: #71B580;
border-radius: 0rpx 13rpx 0rpx 13rpx;
font-weight: 500;
font-size: 27rpx;
color: #FFFFFF;
overflow-x: auto;
white-space: nowrap;
}
.hot::-webkit-scrollbar {
display: none;
} }
.line-content { .line-content {
@ -724,7 +753,7 @@
.strategy-subtitle { .strategy-subtitle {
font-weight: 500; font-weight: 500;
font-size: 24rpx; font-size: 24rpx;
color: #248BAA; color: #6b6262;
margin-top: 8rpx; margin-top: 8rpx;
} }
} }

10
pages/login/login.vue
View File

@ -1,8 +1,9 @@
<template> <template>
<view class="bg"> <view class="bg">
<image src="https://static.ticket.sz-trip.com/yandu/images/user/logo.png" class="logo"></image> <image src="https://static.ticket.sz-trip.com/tongli/images/user/logos.png" class="logo"></image>
<view :class="['btn', 'flex-center', {'btns': flag}]" @click="getUserInfo()">快捷登录</view> <view :class="['btn', 'flex-center', {'btns': flag}]" @click="getUserInfo()">快捷登录</view>
<view class="btn, flex-center" @click="cancel()" style="margin-top: 113rpx;">取消</view>
<image src="https://static.ticket.sz-trip.com/yandu/images/user/tips.png" class="tips" v-show="!flag"></image> <image src="https://static.ticket.sz-trip.com/yandu/images/user/tips.png" class="tips" v-show="!flag"></image>
<footer class="flex-between"> <footer class="flex-between">
@ -82,6 +83,11 @@
console.log(err); console.log(err);
}, },
}) })
},
cancel() {
uni.switchTab({
url: '/pages/index/index'
})
} }
} }
} }
@ -94,7 +100,7 @@
.logo { .logo {
width: 186rpx; width: 186rpx;
height: 132rpx; height: 186rpx;
position: absolute; position: absolute;
top: 79rpx; top: 79rpx;
left: 50%; left: 50%;

23
pages/map/map.vue
View File

@ -1,6 +1,7 @@
<template> <template>
<view class="content"> <view class="content">
<web-view :src="src"></web-view> <!-- <web-view :src="src"></web-view> -->
暂未开放
</view> </view>
</template> </template>
@ -13,14 +14,14 @@
}, },
onShow() { onShow() {
// 必须登录 // 必须登录
let userInfo = (uni.getStorageSync('userInfo') && JSON.parse(uni.getStorageSync('userInfo'))) || this.$store.state.user.userInfo || {} // let userInfo = (uni.getStorageSync('userInfo') && JSON.parse(uni.getStorageSync('userInfo'))) || this.$store.state.user.userInfo || {}
if(userInfo.token) { // if(userInfo.token) {
this.src = 'https://yandumap.sz-trip.com?token=' + userInfo.token // this.src = 'https://yandumap.sz-trip.com?token=' + userInfo.token
}else { // }else {
uni.navigateTo({ // uni.navigateTo({
url: '/pages/login/login' // url: '/pages/login/login'
}) // })
} // }
}, },
methods: { methods: {
@ -32,6 +33,8 @@
.content { .content {
width: 100vw; width: 100vw;
height: 100vh; height: 100vh;
padding-bottom: env(safe-area-inset-bottom) padding-bottom: env(safe-area-inset-bottom);
padding-top: 100rpx;
text-align: center;
} }
</style> </style>

28
pages/user/user.vue
View File

@ -11,7 +11,7 @@
<view class="username" v-else>请登录/注册 ></view> <view class="username" v-else>请登录/注册 ></view>
</view> </view>
<view class="top-right" v-if="userInfo.nickname"> <view class="top-right" v-if="userInfo.nickname">
个人信息 <image src="https://static.ticket.sz-trip.com/tongli/images/user/rightIcons.png" mode=""></image> 个人信息 <image src="https://static.ticket.sz-trip.com/tongli/images/user/rightIcon1.png" mode=""></image>
</view> </view>
</view> </view>
@ -20,7 +20,7 @@
我的订单 我的订单
<span class="flex-between"> <span class="flex-between">
全部订单 全部订单
<image src="https://static.ticket.sz-trip.com/tongli/images/user/rightIcons.png" mode=""></image> <image src="https://static.ticket.sz-trip.com/tongli/images/user/rightIcon1.png" mode=""></image>
</span> </span>
</navigator> </navigator>
@ -52,7 +52,7 @@
@click="gotoUrl(item.path,index)" v-if="item.isShow"> @click="gotoUrl(item.path,index)" v-if="item.isShow">
<button id="contact" class="cyItem flex-between" open-type="contact" bindcontact="handleContact" session-from="sessionFrom" v-if="index == 2"> <button id="contact" class="cyItem flex-between" open-type="contact" bindcontact="handleContact" session-from="sessionFrom" v-if="index == 2">
<view class="flex-center"> <view class="flex-center">
<img src="https://static.ticket.sz-trip.com/tongli/images/user/lxwm.png" class="headIcon"> <img src="https://static.ticket.sz-trip.com/tongli/images/user/lxwms.png" class="headIcon">
联系我们 联系我们
</view> </view>
<img src="https://static.ticket.sz-trip.com/dongtai/images/user/rightIcon-gray.png" class="rightIcon"> <img src="https://static.ticket.sz-trip.com/dongtai/images/user/rightIcon-gray.png" class="rightIcon">
@ -91,17 +91,17 @@
nowDateTime: '', //当前时间秒数 nowDateTime: '', //当前时间秒数
userInfo: {}, userInfo: {},
orderList: [{ orderList: [{
src: 'https://static.ticket.sz-trip.com/tongli/images/user/dfk.png', src: 'https://static.ticket.sz-trip.com/tongli/images/user/dfks.png',
title: '待付款', title: '待付款',
status: 'WAIT_PAYMENT' status: 'WAIT_PAYMENT'
}, },
{ {
src: 'https://static.ticket.sz-trip.com/tongli/images/user/dfh.png', src: 'https://static.ticket.sz-trip.com/tongli/images/user/dfhs.png',
title: '待发货', title: '待发货',
status: 'PAYMENT_SUCCESSFULLY' status: 'PAYMENT_SUCCESSFULLY'
}, },
{ {
src: 'https://static.ticket.sz-trip.com/tongli/images/user/dsh.png', src: 'https://static.ticket.sz-trip.com/tongli/images/user/dshs.png',
title: '待收货', title: '待收货',
status: 'POST' status: 'POST'
}, },
@ -111,7 +111,7 @@
// status: 'WAIT_COMMENT' // status: 'WAIT_COMMENT'
// }, // },
{ {
src: 'https://static.ticket.sz-trip.com/tongli/images/user/tksh.png', src: 'https://static.ticket.sz-trip.com/tongli/images/user/tkshs.png',
title: '退款/售后', title: '退款/售后',
status: 'WAIT_REFUND,REFUND_SUCCESS,REFUND_REFUSAL,REFUND_ERROR,REFUND_PART' status: 'WAIT_REFUND,REFUND_SUCCESS,REFUND_REFUSAL,REFUND_ERROR,REFUND_PART'
}, },
@ -124,19 +124,19 @@
// isShow: true // isShow: true
// }, // },
{ {
src: 'https://static.ticket.sz-trip.com/tongli/images/user/yhq.png', src: 'https://static.ticket.sz-trip.com/tongli/images/user/yhqs.png',
title: '优惠券', title: '优惠券',
path: '/subPackages/user/coupon', path: '/subPackages/user/coupon',
isShow: true isShow: true
}, },
{ {
src: 'https://static.ticket.sz-trip.com/tongli/images/user/cyxx.png', src: 'https://static.ticket.sz-trip.com/tongli/images/user/cyxxs.png',
title: '常用信息', title: '常用信息',
path: '/subPackages/user/travelerList', path: '/subPackages/user/travelerList',
isShow: true isShow: true
}, },
{ {
src: 'https://static.ticket.sz-trip.com/tongli/images/user/lxwm.png', src: 'https://static.ticket.sz-trip.com/tongli/images/user/lxwms.png',
title: '联系我们', title: '联系我们',
path: '', path: '',
isShow: true isShow: true
@ -148,7 +148,7 @@
// isShow: true // isShow: true
// }, // },
{ {
src: 'https://static.ticket.sz-trip.com/tongli/images/user/ysgl.png', src: 'https://static.ticket.sz-trip.com/tongli/images/user/ysgls.png',
title: '隐私管理', title: '隐私管理',
path: '/subPackages/user/privacy', path: '/subPackages/user/privacy',
isShow: true isShow: true
@ -338,7 +338,7 @@
height: 413.33rpx; height: 413.33rpx;
box-sizing: border-box; box-sizing: border-box;
display: flex; display: flex;
background-image: url('https://static.ticket.sz-trip.com/tongli/images/user/topBg.png'); background-image: url('https://static.ticket.sz-trip.com/tongli/images/user/topBgs.png');
background-size: 100% 100%; background-size: 100% 100%;
padding: 50rpx 40rpx 0 28rpx; padding: 50rpx 40rpx 0 28rpx;
@ -365,7 +365,7 @@
.top-right { .top-right {
font-weight: 500; font-weight: 500;
font-size: 25rpx; font-size: 25rpx;
color: #248BAA; color: #100E0E;
image { image {
width: 11.33rpx; width: 11.33rpx;
@ -395,7 +395,7 @@
span { span {
font-weight: 500; font-weight: 500;
font-size: 25rpx; font-size: 25rpx;
color: #248BAA; color: #100E0E;
box-sizing: border-box; box-sizing: border-box;
image { image {

6
static/font/font.css
View File

@ -0,0 +1,6 @@
@font-face {
font-family:"MyFont"; //自定义字体名称
src: url('https://static.ticket.sz-trip.com/tongli/font.ttf'); //引入字体路径
font-weight: normal; //字体粗细
font-style: normal;//字体风格
}

BIN
static/font/font.ttf
View File

Binary file not shown.

BIN
static/images/index.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 12 KiB

After

Width:  |  Height:  |  Size: 10 KiB

BIN
static/images/index_HL.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 12 KiB

BIN
static/images/map.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 17 KiB

After

Width:  |  Height:  |  Size: 8.9 KiB

BIN
static/images/map_HL.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 19 KiB

BIN
static/images/user.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 12 KiB

After

Width:  |  Height:  |  Size: 17 KiB

BIN
static/images/user_HL.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 13 KiB

12
subPackages/eventCalendar/eventCalendar.vue
View File

@ -478,7 +478,7 @@
height: 80rpx; height: 80rpx;
text-align: center; text-align: center;
line-height: 80rpx; line-height: 80rpx;
background: #248BAA; background: #515150;
font-size: 29rpx; font-size: 29rpx;
font-family: PingFang SC; font-family: PingFang SC;
font-weight: 500; font-weight: 500;
@ -547,8 +547,8 @@
height: 134rpx; height: 134rpx;
.type-item { .type-item {
line-height: 54rpx; line-height: 45rpx;
border-radius: 13rpx; border-radius: 22rpx;
border: 1rpx solid #999999; border: 1rpx solid #999999;
padding: 0 20rpx; padding: 0 20rpx;
font-weight: 500; font-weight: 500;
@ -556,7 +556,7 @@
color: #666666; color: #666666;
} }
.type-active { .type-active {
background: #248BAA; background: #515150;
font-weight: bold; font-weight: bold;
color: #fff; color: #fff;
border: none; border: none;
@ -593,10 +593,10 @@
max-width: 400rpx; max-width: 400rpx;
line-height: 36rpx; line-height: 36rpx;
border-radius: 7rpx; border-radius: 7rpx;
border: 1rpx solid #248BAA; border: 1rpx solid #515150;
font-weight: 500; font-weight: 500;
font-size: 24rpx; font-size: 24rpx;
color: #248BAA; color: #515150;
} }
.subtitle { .subtitle {

6
subPackages/line/detail.vue
View File

@ -51,7 +51,7 @@
</view> </view>
</button> </button>
</view> </view>
<view class="btn" @tap="order">立即预订</view> <view class="btn" @tap="order">立即购买</view>
</view> </view>
</view> </view>
</template> </template>
@ -261,7 +261,7 @@
width: 46rpx; width: 46rpx;
height: 6rpx; height: 6rpx;
border-radius: 3rpx; border-radius: 3rpx;
background: #248BAA; background: #515150;
left: 50%; left: 50%;
margin-left: -23rpx; margin-left: -23rpx;
bottom: 0rpx; bottom: 0rpx;
@ -323,7 +323,7 @@
.btn { .btn {
width: 254rpx; width: 254rpx;
height: 77rpx; height: 77rpx;
background: linear-gradient(270deg, #FC5109, #FC930A); background: #C3282E;
border-radius: 39rpx; border-radius: 39rpx;
text-align: center; text-align: center;
line-height: 77rpx; line-height: 77rpx;

6
subPackages/line/order.vue
View File

@ -388,7 +388,7 @@
left: 0; left: 0;
right: 0; right: 0;
height: 8rpx; height: 8rpx;
background: #248BAA; background: #515150;
border-radius: 4rpx; border-radius: 4rpx;
bottom: 0; bottom: 0;
} }
@ -459,7 +459,7 @@
} }
.day-item.active { .day-item.active {
.date-item-in { .date-item-in {
background: #248BAA; background: #515150;
color: #fff; color: #fff;
border-radius: 7rpx; border-radius: 7rpx;
@ -564,7 +564,7 @@
width: 293rpx; width: 293rpx;
text-align: center; text-align: center;
line-height: 87rpx; line-height: 87rpx;
background: linear-gradient(-90deg, #F84A56, #FF9834); background: #C3282E;
border-radius: 43rpx; border-radius: 43rpx;
color: #fff; color: #fff;
font-size: 36rpx; font-size: 36rpx;

8
subPackages/line/orders.vue
View File

@ -45,7 +45,7 @@
<navigator :url="'/subPackages/order/orderCoupon?allprice='+ price + '&sku_ids='+ sku_ids.toString()" class="coupon-box flex-between"> <navigator :url="'/subPackages/order/orderCoupon?allprice='+ price + '&sku_ids='+ sku_ids.toString()" class="coupon-box flex-between">
<text>优惠券</text> <text>优惠券</text>
<view style="display: flex;align-items: center;"> <view style="display: flex;align-items: center;">
<view class="add-btn" v-if="!coupon">请选择</view> <view class="add-btn" v-if="!coupon">选择优惠券</view>
<view style="display: flex;align-items: center;color: #FC5109;" v-if="coupon && coupon.CouponActivity"> <view style="display: flex;align-items: center;color: #FC5109;" v-if="coupon && coupon.CouponActivity">
<view>-￥{{coupon.CouponActivity.discounts/100}}</view> <view>-￥{{coupon.CouponActivity.discounts/100}}</view>
</view> </view>
@ -476,7 +476,7 @@
.add-btn { .add-btn {
display: flex; display: flex;
width: 140rpx; width: 153rpx;
height: 57rpx; height: 57rpx;
border: 1rpx solid #333333; border: 1rpx solid #333333;
border-radius: 29rpx; border-radius: 29rpx;
@ -682,7 +682,7 @@
.order-btn { .order-btn {
width: 293rpx; width: 293rpx;
background: linear-gradient(90deg, #F84A56, #FF9834); background: #C3282E;
border-radius: 43rpx; border-radius: 43rpx;
text-align: center; text-align: center;
line-height: 87rpx; line-height: 87rpx;
@ -760,7 +760,7 @@
.add-btn { .add-btn {
width: 153rpx; width: 153rpx;
line-height: 40rpx; line-height: 40rpx;
background: #EE3E3B; background: #C3282E;
border-radius: 9rpx; border-radius: 9rpx;
text-align: center; text-align: center;
font-weight: 500; font-weight: 500;

30
subPackages/order/detail.vue
View File

@ -350,7 +350,7 @@
<view class="order-subtitle" style="display: flex;align-items: center;"> <view class="order-subtitle" style="display: flex;align-items: center;">
<span>订单账号：</span>{{info.order_id}} <span>订单账号：</span>{{info.order_id}}
<view class="copy flex-around" @click="clickCopy"> <view class="copy flex-around" @click="clickCopy">
<image src="https://static.ticket.sz-trip.com/tongli/images/order/copy.png" class="copy-img"></image> <image src="https://static.ticket.sz-trip.com/tongli/images/order/copys.png" class="copy-img"></image>
复制 复制
</view> </view>
</view> </view>
@ -363,8 +363,8 @@
</view> </view>
<!-- 联系客服 --> <!-- 联系客服 -->
<view class="kefu-box" @click="$refs.popup.open()"> <view class="kefu-box" @click="openKf(1)">
<image src="https://static.ticket.sz-trip.com/tongli/images/order/kefu.png" mode="" class="kefu-img"></image> <image src="https://static.ticket.sz-trip.com/tongli/images/order/kefus.png" mode="" class="kefu-img"></image>
联系客服 联系客服
</view> </view>
@ -431,7 +431,7 @@
即将拨打客服电话 即将拨打客服电话
<view class="consult-subtitle">服务时间：周一至周五<br>8:30-11:30，14:30-18:00</view> <view class="consult-subtitle">服务时间：周一至周五<br>8:30-11:30，14:30-18:00</view>
<view class="consult-btns"> <view class="consult-btns">
<view @click="$refs.popup.close()">取消</view> <view @click="openKf(0)">取消</view>
<view @click="clickPhone('0515-69186109')">确定</view> <view @click="clickPhone('0515-69186109')">确定</view>
</view> </view>
</view> </view>
@ -462,6 +462,14 @@
}, },
methods: { methods: {
// 客服
openKf(flag) {
if(flag) {
this.$refs.popup.open()
}else {
this.$refs.popup.close()
}
},
// 计算两个日期间的天数 // 计算两个日期间的天数
calDate(startDate, endDate) { calDate(startDate, endDate) {
var start = new Date(startDate); var start = new Date(startDate);
@ -747,7 +755,7 @@
.top-box { .top-box {
width: 750rpx; width: 750rpx;
height: 414rpx; 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; padding: 200rpx 0 0 50rpx;
font-weight: bold; font-weight: bold;
font-size: 43rpx; font-size: 43rpx;
@ -848,7 +856,7 @@
} }
.swiper-points { .swiper-points {
background: #71B580; background: #248BAA;
} }
} }
@ -1358,10 +1366,10 @@
width: 93rpx; width: 93rpx;
height: 37rpx; height: 37rpx;
border-radius: 11rpx; border-radius: 11rpx;
border: 1rpx solid #248BAA; border: 1rpx solid #515150;
font-weight: 500; font-weight: 500;
font-size: 22rpx; font-size: 22rpx;
color: #248BAA; color: #515150;
margin-left: 30rpx; margin-left: 30rpx;
.copy-img { .copy-img {
@ -1443,7 +1451,7 @@
.pay-btn { .pay-btn {
height: 73rpx; height: 73rpx;
background: linear-gradient(270deg, #FD6F34, #F4A61F); background: rgba(195, 40, 46, 1);
border: none; border: none;
color: #FFFFFF; color: #FFFFFF;
} }
@ -1559,7 +1567,7 @@
} }
.express-item-icons { .express-item-icons {
background: #71B580; background: #248BAA;
} }
.consult-popup { .consult-popup {
@ -1588,7 +1596,7 @@
width: 50%; width: 50%;
font-weight: bold; font-weight: bold;
font-size: 32rpx; font-size: 32rpx;
color: #71B580; color: #248BAA;
line-height: 54rpx; line-height: 54rpx;
} }

8
subPackages/order/trades.vue
View File

@ -376,7 +376,7 @@
.common-type.active { .common-type.active {
font-size: 31rpx; font-size: 31rpx;
font-weight: bold; font-weight: bold;
color: #248BAA; color: #000;
} }
.common-type.active:after { .common-type.active:after {
@ -390,7 +390,7 @@
right: 0; right: 0;
bottom: 1rpx; bottom: 1rpx;
height: 4rpx; height: 4rpx;
background: #248BAA; background: #C3282E;
border-radius: 2rpx; border-radius: 2rpx;
} }
@ -509,7 +509,7 @@
padding: 0 20rpx; padding: 0 20rpx;
font-weight: 500; font-weight: 500;
font-size: 24rpx; font-size: 24rpx;
color: #248BAA; color: #C3282E;
margin-top: 20rpx; margin-top: 20rpx;
} }
@ -573,7 +573,7 @@
.trade-item-btns .pay-btn { .trade-item-btns .pay-btn {
color: #FFFFFF; color: #FFFFFF;
background: linear-gradient(90deg, #FD6F34, #F4A61F); background: #C3282E;
border: none; border: none;
padding: 10rpx 16rpx; padding: 10rpx 16rpx;
} }

Write Preview
Loading…
Cancel
Save