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

提交

master
chenkainan 1 year ago
parent
e44c8d26b6
commit
5823f94630
9 changed files with 56 additions and 43 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
      manifest.json
  2. 4
      pages.json
  3. 4
      pages/index/index.vue
  4. 32
      pages/user/user.vue
  5. 4
      static/js/CommonFunction.js
  6. 2
      static/js/request.js
  7. 39
      subPackages/eventCalendar/eventCalendar.vue
  8. 6
      subPackages/user/coupon.vue
  9. 6
      subPackages/user/travelerList.vue

2
manifest.json
View File

@ -50,7 +50,7 @@
"quickapp" : {}, "quickapp" : {},
/* 小程序特有相关 */ /* 小程序特有相关 */
"mp-weixin" : { "mp-weixin" : {
"appid" : "wxb8f15afe2765976d", "appid" : "wxcb555ab174f22ec9",
"setting" : { "setting" : {
"urlCheck" : false, "urlCheck" : false,
"es6" : true, "es6" : true,

4
pages.json
View File

@ -102,8 +102,8 @@
{ {
"path": "eventCalendar/eventCalendar", "path": "eventCalendar/eventCalendar",
"style": { "style": {
"navigationBarTitleText": "活动日历", "navigationBarTitleText": "活动日历"
"navigationStyle": "custom" // "navigationStyle": "custom"
} }
}, },
{ {

4
pages/index/index.vue
View File

@ -12,7 +12,7 @@
</swiper> </swiper>
<view class="swiper-num"> <view class="swiper-num">
{{current}}/{{topBanner.length}} {{current + 1}}/{{topBanner.length}}
</view> </view>
</view> </view>
@ -135,7 +135,7 @@
{ {
img: 'https://static.ticket.sz-trip.com/tongli/images/index/hdrl.png', img: 'https://static.ticket.sz-trip.com/tongli/images/index/hdrl.png',
text: '活动日历', text: '活动日历',
path: '/subPackages/hotelHomestay/hotelHomestay' path: '/subPackages/eventCalendar/eventCalendar'
}, },
{ {
img: 'https://static.ticket.sz-trip.com/tongli/images/index/tsty.png', img: 'https://static.ticket.sz-trip.com/tongli/images/index/tsty.png',

32
pages/user/user.vue
View File

@ -48,21 +48,23 @@
</view> </view>
<view class="cygj"> <view class="cygj">
<view class="cyItem flex-between" v-for="(item,index) in cyList" :key="index" <view v-for="(item,index) in cyList" :key="index"
@click="gotoUrl(item.path,index)" v-if="item.isShow"> @click="gotoUrl(item.path,index)" v-if="item.isShow">
<view class="flex-center"> <button id="contact" class="cyItem flex-between" open-type="contact" bindcontact="handleContact" session-from="sessionFrom" v-if="index == 2">
<img :src="item.src" class="headIcon"> <view class="flex-center">
{{item.title}} <img src="https://static.ticket.sz-trip.com/tongli/images/user/lxwm.png" class="headIcon">
联系我们
</view>
<img src="https://static.ticket.sz-trip.com/dongtai/images/user/rightIcon-gray.png" class="rightIcon">
</button>
<view class="cyItem flex-between" v-else>
<view class="flex-center">
<img :src="item.src" class="headIcon">
{{item.title}}
</view>
<img src="https://static.ticket.sz-trip.com/yandu/images/user/rightIcon-gray.png" class="rightIcon">
</view> </view>
<img src="https://static.ticket.sz-trip.com/yandu/images/user/rightIcon-gray.png" class="rightIcon">
</view> </view>
<!-- <button id="contact" class="cyItem flex-between" open-type="contact" bindcontact="handleContact" session-from="sessionFrom">
<view class="flex-center">
<img src="https://static.ticket.sz-trip.com/dongtai/images/user/zxkf.png" class="headIcon">
在线客服
</view>
<img src="https://static.ticket.sz-trip.com/dongtai/images/user/rightIcon-gray.png" class="rightIcon">
</button> -->
</view> </view>
<!-- 旅游咨询弹框 --> <!-- 旅游咨询弹框 -->
@ -272,8 +274,8 @@
// this.$refs.popup.open('center') // this.$refs.popup.open('center')
// }, // },
gotoUrl(path, index) { gotoUrl(path, index) {
if (index == 3) { if (index == 2) {
this.$refs.popup.open() // this.$refs.popup.open()
return; return;
} }
uni.navigateTo({ uni.navigateTo({
@ -555,7 +557,7 @@
color: transparent; color: transparent;
cursor: pointer; cursor: pointer;
overflow: hidden; overflow: hidden;
padding: 0 27rpx; padding: 0;
position: relative; position: relative;
text-align: center; text-align: center;
text-decoration: none; text-decoration: none;

4
static/js/CommonFunction.js
View File

@ -91,7 +91,7 @@ Vue.prototype.showImg = img => {
if (img.indexOf('https://') != -1 || img.indexOf('http://') != -1) { if (img.indexOf('https://') != -1 || img.indexOf('http://') != -1) {
return img; return img;
} else { } else {
return 'https://tongli.sz-trip.com' + img; return 'https://tlgz.sz-trip.com' + img;
} }
} }
@ -115,7 +115,7 @@ Vue.prototype.getHeadImg = type => {
{ {
type, type,
}, },
'/api/scene/getKumgangHeadImgList' '/api/public_service/getKumgangHeadImgList'
).then(res => { ).then(res => {
return res.data[0].image return res.data[0].image
}); });

2
static/js/request.js
View File

@ -1,7 +1,7 @@
import Vue from 'vue' import Vue from 'vue'
import store from '@/store' import store from '@/store'
let NEWAPIURL = 'https://tongli.sz-trip.com' let NEWAPIURL = 'https://tlgz.sz-trip.com'
Vue.prototype.Post = (params, apiurl) => { Vue.prototype.Post = (params, apiurl) => {
if (uni.getStorageSync('userInfo') && JSON.parse(uni.getStorageSync('userInfo')).token) params.token = JSON.parse(uni.getStorageSync('userInfo')).token if (uni.getStorageSync('userInfo') && JSON.parse(uni.getStorageSync('userInfo')).token) params.token = JSON.parse(uni.getStorageSync('userInfo')).token

39
subPackages/eventCalendar/eventCalendar.vue
View File

@ -1,6 +1,7 @@
<template> <template>
<view class="bg"> <view class="bg">
<span class="iconfont topLeft" @click="goBack">&#xe660;</span> <!-- <span class="iconfont topLeft" @click="goBack">&#xe660;</span> -->
<image :src="showImg(headImg)" class="topImg"></image>
<view class="calendar"> <view class="calendar">
<view class="calendar-top flex-between"> <view class="calendar-top flex-between">
@ -8,7 +9,7 @@
<img src="https://static.ticket.sz-trip.com/hsrNewTown/images/calendar/left.png" class="iconfont" /> <img src="https://static.ticket.sz-trip.com/hsrNewTown/images/calendar/left.png" class="iconfont" />
{{ monthShow ? '上一月' : '上一周' }} {{ monthShow ? '上一月' : '上一周' }}
</view> </view>
<view>{{year}}年<span>{{month}}</span>月</view> <view>{{year}}年{{month}}月</view>
<view @click="preNextDate(1)"> <view @click="preNextDate(1)">
{{ monthShow ? '下一月' : '下一周' }} {{ monthShow ? '下一月' : '下一周' }}
<img src="https://static.ticket.sz-trip.com/hsrNewTown/images/calendar/right.png" class="iconfont" /> <img src="https://static.ticket.sz-trip.com/hsrNewTown/images/calendar/right.png" class="iconfont" />
@ -103,7 +104,8 @@
id: '16' id: '16'
} }
], ],
typeIndex: 0 typeIndex: 0,
headImg: ''
} }
}, },
onLoad() { onLoad() {
@ -120,6 +122,7 @@
this.getWeekDates(new Date()) this.getWeekDates(new Date())
this.getList() this.getList()
this.getHeadImg('calendar').then(res => {this.headImg = res})
}, },
methods: { methods: {
// 列表 // 列表
@ -372,9 +375,9 @@
.bg { .bg {
min-height: 100vh; min-height: 100vh;
overflow-x: hidden; overflow-x: hidden;
background: url('https://static.ticket.sz-trip.com/yandu/images/eventCalendar/topBg.png') no-repeat; // background: url('https://static.ticket.sz-trip.com/yandu/images/eventCalendar/topBg.png') no-repeat;
background-size: 100%; // background-size: 100%;
background-color: #F7F7F7; background-color: #F5F5F5;
padding-bottom: 100rpx; padding-bottom: 100rpx;
} }
@ -394,9 +397,17 @@
left: 0; left: 0;
} }
.topImg {
width: 750rpx;
height: 309.33rpx;
}
.calendar{ .calendar{
padding: 0 26rpx; padding: 0 26rpx;
margin-top: 170rpx; border-radius: 20rpx 20rpx 0 0;
position: relative;
margin-top: -20rpx;
background: #F5F5F5;
.calendar-top{ .calendar-top{
height: 109rpx; height: 109rpx;
@ -467,11 +478,11 @@
height: 80rpx; height: 80rpx;
text-align: center; text-align: center;
line-height: 80rpx; line-height: 80rpx;
background: linear-gradient(90deg, #9EE4FE, #7FD491); background: #248BAA;
font-size: 29rpx; font-size: 29rpx;
font-family: PingFang SC; font-family: PingFang SC;
font-weight: 500; font-weight: 500;
color: #000000; color: #fff;
border-radius: 50%; border-radius: 50%;
} }
} }
@ -512,7 +523,7 @@
width: 670rpx; width: 670rpx;
height: 53rpx; height: 53rpx;
background: #F7F7F7; background: #F7F7F7;
border-radius: 13rpx; border-radius: 27rpx;
padding: 0 12rpx; padding: 0 12rpx;
display: flex; display: flex;
align-items: center; align-items: center;
@ -545,9 +556,9 @@
color: #666666; color: #666666;
} }
.type-active { .type-active {
background: linear-gradient(90deg, #9EE4FE, #7FD491); background: #248BAA;
font-weight: bold; font-weight: bold;
color: #000000; color: #fff;
border: none; border: none;
} }
} }
@ -582,10 +593,10 @@
max-width: 400rpx; max-width: 400rpx;
line-height: 36rpx; line-height: 36rpx;
border-radius: 7rpx; border-radius: 7rpx;
border: 1rpx solid #71B580; border: 1rpx solid #248BAA;
font-weight: 500; font-weight: 500;
font-size: 24rpx; font-size: 24rpx;
color: #71B580; color: #248BAA;
} }
.subtitle { .subtitle {

6
subPackages/user/coupon.vue
View File

@ -59,7 +59,7 @@
</view> </view>
<view v-else class="noCoupon"> <view v-else class="noCoupon">
<img src="https://static.ticket.sz-trip.com/yandu/images/user/couponNo.png" class="no-couPon"> <img src="https://static.ticket.sz-trip.com/tongli/images/user/couponNo.png" class="no-couPon">
<view>暂无优惠券</view> <view>暂无优惠券</view>
</view> </view>
@ -230,8 +230,8 @@
} }
.nav-list .nav-item.active { .nav-list .nav-item.active {
color: #71B580; // color: #71B580;
border-bottom: 7rpx solid #71B580; border-bottom: 7rpx solid #248BAA;
} }
.coupon-list{ .coupon-list{

6
subPackages/user/travelerList.vue
View File

@ -197,7 +197,7 @@
.active-bar{ .active-bar{
width: 100%; width: 100%;
height: 11rpx; height: 11rpx;
background: #71B580; background: #248BAA;
} }
} }
@ -225,7 +225,7 @@
span { span {
padding: 3rpx 9rpx; padding: 3rpx 9rpx;
background: #71B580; background: #248BAA;
border-radius: 7rpx; border-radius: 7rpx;
font-weight: bold; font-weight: bold;
font-size: 24rpx; font-size: 24rpx;
@ -319,7 +319,7 @@
border-radius: 37rpx; border-radius: 37rpx;
font-weight: 500; font-weight: 500;
font-size: 36rpx; font-size: 36rpx;
color: #000000; color: #fff;
text-align: center; text-align: center;
position: fixed; position: fixed;
bottom: 53rpx; bottom: 53rpx;

Write Preview
Loading…
Cancel
Save