From 2fcda30a7786946ec34a1064557061578274a32d Mon Sep 17 00:00:00 2001
From: chenkainan <chenkainan163@163.com>
Date: Mon, 12 May 2025 10:48:48 +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.json                       |  25 +-
 pages/index/index.vue            | 413 ++++++++++++++++++-
 pages/user/user.vue              | 651 ++++++++++++++++++++++++++++-
 static/images/home.png           | Bin 1245 -> 6886 bytes
 static/images/mine.png           | Bin 1282 -> 6168 bytes
 static/images/selectHome.png     | Bin 1237 -> 5473 bytes
 static/images/selectMine.png     | Bin 1149 -> 10344 bytes
 static/js/CommonFunction.js      |   2 +-
 static/js/request.js             |   6 +-
 subPackages/order/trades.vue     | 680 +++++++++++++++++++++++++++++++
 subPackages/user/privacy.vue     |  58 +++
 subPackages/user/privacyInfo.vue |  30 ++
 12 files changed, 1855 insertions(+), 10 deletions(-)
 create mode 100644 subPackages/order/trades.vue
 create mode 100644 subPackages/user/privacy.vue
 create mode 100644 subPackages/user/privacyInfo.vue

diff --git a/pages.json b/pages.json
index 8129427..0ab055b 100644
--- a/pages.json
+++ b/pages.json
@@ -9,7 +9,8 @@
 		{
 			"path": "pages/user/user",
 			"style": {
-				"navigationBarTitleText": "大美非遗"
+				"navigationBarTitleText": "我的",
+				"navigationStyle": "custom"
 			}
 		}
 	],
@@ -21,12 +22,30 @@
 				"style": {
 					"navigationBarTitleText": "uni-app"
 				}
+			},
+			{
+			    "path" : "user/privacy",
+			    "style" : {
+			        "navigationBarTitleText" : "详情"
+			    }
+			},
+			{
+			    "path" : "user/privacyInfo",
+			    "style" : {
+			        "navigationBarTitleText" : "详情"
+			    }
+			},
+			{
+			    "path" : "order/trades",
+			    "style" : {
+			        "navigationBarTitleText" : "全部订单"
+			    }
 			}
 		]
 	}],
 	"tabBar": {
-		"color": "#999999",
-		"selectedColor": "#333333",
+		"color": "#333333",
+		"selectedColor": "#6CA5AA",
 		"borderStyle": "black",
 		"backgroundColor": "#ffffff",
 		"fontSize": "24rpx",
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 579d4cb..9fe3e7b 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -1,6 +1,81 @@
 <template>
 	<view class="content">
+		<!-- 头部banner -->
+		<view class="top-box">
+			<!-- 搜索 -->
+			<view class="search-box">
+				<image src="https://static.ticket.sz-trip.com/cgc/images/index/search.png" mode=""></image>
+				<span>|</span>
+				搜一搜您想要的
+			</view>
+			
+			<swiper class="top-banner" :circular="true" :interval="6000"
+				:duration="800" :indicator-dots="false" :autoplay="true" v-if="topBanner">
+				<swiper-item v-for="(item, index) in topBanner" :key="index" @click.stop="gotoUrlNew(item)">
+					<image class="top-banner" :src="showImg(item.head_img)" mode="aspectFill" lazy-load="true"></image>
+				</swiper-item>
+			</swiper>
+		</view>
 		
+		<!-- 金刚区 -->
+		<view class="menu-box flex-between">
+			<view class="menu-left flex-around">
+				<view class="" v-for="(item,index) in menuList" :key="index">
+					<image :src="`https://static.ticket.sz-trip.com/cgc/images/index/${index + 1}.png`" class="topImg" mode="heightFix"></image>
+					<image :src="`https://static.ticket.sz-trip.com/cgc/images/index/${index + 1}s.png`" class="titleImg" mode="heightFix"></image>
+				</view>
+			</view>
+			<view class="menu-right flex-around">
+				<swiper class="menu-right" :circular="true" :interval="6000"
+					:duration="800" :indicator-dots="false" :autoplay="true" v-if="topBanner">
+					<swiper-item v-for="(item, index) in topBanner" :key="index" @click.stop="gotoUrlNew(item)">
+						<image class="menu-right" :src="showImg(item.head_img)" mode="aspectFill" lazy-load="true"></image>
+					</swiper-item>
+				</swiper>
+			</view>
+		</view>
+		
+		<!-- 非遗手札 -->
+		<view class="title-box flex-between">
+			<image src="https://static.ticket.sz-trip.com/cgc/images/index/title1.png" mode=""></image>
+			<image src="https://static.ticket.sz-trip.com/cgc/images/index/more.png" mode=""></image>
+		</view>
+		<view class="handwritten-box flex-between">
+			<image :src="showImg(item.head_img)" mode="aspectFill" v-for="(item,index) in handwrittenList" :key="index"></image>
+		</view>
+		
+		<!-- 非遗时光 -->
+		<view class="title-box flex-between">
+			<image src="https://static.ticket.sz-trip.com/cgc/images/index/title2.png" mode=""></image>
+			<image src="https://static.ticket.sz-trip.com/cgc/images/index/more.png" mode=""></image>
+		</view>
+		<view class="time-box" style="background-image: url('https://static.ticket.sz-trip.com/uploads/20230920/7cdb05709d09cc2c86ea5671bd657c85.jpg')">
+			<image src="https://static.ticket.sz-trip.com/cgc/images/index/play.png" class="play"></image>
+		</view>
+		
+		<!-- 底部推荐 -->
+		<view class="hot-type flex-around">
+			<view v-for="(item,index) in hotType" :key="index" :class="{'hot-active': index == hotIndex}" @click="changeType(index)">
+				{{item.title}}
+			</view>
+		</view>
+		<view class="hot-box">
+			<view class="hot-column" v-for="(column, index) in 2" :key="index">
+				<view v-for="(item,indexs) in getColumnItems(index)" :key="indexs" class="hot-item" @click="gotoHotDetail(item)">
+					<view class="image-container">
+						<image :src="item.src" mode="widthFix" class="hot-img" lazy-load="true"></image>
+						<image src="https://static.ticket.sz-trip.com/cgc/images/index/plays.png" mode="widthFix" class="play-img" v-if="hotIndex" lazy-load="true"></image>
+					</view>
+					<view class="hot-content">
+						<view class="title text-overflowRows">{{item.title || item.name}}</view>
+						<view class="subtitle" v-if="hotIndex">
+							<image :src="item.src" mode="aspectFill"></image>
+							{{item.author}}
+						</view>
+					</view>
+				</view>
+			</view>
+		</view>
 	</view>
 </template>
 
@@ -8,14 +83,133 @@
 	export default {
 		data() {
 			return {
-				
+				topBanner: [
+					{
+						head_img: 'https://static.ticket.sz-trip.com/uploads/20230920/7cdb05709d09cc2c86ea5671bd657c85.jpg'
+					},
+					{
+						head_img: 'https://changshu.js-dyyj.com/uploads/20250418/8a7631a1955ca05e619c0a25ad5ac1d1.jpg'
+					}
+				],
+				menuList: [
+					{
+						path: ''
+					},
+					{
+						path: ''
+					},
+					{
+						path: ''
+					},
+					{
+						path: ''
+					},
+					{
+						path: ''
+					},
+					{
+						path: ''
+					}
+				],
+				handwrittenList: [
+					{head_img: 'https://static.ticket.sz-trip.com/uploads/20230920/7cdb05709d09cc2c86ea5671bd657c85.jpg'},
+					{head_img: 'https://static.ticket.sz-trip.com/uploads/20230920/7cdb05709d09cc2c86ea5671bd657c85.jpg'},
+					{head_img: 'https://static.ticket.sz-trip.com/uploads/20230920/7cdb05709d09cc2c86ea5671bd657c85.jpg'},
+					{head_img: 'https://static.ticket.sz-trip.com/uploads/20230920/7cdb05709d09cc2c86ea5671bd657c85.jpg'},
+				],
+				hotType: [
+					{
+						title: '好物推荐',
+						id: '41'
+					},
+					{
+						title: '猜你喜欢',
+						id: '41'
+					}
+				],
+				hotIndex: 0,
+				hotList: [],
+				isLoading: false,
+				limit: 4
 			}
 		},
 		onLoad() {
 
+		},
+		onReady() {
+			// 获取经纬度
+			if(!uni.getStorageSync('location')) {
+				this.getLocation()
+			}
+			
+			this.changeType(0)
+		},
+		onReachBottom() {
+			setTimeout(() => {
+				if (!this.isLoading) this.getHotList();
+			}, 1000);
 		},
 		methods: {
-
+			// 瀑布流
+			getColumnItems(columnIndex) {
+				const columnItems = [];
+				this.hotList.forEach((item, index) => {
+					switch (this.hotIndex) {
+					  case 1:
+					    item.src = this.showImg(item.image);
+					    break;
+					  default:
+					    item.src = this.showImg(item.image);
+					}
+					
+					if (index % 2 === columnIndex) {
+						columnItems.push(item);
+					}
+				});
+				return columnItems;
+			},
+			// 更改热门推荐类型
+			changeType(index) {
+				this.hotIndex = index
+				this.isLoading = false
+				this.hotList = []
+				this.getHotList()
+			},
+			getHotList() {
+				if(this.typeIndex == 1) {
+					this.Post({
+						type_id: this.hotType[this.hotIndex].id,
+						offset: this.hotList.length,
+						limit: this.limit
+					},'/api/Article/getArticleByType').then(res => {
+						if(res) {
+							if(res.data.length < this.limit) this.isLoading = true
+							this.hotList = this.hotList.concat(res.data)
+						}
+					})
+				}else {
+					this.Post({
+						type_id: this.hotType[this.hotIndex].id,
+						offset: this.hotList.length,
+						limit: this.limit
+					},'/api/Article/getArticleByType').then(res => {
+						if(res) {
+							if(res.data.length < this.limit) this.isLoading = true
+							this.hotList = this.hotList.concat(res.data)
+						}
+					})
+				}
+			},
+			gotoHotDetail(item) {
+				if(this.typeIndex == 1) {
+					// 视频
+					uni.navigateTo({
+						url: '/subPackages/video/video?item=' + encodeURIComponent(JSON.stringify(item))
+					})
+				}else {
+					
+				}
+			}
 		}
 	}
 </script>
@@ -26,4 +220,219 @@
 		background: #F9F0EA;
 		padding: 21rpx 0 50rpx;
 	}
