From 3c2901075f992f0011a6ea10d87f3b9dcddacc3c Mon Sep 17 00:00:00 2001
From: chenkainan <chenkainan163@163.com>
Date: Fri, 13 Dec 2024 17:55:40 +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

---
 pages/daoyou/index.vue              |  1 -
 subPackages/daoyou/detail.vue       | 17 ++++++++++++++---
 subPackages/daoyou/order.vue        |  2 +-
 subPackages/line/orders.vue         | 24 ++++++++++++++++--------
 subPackages/order/orderDetail.vue   |  7 +++++--
 subPackages/order/trades.vue        |  4 +++-
 subPackages/user/bindTel.vue        |  1 +
 subPackages/user/changeNickname.vue |  1 +
 subPackages/user/logout.vue         |  1 +
 subPackages/user/myContactsAdd.vue  |  1 +
 subPackages/user/profile.vue        |  2 ++
 subPackages/user/register.vue       |  2 ++
 12 files changed, 47 insertions(+), 16 deletions(-)

diff --git a/pages/daoyou/index.vue b/pages/daoyou/index.vue
index 5c847f4..9560248 100644
--- a/pages/daoyou/index.vue
+++ b/pages/daoyou/index.vue
@@ -377,7 +377,6 @@
 		height: 273rpx;
 		background: #FFFFFF;
 		border-radius: 7rpx;
-		border: 1rpx solid #96684F;
 		background-image: url('https://static.ticket.sz-trip.com/tourist/daoyou/itemBg.png');
 		background-size: 100% 100%;
 		padding: 14rpx;
diff --git a/subPackages/daoyou/detail.vue b/subPackages/daoyou/detail.vue
index 1d3cb4a..788d197 100644
--- a/subPackages/daoyou/detail.vue
+++ b/subPackages/daoyou/detail.vue
@@ -1,6 +1,6 @@
 <template>
 	<view class="bg">
-		<view class="kefu-box">
+		<view class="kefu-box" @click="gotoPath('/subPackages/onlineService/index')">
 			<image src="https://static.ticket.sz-trip.com/tourist/daoyou/kefu.png" class="kefu-img"></image>
 			客服
 		</view>
