From 5823f946304ef6cbb3d407d404e8c65a99be87bb Mon Sep 17 00:00:00 2001
From: chenkainan <chenkainan163@163.com>
Date: Wed, 23 Oct 2024 10:55:05 +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

---
 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 @@
 			</swiper>
 			
 			<view class="swiper-num">
-				{{current}}/{{topBanner.length}}
+				{{current + 1}}/{{topBanner.length}}
 			</view>
 		</view>
 		
@@ -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 @@
 		</view>
 
 		<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">
-				<view class="flex-center">
-					<img :src="item.src" class="headIcon">
-					{{item.title}}
+				<button id="contact" class="cyItem flex-between" open-type="contact" bindcontact="handleContact" session-from="sessionFrom" v-if="index == 2">
+					<view class="flex-center">
+						<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>
-				<img src="https://static.ticket.sz-trip.com/yandu/images/user/rightIcon-gray.png" class="rightIcon">
 			</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>
 		
 		<!-- 旅游咨询弹框 -->
@@ -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 @@
 <template>
 	<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-top flex-between">
@@ -8,7 +9,7 @@
 					<img src="https://static.ticket.sz-trip.com/hsrNewTown/images/calendar/left.png" class="iconfont" />
 					{{ monthShow ? '上一月' : '上一周' }}
 				</view>
-				<view>{{year}}年<span>{{month}}</span>月</view>
+				<view>{{year}}年{{month}}月</view>
 				<view @click="preNextDate(1)">
 					{{ monthShow ? '下一月' : '下一周' }}
 					<img src="https://static.ticket.sz-trip.com/hsrNewTown/images/calendar/right.png" class="iconfont" />
@@ -103,7 +104,8 @@
 						id: '16'
 					}
 				],
-				typeIndex: 0
+				typeIndex: 0,
+				headImg: ''
 			}
 		},
 		onLoad() {
@@ -120,6 +122,7 @@
 			this.getWeekDates(new Date())
 			
 			this.getList()
+			this.getHeadImg('calendar').then(res => {this.headImg = res})
 		},
 		methods: {
 			// 列表
@@ -372,9 +375,9 @@
 	.bg {
 		min-height: 100vh;
 		overflow-x: hidden;
-		background: url('https://static.ticket.sz-trip.com/yandu/images/eventCalendar/topBg.png') no-repeat;
-		background-size: 100%;
-		background-color: #F7F7F7;
+		// background: url('https://static.ticket.sz-trip.com/yandu/images/eventCalendar/topBg.png') no-repeat;
+		// background-size: 100%;
+		background-color: #F5F5F5;
 		padding-bottom: 100rpx;
 	}
 	
@@ -394,9 +397,17 @@
 		left: 0;
 	}
 	
+	.topImg {
+		width: 750rpx;
+		height: 309.33rpx;
+	}
+	
 	.calendar{
 		padding: 0 26rpx;
-		margin-top: 170rpx;
+		border-radius: 20rpx 20rpx 0 0;
+		position: relative;
+		margin-top: -20rpx;
+		background: #F5F5F5;
 		
 		.calendar-top{
 			height: 109rpx;
@@ -467,11 +478,11 @@
 					height: 80rpx;
 					text-align: center;
 					line-height: 80rpx;
-					background: linear-gradient(90deg, #9EE4FE, #7FD491);
+					background: #248BAA;
 					font-size: 29rpx;
 					font-family: PingFang SC;
 					font-weight: 500;
-					color: #000000;
+					color: #fff;
 					border-radius: 50%;
 				}
 			}
@@ -512,7 +523,7 @@
 			width: 670rpx;
 			height: 53rpx;
 			background: #F7F7F7;
-			border-radius: 13rpx;
+			border-radius: 27rpx;
 			padding: 0 12rpx;
 			display: flex;
 			align-items: center;
@@ -545,9 +556,9 @@
 				color: #666666;
 			}
 			.type-active {
-				background: linear-gradient(90deg, #9EE4FE, #7FD491);
+				background: #248BAA;
 				font-weight: bold;
-				color: #000000;
+				color: #fff;
 				border: none;
 			}
 		}
@@ -582,10 +593,10 @@
 					max-width: 400rpx;
 					line-height: 36rpx;
 					border-radius: 7rpx;
-					border: 1rpx solid #71B580;
+					border: 1rpx solid #248BAA;
 					font-weight: 500;
 					font-size: 24rpx;
-					color: #71B580;
+					color: #248BAA;
 				}
 				
 				.subtitle {
diff --git a/subPackages/user/coupon.vue b/subPackages/user/coupon.vue
index d95142d..61a5295 100644
--- a/subPackages/user/coupon.vue
+++ b/subPackages/user/coupon.vue
@@ -59,7 +59,7 @@
 		</view>
 		
 		<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>
 			
@@ -230,8 +230,8 @@
 }
 
 .nav-list .nav-item.active {
-	color: #71B580;
-    border-bottom: 7rpx solid #71B580;
+	// color: #71B580;
+    border-bottom: 7rpx solid #248BAA;
 }
 
 .coupon-list{
diff --git a/subPackages/user/travelerList.vue b/subPackages/user/travelerList.vue
index 0d65e42..6abadd5 100644
--- a/subPackages/user/travelerList.vue
+++ b/subPackages/user/travelerList.vue
@@ -197,7 +197,7 @@
 		.active-bar{
 			width: 100%;
 			height: 11rpx;
-			background: #71B580;
+			background: #248BAA;
 		}
 	}
 	
@@ -225,7 +225,7 @@
 			
 			span {
 				padding: 3rpx 9rpx;
-				background: #71B580;
+				background: #248BAA;
 				border-radius: 7rpx;
 				font-weight: bold;
 				font-size: 24rpx;
@@ -319,7 +319,7 @@
 			border-radius: 37rpx;
 			font-weight: 500;
 			font-size: 36rpx;
-			color: #000000;
+			color: #fff;
 			text-align: center;
 			position: fixed;
 			bottom: 53rpx;