+	
+	.top-box {
+		width: 684rpx;
+		height: 451rpx;
+		border-radius: 30rpx;
+		overflow: hidden;
+		position: relative;
+		margin: auto;
+		
+		.top-banner {
+			width: 100%;
+			height: 100%;
+		}
+		
+		.search-box {
+			width: 632rpx;
+			height: 40rpx;
+			background: #FFFFFF;
+			border-radius: 20rpx;
+			position: absolute;
+			z-index: 1000;
+			top: 31rpx;
+			left: 26rpx;
+			display: flex;
+			align-items: center;
+			font-weight: 500;
+			font-size: 24rpx;
+			color: #7B7C7D;
+			padding-left: 21rpx;
+			
+			image {
+				width: 29rpx;
+				height: 28rpx;
+			}
+			
+			span {
+				padding: 0 15rpx;
+			}
+		}
+	}
+	
+	.menu-box {
+		margin: 54rpx 33rpx 0;
+		
+		.menu-left {
+			flex-wrap: wrap;
+			
+			&>view {
+				width: 33%;
+				display: flex;
+				flex-direction: column;
+				align-items: center;
+			}
+			&>view:nth-child(n+4) {
+				margin-top: 36rpx;
+			}
+			
+			.topImg {
+				height: 108rpx;
+			}
+			
+			.titleImg {
+				height: 22rpx;
+				margin-top: 8rpx;
+			}
+		}
+		
+		.menu-right {
+			width: 254rpx;
+			height: 323rpx;
+			border-radius: 20rpx;
+		}
+	}
+	
+	.title-box {
+		margin: 60rpx 44rpx 21rpx 50rpx;
+		align-items: flex-end;
+		
+		&>image {
+			width: 350rpx;
+			height: 32rpx;
+		}
+		&>image:last-child {
+			width: 59rpx;
+			height: 20rpx;
+		}
+	}
+	
+	.handwritten-box {
+		margin: 0 46rpx;
+		flex-wrap: wrap;
+		
+		image {
+			width: 322rpx;
+			height: 181rpx;
+			border-radius: 10rpx;
+		}
+		&>image:nth-child(n+3) {
+			margin-top: 13rpx;
+		}
+	}
+	
+	.time-box {
+		background-size: 100% 100%;
+		width: 657rpx;
+		height: 370rpx;
+		border-radius: 30rpx;
+		margin: 23rpx auto 0;
+		position: relative;
+		
+		.play {
+			position: absolute;
+			top: 0;
+			bottom: 0;
+			left: 0;
+			right: 0;
+			margin: auto;
+			width: 90rpx;
+			height: 90rpx;
+		}
+	}
+	
+	.hot-type {
+		height: 122rpx;
+		font-weight: bold;
+		font-size: 32rpx;
+		color: #B5B5B6;
+		
+		&>view {
+			position: relative;
+		}
+		&>view::after {
+			content: "";
+			position: absolute;
+			left: 0;
+			right: 0;
+			bottom: -10rpx;
+			background-color: #B5B5B6;
+			margin: 0 auto;
+			width: 32rpx;
+			height: 4rpx;
+		}
+		
+		.hot-active {
+			color: #000000;
+		}
+		.hot-active::after {
+			background-color: #000000;
+		}
+	}
+	
+	.hot-box {
+		margin: 0 48rpx;
+		display: flex;
+		justify-content: space-between;
+		
+		.hot-column {
+		    width: 319rpx;
+		    display: flex;
+		    flex-direction: column;
+		}
+		
+		.hot-item {
+			width: 319rpx;
+			background: #FFFFFF;
+			border-radius: 20rpx;
+			overflow: hidden;
+			margin-bottom: 13rpx;
+			
+			.image-container {
+				position: relative;
+				
+				.hot-img {
+					width: 319rpx;
+				}
+				
+				.play-img {
+					width: 66.67rpx;
+					height: 66.67rpx;
+					position: absolute;
+					top: 50%;
+					left: 50%;
+					transform: translate(-50%, -50%);
+				}
+			}
+			
+			.hot-content {
+				padding: 15rpx;
+				
+				.title {
+					font-weight: bold;
+					font-size: 26rpx;
+					color: #000000;
+				}
+				
+				.subtitle {
+					margin-top: 20rpx;
+					font-weight: 400;
+					font-size: 24rpx;
+					color: #000000;
+					display: flex;
+					align-items: center;
+					
+					image {
+						width: 48rpx;
+						height: 48rpx;
+						border-radius: 50%;
+						border: 1rpx solid #000000;
+						display: block;
+						margin-right: 15rpx;
+					}
+				}
+			}
+		}
+	}
 </style>
diff --git a/pages/user/user.vue b/pages/user/user.vue
index 02409e3..7444496 100644
--- a/pages/user/user.vue
+++ b/pages/user/user.vue
@@ -1,8 +1,657 @@
 <template>
+	<view class="bg">
+		<view class="title">我的</view>
+
+		<view class="topBox">
+			<view class="avatar-box flex-center">
+				<image :src="showImg(userInfo.avatar)" mode="aspectFill" class="headImg" v-if="userInfo.avatar"></image>
+				<image src="https://changshu.js-dyyj.com/uploads/20250326/516242619f0772bee371a60684618c01.png" mode="aspectFill"
+					class="headImg" v-else></image>
+			</view>
+			<view class="username" v-if="userInfo.nickname">{{userInfo.nickname}}</view>
+			<view class="username" v-else>请登录/注册 ></view>
+			<view class="personalCenter flex-center" v-if="userInfo.nickname" @click="gotoProfile">
+				个人中心
+			</view>
+		</view>
+
+		<view class="orderBox">
+			<navigator :url="'/subPackages/order/trades'" class="moreBox flex-between">
+				我的订单
+				<span class="flex-between">查看更多 <img
+						src="https://static.ticket.sz-trip.com/cgc/images/user/rightIcon.png" alt=""></span>
+			</navigator>
+
+			<view class="flex-around" style="margin-top: 20rpx;">
+				<view class="orderItem" v-for="(item,index) in orderList" :key="index" @click="goTrades(item)">
+					<img :src="item.src" alt="">
+					<view>{{item.title}}</view>
+				</view>
+			</view>
+			<!-- 待付款轮播 -->
+			<!-- <swiper class="my-swipe" :autoplay="3000" indicator-color="white" v-if="dfkList && dfkList.length>0" circular>
+				<swiper-item v-for="(item,index) in dfkList" :key="item.id">
+					<div class="dfkBox" @click="goToOrderDetail(item)">
+						<image :src="showImg(item.order_child[0].specifications_image)" mode="aspectFill"></image>
+						<div class="contentBox">
+							<div style="width:300rpx;">
+								<div style="font-size: 27rpx;margin-bottom: 10rpx;">等待付款 </div>
+								<div style="display: flex;color: #8A8A8A;font-size: 27rpx;">剩余时间：<uni-countdown class="countdown" @timeup="timeup(index)" :show-day="false" :hour="differTimeList[index].slice(0,2)" :minute="differTimeList[index].slice(3,5)" :second="differTimeList[index].slice(6,8)"/></div>
+							</div>
+							<div class="orderBtn" @click.stop="setOrderId(item.order_id)">去支付</div>
+						</div>
+					</div>
+				</swiper-item>
+			</swiper> -->
+		</view>
+
+		<view class="cygj">
+			<view class="cyItem" style="font-weight: bold;font-size: 31rpx;color: #333333;">
+				常用工具
+			</view>
+			<view class="cyItem flex-between" v-for="(item,index) in cyList" :key="index"
+				@click="gotoUrl(item,index)" v-if="item.isShow">
+				<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>
+			<!-- <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>
+		
+		<!-- 旅游咨询弹框 -->
+		<uni-popup ref="popup" type="center">
+			<view class="consult-popup">
+				客服电话： 
+				<view class="consult-subtitle">服务时间：周一至周五<br>9:00-12:00，13:00-18:00</view>
+				<view class="consult-btns">
+					<view @click="$refs.popup.close()">取消</view>
+					<view @click="clickPhone('0515-69186109')">确定</view>
+					<!-- <view>
+						<button class="confirm" open-type="contact">确定</button>
+					</view> -->
+				</view>
+			</view>
+		</uni-popup>
+	</view>
 </template>
 
 <script>