@@ -317,7 +317,15 @@
 			},
 			// 切换上一月、下一月
 			preNextDate(e) {
+				let currentDate = new Date()
 				if (e) {
+					// 只能往后点三个月
+					let monthsToAdd = 3; // 三个月
+					let maxMonth = 0
+					currentDate.setMonth(currentDate.getMonth() + monthsToAdd);
+					maxMonth = Number(this.getNowTime(currentDate).slice(5, 7))
+					
+					// if(this.month + 1 == maxMonth) return;
 					// 下一月
 					this.month += 1;
 					if (this.month > 12) {
@@ -330,6 +338,9 @@
 						this.getEveryDay(this.year + '-' + this.month);
 					}
 				} else {
+					currentDate.setMonth(currentDate.getMonth() - 1);
+					let minMonth = Number(this.getNowTime(currentDate).slice(5, 7))
+					if(this.month - 1 == minMonth) return;
 					// 上一月
 					this.month -= 1;
 					if (this.month == 0) {
@@ -475,7 +486,7 @@
 	}
 	
 	.calendar {
-		height: 668rpx;
+		height: auto;
 		background: #FFFFFF;
 		border-radius: 13rpx;
 		margin-top: 28rpx;
@@ -589,7 +600,7 @@
 	.sku-box {
 		border-radius: 13rpx;
 		background-color: #fff;
-		margin-top: 100rpx;
+		margin-top: 30rpx;
 		
 		.sku-item {
 			height: 132rpx;
diff --git a/subPackages/daoyou/order.vue b/subPackages/daoyou/order.vue
index 302d706..169d271 100644
--- a/subPackages/daoyou/order.vue
+++ b/subPackages/daoyou/order.vue
@@ -58,7 +58,7 @@
 			</view>
 			<view class="flex-between">
 				联系电话
-				<input type="number" maxlength="11" v-model="phone" placeholder="请填写联系手机号"/>
+				<input type="number" maxlength="11" v-model="phone" placeholder="请填写联系手机号" style="color: #000;"/>
 				<image src="https://static.ticket.sz-trip.com/tourist/daoyou/phoneClear.png" v-if="phone.length > 0" @click="phone = ''"></image>
 			</view>
 		</view>
diff --git a/subPackages/line/orders.vue b/subPackages/line/orders.vue
index a7963d9..7cfd548 100644
--- a/subPackages/line/orders.vue
+++ b/subPackages/line/orders.vue
@@ -145,7 +145,6 @@
 				coupon: '',
 				reserve_name: '',
 				reserve_phone: '',
-				reserve_mobile: '',
 				remark: '',
 				peopleList: [],
 				linkmanList: [],
@@ -258,7 +257,6 @@
 						data: JSON.stringify(data),
 						method: 'POST',
 					},'/api/order/place').then(res => {
-						console.log(res)
 						if(res.code == 1) {
 							let order_id = res.data.order_id
 							this.$store.commit("changeLineInfo", null);
@@ -315,18 +313,29 @@
 					limit: 100
 				},'/api/user/contactList').then(res => {
 					this.peopleList = res.data
-					this.reserve_mobile = this.peopleList[0].tel
 					// 如果是添加或者修改完出行人后需要默认选中已选择的出行人
 					if(this.linkmanList.length > 0){
+						// 之前选中的出行人在请求列表后默认选中
 						for (let i = 0; i < this.linkmanList.length; i++) {
 							for (let j = 0; j < this.peopleList.length; j++) {
 								if(this.peopleList[j].id == this.linkmanList[i].id){
 									this.linkmanList[i] = this.peopleList[j]
 									this.peopleList[j].is_seld = true
-									this.linkmanList[i].is_seld = true
 								}
 							}
 						}
+						
+						// 之前选中的出行人在请求列表后追加规格id
+						for (let i = 0; i < this.linkmans.length; i++) {
+							this.linkmans[i].forEach(item => {
+								for (let j = 0; j < this.peopleList.length; j++) {
+									if(this.peopleList[j].id == item.id){
+										this.peopleList[j].is_sku = item.is_sku
+									}
+								}
+							})
+						}
+						this.showLinkman(this.skuIndex)
 						this.$forceUpdate()
 					}
 				})
@@ -337,7 +346,6 @@
 				if (res && res.code == 1) {
 					this.getPeople();
 					this.changeContactAddPopup('close')
-					console.log('this.linkmanList3',this.linkmanList)
 				}
 			},
 			// 选择出行人弹框
@@ -348,8 +356,7 @@
 				}
 				
 				this.skuIndex = skuIndex
-				
-				this.peopleList.map(item => {
+				this.peopleList.forEach(item => {
 					if(item.is_seld && item.is_sku != this.sku[this.skuIndex].id) {
 						item.is_disable = true
 					}else {
@@ -393,7 +400,7 @@
 					return;
 				}
 				this.linkmans[this.skuIndex] = []
-				this.peopleList.map(items => {
+				this.peopleList.forEach(items => {
 					if(items.id == item.id) {
 						items.is_seld = !items.is_seld
 					}
@@ -683,6 +690,7 @@
 		
 		.popup-list {
 			height: 666rpx;
+			padding-bottom: 100rpx;
 			overflow: scroll;
 		
 			.popup-item {
diff --git a/subPackages/order/orderDetail.vue b/subPackages/order/orderDetail.vue
index 3cf8b41..82e2363 100644
--- a/subPackages/order/orderDetail.vue
+++ b/subPackages/order/orderDetail.vue
@@ -45,7 +45,7 @@
 			</view>
 
 			<!-- 提示语 -->
-			<view class="swiper-prompt">左右滑动核销其他二维码</view>
+			<view class="swiper-prompt">请到现场后给工作人员出示二维码核销</view>
 		</view>
 
 		<view :style="{margin: isQrcode ? '0' : '-66rpx auto 0'}" v-if="info.order_child">
@@ -269,6 +269,7 @@
 				uni.showModal({
 					title: '提示',
 					content: '是否申请退款？',
+					confirmColor: '#000000',
 					success: successRes => {
 						if (successRes.confirm) {
 							that.Post({
@@ -298,6 +299,7 @@
 				uni.showModal({
 					title: '提示',
 					content: '确认关闭订单？',
+					confirmColor: '#000000',
 					success: successRes => {
 						if (successRes.confirm) {
 							that.Post({
@@ -471,7 +473,7 @@
 	.swiper-prompt {
 		font-weight: 500;
 		font-size: 29rpx;
-		color: #EE3E3B;
+		color: #888888;
 		text-align: center;
 		margin-bottom: 45rpx;
 	}
@@ -549,6 +551,7 @@
 			font-weight: 500;
 			font-size: 27rpx;
 			color: #000000;
+			white-space: nowrap;
 		
 			span {
 				display: inline-block;
diff --git a/subPackages/order/trades.vue b/subPackages/order/trades.vue
index 285c3bf..77ed0a6 100644
--- a/subPackages/order/trades.vue
+++ b/subPackages/order/trades.vue
@@ -50,7 +50,7 @@
 				<view class="item-btns">
 					<view @click.stop="() => refund(item.order_id, key)" v-if="item.status == 'PAYMENT_SUCCESSFULLY'">申请退款</view>
 					<view @click.stop="() => closeOrder(item.order_id, item)" v-if="item.status == 'WAIT_PAYMENT'">关闭订单</view>
-					<view @click.stop="gotoDetailByTypeId(item.order_id[0].goods_id, item.order_id[0].type_id)" v-if="item.status == 'CLOSED'">再次购买</view>
+					<view @click.stop="gotoDetailByTypeId(item.order_child[0].goods_id, item.order_child[0].type_id)" v-if="item.status == 'CLOSED'">再次购买</view>
 					<view class="pay-btn" @click.stop="setOrderId(item.order_id)" v-if="item.status == 'WAIT_PAYMENT'">立即支付</view>
 				</view>
 			</navigator>
@@ -113,6 +113,7 @@
 				uni.showModal({
 					title: '提示',
 					content: '是否申请退款？',
+					confirmColor: '#000000',
 					success: successRes => {
 						if (successRes.confirm) {
 							that.Post(
@@ -139,6 +140,7 @@
 				uni.showModal({
 					title: '提示',
 					content: '是否关闭订单？',
+					confirmColor: '#000000',
 					success: successRes => {
 						if (successRes.confirm) {
 							that.Post(
diff --git a/subPackages/user/bindTel.vue b/subPackages/user/bindTel.vue
index bd9d1e9..c585bbf 100644
--- a/subPackages/user/bindTel.vue
+++ b/subPackages/user/bindTel.vue
@@ -52,6 +52,7 @@
 						uni.showModal({
 							title: '提示',
 							content: '保存成功！',
+							confirmColor: '#000000',
 							success: res => {
 								if (res.confirm) {
 									this.goBack()
diff --git a/subPackages/user/changeNickname.vue b/subPackages/user/changeNickname.vue
index 180f052..4c353cd 100644
--- a/subPackages/user/changeNickname.vue
+++ b/subPackages/user/changeNickname.vue
@@ -32,6 +32,7 @@
 						uni.showModal({
 							title: '提示',
 							content: '保存成功！',
+							confirmColor: '#000000',
 							success: res => {
 								if (res.confirm) {
 									this.goBack()
diff --git a/subPackages/user/logout.vue b/subPackages/user/logout.vue
index dc513cc..2eed90a 100644
--- a/subPackages/user/logout.vue
+++ b/subPackages/user/logout.vue
@@ -50,6 +50,7 @@
 				uni.showModal({
 					title: '提示',
 					content: '确认注销账号？',
+					confirmColor: '#000000',
 					success: successRes => {
 						if (successRes.confirm) {
 							this.Post({
diff --git a/subPackages/user/myContactsAdd.vue b/subPackages/user/myContactsAdd.vue
index 3294e2c..93ad08e 100644
--- a/subPackages/user/myContactsAdd.vue
+++ b/subPackages/user/myContactsAdd.vue
@@ -123,6 +123,7 @@
 							title: '提示',
 							content: '成功',
 							showCancel: false,
+							confirmColor: '#000000',
 							success: res => {
 								if (res.confirm) {
 									uni.navigateBack({})
diff --git a/subPackages/user/profile.vue b/subPackages/user/profile.vue
index 5224918..bd7f315 100644
--- a/subPackages/user/profile.vue
+++ b/subPackages/user/profile.vue
@@ -222,6 +222,7 @@
 				uni.showModal({
 					title: '提示',
 					content: '确认修改您的信息？',
+					confirmColor: '#000000',
 					success: res => {
 						if (res.confirm) {
 							this.Post({
@@ -238,6 +239,7 @@
 										title: '提示',
 										content: res.msg || '修改成功',
 										showCancel: false,
+										confirmColor: '#000000',
 										success: res => {
 											if (res.confirm) {
 												this.getList()
diff --git a/subPackages/user/register.vue b/subPackages/user/register.vue
index 38fdbd9..fd70b37 100644
--- a/subPackages/user/register.vue
+++ b/subPackages/user/register.vue
@@ -413,6 +413,7 @@
 				uni.showModal({
 					title: '提示',
 					content: '确认修改您的信息？',
+					confirmColor: '#000000',
 					success: res => {
 						if (res.confirm) {
 							this.Post(param, api).then(res => {
@@ -422,6 +423,7 @@
 										title: '提示',
 										content: res.msg,
 										showCancel: false,
+										confirmColor: '#000000',
 										success: res => {
 											if (res.confirm) {
 												this.getUserInfo()