From 0ec345c38888c48e258c12791cf4e294e0ffd744 Mon Sep 17 00:00:00 2001
From: chenkainan <chenkainan163@163.com>
Date: Wed, 6 Nov 2024 11:08:06 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages.json                          | 12 ++--
 pages/login/login.vue               | 10 +--
 subPackages/line/orders.vue         |  2 +-
 subPackages/notice/noticeList.vue   |  2 +-
 subPackages/order/detail.vue        |  3 +-
 subPackages/user/changeNickname.vue | 12 ++--
 subPackages/user/coupon.vue         |  2 +-
 subPackages/user/getCoupon.vue      |  5 +-
 subPackages/user/myAddressAdd.vue   |  2 +-
 subPackages/user/myContactsAdd.vue  | 42 +++++++++----
 subPackages/user/profile.vue        | 94 +++++++++++++++++++++--------
 subPackages/user/travelerList.vue   | 32 ++++++----
 12 files changed, 148 insertions(+), 70 deletions(-)

diff --git a/pages.json b/pages.json
index fa48596..aee0d5a 100644
--- a/pages.json
+++ b/pages.json
@@ -89,26 +89,26 @@
 			{
 				"path": "line/lineList",
 				"style": {
-					"navigationBarTitleText": "特色体验",
+					"navigationBarTitleText": "风雅体验",
 					"navigationStyle": "custom"
 				}
 			},
 			{
 				"path": "line/detail",
 				"style": {
-					"navigationBarTitleText": "特色体验"
+					"navigationBarTitleText": "风雅体验"
 				}
 			},
 			{
 				"path": "line/order",
 				"style": {
-					"navigationBarTitleText": "特色体验"
+					"navigationBarTitleText": "风雅体验"
 				}
 			},
 			{
 				"path": "line/orders",
 				"style": {
-					"navigationBarTitleText": "特色体验"
+					"navigationBarTitleText": "风雅体验"
 				}
 			},
 			{
@@ -270,13 +270,13 @@
 			{
 				"path": "user/bindTel",
 				"style": {
-					"navigationBarTitleText": "修改姓名"
+					"navigationBarTitleText": "修改手机号"
 				}
 			},
 			{
 				"path": "user/changeNickname",
 				"style": {
-					"navigationBarTitleText": "修改手机号"
+					"navigationBarTitleText": "修改姓名"
 				}
 			},
 			{
diff --git a/pages/login/login.vue b/pages/login/login.vue
index af54651..7cdfc5c 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -3,11 +3,11 @@
 		<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" @click="cancel()" style="margin-top: 113rpx;">取消</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>
 		<footer class="flex-between">
-			<view @click="flag = !flag" :style="{border: flag ? 'none' : ''}"><image src="https://static.ticket.sz-trip.com/yandu/images/user/dui.png" v-show="flag"></image></view>
+			<view @click="flag = !flag" :style="{border: flag ? 'none' : ''}"><image src="https://static.ticket.sz-trip.com/tongli/images/user/dui.png" v-show="flag"></image></view>
 			我已阅读并同意 <span @click="gotoPath('/subPackages/user/privacy')">《用户服务协议》、《隐私政策》</span>
 		</footer>
 		
@@ -99,8 +99,8 @@
 	}
 	
 	.logo {
-		width: 186rpx;
-		height: 186rpx;
+		width: 135rpx;
+		height: 135rpx;
 		position: absolute;
 		top: 79rpx;
 		left: 50%;
@@ -121,7 +121,7 @@
 		transform: translate(-50%,0)
 	}
 	.btns {
-		background: #71B580;
+		background: #515150;
 	}
 	
 	.tips {
diff --git a/subPackages/line/orders.vue b/subPackages/line/orders.vue
index e7e20f7..36eb64d 100644
--- a/subPackages/line/orders.vue
+++ b/subPackages/line/orders.vue
@@ -29,7 +29,7 @@
 			</view> -->
 			<view class="user-item">
 			    <text class="user-item-text">姓名</text>
-			    <input type="number" v-model="reserve_name" placeholder="输入您的姓名" class="user-input"/>
+			    <input v-model="reserve_name" placeholder="输入您的姓名" class="user-input"/>
 			</view>
 			<view class="user-item">
 			    <text class="user-item-text">手机号</text>
diff --git a/subPackages/notice/noticeList.vue b/subPackages/notice/noticeList.vue
index ce430c0..3c02071 100644
--- a/subPackages/notice/noticeList.vue
+++ b/subPackages/notice/noticeList.vue
@@ -94,7 +94,7 @@
 		
 		.active {
 			color: #fff;
-			background: #248BAA;
+			background: #525251;
 		}
 	}
 	
diff --git a/subPackages/order/detail.vue b/subPackages/order/detail.vue
index 9145d24..9ae9e87 100644
--- a/subPackages/order/detail.vue
+++ b/subPackages/order/detail.vue
@@ -1596,13 +1596,12 @@
 				width: 50%;
 				font-weight: bold;
 				font-size: 32rpx;
-				color: #248BAA;
+				color: #000000;
 				line-height: 54rpx;
 			}
 
 			view:first-child {
 				border-right: 1rpx solid #D8D8D8;
-				color: #000000;
 			}
 		}
 	}