+	// import moment from "moment";
+	export default {
+		data() {
+			return {
+				dfkList: [],
+				differTimeList: [],
+				nowDateTime: '', //当前时间秒数
+				userInfo: {},
+				orderList: [{
+						src: 'https://static.ticket.sz-trip.com/cgc/images/user/dfk.png',
+						title: '待付款',
+						status: 'WAIT_PAYMENT'
+					},
+					{
+						src: 'https://static.ticket.sz-trip.com/cgc/images/user/dfh.png',
+						title: '待使用/发货',
+						status: 'PAYMENT_SUCCESSFULLY'
+					},
+					{
+						src: 'https://static.ticket.sz-trip.com/cgc/images/user/dsh.png',
+						title: '待收货',
+						status: 'POST'
+					},
+					// {
+					// 	src: 'https://changshu.js-dyyj.com/uploads/20250326/3f13d3a10dd0f88e764e3ddf1157c108.png',
+					// 	title: '待评价',
+					// 	status: 'WAIT_COMMENT'
+					// },
+					{
+						src: 'https://static.ticket.sz-trip.com/cgc/images/user/tk.png',
+						title: '退款/售后',
+						status: 'WAIT_REFUND,REFUND_SUCCESS,REFUND_REFUSAL,REFUND_ERROR,REFUND_PART'
+					},
+				],
+				cyList: [
+					{
+						src: 'https://static.ticket.sz-trip.com/cgc/images/user/gwc.png',
+						title: '购物车',
+						path: '',
+						isShow: true
+					},
+					{
+						src: 'https://static.ticket.sz-trip.com/cgc/images/user/kfdh.png',
+						title: '客服电话',
+						path: '',
+						isShow: true
+					},
+					{
+						src: 'https://static.ticket.sz-trip.com/cgc/images/user/shdz.png',
+						title: '收货地址',
+						path: '',
+						isShow: true
+					},
+					{
+						src: 'https://static.ticket.sz-trip.com/cgc/images/user/ysgl.png',
+						title: '隐私管理',
+						path: '/subPackages/user/privacy',
+						isShow: true
+					},
+					// {
+					// 	src: 'https://changshu.js-dyyj.com/uploads/20250326/3e977f62b6cbfeec5a17d945b96b8c8c.png',
+					// 	title: '投诉建议',
+					// 	path: '/subPackages/service/service',
+					// 	isShow: true
+					// },
+				],
+			}
+		},
+		onShow() {
+			this.userInfo = (uni.getStorageSync('userInfo') && JSON.parse(uni.getStorageSync('userInfo'))) || this.$store.state.user.userInfo || {}
+			console.log(this.userInfo)
+			// this.dfkList = []
+			// this.nowDateTime = parseInt(new Date().getTime() / 1000)
+			// this.Post({}, "/api/user/userInfo").then((res) => {
+			// 	if (res.data) {
+			// 		this.userInfo = res.data;
+			// 		// this.getDfk()
+
+			// 		// 是否展示商户核销
+			// 		this.Post({},'/api/merchants/is_merchant').then(res => {
+			// 			this.cyList[6].isShow = res.data
+			// 		})
+			// 	}
+			// });
+		},
+		methods: {
+			// 个人信息或登录
+			gotoProfile() {
+				// 有token去个人信息，没有去登录
+				if(this.userInfo.token) {
+					uni.navigateTo({
+						url: '/subPackages/user/profile'
+					})
+				}else {
+					uni.navigateTo({
+						url: '/pages/login/login'
+					})
+				}
+			},
+			timeup(index) {
+				// return this.dfkList.splice(index,1)
+			},
+			setOrderId(id) {
+				let that = this;
+				that.orderId = id;
+				that.Post({
+						order_id: id,
+						type: "miniprogram",
+						platform: 'miniprogram'
+					},
+					'/api/pay/unify'
+				).then(res => {
+					if (res.data) {
+						uni.requestPayment({
+							nonceStr: res.data.nonceStr,
+							package: res.data.package,
+							paySign: res.data.paySign,
+							signType: res.data.signType,
+							timeStamp: res.data.timeStamp
+						});
+					}
+				});
+			},
+			// 待付款
+			getDfk() {
+				this.differTimeList = []
+				let params = {
+					offset: this.dfkList.length,
+					limit: 10,
+					status: 'WAIT_PAYMENT',
+				}
+				this.Post(params, '/api/order/orderList').then(res => {
+					this.isLoading = false
+					if (res) {
+						this.dfkList = [...this.dfkList, ...res.data]
+						this.dfkList.forEach(item => {
+							// 获取时间差,订单关闭时间-当前时间，若存在即展示倒计时differTimeList
+							let del;
+							if (moment(item.close_time).diff(moment()) > 0) {
+								del = moment.utc(moment(item.close_time).diff(moment())).format('HH:mm:ss')
+							} else {
+								del = '00:00:00'
+							}
+							this.differTimeList.push(del)
+						})
+						console.log(this.differTimeList);
+						console.log('this.differTimeList：' + this.differTimeList[0].slice(0, 2))
+					}
+				})
+			},
+			goToOrderDetail(item) {
+				uni.navigateTo({
+					url: '/subPackages/order/detail?id=' + item.order_id
+				});
+			},
+			getChild(list) {
+				let arr = []
+				for (let i = 0; i < list.length; i++) {
+					if (list[i].product_model == "ticket") {
+						console.log(list[i]);
+						arr.push(list[i])
+						break
+					}
+				}
+				console.log(arr);
+				if (arr.length > 0) {
+					return arr[0]
+				} else {
+					return list[0]
+				}
+
+			},
+			goCoupon() {
+				uni.navigateTo({
+					url: "/subPackages/user/coupon",
+				});
+			},
+			goKeFu() {
+				uni.navigateTo({
+					url: "/subPackages/publicservices/ServiceOnline",
+				});
+			},
+			// open(){
+			//   this.$refs.popup.open('center')
+			// },
+			gotoUrl(item, index) {
+				if (item.title == "客服电话") {
+					this.$refs.popup.open()
+					return;
+				}
+				uni.navigateTo({
+					url: item.path
+				})
+			},
+			qidai() {
+				uni.showToast({
+					title: '功能建设中...',
+					icon: 'none'
+				})
+			},
+			goTrades(item) {
+				if (item) {
+					uni.navigateTo({
+						url: "/subPackages/order/trades?type=" + item.title,
+					});
+				} else {
+					uni.navigateTo({
+						url: "/subPackages/order/trades",
+					});
+				}
+			},
+			//判断是否关注公众号
+			isGz(item) {
+				this.$refs.pop.openPop(
+					'https://yjks.oss-cn-shanghai.aliyuncs.com/uploads/20230517/db9eb60e0abfea8be1075b406fefe551.jpg');
+				// this.Post({}, '/api/wechat/getSubcribeInfo').then(res => {
+				// 	if (res.data) {
+				// uni.navigateTo({
+				// 	url:'/subPackages/webPage/webPage?url='+'https://mp.weixin.qq.com/mp/profile_ext?action=home&__biz=MzU2NjQwNTYxNg==#wechat_redirect'
+				// })
+				// 	} else {
+				// console.log(this.$refs.pop);
+				// 	}
+				// });
+			},
+		}
+	}
 </script>
 