diff --git a/subPackages/user/changeNickname.vue b/subPackages/user/changeNickname.vue
index 26505cf..d35cfb4 100644
--- a/subPackages/user/changeNickname.vue
+++ b/subPackages/user/changeNickname.vue
@@ -1,10 +1,9 @@
 <template>
 	<view class="bg">
 		<view class="nickname-box">
-			<span>姓名：</span>
-			<input v-model="nickname" type="text" placeholder="请输入您的姓名" />
+			<input v-model="nickname" type="text" placeholder="请输入内容" />
 		</view>
-		<view class="btn" @click="save">保存修改</view>
+		<view class="btn" @click="save">保存</view>
 	</view>
 </template>
 
@@ -49,16 +48,19 @@
 <style scoped>
 	.bg {
 		min-height: 100vh;
+		padding-top: 50rpx;
 	}
 
 	.nickname-box {
 		display: flex;
-		padding: 10rpx 30rpx;
+		padding: 10rpx 0 30rpx;
+		margin: 0 30rpx;
 		align-items: center;
 		background: white;
 		margin-bottom: 100rpx;
 		font-size: 30rpx;
 		height: 70rpx;
+		border-bottom: 1rpx solid #D8D8D8;
 	}
 
 	.nickname-box span {
@@ -80,7 +82,7 @@
 		text-align: center;
 		width: 333rpx;
 		height: 80rpx;
-		background: #248BAA;
+		background: #C3282E;
 		border-radius: 40rpx;
 		color: #FFFFFF;
 	}
diff --git a/subPackages/user/coupon.vue b/subPackages/user/coupon.vue
index 61a5295..5219279 100644
--- a/subPackages/user/coupon.vue
+++ b/subPackages/user/coupon.vue
@@ -231,7 +231,7 @@
 
 .nav-list .nav-item.active {
 	// color: #71B580;
-    border-bottom: 7rpx solid #248BAA;
+    border-bottom: 7rpx solid #525251;
 }
 
 .coupon-list{
diff --git a/subPackages/user/getCoupon.vue b/subPackages/user/getCoupon.vue
index c7417d2..8664c5f 100644
--- a/subPackages/user/getCoupon.vue
+++ b/subPackages/user/getCoupon.vue
@@ -86,12 +86,13 @@
 		background-image: url('https://static.ticket.sz-trip.com/tongli/images/index/couponBg.png');
 		background-size: 100% 100%;
 		margin: 27rpx auto 0;
-		padding: 0 20rpx 0 50rpx;
+		padding: 0 20rpx 0 0rpx;
 		display: flex;
 		justify-content: space-between;
 		
 		.item-left {
-			padding: 45rpx 0 29rpx;
+			width: 240rpx;
+			padding: 45rpx 0 30rpx 0;
 			display: flex;
 			flex-direction: column;
 			justify-content: space-between;
diff --git a/subPackages/user/myAddressAdd.vue b/subPackages/user/myAddressAdd.vue
index 4dca43f..4a45460 100644
--- a/subPackages/user/myAddressAdd.vue
+++ b/subPackages/user/myAddressAdd.vue
@@ -377,7 +377,7 @@
 		font-size: 36rpx;
 		width: 697rpx;
 		height: 73rpx;
-		background: #248BAA;
+		background: #C3282E;
 		border-radius: 37rpx;
 		justify-content: center;
 		align-items: center;
diff --git a/subPackages/user/myContactsAdd.vue b/subPackages/user/myContactsAdd.vue
index 5564af8..3ecdde8 100644
--- a/subPackages/user/myContactsAdd.vue
+++ b/subPackages/user/myContactsAdd.vue
@@ -2,10 +2,10 @@
 	<view class="bg">
 		<view class="list-forms">
 			<view class="list-item">
-				<view class="list-item-title">姓名:</view>
+				<view class="list-item-title">姓名</view>
 				<view class="list-item-input"><input type="text" v-model="username" placeholder="请输入姓名" /></view>
 			</view>
-			<view class="list-item">
+			<!-- <view class="list-item">
 				<picker mode="selector" :range="idcardTypeList" range-key="title" @change="changeIdType">
 					<view class="list-item-title flex-center"
 						style="border: 1rpx solid #999999;border-radius: 7rpx;padding: 18rpx 19rpx;">{{idcardTypeValue}}
@@ -14,12 +14,22 @@
 					</view>
 				</picker>
 				<view class="list-item-input"><input type="text" v-model="idNumber" placeholder="请输入正确的证件号" /></view>
-			</view>
+			</view> -->
 			<view class="list-item">
-				<view class="list-item-title">手机号:</view>
+				<view class="list-item-title">手机号</view>
 				<view class="list-item-input"><input type="number" v-model="mobile" placeholder="请输入手机号"
 						maxlength="11" /></view>
 			</view>
+			<view class="list-item">
+				<view class="list-item-title">身份证号</view>
+				<view class="list-item-input"><input type="text" v-model="idNumber" placeholder="请输入正确的证件号" /></view>
+			</view>
+			<view class="list-item">
+				<view class="list-item-title">设为默认</view>
+				<view class="list-item-switch">
+					<switch :checked="idDefault" @change="switchChange" color="#515150"/>
+				</view>
+			</view>
 		</view>
 
 		<view class="btn" @click="submit">保存</view>
@@ -38,7 +48,8 @@
 				idcardTypeList: [],
 				document_type: 'DAM01001',
 				id: '',
-				type: ''
+				type: '',
+				idDefault: false,
 			}
 		},
 		onLoad(option) {
@@ -64,6 +75,9 @@
 			}
 		},
 		methods: {
+			switchChange(e){
+				this.idDefault = e.detail.value
+			},
 			getDetail() {
 				this.Post({
 					id: this.id
@@ -165,7 +179,8 @@
 					id_number: this.idNumber,
 					name: this.username,
 					tel: this.mobile,
-					document_type: this.document_type
+					document_type: this.document_type,
+					is_default: this.idDefault ? '1' : '0',
 				}, this.type=='edit'?'/api/user/editContact':'/api/user/addContact').then(res => {
 					if (res.code == 1) {
 						uni.showModal({
@@ -201,11 +216,18 @@
 			padding: 30rpx 0;
 			height: 60rpx;
 			box-sizing: content-box;
+			align-items: center;
 
 			.list-item-title {
 				font-size: 34rpx;
 				margin-right: 20rpx;
 			}
+			
+			.list-item-switch {
+				display: flex;
+				flex: 1;
+				justify-content: flex-end;
+			}
 
 			.list-item-input {
 				flex: 1;
@@ -230,9 +252,9 @@
 	}
 
 	.btn {
-		width: 697rpx;
+		width: 333rpx;
 		height: 80rpx;
-		background: #248BAA;
+		background: #C3282E;
 		border-radius: 40rpx;
 		text-align: center;
 		line-height: 80rpx;
@@ -240,8 +262,6 @@
 		font-family: PingFang SC;
 		font-weight: 500;
 		color: #FFFFFF;
-		position: absolute;
-		bottom: 53rpx;
-		left: 27rpx;
+		margin: 271rpx auto 0;
 	}
 </style>
diff --git a/subPackages/user/profile.vue b/subPackages/user/profile.vue
index 0592fb5..0984eae 100644
--- a/subPackages/user/profile.vue
+++ b/subPackages/user/profile.vue
@@ -14,17 +14,12 @@
 			</navigator>
 			<view class="userinfo-item" @click="showSexSelect = true">
 				<span>性别</span>
-				<!-- <view>{{sexes[info.gender]}}</view> -->
-				<radio-group @change="changesex">
-					<label style="margin-right: 15rpx;" v-for="(item,index) in sexes" :key="index">
-						<radio color="#248BAA" :value="item.value" :checked="index === info.gender-1" />{{item.text}}
-					</label>
-				</radio-group>
+				<view  @click="$refs.popup.open()">{{gender == 1 ? '男' : (gender == 2 ? '女' : '保密')}}</view>
 			</view>
-			<view class="userinfo-item">
+			<navigator url="/subPackages/user/bindTel" class="userinfo-item">
 				<span>手机号</span>
 				<view>{{info.mobile}}</view>
-			</view>
+			</navigator>
 			<view class="userinfo-item">
 				<span>生日</span>
 				<picker mode="date" :value="date" :start="startDate" :end="endDate" @change="bindDateChange">
@@ -33,6 +28,14 @@
 			</view>
 			<view class="btn-tao" @click="submit">保存</view>
 		</view>
+		
+		<!-- 性别弹框 -->
+		<uni-popup ref="popup" type="bottom">
+			<view class="popup-box">
+				<view class="popup-item flex-center" v-for="(item,index) in sexes" :key="index" @click="changesex(index)">{{item.text}}</view>
+				<view class="popup-items flex-center" @click="$refs.popup.close()">取消</view>
+			</view>
+		</uni-popup>
 	</view>
 </template>
 
@@ -55,6 +58,10 @@
 					{
 						value: '2',
 						text: '女'
+					},
+					{
+						value: '0',
+						text: '保密'
 					}
 				],
 				today: null,
@@ -183,8 +190,9 @@
 				day = day > 9 ? day : '0' + day;
 				return `${year}/${month}/${day}`;
 			},
-			changesex(value) {
-				this.gender = value.detail.value
+			changesex(index) {
+				this.gender = this.sexes[index].value
+				this.$refs.popup.close()
 			},
 			submit() {
 				uni.showModal({
@@ -220,7 +228,7 @@
 	}
 </script>
 
-<style scoped>
+<style scoped lang="scss">
 	view {
 		box-sizing: content-box;
 	}
@@ -239,11 +247,12 @@
 		align-items: center;
 	}
 	.info-avatar-top view:after{
-		font-family: "iconfont";
-		content: "\e62e";
-		font-size: 26rpx;
-		font-weight: bold;
+		content: "";
+		width: 20rpx;
+		height: 20rpx;
 		margin-left: 6rpx;
+		background-image: url('https://static.ticket.sz-trip.com/tongli/images/user/rightIcon-gray.png');
+		background-size: 100% 100%;
 	}
 	.info-avatar-top img {
 		width: 80rpx;
@@ -282,9 +291,10 @@
 		align-items: center;
 		font-size: 30rpx;
 		border-bottom: 1rpx solid #D8D8D8;
-		padding: 40rpx 0;
+		padding: 40rpx 30rpx 40rpx 0;
 		height: 48rpx;
 		color: #333;
+		position: relative;
 	}
 
 	.info-avatar-top span {
@@ -299,13 +309,20 @@
 		flex-shrink: 0;
 	}
 
-	.userinfo-item view:after,
-	.birthday-box:after {
-		font-family: "iconfont";
-		content: "\e62e";
-		font-size: 26rpx;
-		font-weight: bold;
-		margin-left: 6rpx;
+	.userinfo-item {
+		& view::after {
+			content: "";
+			width: 20rpx;
+			height: 20rpx;
+			margin-left: 6rpx;
+			background-image: url('https://static.ticket.sz-trip.com/tongli/images/user/rightIcon-gray.png');
+			background-size: 100% 100%;
+			position: absolute;
+			right: 0;
+			margin: auto;
+			top: 0;
+			bottom: 0;
+		}
 	}
 
 	.birthday-box {
@@ -339,7 +356,7 @@
 		font-size: 30rpx;
 		width: 697rpx;
 		height: 80rpx;
-		background: #248BAA;
+		background: #C3282E;
 		border-radius: 40rpx;
 		line-height: 80rpx;
 		color: #FFFFFF;
@@ -347,4 +364,33 @@
 		left: 26rpx;
 		bottom: 100rpx;
 	}
+	
+	.popup-box {
+		border-radius: 20rpx 20rpx 0rpx 0rpx;
+		background: #fff;
+		overflow: hidden;
+		
+		.popup-item {
+			width: 697rpx;
+			height: 99rpx;
+			font-weight: 500;
+			font-size: 31rpx;
+			color: #12293C;
+			margin: auto;
+		}
+		.popup-item:nth-child(2) {
+			border: none;
+			border-bottom: 1rpx solid #D8D8D8;
+			border-top: 1rpx solid #D8D8D8;
+		}
+		
+		.popup-items {
+			width: 100%;
+			height: 99rpx;
+			font-weight: 500;
+			font-size: 31rpx;
+			color: #12293C;
+			border-top: 13rpx solid #F2F2F2;
+		}
+	}
 </style>
diff --git a/subPackages/user/travelerList.vue b/subPackages/user/travelerList.vue
index 6abadd5..77b6ae9 100644
--- a/subPackages/user/travelerList.vue
+++ b/subPackages/user/travelerList.vue
@@ -20,6 +20,7 @@
 					</view>
 					<view class="">
 						{{item.tel}}
+						<span v-if="item.is_default==1">默认</span>
 					</view>
 				</view>
 				<view class="idcard">
@@ -32,7 +33,7 @@
 				</view>
 				<view class="item-btn">
 					<view class="choice">
-						<image src="https://static.ticket.sz-trip.com/yandu/images/user/dui.png" mode="aspectFill"
+						<!-- <image src="https://static.ticket.sz-trip.com/yandu/images/user/dui.png" mode="aspectFill"
 							v-if="item.is_default==1">
 						</image>
 						<view class="yuan" v-else @click.stop="defaultC(item)">
@@ -40,7 +41,7 @@
 						</view>
 						<view class="">
 							默认出行人
-						</view>
+						</view> -->
 					</view>
 					<view class="btn-list">
 						<view class="btn-item" @click.stop="edit(item.id)">
@@ -89,7 +90,7 @@
 		
 		<view class="btn-box">
 			<navigator :url="showType ? '/subPackages/user/myAddressAdd' : '/subPackages/user/myContactsAdd'" class="btn">
-				{{showType ? '添加联系人' : '添加出行人'}}
+				{{showType ? '添加联系人' : '添加收货地址'}}
 			</navigator>
 		</view>
 	</view>
@@ -185,19 +186,29 @@
 		display: flex;
 		height: 112rpx;
 		flex-shrink: 0;
+		background-color: #fff;
 		.concat-nav-item{
 			ffont-weight: 500;
 			font-size: 35rpx;
 			color: #000000;
+			height: 100%;
 			text-align: center;
+			position: relative;
+			padding-top: 35rpx;
 		}
 		.concat-nav-item.active{
 			color: #000000;
 		}
 		.active-bar{
-			width: 100%;
-			height: 11rpx;
-			background: #248BAA;
+			width: 73rpx;
+			height: 7rpx;
+			background: #515150;
+			border-radius: 3rpx;
+			margin: auto;
+			position: absolute;
+			bottom: 0;
+			left: 0;
+			right: 0;
 		}
 	}
 	
@@ -205,8 +216,7 @@
 		width: 697rpx;
 		background: #FFFFFF;
 		border-radius: 13rpx;
-		margin: 0 auto;
-		margin-bottom: 28rpx;
+		margin: 28rpx auto 0;
 		padding: 26rpx;
 		
 		.name,
@@ -219,13 +229,13 @@
 		}
 		
 		.name {
-			view:last-child {
+			view:last-child{
 				margin-left: 40rpx;
 			}
 			
 			span {
 				padding: 3rpx 9rpx;
-				background: #248BAA;
+				background: #515150;
 				border-radius: 7rpx;
 				font-weight: bold;
 				font-size: 24rpx;
@@ -315,7 +325,7 @@
 		.btn {
 			width: 697rpx;
 			line-height: 80rpx;
-			background: #248BAA;
+			background: #C3282E;
 			border-radius: 37rpx;
 			font-weight: 500;
 			font-size: 36rpx;