-<style>
+<style scoped lang="scss">
+	view{
+		box-sizing: border-box;
+	}
+	
+	::v-deep .uni-countdown {
+		font-size: 20px !important;
+
+		::v-deep .uni-countdown__splitor {
+			font-size: 20px !important;
+		}
+	}
+
+	.bg {
+		min-height: 100vh;
+		overflow-x: hidden;
+		background: url('https://static.ticket.sz-trip.com/cgc/images/user/bg.png') no-repeat;
+		background-size: 100% auto;
+		background-color: #F7F7F7;
+		padding-bottom: 100rpx;
+	}
+
+	.title {
+		font-weight: bold;
+		font-size: 36rpx;
+		color: #333333;
+		position: absolute;
+		top: 110rpx;
+		left: 50%;
+		transform: translate(-50%, 0);
+	}
+
+	.topBox {
+		width: 750rpx;
+		height: 373rpx;
+		padding: 100rpx 0 0 26rpx;
+		box-sizing: border-box;
+		display: flex;
+		margin-top: 90rpx;
+
+		.avatar-box {
+			width: 120rpx;
+			height: 120rpx;
+			background: #FFFFFF;
+			border-radius: 50%;
+			overflow: hidden;
+		}
+
+		.headImg {
+			width: 120rpx;
+			height: 120rpx;
+			border-radius: 50%;
+		}
+
+		.username {
+			margin: 40rpx 0 0 28rpx;
+			font-weight: 500;
+			font-size: 40rpx;
+			color: #000000;
+		}
+		
+		.personalCenter {
+			width: 165rpx;
+			height: 59rpx;
+			background: rgba(24, 135, 145, 1);
+			border-radius: 29rpx 0rpx 0rpx 29rpx;
+			margin: 40rpx 0 0 auto;
+			font-weight: bold;
+			font-size: 28rpx;
+			color: #FFFFFF;
+		}
+	}
+
+	.orderBox {
+		width: 697rpx;
+		background: #FFFFFF;
+		box-shadow: 0rpx 0rpx 23rpx 0rpx rgba(80, 80, 80, 0.12);
+		border-radius: 20rpx;
+		margin: -48rpx auto 0;
+		padding-bottom: 30.6rpx;
+
+		.moreBox {
+			height: 84rpx;
+			margin: auto;
+			font-size: 31rpx;
+			font-family: PingFang SC;
+			font-weight: bold;
+			color: #000000;
+			padding-left: 26rpx;
+
+			span {
+				padding-right: 18rpx;
+				font-size: 27rpx;
+				font-family: PingFang SC;
+				font-weight: 500;
+				box-sizing: border-box;
+
+				img {
+					width: 12rpx;
+					height: 21rpx;
+					margin-left: 12rpx;
+				}
+			}
+		}
+
+		.orderItem {
+			font-size: 27rpx;
+			font-family: PingFang SC;
+			font-weight: 500;
+			color: #000000;
+			width: 25%;
+			text-align: center;
+
+			img {
+				width: 80rpx;
+				height: 80rpx;
+			}
+		}
+	}
+
+	.lxwm {
+		width: 696rpx;
+		height: 447rpx;
+		background: #FFFFFF;
+		box-shadow: 0px 4rpx 12rpx 0px rgba(150, 149, 149, 0.3);
+		border-radius: 20rpx;
+		margin: auto;
+		padding: 27rpx 19rpx 0 19rpx;
+		font-size: 31rpx;
+		font-family: PingFang SC;
+		font-weight: bold;
+		color: #000000;
+
+		.midBox {
+			padding: 26rpx 43rpx 21rpx 44rpx;
+			box-sizing: border-box;
+
+			img {
+				width: 265rpx;
+				height: 252rpx;
+				border-radius: 15rpx;
+			}
+		}
+
+		.botBox {
+			padding: 0 30rpx 0 51rpx;
+			font-size: 27rpx;
+			font-family: PingFang SC;
+			font-weight: bold;
+			color: #000000;
+		}
+	}
+
+	.cygj {
+		width: 697rpx;
+		background: #FFFFFF;
+		border-radius: 20rpx;
+		margin: 30rpx auto 0;
+		padding: 0 27rpx;
+		font-size: 28rpx;
+		font-family: PingFang SC;
+		font-weight: 500;
+		color: #000000;
+		box-sizing: border-box;
+
+		.cyItem {
+			height: 106rpx;
+			display: flex;
+			align-items: center;
+			border-bottom: 1rpx solid #D8D8D8;
+
+			.headIcon {
+				width: 42rpx;
+				height: 42rpx;
+				margin-right: 15rpx;
+			}
+
+			.rightIcon {
+				width: 20rpx;
+				height: 20rpx;
+			}
+		}
+
+		.cyItem:last-child {
+			border: none;
+		}
+	}
+
+	.my-swipe {
+		// width: 100%;
+		margin: 0 30rpx;
+		margin-top: 37.3rpx;
+	}
+
+	swiper {
+		height: 111rpx !important;
+	}
+
+	.dfkBox {
+		width: 100%;
+		height: 111rpx;
+		background: #F7F7F7;
+		margin: 0 auto 30.64rpx;
+		// padding: 0.25rem;
+		display: flex;
+	}
+
+	.dfkBox image {
+		width: 137rpx;
+		height: 111rpx;
+		border-radius: 13rpx;
+		flex-shrink: 0;
+		// margin-right: 16.7rpx;
+	}
+
+	.dfkBox .contentBox {
+		padding-left: 5rpx;
+		padding-right: 5rpx;
+		height: 111rpx;
+		width: 100%;
+		display: flex;
+		justify-content: space-around;
+		align-items: center;
+	}
+
+	// .van-count-down{
+	// 	font-size: 0.39rem;
+	// 	font-family: PingFang SC;
+	// 	font-weight: 400;
+	// 	color: #FB6E4D;
+	// }
+
+	.orderBtn {
+		width: 152rpx;
+		height: 56rpx;
+		background: linear-gradient(270deg, #FC5109, #FDC43A);
+		;
+		border-radius: 28rpx;
+		text-align: center;
+		line-height: 56rpx;
+		font-size: 27rpx;
+		font-family: PingFang SC;
+		font-weight: 400;
+		color: #FFFFFF;
+		// margin-left: 50rpx;
+		// margin-right: 20rpx;
+	}
+
+	#contact {
+		-webkit-tap-highlight-color: transparent;
+		background-color: rgba(0, 0, 0, 0);
+		border-radius: 0;
+		box-sizing: border-box;
+		color: transparent;
+		cursor: pointer;
+		overflow: hidden;
+		padding: 0 27rpx;
+		position: relative;
+		text-align: center;
+		text-decoration: none;
+		border: transparent 0px solid;
+		display: flex;
+		align-items: center;
+		font-size: 28rpx;
+		font-family: PingFang SC;
+		font-weight: 500;
+		color: #000000;
+	}
+
+	button::after {
+		border: none;
+		background-color: rgba(0, 0, 0, 0);
+	}
+
+	.more {
+		width: 100vw;
+		height: 100vh;
+		background-color: rgba(0, 0, 0, .5);
+		position: fixed;
+		top: 0;
+		left: 0;
+		display: flex;
+		flex-direction: column;
+		justify-content: space-around;
+		align-items: center;
+
+		image {
+			width: 646rpx;
+			height: 959rpx;
+		}
+
+		img {
+			width: 80rpx;
+			height: 80rpx;
+		}
+	}
+	
+	.consult-popup {
+		width: 487rpx;
+		height: 367rpx;
+		background: #F0F0F0;
+		border-radius: 20rpx;
+		padding: 65rpx 0 23rpx;
+		font-weight: bold;
+		font-size: 32rpx;
+		color: #000000;
+		text-align: center;
+		
+		.consult-subtitle {
+			font-weight: 500;
+			font-size: 27rpx;
+			color: #333333;
+			margin-top: 43rpx;
+		}
+		
+		.consult-btns {
+			display: flex;
+			margin-top: 75rpx;
+			
+			view {
+				width: 50%;
+				font-weight: bold;
+				font-size: 32rpx;
+				color: #00AEA0;
+				line-height: 54rpx;
+			}
+			view:first-child {
+				border-right: 1rpx solid #D8D8D8;
+				color: #000000;
+			}
+		}
+	}
+
+	.confirm{
+		height: 58rpx;
+		line-height: 58rpx;
+		background: none;
+		font-weight: bold;
+		font-size: 32rpx;
+		color: #00AEA0;
+	}
 </style>
\ No newline at end of file
diff --git a/static/images/home.png b/static/images/home.png
index 9d134267c61d8700fe2ed3b2ee94b866143a5df0..adfa5beb1d19f737c876f37ad92a6980803ce3cd 100644
GIT binary patch
literal 6886
zcma)BWn5F={~tLdH$p;k(m5DPD&c6Pkx&K_qq|c=V4#%bXpoQ=5R@Ju>FAP1a)6Y8
zNQl3EpZ_2H@9TB%d2r5y^Evl(-*w~kbkwNGS;zqZ0F{P1+yFnm{qH6t#XoB?N{{ga
zfwzI0GN5*pbr%3&Db#=~83iB?Ebe$%%mm*4^IqkB{>~NKDXVG~<zl9*+aQ94WR!rE
zhX^%NK@CkKk|W#)+#`}xelfe+IlPXOE-*=rR7J9{addZWY#Pl$i^>@V+$AV$o4a&2
ztWi{h4JDtKPA|gt0`u+f@2*^w@O5mhFeeP09zMFr{TFhv`tKj~lCi0&i6kZ_CL4vL
z1;@n?qOq*t6fWcn4`i|T$8oc*L?Dzssaz0k`(o&gWh3(G$no(pZRxZo#9S5rCJyHV
zspKjKfO+C@RFDNV_!!K)3w8E&<77uL-HqW6lSf)gN=mf({+9W^a~w_;A{&e9Nd>$#
zg|}t}62TOhC`m1MaX6+5$u%QxtKtb<pk~EB3Ks>Z=P5Rakhi#Wg1~@ZYT$V#xIZN|
zwcBE&J<S(TSQV;j9YFV{udu2;2Zb@qMz@%MT?~W4hW@RFgrgQzHjAvF-@}%D=MK6K
zniqX|ILizG@2%@i;m#fE0=`19E?syAZA$tMFOj4pWT7bSN+4}r6Re*OU_#(4JRck!
zWWe5NcrZX@dsQq?;@^vdRp9$<6Tbmq-;6c}<Js`IK5HegOcHvL)$JGoY0X95Wtor=
z;BQ}vQi9tuf**-O_M2w&IyySs165vBESofkJG#2oXqFo6$hDGUys8?};}-PbKr@&$
z@GEsSuSvZf=9~qlpbB@Ui-QkLmTCd#YM$F?vT!bK??(r?+0ZW^#WYqUky+pV$mO6Q
z?0imgW9KOKp7{`*%;{U*{sYhO4Jhm)elW&Ju&KGO?x=9_N$Kz4c>?6ta5{y`ChcN#
zT`a%#Hjk=H09eUg{B#P^fJW2MO?ZJLRE%}uN@6+Ruxjv4X2^m%{5ifG@|T;O=fGlP
z89k5eh?qRm_4tia)wyf+G?yWeOz~3z_NPdXST0jJ%?e9tMdzcvJ=uUEp3K}-ZC(Wt
zh!hC?^`1Ni<m|@S0|df1{jrqMUtXQ8_qk_8p#&)~81LXe$3MIyyVnL(Hf519{OBW3
z@A}JFl}!`#eITd7-rgRyjW>aE&AC8^orNf*fV0>bOG&*=%5+0L-cB|39DWE+5qb3J
z(RGKsDfS{w-U>v+!p3INjh&NWH#Jpe+_I8*q8kx?%7l5R&D#bfC5_Qp`sg4TL=Lm;
z!@fE+eUi!bcC9boKr>}FC>hnvLa`UOva+)Ch8g7MEo6pS3OOB_eIwTS1rQWNM}L!S
zvk;bsI({YQ9BJaG2M6gbC2RA(s%Tn~f<ggO|Gt=nhKBOf#wiwD0>B*u!~&0YA9(yy
zS^`gmX4utmu(Ri%S-9mq%;^f|I&>Lz@A0oQtzQ@Z)==v+NdrhTCKax|ivB@aC-)=5
z6?>zFTzM!j9}*z((UzCMEkm6f(_KrThz>-noxJ8sq@AG9d(9?xx)310GK9^yeJ<{*
zs6ohk_l*c&v5?B9ITF!}ZF0Mp$)o%mHE5V&=SoRTc)-TS_Ay4@(%0Ab$K~mc<ywF*
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

literal 1245
zcmV<31S0#1P)<h;3K|Lk000e1NJLTq000>P000>X1^@s6#OZ}&00001b5ch_0Itp)
z=>Px(mq|oHR7gwBmRoF8RTPH*wf32r!we~fUZ#V9FSb4yFVQHXCbfwP7$e3jH;pAB
zGtr?{nvj^7n1jAqQn1Mg6Jth=F{KJ(6OjjsDZxv;APEo1lQuX^Z$QXQhdOiiUS?0G
z1ZuH`C(p|{$zJ<>YpuQ3`Zr<z4`ni$5CFGSDwT4%+?3~eW<J|#K1QDBISmaB&5q-2
zBBDn{<c!w(qp7K>U%I-wF3<IkxggZj)8mH2;d_YaWf8dxKoP(~09gQ^ghHXA_V)Hm
zL?qXPT^AxEw0rmNMUhBkl`&=$fO-I5i^y>R%|!G(fG{)f7m;srx!maW(l;x_^E_^7
zXlPVQJw`;&iiq{{K)GB#8Vm-<?azJRU+Fl`IuTh;L`RfT2ej71iA172GopV%Z2s%&
z>XrwC!6%7mwJ~M_z!!x=;fF$@aG~lgrBbPgQtD0s&jGOS6C$$Db=}jOH*cQ08gvcB
z^Sod*8f{@_>-{PsI-``@Un~|+c64;)XXZVV$=FJ3HpZ+aqDP2mSVTV4TAxTJlal}{
z=X3><PN%~nayNhtHs=6-BBHMV{GLc8Yz57Fu<3L<0APiPtOl?KK!KV2nECjYEn6<y
zeHBP=Z*M3V47ODPi$&zyU@&-Sa&q#|&d$!i=PFT~;%GD)W#(29d5VZ!t@S};%)r*I
zThCV@sZ{DVrPNOQEg}b*`DjZ^%el6;Hh(U_^tvsU`uh6Cj^nHpkr#;QRwCLNkH-&@
zE!A{7{WuZ5M?~)u(Lgqv9iMME&v1hJ`}-pk6B7?ArMg9AU}R)u2U!ndvDkVMd54)_
z5|N*0E5rFlWbO9s*>j6M7ZLew$&w}8Dv+g1mu?V|9mbfAqoboIJkOhVnr4G%GMT1w
zx!k9<K2=v&_xk?_Vxw(sZRMe%A)fX;7K=$Pm(#PI-Hk><-QC^cnwpyB#+W8%4myql
z-}h}5YOVEo+kj(ZW0$Um-4Mjqe^XP_9RSu<8x&V{JsV@ji0I3FKL7pp?b~gKSDqV!
zq*AGcN~tH9d83Hr0Gu(#l$qH^vI2m0;F#9><76^9a#N69yLQ!v!(lrB*D&*d@B4!y
zQZ&Y}<2d(<NINtC;ro6%nM|JjPsp-m%hqeH-)80)jWNGY_emy`sV$ewRyXX(-)D?D
zoJb_BXxRpS0Kh8%{+bC%r_-^j{mDw7R6BkxfF2Qf&2`-))1&%kAhr@48ylOIQlE;*
z;Nalkn|5|tuWlESJ^<etV|w%X{JGlNS`A<kfM@LB1JE}!5)pZoh(?I$LlLnNF*Dme
zPcw4|GryJ1W<ReC$ex~_1(8T(8vuL2r-|rCX1-vIaRJ;9ASNOo5YaX15|J(d_6Bpz
z7;{l66}AE<A`b&NMMRy6L}KEKp4ilsN+o+6*<g&Zl4^Crt}6hiMPz5OSUgg_ozULB
zd+!sGH<<aMs-4vvEh6Uu944ao<MH@eTk_W^V}F0Y8Xq5D;JR*&@B2=<T&}DK0)Y~M
zOYwO8@^qhA4GIJTi<sG+whM(q+Hsu1@bGZK^E{jGiqQQ7KjHI5(5N-A00000NkvXX
Hu0mjfB;rn2

diff --git a/static/images/mine.png b/static/images/mine.png
index 67970d8666deb06be12bd3a0ba4129e237cc77fc..386baa3fcda5ca6d97c3532897b2bf5f257432e5 100644
GIT binary patch
literal 6168
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

literal 1282
zcmV+d1^xPoP)<h;3K|Lk000e1NJLTq000>P000>X1^@s6#OZ}&00001b5ch_0Itp)
z=>Px(yh%hsR7gvWmThd4RTRh1xzF>oV{21Z+P#rx5JSMlX#8N10HX2%5>bQ6784B`
zY1S4<69~~5qj_SY7>td<zO3umG?*9%ej$d)hZ6awQxJojL?#g_u%fFSb1Uo9dycsc
zBV)E}`}N%C{O<p}{BIHJ_%So~_xI}n&{!xG8XOLXmC0mg0ibA_Ce=!TOC2yxQ@Gvk
z6?VIQBLF;yh>tR}i<##T@i!tmb?45V(^FGZ8PhaN)pAvZba!`a+qP|6T`HAcLBuDS
z`7cB~M?^OPzy$!02qD%0z$IPR2WDnw&WFR{xk{jF5KJTz9YTm#nfY-<{8k8Ys!%9g
zx7+Qdd_J!^9FFCPxLF9X6995V6!UmIqdh%6axthPBoc`%b2uDZiRd+EKF7>ocs!n~
z3lpePwzs#trIg!+5HA40SzXtU`ThP}U64c~(V}TukeSyqb8=#0;ycqci;F*2AfL~-
zMoQVs%+1VvC>RWm0{|~PTT#itz(6Mvy~)f4W{wAg!OPW}noK4=0PrF+Z<SKM@AZ1m
zFD_X{NGg?DO+;@4K$eJ-p-||LYLIw5-h8)Q&r2yk@Or)9*993I9Q0Y1^@iFH0Eh(w
zfnO2vz7otsW3gD9uIn!Wzy?jz-pgb%KQG>$ib|r<=nBIy)MTwEqR*N6%-+3w|6Qym
znM@i|%7-;g+YJDch&~F1LRahR$&n*R?7FV2@$3bF>i{q;rM$Rj&z_liMe0mLLqjJs
zKMMexnE7i&JP`;4rfN=?nwXZB7MBoW10t#s?f`%hW<HCES9D#UDV0h#0BA?V^#Je`
z02s`COw+W}E|=@(l08v?&d$!3VzIax0G?2Z0Kg(5LPWLA{{X-&BHHebY?BZ|UEB@;
zO2Lnan7(o2#+8LObFU|=$$fo&UPOEb5uaw}+e9>?Y1;3~Mi6l=5vkiNfP&@_@v;!&
z8WF7kfX9ev6#$F@z=?D^edYM^<K^wY2T3NAjYPBq5xW84Pa-;Lv)L|YGMU?5U0ufH
z<fI!BRT&jTHF?_Ubmqp#$7h?Gn(Qu@Yn9p+X5NH|Kg`X|eHspj|5ig#hNv=ibaXsO
zMDHjCh&VVqJA2{4fdhqFHa;IWO;caFa-~m7*@K8%h$x=TX1`HoD?`+z*zNWZGpmJ)
zIGxTjyLRoGsTZ&i)Y{s*P6+WjGZzbm!omIf_vg!yNF?HJY;62Yl}XdILw>*idbQ=N
z1wMN8sFR3x5>eQ)tloY5_Wh(F7>!1|48!;m06r|0N?%o4yjscU<HN(lT0Wm&$IL@g
z%KlroZVjTEs#GeqotZyY)-Hq?2?PRGy-6#byK6NA%=}9_oqnqf>Few37DBws%r8$&
zOk7y%DXjyJu~@9tFpMZOUu$k|K3Imt<MEBUuBVv!u+3&u_Aos?JzdcdmxAPSIrRB_
zhGkg~A>t=QbRwJ09xgY2XlQ78u~<w1fO<zx3L!2DA^!JB)lwm))RYY&;tnB1ix6VB
z-|rv2w<m3FZ4U?`l)Z0ZW(OiJ`A?<_P^nj!8%4y3@;lYvg^AEKO~dQ;x@|VwGRwLz
sR!c-VZWxAwST2`qa%^mDZvI{Q4-`3VK@i3r$^ZZW07*qoM6N<$f;{3%wg3PC

diff --git a/static/images/selectHome.png b/static/images/selectHome.png
index 23594133df081889b7bc0626b56448ab8d6ba38e..5800170744f21aef93cecdbaa52cc34b42cf9bf4 100644
GIT binary patch
literal 5473
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
Xk{`!7cdfhz00000NkvXXu0mjf=1X{G

literal 1237
zcmV;`1S<Q9P)<h;3K|Lk000e1NJLTq000>P000>X1^@s6#OZ}&00001b5ch_0Itp)
z=>Px(k4Z#9R7gvWmRoF8RTPH5z0b_Fr5$dz#3}(Bh=dSKBqi7gXvGAhF_9P42MLA;
zk`fai6pTV_z^D~9F~%AbuOuee2YgY3@?b)sC<=m5fgrJ55-u&Jm9}#^XRl?>oSErN
zI~8U!4|Dc8``iD&{=N1w-0r7cEzLvIFjZ3->A%Tevj=H6ayyTk+qsEPevi}Gbgvcj
ztg0?GYJQV!b~i(p&akoBzttT74^cIIM-6&oi51y^vRa+iqk3JHy}00W>NvuajVUlX
z8EkS$2>5<zy61F-r~15w6~2=hB4Sk#R0mN#Kp<a`ar@aY`v#^ms4}Fh%fowOR@{s{
zRu{MH?yj~=YCV#@!_Hhw2^v;HRdG6u>QS8TLfl@Gzg%VQS~p(NL`dlWtod_lJh!GH
zVV_w#-7Z|!5U=?+BWCx73?~MCTsVzr1QJc*^bD%I$*_mm)$`-)R1Wz;tKylyg>|vm
z(@nMZsg?Dyrsip0)%CQn_i~m){aJ=Gc_ksF_>(L`FKWIe>%L(?Pto3#E+`s<bX}{f
zPQ>n?S#6(NoMiQ*^@+y2s!hCSFks)6ET@M8hJ8U@s35PT45U6zFQe?k*<Hk|kFsgj
za0rSZKVGS2#A}@rv+Ez68DGApF;*W3??9i=!9JghBaTcUB`Yt1XsIGxm^>T@Q2mms
z)X!{MG;9b{wCCzFW8$yZSZ!&ok0%!=tvxajaO{T9Kw5CQ)t60H0?c18jvGPbCc>|%
zzn#qsx()4W?S1_(s+!k4bVhyLm@1UMl#mK4`CkB5v<wQ#69!S<Bt7qaLm1cCs<#lg
z3CEQ36;JAaUP&&><5U%r$0$xaIezSw2x3}0aIOtCHIqLyezNfYq_qj*Da3a2=O0@l
zh=!0Lf<*bRT;xKUisR!fE4`kBm`+X}&qJiOgTNny+-kC7bSv0Zh<6B4+euFWl6|NH
z3EGfKcI9oE;C+c*rDFw%(-g*Za_U50NqR*GB5ep2?8+5Cjng5N6cX+iz-d^&X^2$k
z6E!{zDX^WKDL_U;h#P~H?qtpN+}?1@BJwvb{AvtgKH^rR%th2jbu6`y6wt}pp1hKq
z%Oi+tO<7_hSODfQD(~T^yNONB5(Eh{ndPW?3A7neZvv!HlXC^gV9VPmZHP=MLdJX!
z5Yvt74o1@ZX<wA3y(fXOtzfsJ(lQYe_9`94@iD!pw&Zp^cV2uIHJcHaj5=#s{sYu>
z1LY90tyr@ar!62}+2W!zav0H_)GmG_>RlgQcm(uQMCYJt$5|Gjbfb0$nGz+UkrGD>
zs8`%yxpajmr(8t6jl8?)r>F~m)|X^tbQ>b;5V-@zE4Fi|0iuTxcHsOmy8`<#D%((f
z04cd24Ue?zC|~1cx6{!)ls`|@u=894hV{T&MCT$V9u-p@%3++ogSvyongnho&b|z$
z8Ik;=@IlU_(nXN@iVv1u3tuowPe#KFXA?BWnuxi3P^$5rK~bC=fW&E-*PnaW3hS6X
z*?`jpC^Hdbu&Su0Nts^ErGNPF@oZTA(5U|aK!3nmxdw(v00000NkvXXu0mjfwR}LG

diff --git a/static/images/selectMine.png b/static/images/selectMine.png
index 16e1d3435c70208397cf9c4a735307b2c922a74a..69b7f194e2e53e7f8e2bbac3f93f6f1b873e839c 100644
GIT binary patch
literal 10344
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
GLSTa6j`uSF

literal 1149
zcmV-@1cLjCP)<h;3K|Lk000e1NJLTq000>P000>X1^@s6#OZ}&00001b5ch_0Itp)
z=>Px(H%UZ6R7gvWmTibsWfaGM&%LvwGwUv*GVV@gDw1fnr5Kb#VIh8ygaSAG7Fkpx
ziD6lNhzY_pA`79A3i3mgqf%7XH!%oI5z^A$C^z4BHMiB(b$8Z#pL625cW39$OS@ed
z=IwHR&;R_-`Og^s&s9{P)V0a@b_Rr#3F&8e!WmL6m+3Tiyb@;28(i_$-ke|Zm*KHW
zMHZ^iit05*j}ht@h<5;g+QqS8{|(uBv?<+o%RJ+y*G}~GA<*_xpy|M>Q9)HDK=cA?
zzCwZz7`Skfrxpi|4&4}1P>;p^Gn=vN=QR7PADotI&lvpuJpm{B147pzRS;|pVlUS0
z;ICX41tYbf#*pIQlhWzbs=2M+=124C`SV)5)OVKxK0AMdGXo*w%0!UpVNreowvkDF
zPG@f5e?oe1nws@qT%Jp<SvkFF>Y?6{uX~0$KPUuNoProo0rer?ZdA7L<jv>Cho~C%
z^~}9>Qs&LheENY|S(Dk-RpMx0fVJhqBam2$gOw2d7L(e@6YalZj3z<#?J5*JI-Z?B
zJ7eB?IN!81W0>&inG%0o4a@BTSE3AvpKl->A_zCoH|wWbU+N)|l1p=@rM)-qXz`aD
z(dJ{9L;6ZKQ8)pK2VfA@1CZLpGx^`gSK@RQyV}w;Z<uI!3}yOYASR5wD4SgcQLJ79
ze;0w>&c>NN<9p)n__908fWHE(n^9eeXu7IB@#)LZ0OdGpwlRF=8=k-O`uGsHBe(TT
zA>=;PtV8u)RI@c6i~u6g5W-<Z-=!&YkiNEm#`dIG^s!6xSaUyORwB9tt9evYiE*uM
zTZq*Qz#**eC%AEt<0sCsr*kyZD#p91nzgnazv&S|Sq-`Xr4=iFqBS-9G1@X0G*_|w
zjL2RBZx4LjO`#BNe+5$1Nep#&qUPxcAUY9I6St{uWGn3&T}U?=ri92zM0cY7yD8jr
zwE}TI%<fr)@;ahR5zSP4P!%KfQ&!o0w?jjyevj(QFz<--CstC_4A;9~K+SqordAY;
z=2NwrWYOA)Q54b32=9>^+(KdTU<}#SJp(JBAbK}KQ~kI$XxS(znPa1h-B|yCwQJbg
zamwH}{KIoAQ2husxyC9+AXN%nX4P$e`6ob8>BY)Awsq_?I6v}dpF_<nh_p0F*yK(m
zlXonLyYD(`-XeQ@A%?V_eGSzONO|dMPgoNt$yT}7$pnbrM{OI5rtI`@n_@`r^y7%x
ziprF@T@6OIwonxDWj_+W#GfgcD+sUBvS3GS{M&!dz<BSY(fDQ&oLALxUf2IxPex34
z)8$mCIfAg3?Hyg^5%%dmwFu!Q)I|wdL`Fb0r>#;@qs9SX5Rt=JyOkvikGOv^m5pCr
z^jWej$8i5$;I&`_FH-3eNJe6)oJQ{1MSt>&zB7WD0aD&Ex_-P^&aZy~8I)a13~2d7
P00000NkvXXu0mjfZnQ7S

diff --git a/static/js/CommonFunction.js b/static/js/CommonFunction.js
index cde3d8a..08b5ffa 100644
--- a/static/js/CommonFunction.js
+++ b/static/js/CommonFunction.js
@@ -90,7 +90,7 @@ Vue.prototype.showImg = img => {
 	if (img.indexOf('https://') != -1 || img.indexOf('http://') != -1) {
 		return img;
 	} else {
-		return this.NEWAPIURL + img;
+		return Vue.prototype.NEWAPIURL + img;
 	}
 }
 
diff --git a/static/js/request.js b/static/js/request.js
index 5513e1d..3c2234e 100644
--- a/static/js/request.js
+++ b/static/js/request.js
@@ -2,8 +2,8 @@ import Vue from 'vue';
 import store from '@/store';
 
 // 定义 API URL
-const DEV_API_URL = 'https://api.cloud.sz-trip.com';
-const PROD_API_URL = 'https://api.cloud.sz-trip.com';
+const DEV_API_URL = 'https://tlgz.sz-trip.com';
+const PROD_API_URL = 'https://tlgz.sz-trip.com';
 const NEWAPIURL = process.env.NODE_ENV === 'development' ? DEV_API_URL : PROD_API_URL;
 
 // 获取token
@@ -39,7 +39,7 @@ Vue.prototype.NEWAPIURL = '/api';
 // #endif
 
 Vue.prototype.Post = (params = {}, apiurl) => {
-    const token = getToken();
+    const token = getToken() || '92f610cd-381e-4135-ac27-fc5671af8495';
     if (token) {
         params.token = token;
     }
diff --git a/subPackages/order/trades.vue b/subPackages/order/trades.vue
new file mode 100644
index 0000000..81f31e4
--- /dev/null
+++ b/subPackages/order/trades.vue
@@ -0,0 +1,680 @@
+<template>
+	<view class="bg">
+		<view class="top-bg">
+			<view class="search-box">
+				<view class="left">
+					<image src="https://static.ticket.sz-trip.com/yandu/images/eventCalendar/search.png"
+						mode="aspectFill"></image>
+					<input v-model="keywords" type="text" placeholder="请输入关键字" @confirm="search()" />
+				</view>
+
+				<!-- <view class="btn" @click="search()">搜索</view> -->
+			</view>
+			<view class="common-box">
+				<view class="common-types com-flex-tao">
+					<view @click="setType(index)" v-for="(item, index) in typeList" :key="item.id"
+						:class="['common-type', typeIndex == index ? 'active' : '']">
+						{{ item.name }}
+					</view>
+				</view>
+			</view>
+		</view>
+		<view class="list-common-empty" v-if="list.length == 0">
+			<img :src="showImg('/uploads/20221201/8f97261b8eddffcc55342eca0ed0249c.png')" />
+			<p class="list-common-empty-tip">暂无订单~</p>
+		</view>
+		<view class="trade-list" v-if="list.length > 0">
+			<view v-for="(item, key) in list" :key="item.id" class="trade-items" v-if="showItem(item)"
+				@click="() => choseType(item)">
+				<view class="trade-item-head">
+					<view class="trade-item-head-tid">订单号:{{ item.order_id }}</view>
+					<view class="trade-item-head-state">{{ item.status_text }}</view>
+				</view>
+				<view class="trade-item-pros">
+					<view class="trade-item-pro" v-for="(pro, proIndex) in item.order_child" :key="pro.child_id">
+						<view class="trade-item-pro-img" v-if="pro.specifications_image">
+							<image :src="showImg(pro.specifications_image)" mode="aspectFill"></image>
+						</view>
+						<view style="flex: 1;">
+							<view class="trade-item-pro-title">{{ pro.goods_title }}</view>
+							<view class="trade-item-pro-subtitle">{{ pro.specifications_name }}</view>
+						</view>
+						<view class="trade-item-pro-price">
+							<view class="trade-item-pro-price-pri">￥{{ pro.pay_money / 100 }}</view>
+							<view class="trade-item-pro-num">x{{ pro.num }}</view>
+						</view>
+					</view>
+				</view>
+				<view class="trade-item-info">
+					合计
+					<text>￥{{ item.pay_money / 100 }}</text>
+				</view>
+				<view class="trade-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="confirmpost(item.order_id, key)" v-if="item.postFlag">确认收货</view>
+					<view class="pay-btn" @click.stop="setOrderId(item.order_id)" v-if="item.status == 'WAIT_PAYMENT'">
+						立即支付</view>
+				</view>
+			</view>
+		</view>
+		<!-- <view v-if="list.length === 0 && finished" class="noDate">
+			<view>暂无订单</view>
+		</view> -->
+	</view>
+</template>
+
+<script>
+	export default {
+		name: 'Trades',
+		data() {
+			return {
+				finished: false,
+				list: [],
+				typeList: [{
+						id: 'ALL',
+						name: '全部'
+					},
+					{
+						id: 'WAIT_PAYMENT',
+						name: '待付款'
+					},
+					{
+						id: 'PAYMENT_SUCCESSFULLY',
+						name: '待使用'
+					},
+					{
+						id: 'PAYMENT_SUCCESSFULLY',
+						name: '待发货'
+					},
+					{
+						id: 'POST',
+						name: '待收货'
+					},
+					// {
+					// 	id: 'WAIT_COMMENT',
+					// 	name: '待评价'
+					// },
+					{
+						id: 'WAIT_REFUND,REFUND_SUCCESS,REFUND_REFUSAL,REFUND_ERROR,REFUND_PART',
+						name: '退款/售后'
+					}
+				],
+				typeIndex: 0,
+				ajaxFlag: true,
+				keywords: '',
+				orderId: null,
+				dateRange: [],
+				type: ''
+			};
+		},
+		onLoad(options) {
+			console.log(options);
+			if (options.type) this.typeIndex = this.typeList.findIndex(vm => vm.name === options.type);
+			uni.$on("updateDataByConnect", this.getDataByConnect)
+		},
+		onShow() {
+			this.getList();
+		},
+		onUnload() {
+			uni.$off("updateDataByConnect", this.getDataByConnect)
+		},
+		onReachBottom() {
+			if (this.finished) return false;
+			this.getList();
+		},
+		methods: {
+			getDataByConnect(data) {
+				if (data.msgType == "updateOrderTrades") {
+					this.list = [];
+					this.finished = false;
+					this.getList()
+				}
+			},
+			emptyFunc() {
+
+			},
+			showItem(item) {
+				let flag = true;
+				// if (this.typeIndex == 2 && item.order_child[0] && !item.order_child[0].consignee) flag = false
+				return flag;
+			},
+			onReload() {
+				this.list = [];
+				this.finished = false;
+				this.getList();
+			},
+			setType(index) {
+				this.typeIndex = index;
+				this.onReload();
+			},
+			setOrderId(id) {
+				let that = this;
+				that.orderId = id;
+				that.Post({
+						order_id: id,
+						type: "miniprogram",
+						platform: 'miniprogram'
+					},
+					'/api/pay/unify'
+				).then(res => {
+					if (res.data) {
+						uni.requestPayment({
+							nonceStr: res.data.nonceStr,
+							package: res.data.package,
+							paySign: res.data.paySign,
+							signType: res.data.signType,
+							timeStamp: res.data.timeStamp,
+							success: () => {
+								const templateIds = [
+									// 退款成功通知
+									'hRZoiEES2BWtKb6Xgsnn8khLQH9un5j_11qu0bwlhfE',
+									// 出票结果通知
+									'YyTCUIYBnrj9CyKks8cOjNX_Rk8a4yVdswMP-zXVbhc'
+								]
+								uni.requestSubscribeMessage({
+									tmplIds: templateIds,
+									complete (res) {
+										that.list = [];
+										that.finished = false;
+										that.getList()
+									}
+								})
+							}
+						});
+					}
+				});
+			},
+			// 确认收货
+			confirmpost(id, index) {
+				let that = this;
+				uni.showModal({
+					title: '提示',
+					content: '是否确认收货？',
+					success: successRes => {
+						if (successRes.confirm) {
+							that.Post({
+									order_id: id
+								},
+								'/api/order/confirmPost'
+							).then(res => {
+								if (res.code == 1) {
+									list[index].order_child.map(item => {
+										item.status = 'WAIT_COMMENT';
+									});
+									list[index].status = 'WAIT_COMMENT';
+									list[index].postFlag = false;
+									that.list = list;
+									uni.showToast({
+										title: '操作成功'
+									});
+									that.$forceUpdate();
+								}
+							});
+						}
+					}
+				});
+			},
+			// 关闭订单
+			closeOrder(id, index) {
+				console.log(id);
+				console.log(index);
+				let that = this;
+				uni.showModal({
+					title: '提示',
+					content: '是否关闭订单？',
+					success: successRes => {
+						if (successRes.confirm) {
+							that.Post({
+									order_id: id
+								},
+								'/api/order/closeOrder'
+							).then(res => {
+								if (res.code == 1) {
+									uni.showToast({
+										title: '关闭成功',
+										icon: 'success'
+									});
+									that.list = [];
+									that.finished = false;
+									that.getList();
+								}
+							});
+						}
+					}
+				});
+			},
+			//删除订单
+			deletOrder(id) {
+				let that = this;
+				uni.showModal({
+					title: '提示',
+					content: '是否删除订单？',
+					success: successRes => {
+						if (successRes.confirm) {
+							that.Post({
+									order_id: id
+								},
+								'/api/order/delOrder'
+							).then(res => {
+								if (res.code == 1) {
+									uni.showToast({
+										title: '删除成功',
+										icon: 'success'
+									});
+									that.list = [];
+									that.finished = false;
+									that.getList();
+								}
+							});
+						}
+					}
+				});
+			},
+			// 申请退款
+			refund(id, index) {
+				console.log(id);
+				let that = this;
+				uni.showModal({
+					title: '提示',
+					content: '是否申请退款？',
+					success: successRes => {
+						if (successRes.confirm) {
+							that.Post({
+									order_id: id
+								},
+								'/api/order/applyRefund'
+							).then(res => {
+								if (res.code == 1) {
+									uni.showToast({
+										title: '申请成功',
+										icon: 'success'
+									});
+									that.onReload();
+								}
+							});
+						}
+					}
+				});
+			},
+			search(e) {
+				this.list = [];
+				this.getList();
+				// if (e.keyCode == 13) {
+				// 	//  提交
+				// 	this.keywords = e.target.value;
+				// }
+			},
+			getList() {
+				let data = {
+					status: this.typeList[this.typeIndex].id == 'ALL' ? '' : this.typeList[this.typeIndex].true_id ||
+						this.typeList[this.typeIndex].id,
+					offset: this.list.length,
+					limit: 5,
+					name: this.keywords,
+					type: this.typeList[this.typeIndex].name == '待使用' ? 1 : (this.typeList[this.typeIndex].name ==
+						'待发货' ? 2 : '')
+				};
+				this.Post(data, '/api/order/orderList').then(res => {
+					this.list = [...this.list, ...res.data]
+					if (res.data.length < 5) {
+						this.finished = true;
+					}
+				});
+			},
+			UpdateOrder(id) {
+				this.ajaxFlag = false;
+				let list = this.list;
+				this.Post({
+						order_id: id
+					},
+					'/api/order/orderDetail'
+				).then(res => {
+					this.ajaxFlag = true;
+					list.map(item => {
+						if (item.order_id == id) {
+							item = res.data;
+						}
+					});
+					this.list = list;
+				});
+			},
+			choseType(item) {
+				uni.navigateTo({
+					url: '/subPackages/order/detail?id=' + item.order_id
+				});
+			},
+		}
+	};
+</script>
+
+<style scoped lang="scss">
+	view {
+		box-sizing: border-box;
+	}
+
+	.common-box {
+		height: 90rpx;
+	}
+
+	.common-types {
+		background: white;
+		height: 90rpx;
+		font-size: 31rpx;
+		z-index: 10;
+		margin: auto;
+		color: #666;
+		overflow-x: scroll;
+		overflow-y: hidden;
+		padding: 0 27rpx;
+	}
+
+	.common-types::-webkit-scrollbar {
+		width: 0rpx;
+		height: 0;
+		display: none;
+	}
+
+	.common-type {
+		flex-shrink: 0;
+		margin: 0 26rpx;
+		line-height: 90rpx;
+		height: 90rpx;
+		position: relative;
+	}
+
+	.common-type.active {
+		font-size: 31rpx;
+		font-weight: bold;
+		color: #000;
+	}
+
+	.common-type.active:after {
+		display: block;
+		width: 60%;
+		font-size: 0;
+		content: '1';
+		margin: auto;
+		position: absolute;
+		left: 0;
+		right: 0;
+		bottom: 1rpx;
+		height: 4rpx;
+		background: #C3282E;
+		border-radius: 2rpx;
+	}
+
+	.bg {
+		min-height: 100vh;
+		background-color: #f7f7f7;
+	}
+
+	.noDate {
+		display: flex;
+		flex-direction: column;
+		justify-content: center;
+		align-items: center;
+		margin-top: 200rpx;
+	}
+
+	.noDate img {
+		width: 514rpx;
+		height: auto;
+	}
+
+	.noDate view {
+		font-size: 24rpx;
+		color: #777777;
+	}
+
+	.trade-list {
+		padding: 28rpx 26rpx;
+	}
+
+	.trade-items {
+		background-color: white;
+		margin-bottom: 28rpx;
+		border-radius: 20rpx;
+	}
+
+	.trade-item-head {
+		display: flex;
+		justify-content: space-between;
+		padding: 28rpx 20rpx;
+		border-bottom: 1rpx solid #d8d8d8;
+	}
+
+	.trade-item-head-tid {
+		font-size: 24rpx;
+		display: flex;
+		align-items: center;
+		color: #666666;
+	}
+
+	.trade-item-head-state {
+		font-size: 27rpx;
+		font-family: PingFang SC;
+		font-weight: bold;
+		color: #C3282E;
+	}
+
+	.trade-item-head-name {
+		display: flex;
+		align-items: center;
+
+		font-size: 31rpx;
+		font-family: PingFang SC;
+		font-weight: bold;
+		color: #333333;
+
+		image {
+			width: 33rpx;
+			height: 31rpx;
+		}
+
+		view {
+			margin-left: 13rpx;
+		}
+	}
+
+	.trade-item-pros {
+		display: flex;
+		/* background-color: #F2F2F2; */
+		flex-direction: column;
+	}
+
+	.trade-item-pro {
+		display: flex;
+		padding: 20rpx;
+		justify-content: space-between;
+	}
+
+	.trade-item-pro-img {
+		display: flex;
+		justify-content: center;
+		align-items: center;
+	}
+
+	.trade-item-pro-img image {
+		width: 180rpx;
+		height: 180rpx;
+		border-radius: 10rpx;
+	}
+
+	.trade-item-pro-price {
+		display: flex;
+		flex-direction: column;
+	}
+
+	.trade-item-pro-title {
+		text-align: left;
+		flex: 1;
+		padding: 0 20rpx;
+		font-size: 28rpx;
+	}
+
+	.trade-item-pro-subtitle {
+		text-align: left;
+		flex: 1;
+		padding: 0 20rpx;
+		font-weight: 500;
+		font-size: 24rpx;
+		color: #C3282E;
+		margin-top: 20rpx;
+	}
+
+	.trade-item-pro-price view {
+		display: flex;
+		flex-wrap: nowrap;
+		text-wrap: none;
+		white-space: nowrap;
+		justify-content: flex-end;
+	}
+
+	.trade-item-pro-price-pri {
+		font-size: 27rpx;
+		color: #C3282E;
+		font-weight: 500;
+		color: #333333;
+	}
+
+	.trade-item-pro-num {
+		font-size: 24rpx;
+		color: #666666;
+		margin-top: 24rpx;
+	}
+
+	.trade-item-info {
+		font-size: 28rpx;
+		display: flex;
+		justify-content: flex-end;
+		align-items: center;
+		background-color: white;
+		padding: 0rpx 20rpx;
+		margin-top: -6rpx;
+		/* border-bottom: 1px solid #B6B6B6; */
+	}
+
+	.trade-item-info text {
+		font-size: 36rpx;
+		font-weight: bold;
+		color: rgba(238, 0, 0, 1);
+	}
+
+	.trade-item-btns {
+		display: flex;
+		flex-direction: row;
+		justify-content: flex-end;
+		align-items: center;
+		padding: 20rpx;
+	}
+
+	.trade-item-btns view {
+		margin-left: 20rpx;
+		background: rgba(237, 237, 237, 0);
+		border: 1rpx solid #999999;
+		border-radius: 27rpx;
+		padding: 8rpx 16rpx;
+		font-size: 27rpx;
+		font-family: PingFang SC;
+		font-weight: 500;
+		color: #333333;
+	}
+
+	.trade-item-btns .pay-btn {
+		color: #FFFFFF;
+		background: #C3282E;
+		border: none;
+		padding: 10rpx 16rpx;
+	}
+
+	.comment-btn {
+		width: 100rpx;
+		text-align: center;
+		line-height: 40rpx;
+		border-radius: 20rpx;
+		border: 1px solid #999999;
+		color: #333333;
+		justify-content: center !important;
+		font-size: 24rpx;
+		margin-top: 16rpx;
+	}
+
+	.list-common-empty {
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		justify-content: center;
+		min-height: 50vh;
+	}
+
+	.list-common-empty img {
+		width: 483rpx;
+		height: 254rpx;
+	}
+
+	.list-common-empty-tip {
+		margin-top: 61rpx;
+
+		font-size: 29rpx;
+		font-family: PingFang SC;
+		font-weight: 500;
+		color: #8599b5;
+	}
+
+	.com-flex-tao {
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+	}
+
+	.search-box {
+		width: 697rpx;
+		height: 67rpx;
+		background: #f2f2f2;
+		border-radius: 33rpx;
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		padding: 0 8rpx 0 28rpx;
+		margin: 0 auto;
+		margin-bottom: 20rpx;
+
+		.left {
+			display: flex;
+			align-items: center;
+
+			image {
+				width: 28rpx;
+				height: 30rpx;
+			}
+
+			input {
+				margin-left: 20rpx;
+				font-size: 31rpx;
+				font-weight: 400;
+				color: #333;
+				width: 450rpx;
+			}
+		}
+
+		.btn {
+			width: 107rpx;
+			height: 53rpx;
+			background: #71B580;
+			border-radius: 27rpx;
+			font-size: 28rpx;
+			font-weight: 400;
+			color: #ffffff;
+			line-height: 53rpx;
+			text-align: center;
+		}
+	}
+
+	.top-bg {
+		background: #fff;
+		padding-top: 20rpx;
+	}
+</style>
\ No newline at end of file
diff --git a/subPackages/user/privacy.vue b/subPackages/user/privacy.vue
new file mode 100644
index 0000000..40eec99
--- /dev/null
+++ b/subPackages/user/privacy.vue
@@ -0,0 +1,58 @@
+<template>
+	<view class="bg">
+		<view class="list">
+			<view class="item" v-for="(item,index) in list" :key="item.id" @click="goInfo(item)">
+				{{item.name}}
+			</view>
+		</view>		
+	</view>
+</template>
+<script>
+	export default{
+		data(){
+			return {
+				list:[{name:'用户协议',id:'10001'},{name:'隐私协议',id:'9999'},{name:'个人信息收集清单',id:'10202	'}],
+			}
+		},
+		onShow() {
+			// this.Post({
+			// 	id: 9999
+			// },'/api/article/getArticleById').then(res => {
+			// 	this.content = res.data.content
+			// })
+		},
+			
+		methods:{
+			goInfo(item){
+				uni.navigateTo({
+					url:'/subPackages/user/privacyInfo?id='+item.id
+				})
+			}
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+	view{
+		box-sizing: border-box;
+	}
+	.list{
+		width: 698rpx;
+		background: #FFFFFF;
+		box-shadow: 0px 4rpx 12rpx 0px rgba(150,149,149,0.3);
+		border-radius: 18rpx;
+		margin: 0 auto;
+		margin-top: 20rpx;
+		padding:0 20rpx ;
+	}
+	.item{
+		width: 100%;
+		height: 93rpx;
+		border-bottom: 1rpx solid #EEEFF7;
+		font-size: 28rpx;
+		font-family: PingFang SC;
+		font-weight: 500;
+		color: #333333;
+		line-height: 93rpx;
+	}
+</style>
\ No newline at end of file
diff --git a/subPackages/user/privacyInfo.vue b/subPackages/user/privacyInfo.vue
new file mode 100644
index 0000000..84bcba7
--- /dev/null
+++ b/subPackages/user/privacyInfo.vue
@@ -0,0 +1,30 @@
+<template>
+	<view class="bg">
+		<view class="text" v-html="formateRichText(content)">
+			
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				content:''
+			};
+		},
+		onLoad(option){
+			this.Post({
+				id:option.id
+			},'/api/article/getArticleById').then(res => {
+				this.content = res.data.content
+			})
+		}
+	}
+</script>
+
+<style lang="scss">
+	.text{
+		padding: 20rpx;
+	}
+</style>