diff --git a/components/contactAdd.vue b/components/contactAdd.vue
new file mode 100644
index 0000000..f625468
--- /dev/null
+++ b/components/contactAdd.vue
@@ -0,0 +1,270 @@
+<template>
+	<view class="content">
+		<view class="list-forms">
+			<view class="list-item">
+				<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-title">证件类型</view>
+				<view class="list-item-input">
+					<picker mode="selector" :range="idcardTypeList" range-key="title" @change="changeIdType">
+						<input type="text" readonly style="font-size: 35rpx;position: relative;"
+								v-model="idcardTypeValue" disabled="true" placeholder="请选择"/>
+					</picker>
+				</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-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-switch" style="margin-left: auto;">
+					<switch :checked="idDefault" @change="switchChange" color="#96684F"/>
+				</view>
+			</view>
+		</view>
+
+		<!-- <view class="btn" @click="submit">保存</view> -->
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				username: '',
+				mobile: '',
+				idNumber: '',
+				idcardTypeValue: '身份证',
+				show: false,
+				idcardTypeList: [],
+				document_type: 'DAM01001',
+				id: '',
+				type: '',
+				idDefault: false,
+			}
+		},
+		methods: {
+			
+			init (data) {
+				
+				this.username = ''
+				this.mobile= ''
+				this.idNumber= ''
+				this.idcardTypeValue= '身份证'
+				this.show= false
+				this.idcardTypeList= []
+				this.document_type= 'DAM01001'
+				this.id= ''
+				this.type=''
+				this.idDefault= false
+				
+				this.type = 'add'
+				// this.getIdcardTypeList()
+				if (data && data.id) {
+					this.id = data.id
+					this.type = 'edit'
+					this.getDetail()
+				}
+			},
+			switchChange(e){
+				this.idDefault = e.detail.value
+			},
+			
+			getDetail() {
+				this.Post({
+					id: this.id
+				}, '/api/user/contactDetail').then(res => {
+					if (res.code === 1) {
+						res = res.data
+						if (res && res.id > 0) {
+							this.username = res.name
+							this.mobile = res.tel
+							this.idNumber = res.id_number
+							this.idDefault = res.is_default == 1 ? true : false
+							this.document_type = res.document_type
+							this.idcardTypeValue = res.document_type_text
+						}
+					}
+				})
+			},
+			//获取证件类型
+			getIdcardTypeList() {
+				this.Post({}, '/api/user/getIdcardTypeList').then(res => {
+					this.idcardTypeList = res.data
+				})
+			},
+			// 选择证件类型
+			changeIdType(e) {
+				this.idcardTypeValue = this.idcardTypeList[e.detail.value].title
+				this.document_type = this.idcardTypeList[e.detail.value].document_type
+			},
+			// 提交
+			async submit() {
+				this.username = this.username.trim()
+				this.mobile = this.mobile.trim()
+				this.idNumber = this.idNumber.trim()
+				if (this.username.length < 1) {
+					uni.showToast({
+						title: '请输入姓名',
+						icon: 'none'
+					})
+					return
+				}
+				if (!this.IsTel(this.mobile)) {
+					uni.showToast({
+						title: '请输入正确的手机号',
+						icon: 'none'
+					})
+					return
+				}
+				if (this.idcardTypeValue == '身份证') {
+					if (!this.idCardNumber(this.idNumber)) {
+						uni.showToast({
+							title: '请输入正确的身份证',
+							icon: 'none'
+						})
+						return
+					}
+				} else if (this.idcardTypeValue == '护照') {
+					if (!this.passportValid(this.idNumber)) {
+						uni.showToast({
+							title: '请输入正确的护照',
+							icon: 'none'
+						})
+						return
+					}
+				} else if (this.idcardTypeValue == '台胞证') {
+					if (!this.taiwanValid(this.idNumber)) {
+						uni.showToast({
+							title: '请输入正确的台胞证',
+							icon: 'none'
+						})
+						return
+					}
+				} else if (this.idcardTypeValue == '港澳通行证') {
+					if (!this.gangaoValid(this.idNumber)) {
+						uni.showToast({
+							title: '请输入正确的港澳通行证',
+							icon: 'none'
+						})
+						return
+					}
+				} else if (this.idcardTypeValue == '外国人永久居留证') {
+					if (!this.foreignerValid(this.idNumber)) {
+						uni.showToast({
+							title: '请输入正确的外国人永久居留证',
+							icon: 'none'
+						})
+						return
+					}
+				} else if (this.idcardTypeValue == '军官证') {
+					if (!this.officerValid(this.idNumber)) {
+						uni.showToast({
+							title: '请输入正确的军官证',
+							icon: 'none'
+						})
+						return
+					}
+				}
+				let res = await this.Post({
+					id: this.type == 'edit'?this.id:'',
+					id_number: this.idNumber,
+					name: this.username,
+					tel: this.mobile,
+					document_type: this.document_type,
+					is_default: this.idDefault ? '1' : '0',
+				}, this.type=='edit'?'/api/user/editContact':'/api/user/addContact')
+				if (res.code == 1) {
+					uni.showModal({
+						title: '提示',
+						content: '操作成功',
+						showCancel: false,
+					})
+				}else{
+					uni.showModal({
+						title: '提示',
+						content: res.msg,
+						showCancel: false,
+					})
+				}
+				return {...res,data: {id: this.id}}
+			}
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+	.content {
+		width: 100%;
+		height: 100%;
+		position: relative;
+	}
+
+	.list-forms {
+		padding: 0 24rpx;
+		background: #fff;
+		border-radius: 13rpx;
+
+		.list-item {
+			display: flex;
+			border-bottom: 1rpx solid #D8D8D8;
+			padding: 30rpx 0;
+			height: 60rpx;
+			box-sizing: content-box;
+			align-items: center;
+
+			.list-item-title {
+				font-size: 34rpx;
+				margin-right: 20rpx;
+				width: 200rpx;
+			}
+
+			.list-item-input {
+				flex: 1;
+
+				input {
+					width: 100%;
+					height: 100%;
+					padding: 0;
+					margin: 0;
+					border: 0;
+					background-color: transparent;
+					line-height: 34rpx;
+					font-size: 34rpx;
+					text-align: left;
+				}
+
+				input::placeholder {
+					font-size: 26rpx;
+				}
+			}
+		}
+		.list-item:last-child {
+			border: none;
+		}
+	}
+
+	.btn {
+		width: 697rpx;
+		height: 80rpx;
+		background: #515150;
+		border-radius: 40rpx;
+		text-align: center;
+		line-height: 80rpx;
+		font-size: 36rpx;
+		font-family: PingFang SC;
+		font-weight: 500;
+		color: #FFFFFF;
+		position: absolute;
+		bottom: 53rpx;
+		left: 27rpx;
+	}
+</style>
diff --git a/pages.json b/pages.json
index 5adcd98..b5a7201 100644
--- a/pages.json
+++ b/pages.json
@@ -101,9 +101,43 @@
 				"style": {
 					"navigationBarTitleText": ""
 				}
+			},
+			{
+				"path": "line/lineList",
+				"style": {
+					"navigationBarTitleText": "精选线路"
+				}
+			},
+			{
+				"path": "line/detail",
+				"style": {
+					"navigationBarTitleText": "线路详情"
+				}
+			},
+			{
+				"path": "line/order",
+				"style": {
+					"navigationBarTitleText": "填写订单"
+				}
+			},
+			{
+				"path": "line/orders",
+				"style": {
+					"navigationBarTitleText": "填写订单"
+				}
+			},
+			{
+				"path": "order/trades",
+				"style": {
+					"navigationBarTitleText": "全部订单"
+				}
+			},
+			{
+				"path": "order/orderDetail",
+				"style": {
+					"navigationBarTitleText": "订单详情"
+				}
 			}
-			
-			
 		]
 	}],
 	"tabBar": {
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 9a7ec06..8f2f107 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -11,7 +11,7 @@
 			</view>
 		</view>
 		
-		<swiper class="top-banner" :circular="true" :interval="6000" :current="current" indicator-active-color="#fff"
+		<swiper class="top-banner" :circular="true" :interval="6000" indicator-active-color="#fff"
 			:duration="800" :indicator-dots="true" :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"></image>
@@ -21,7 +21,7 @@
 		<!-- 发现宝藏导游 -->
 		<view class="title-box flex-between">
 			<image src="https://static.ticket.sz-trip.com/tourist/index/title1.png" class="title-img"></image>
-			<view class="title-btn flex-around">
+			<view class="title-btn flex-around" @click="gotoDy">
 				探索更多
 				<image src="https://static.ticket.sz-trip.com/tourist/index/rightIcon.png" class="rightIcon"></image>
 			</view>
@@ -44,7 +44,7 @@
 		<!-- 精选线路 -->
 		<view class="title-box flex-between">
 			<image src="https://static.ticket.sz-trip.com/tourist/index/title2.png" class="title-img"></image>
-			<view class="title-btn flex-around">
+			<view class="title-btn flex-around" @click="gotoPath('/subPackages/line/lineList')">
 				探索更多
 				<image src="https://static.ticket.sz-trip.com/tourist/index/rightIcon.png" class="rightIcon"></image>
 			</view>
@@ -176,6 +176,12 @@
 						break;
 				}
 			},
+			// 去导游
+			gotoDy() {
+				uni.switchTab({
+					url: '/pages/daoyou/index'
+				})
+			}
 		}
 	}
 </script>
diff --git a/pages/user/user.vue b/pages/user/user.vue
index cfcf420..d1561f8 100644
--- a/pages/user/user.vue
+++ b/pages/user/user.vue
@@ -13,7 +13,7 @@
 		
 		<view class="order-bg">
 			<view class="order-box">
-				<view class="order-top flex-between">
+				<view class="order-top flex-between" @click="goTrades()">
 					<view>我的订单</view>
 					<view>
 						全部
@@ -22,7 +22,7 @@
 				</view>
 				
 				<view class="order-bottom">
-					<view v-for="(item,index) in orderList" :key="index">
+					<view v-for="(item,index) in orderList" :key="index" @click="goTrades(item)">
 						<image :src="item.img" mode=""></image>
 						<view>{{item.text}}</view>
 					</view>
@@ -94,6 +94,20 @@
 			// this.Post({}, '/api/Merchants/get_login_details').then(res => {
 			// 	this.userInfo = res.data
 			// })
+		},
+		methods: {
+			// 去订单
+			goTrades(item) {
+				if (item) {
+					uni.navigateTo({
+						url: "/subPackages/order/trades?type=" + item.text,
+					});
+				} else {
+					uni.navigateTo({
+						url: "/subPackages/order/trades",
+					});
+				}
+			},
 		}
 	}
 </script>
diff --git a/static/js/CommonFunction.js b/static/js/CommonFunction.js
index e0aca45..42be1a5 100644
--- a/static/js/CommonFunction.js
+++ b/static/js/CommonFunction.js
@@ -184,4 +184,18 @@ Date.prototype.Format = function(fmt)
         if(new RegExp("("+ k +")").test(fmt))
             fmt = fmt.replace(RegExp.$1, (RegExp.$1.length==1) ? (o[k]) : (("00"+ o[k]).substr((""+ o[k]).length)));
     return fmt;
+}
+
+// 根据type_id跳转详情
+Vue.prototype.gotoDetailByTypeId = (goodsId, type) => {
+	// 1线路 2导游
+	if(type == 1) {
+		uni.navigateTo({
+			url: '/subPackages/line/detail?id=' + goodsId
+		})
+	}else {
+		uni.navigateTo({
+			url: '/subPackages/daoyou/detail?id=' + goodsId
+		})
+	}
 }
\ No newline at end of file
diff --git a/store/modules/user.js b/store/modules/user.js
index 8e2b3d1..14c7ee6 100644
--- a/store/modules/user.js
+++ b/store/modules/user.js
@@ -22,6 +22,7 @@ export default {
 		
 		lingoIds: [],// 语言列表
 		scenicIds: [], // 景区列表
+		lineInfo: "", // 线路
 	},
 	// 类似 vue 里的 mothods(同步方法)
 	mutations: {
@@ -75,5 +76,9 @@ export default {
 		changeScenicIds(state, data) {
 			state.scenicIds = data
 		},
+		// 线路下单
+		changeLineInfo(state, data){
+			state.lineInfo = data
+		}
 	}
 }
diff --git a/subPackages/daoyou/order.vue b/subPackages/daoyou/order.vue
index 4295c9c..8791853 100644
--- a/subPackages/daoyou/order.vue
+++ b/subPackages/daoyou/order.vue
@@ -21,10 +21,20 @@
 		
 		<!-- 出行信息 -->
 		<view class="people-box">
-			<view>{{skuInfo.is_card ? '需填'+buyNum+'位出行人' : '无需填写出行人'}}</view>
+			<view>{{skuInfo.is_card ? (skuInfo.sku_model.is_real_name ? '需填'+buyNum+'位出行人' : '需填1位出行人') : '无需填写出行人'}}</view>
 			
 			<!-- is_card是否实名 -->
 			<view v-if="skuInfo.is_card">
+				<!-- 已选中出行人 -->
+				<view v-if="seldPeople.length > 0">
+					<view class="people-seld">
+						<view class="people-seldItem" v-for="(item,index) in seldPeople" :key="index">
+							{{item.name}}
+							<image src="https://static.ticket.sz-trip.com/tourist/daoyou/dui.png"></image>
+						</view>
+						<view class="people-more" @click="changeContactAddPopup('open',{})">更多></view>
+					</view>
+				</view>
 				<view class="people-list">
 				    <view class="people-item flex-between" v-for="(item,index) in seldPeople" :key="item.id">
 						<image src="https://static.ticket.sz-trip.com/tourist/daoyou/del.png" class="del-img" @click="removeSeldPeople(item, index)"></image>
@@ -36,10 +46,11 @@
 				            <view class="subtitle">手机号 {{ item.tel }}</view>
 				            <view class="subtitle">{{ item.title }} {{ item.id_number }}</view>
 				        </view>
-						<image src="https://static.ticket.sz-trip.com/tourist/daoyou/edit.png" class="edit-img" @click="gotoEditContacts(item)"></image>
+						<image src="https://static.ticket.sz-trip.com/tourist/daoyou/edit.png" class="edit-img" @click="changeContactAddPopup('open',item)"></image>
 				    </view>
 				</view>
-				<view class="people-add" v-for="(item,index) in buyNum" :key="index">
+				<view class="people-add" v-for="(item,index) in skuInfo.sku_model.is_real_name ? buyNum : 1" :key="index" @click="changeContactAddPopup('open',{})"
+				 v-if="!seldPeople[index]">
 					<image src="https://static.ticket.sz-trip.com/tourist/daoyou/add.png" class="add-img"></image>
 					<view>出行人{{index + 1}}  点击填写1位出行人信息</view>
 					<image src="https://static.ticket.sz-trip.com/tourist/daoyou/peopleRight.png" class="right-img"></image>
@@ -51,28 +62,267 @@
 				<image src="https://static.ticket.sz-trip.com/tourist/daoyou/phoneClear.png" v-if="phone.length > 0" @click="phone = ''"></image>
 			</view>
 		</view>
+		
+		<footer class="flex-between">
+			<view class="footer-left">
+				<view>
+					合计：<span>200</span>
+				</view>
+				<view style="margin-top: 10rpx;" @click="clickAgreement(0)">
+					<span><image src="https://static.ticket.sz-trip.com/tongli/images/user/dui.png" v-show="isAgreement"></image></span>阅读并同意《xxx协议》
+				</view>
+			</view>
+			<view :class="['order-btn', {'order-disable': !isAgreement}]" @click="order">去支付</view>
+		</footer>
+		
+		<!-- 选择出行人 -->
+		<uni-popup ref="contactPopup" type="bottom" backgroundColor="#F4F4F4" >
+			<view class="people-popup">
+				<view class="ptop-box">
+					<view class="top flex-between" style="padding-bottom: 14rpx;">
+						<text class="text-overflow" @click="$refs.contactPopup.close()">取消</text>
+						<text style="color: #96684F;" class="confirm" @click="$refs.contactPopup.close()">确定</text>
+					</view>
+				</view>
+				
+				<view class="button" @click="$refs.contactAddPopup.open()">添加出行人</view>
+				<view class="popup-list" v-if="contactList.length > 0">
+					<view :class="['popup-item', item.isSeld ? 'active': '']" 
+						v-for="(item, index) in contactList" :key="index" @click="seldThisContact(item,index)">
+						<view class="item-top flex flex-items-center">
+							<image src="https://static.ticket.sz-trip.com/tourist/daoyou/edit.png" class="edit-img" @click.stop="changeContactAddPopup('open',item)"></image>
+							<view class="name flex-shrink-0" style="padding-left: 32rpx;width: 180rpx;">{{item.name}}</view>
+							<view class="flex-1 w-1rpx" style="padding-left: 20rpx;">
+								<view class="name">
+									<text>手机号 {{ item.tel }}</text>
+									<text class="tag" v-if="item.is_default == 1">默认</text>
+								</view>
+								<view class="subtitle text-overflowRows">身份证 {{ item.id_number}}</view>
+							</view>
+							
+						</view>
+					</view>
+				</view>
+			</view>
+		</uni-popup>
+		
+		<!-- 新增编辑出行人弹窗 -->
+		<uni-popup ref="contactAddPopup" type="bottom" backgroundColor="#F4F4F4" style="border-radius: 13rpx 13rpx 0 0;">
+			<view class="people-popup" style="padding: 0;">
+				<view class="ptop-box">
+					<view class="top flex-between" style="height: fit-content;">
+						<text class="text-overflow" @click="changeContactAddPopup('close')">取消</text>
+						<text style="color: #96684F;" class="confirm" @click="saveContact">保存</text>
+					</view>
+				</view>
+				
+				<view class="add-edit-content">
+					<contactAddVue ref="contactAddVueRef"></contactAddVue>
+				</view>
+			</view>
+		</uni-popup>
+		
+		<!-- 协议弹框 -->
+		<uni-popup ref="agreementPopup" type="bottom" backgroundColor="#FFFFFF">
+			<view class="agreement-box">
+				<image src="https://static.ticket.sz-trip.com/tourist/daoyou/cha.png" class="agreement-cha" @click="$refs.agreementPopup.close()"></image>
+				
+				<scroll-view class="agreement-content" scroll-y="true" @scrolltolower="lower" lower-threshold="20">
+					<view class="agreement-title">xxxx协议</view>
+					<view>
+						协议内容协议内容协议内容协议内容协议内容协议内容协议内容协议内容协议内容协议内容协议内容协议内容协议内容协议内容协
+						协议内容协议内容协议内容协议内容协议内容协议内容协议内容协议内容协议内容协议内容协议内容协议内容协议内容协议内容协
+						协议内容协议内容协议内容协议内容协议内容协议内容协议内容协议内容协议内容协议内容协议内容协议内容协议内容协议内容协
+						协议内容协议内容协议内容协议内容协议内容协议内容协议内容协议内容协议内容协议内容协议内容协议内容协议内容协议内容协
+						协议内容协议内容协议内容协议内容协议内容协议内容协议内容协议内容协议内容协议内容协议内容协议内容协议内容协议内容协
+						协议内容协议内容协议内容协议内容协议内容协议内容协议内容协议内容协议内容协议内容协议内容协议内容协议内容协议内容协
+						协议内容协议内容协议内容协议内容协议内容协议内容协议内容协议内容协议内容协议内容协议内容协议内容协议内容协议内容协
+						协议内容协议内容协议内容协议内容协议内容协议内容协议内容协议内容协议内容协议内容协议内容协议内容协议内容协议内容协
+						协议内容协议内容协议内容协议内容协议内容协议内容协议内容协议内容协议内容协议内容协议内容协议内容协议内容协议内容协
+						协议内容协议内容协议内容协议内容协议内容协议内容协议内容协议内容协议内容协议内容协议内容协议内容协议内容协议内容协
+						协议内容协议内容协议内容协议内容协议内容协议内容协议内容协议内容协议内容协议内容协议内容协议内容协议内容协议内容协
+						协议内容协议内容协议内容协议内容协议内容协议内容协议内容协议内容协议内容协议内容协议内容协议内容协议内容协议内容协
+						协议内容协议内容协议内容协议内容协议内容协议内容协议内容协议内容协议内容协议内容协议内容协议内容协议内容协议内容协
+						协议内容协议内容协议内容协议内容协议内容协议内容协议内容协议内容协议内容协议内容协议内容协议内容协议内容协议内容协
+						协议内容协议内容协议内容协议内容协议内容协议内容协议内容协议内容协议内容协议内容协议内容协议内容协议内容协议内容协
+						协议内容协议内容协议内容协议内容协议内容协议内容协议内容协议内容协议内容协议内容协议内容协议内容协议内容协议内容协
+					</view>
+				</scroll-view>
+				
+				<view class="agreement-btn flex-center">
+					<view :class="['flex-center', {'agreement-disable': !isBottom}]" @click="clickAgreement(1)">同意本条款</view>
+				</view>
+			</view>
+		</uni-popup>
 	</view>
 </template>
 
 <script>
+	import contactAddVue from '@/components/contactAdd.vue';
 	export default {
+		components: {contactAddVue},
 		data() {
 			return {
 				buyNum: 1,
-				skuInfo: {is_card: 1},
+				skuInfo: {is_card: 1, sku_model: {is_real_name: 1}},
 				phone: '',
-				seldPeople: [
-					{
-						name: '张三',
-						tel: '13888888888',
-						title: '身份证',
-						id_number: '123************123',
-						id: 1
-					}
-				]
+				seldPeople: [],
+				contactList: [],
+				isAgreement: false,
+				isBottom: false
 			}
 		},
+		onLoad() {
+			this.getContactList()
+		},
 		methods: {
+			// 下单
+			order() {
+				let seldUserIdArr = []
+				// is_card 是否实名 0否 1是
+				if(this.skuInfo.is_card) {
+					for (let i = 0; i < this.seldPeople.length; i++) {
+						seldUserIdArr.push(this.seldPeople[i].id)
+					}
+					if (seldUserIdArr.length < 1) {
+						uni.showToast({
+							title:'请选择出行人',
+							icon:'none'
+						})
+						return;
+					}
+				}
+				
+				if (!this.IsTel(this.phone)) {
+					uni.showToast({
+						title:'请输入正确格式的手机号',
+						icon:'none'
+					})
+				    return;
+				}
+				
+				// 阅读协议
+				if(this.isAgreement) {
+					let goods = []
+					let params = {
+						specifications_id: '',
+						num: this.buyNum,
+						contact_id: seldUserIdArr,
+						date: '',
+						start_time: '',
+						end_time: '',
+					}
+					goods.push(params)
+					
+					let data = {
+						goods: goods,
+						coupon: this.coupon ? this.coupon.id : "",
+						reserve_phone: this.phone
+					}
+					
+					this.Post({
+						method: 'POST',
+						data: JSON.stringify(data)
+					}, '/api/order/place').then(res => {
+						
+					})
+				}else {
+					this.isBottom = false
+					this.$refs.agreementPopup.open()
+				}
+			},
+			// 查看协议
+			clickAgreement(type) {
+				if(type) {
+					this.isAgreement = true
+					this.$refs.agreementPopup.close()
+				}else {
+					if(this.isAgreement){
+						this.isAgreement = false
+						return;
+					}
+					this.isBottom = false
+					this.$refs.agreementPopup.open()
+				}
+			},
+			// 协议触底
+			lower() {
+				this.isBottom = true
+			},
+			// 出行人弹框
+			changeContactAddPopup(type, item) {
+				if(type == 'open') {
+					// 如果没有出行人或编辑 打开新增编辑弹窗
+					if (this.contactList.length<=0 || item.id) {
+						
+						this.$refs.contactAddPopup.open()
+						
+						if(item.id) {
+							this.$nextTick(()=>{
+								this.$refs.contactAddVueRef.init(item)
+							})
+						}
+						return;
+					}
+					this.$refs.contactPopup.open()
+				}else {
+					this.$refs.contactAddPopup.close()
+				}
+			},
+			// 选中出行人
+			seldThisContact(item,index) {
+				
+				// 实名一证多票
+				if(!this.skuInfo.sku_model.is_real_name) {
+				    if(item.isSeld) {
+				        this.contactList[index].isSeld = false
+				        this.seldPeople = []
+				    }else {
+				        for (let i = 0; i < this.contactList.length; i++) {
+				            this.contactList[i].isSeld = false
+				            this.contactList[i].selected = false
+				        }
+				    }
+				};
+				
+				// 一证一票
+				if (this.skuInfo.sku_model.is_real_name && item.isSeld) {
+				    this.contactList[index].isSeld = false
+				    this.seldPeople = []
+				    for (let i = 0; i < this.contactList.length; i++) {
+				        if (this.contactList[i].isSeld) {
+				            this.seldPeople.push(this.contactList[i])
+				        }
+				    }
+				    if (this.buyNum <= this.seldPeople.length + 1) {
+				        this.buyNum = this.seldPeople.length || 1
+				    }
+				    return
+				}
+				
+				let nowSeld = []
+				for (let i = 0; i < this.contactList.length; i++) {
+				    if (this.contactList[i].isSeld) {
+				        nowSeld.push(this.contactList[i])
+				    }
+				}
+				
+				// 根据出行数量更换出行人
+				if(this.buyNum == 1) {
+				    for (let i = 0; i < this.contactList.length; i++) {
+				        this.contactList[i].isSeld = false
+				    }
+				    nowSeld = []
+				}else if(this.skuInfo.sku_model.is_real_name && this.seldPeople.length == this.buyNum && item.isSeld == false) {
+				    this.$toast('您只需选择' + this.buyNum + '游客')
+				    return;
+				}
+				
+				item.isSeld = true
+				
+				nowSeld.push(this.contactList[index])
+				this.seldPeople = nowSeld
+			},
 			// 取消选中出行人
 			removeSeldPeople(item,index) {
 				for (let i = 0; i < this.seldPeople.length; i++) {
@@ -81,6 +331,23 @@
 				    }
 				}
 			},
+			// 保存出行人
+			async saveContact () {
+				let res = await this.$refs.contactAddVueRef.submit()
+				if (res && res.code == 1) {
+					this.getContactList();
+					this.changeContactAddPopup('close')
+				}
+			},
+			// 获取出行人信息
+			getContactList() {
+				this.Post({},'/api/user/contactList').then(res => {
+					res.data.forEach(item => {
+						item.isSeld = false
+					})
+					this.contactList = res.data
+				})
+			},
 			// 选择数量
 			changeNum(type) {
 				if(type) {
@@ -91,15 +358,14 @@
 					if (this.buyNum <= 1) {
 					    return
 					}
-					// if(this.buyNum == this.seldPeople.length) {
-					//     this.allSeldPeople.forEach(item => {
-					//         if(item.id == this.seldPeople[this.seldPeople.length -1].id) {
-					//             item.is_seld = false
-					//             item.selected = false
-					//         }
-					//     })
-					//     this.seldPeople.pop()
-					// }
+					if(this.buyNum == this.seldPeople.length) {
+					    this.contactList.forEach(item => {
+					        if(item.id == this.seldPeople[this.seldPeople.length -1].id) {
+					            item.isSeld = false
+					        }
+					    })
+					    this.seldPeople.pop()
+					}
 					this.buyNum -= 1
 				}
 			}
@@ -206,9 +472,46 @@
 			}
 		}
 		
+		.people-seld {
+			display: flex;
+			flex-wrap: wrap;
+			
+			.people-seldItem {
+				padding: 0 50rpx;
+				line-height: 70rpx;
+				background: #F9F5F0;
+				border-radius: 11rpx;
+				border: 2rpx solid #96684F;
+				position: relative;
+				font-weight: 400;
+				font-size: 29rpx;
+				color: #000000;
+				margin: 0 15rpx 10rpx 0;
+				
+				image {
+					width: 28rpx;
+					height: 28rpx;
+					position: absolute;
+					bottom: 0;
+					right: 0;
+				}
+			}
+			.people-more {
+				width: 110rpx;
+				line-height: 73rpx;
+				background: #F6F1EA;
+				border-radius: 11rpx;
+				text-align: center;
+				font-weight: 500;
+				font-size: 29rpx;
+				color: #96684F;
+			}
+		}
+		
 		.people-list {
 			.people-item {
 				padding: 0 20rpx;
+				margin-top: 20rpx;
 				
 				.del-img {
 					width: 45.33rpx;
@@ -240,9 +543,6 @@
 					height: 32.67rpx;
 				}
 			}
-			.people-item:nth-child(n+2) {
-				margin-top: 20rpx;
-			}
 		}
 		
 		.people-add {
@@ -272,4 +572,301 @@
 			margin-top: 26rpx;
 		}
 	}
+	
+	.people-popup {
+		padding: 26rpx;
+		height: 800rpx;
+		background: #F7F7F7;
+	
+		.ptop-box {
+			height: 120rpx;
+			display: flex;
+			align-items: center;
+	
+			.top {
+				position: fixed;
+				left: 0;
+				right: 0;
+				color: #000;
+				height: 80rpx;
+				font-size: 0;
+				overflow: hidden;
+				padding: 0 26rpx;
+	
+				text {
+					text-align: left;
+					font-size: 35rpx;
+					font-weight: 400;
+					color: #000000;
+				}
+	
+				.confirm {
+					font-weight: 400;
+					color: #000000;
+				}
+			}
+		}
+		
+		.popup-list {
+			height: 666rpx;
+			overflow: scroll;
+		
+			.popup-item {
+				border-radius: 12rpx;
+				padding: 2rpx;
+				margin-top: 24rpx;
+				font-size: 24rpx;
+				color: #333333;
+				font-weight: 400;
+				background-color: #ffffff;
+		
+				.item-top {
+					border-radius: 12rpx;
+					padding: 30rpx 40rpx;
+					background-color: #ffffff;
+					
+					image {
+						color: #666666;
+						width: 40rpx;
+						height: 40rpx;
+					}
+		
+					.name {
+						overflow: hidden;
+						font-family: PingFang SC;
+						font-weight: 400;
+						font-size: 32rpx;
+		
+						text {
+							color: #666;
+							font-size: 25rpx;
+						}
+		
+						.tag {
+							padding: 0 8rpx;
+							height: 32rpx;
+							border-radius: 7rpx;
+							line-height: 30rpx;
+							text-align: center;
+							font-size: 23rpx;
+							font-family: PingFang SC;
+							font-weight: 500;
+							color: #ffffff;
+							background: #96684F;
+							margin-left: 10rpx;
+						}
+					}
+		
+					.com-flex-start {
+						margin: 0 0 30rpx;
+					}
+		
+					.subtitle {
+						font-weight: 400;
+						flex: 1;
+						text-align: left;
+						margin-top: 33rpx;
+						color: #666666;
+						font-size: 25rpx;
+		
+						.mobile {
+							margin-bottom: 36rpx;
+						}
+					}
+		
+					.status {
+						width: 40rpx;
+						height: 40rpx;
+						line-height: 40rpx;
+						border-radius: 50%;
+						text-align: center;
+						box-sizing: border-box;
+		
+						img {
+							width: 27rpx;
+							height: 21rpx;
+						}
+					}
+					.statuss {
+						background: linear-gradient(90deg, #fa2b66, #ff9834);
+						border: none;
+					}
+					.noSelect {
+						border: 1rpx solid #999999;
+					}
+				}
+		
+				.item-site {
+					color: #666666;
+					display: flex;
+					align-items: center;
+					padding: 36rpx 0;
+		
+					view {
+						width: 23rpx;
+						height: 23rpx;
+						margin-right: 10rpx;
+						border: 1rpx solid #999999;
+						border-radius: 50%;
+		
+						view {
+							width: 8rpx;
+							height: 8rpx;
+							background: #000000;
+							border-radius: 50%;
+							margin: auto;
+						}
+					}
+				}
+			}
+			
+			.popup-item.active{
+				border: 2rpx solid #96684F;
+			}
+			.popup-item.disabled{
+				.item-top {
+					background-color: #CCC;
+				}
+			}
+		}
+		
+		.button {
+			text-align: center;
+			width: 100%;
+			height: 80rpx;
+			line-height: 80rpx;
+			background-color: #ffffff;
+			border-radius: 40rpx;
+			font-family: PingFang SC;
+			font-weight: 400;
+			font-size: 33rpx;
+			color: #000000;
+		}
+		
+		.add-edit-content{
+			border-radius: 13rpx;
+			min-height: 800rpx;
+			margin: 0 22rpx;
+		}
+	}
+	
+	footer {
+		width: 750rpx;
+		height: 153rpx;
+		background: #FFFFFF;
+		box-shadow: 0rpx 0rpx 13rpx 0rpx rgba(82,82,82,0.25);
+		position: fixed;
+		bottom: 0;
+		left: 0;
+		
+		.footer-left {
+			margin-left: 26rpx;
+			
+			&>view:first-child {
+				font-weight: bold;
+				font-size: 32rpx;
+				color: #000000;
+				
+				span {
+					font-size: 40rpx;
+					color: #DC2525;
+				}
+				span::before {
+					font-size: 24rpx;
+					content: '￥';
+				}
+			}
+			
+			&>view:last-child {
+				display: flex;
+				align-items: center;
+				font-weight: 500;
+				font-size: 24rpx;
+				color: #666666;
+				
+				span {
+					width: 31rpx;
+					height: 31rpx;
+					border-radius: 50%;
+					border: 1rpx solid #666666;
+					margin-right: 11rpx;
+					
+					image {
+						width: 100%;
+						height: 100%;
+					}
+				}
+			}
+		}
+		
+		.order-btn {
+			width: 233rpx;
+			line-height: 73rpx;
+			border-radius: 11rpx;
+			background: #DC2525;
+			text-align: center;
+			font-weight: bold;
+			font-size: 32rpx;
+			color: #FFFFFF;
+			margin-right: 26rpx;
+		}
+		.order-disable {
+			background: #CCCCCC;
+		}
+	}
+	
+	.agreement-box {
+		width: 100vw;
+		height: 60vh;
+		padding: 80rpx 26rpx 200rpx 26rpx;
+		position: relative;
+		
+		.agreement-cha {
+			width: 31.33rpx;
+			height: 31.33rpx;
+			position: absolute;
+			right: 26rpx;
+			top: 26rpx;
+		}
+		
+		.agreement-content {
+			font-weight: 500;
+			font-size: 29rpx;
+			color: #666666;
+			padding-bottom: 50rpx;
+			height: 45vh;
+			
+			.agreement-title {
+				font-weight: bold;
+				font-size: 32rpx;
+				color: #000000;
+				text-align: center;
+				margin-bottom: 36rpx;
+			}
+		}
+		
+		.agreement-btn {
+			width: 750rpx;
+			height: 153rpx;
+			background: #FFFFFF;
+			box-shadow: 0rpx 0rpx 13rpx 0rpx rgba(82,82,82,0.25);
+			position: absolute;
+			bottom: 0;
+			left: 0;
+			
+			view {
+				width: 697rpx;
+				height: 73rpx;
+				background: #DC2525;
+				border-radius: 11rpx;
+				font-weight: bold;
+				font-size: 32rpx;
+				color: #FFFFFF;
+			}
+			
+			.agreement-disable {
+				background: #CCCCCC;
+			}
+		}
+	}
 </style>
\ No newline at end of file
diff --git a/subPackages/line/detail.vue b/subPackages/line/detail.vue
new file mode 100644
index 0000000..c612c79
--- /dev/null
+++ b/subPackages/line/detail.vue
@@ -0,0 +1,299 @@
+<template>
+	<view class="bg">
+		<view class="swipe-box">
+			<swiper class="swiper" :autoplay="true" :interval="3000" :duration="1000" circular indicator-dots="true" indicator-color="rgba(255,255,255,.5)"
+				indicator-active-color="#fff" @change="swiperChange">
+				<swiper-item v-for="(item, index) in info.list_images.split(',')" :key="item.id">
+					<view class="swiper-item">
+						<image class="item-img" :src="showImg(item)" mode="aspectFill"></image>
+					</view>
+				</swiper-item>
+			</swiper>
+		</view>
+		
+		<view class="top-box">
+			<view class="top-price">
+				<span>{{info.low_money / 100}}</span>
+				参团价
+			</view>
+			<view class="top-title">{{info.title}}</view>
+			<view class="top-subtitle">{{info.subtitle}}</view>
+			<view class="top-tags">
+				<view class="top-tag" v-for="(item,index) in info.goods_new_tag" :key="index">
+					{{item}}
+				</view>
+			</view>
+		</view>
+		
+		<view class="scroll-all-box" id="menus" v-if="info">
+			<view :class="'scroll-menus' + (fixed ? ' fixed-menus' : '')">
+				<view :class="'scroll-menu-item' + (type == 1 ? ' active' : '')" @click="changeMenu(1)">产品详情</view>
+				<view :class="'scroll-menu-item' + (type == 2 ? ' active' : '')" @click="changeMenu(2)">预定须知</view>
+			</view>
+			<view style="height: 85rpx" v-if="fixed"></view>
+			<view class="info-box" id="box1">
+				<view class="info-title">产品详情</view>
+				<view class="info-content" v-html="formateRichText(info.special_content)"></view>
+			</view>
+			<view class="info-box" id="box2">
+				<view class="info-title">预定须知</view>
+				<view class="info-content" v-html="formateRichText(info.price_content)"></view>
+			</view>
+		</view>
+		
+		<footer class="flex-center">
+			<view @click="order">立即购买</view>
+		</footer>
+	</view>
+</template>
+
+<script>
+	const device = uni.getSystemInfoSync();
+	const ratio = device.windowWidth / 750;
+	export default {
+		data() {
+			return {
+				id: null,
+				swiperCurrent: 1,
+				info: {list_images:''},
+				top: 0,
+				fixed: false,
+				type: 0,
+				down: false,
+			}
+		},
+		onLoad(options) {
+			this.id = options.id;
+			this.getInfo();
+			let rect = uni.getMenuButtonBoundingClientRect();
+			this.top = (rect.top - device.statusBarHeight) * 2 + rect.height + device.statusBarHeight;
+		},
+		onPageScroll(e){
+			let query = uni.createSelectorQuery()
+				query.select("#menus").boundingClientRect(res => {
+			　　　　if(res.top < 0){
+						this.fixed = true
+					}else{
+						this.fixed = false
+					}
+				}).exec()
+				
+				if (this.down) {
+					return
+				}else{
+					this.down = true
+					for(let i = 1; i < 3; i++) {
+						query.select("#box" + i).boundingClientRect(res => {
+							if(res.top < 0) {
+								this.type = i
+							}
+						}).exec()
+					}
+					this.down = false
+				}
+		},
+		methods: {
+			// 去下单
+			order() {
+				uni.navigateTo({
+					url: "/subPackages/line/order?id=" + this.info.id
+				})
+			},
+			swiperChange (e) {
+				this.swiperCurrent = e.detail.current+1
+			},
+			// 获取信息
+			getInfo() {
+				this.Post({goods_id: this.id},'/api/goods/getGoodDetail').then(res => {
+					if (res.data.flag == 0) {
+						uni.showToast({title: '商品不存在或已下架',icon: 'none'})
+						setTimeout(() => {this.goBack()}, 2000)
+					}
+					res.data.goods_new_tag = (res.data.goods_new_tag ? res.data.goods_new_tag.split(',') : []).splice(0, 3);
+					this.info = res.data;
+				});
+			},
+			changeMenu(e) {
+				this.down = true
+			    let index = e;
+				let that = this
+			    const query = uni.createSelectorQuery(); //创建节点查询器
+			    query.select('#box' + index).boundingClientRect(); //选择toViewid获取位置信息
+			    query.selectViewport().scrollOffset(); //获取页面查询位置的
+			    query.exec(function (res) {
+			        let scrollTop = res[0].top + res[1].scrollTop - 110 * ratio - that.top;
+			        uni.pageScrollTo({
+			            scrollTop: scrollTop + 4,
+			            duration: 0
+			        });
+			        that.type = index
+					setTimeout(()=>{
+						that.down = false
+					},1000)
+			    });
+			},
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.bg {
+		min-height: 100vh;
+		background: #FFFFFF;
+		padding-bottom: 200rpx;
+	}
+	
+	.swiper {
+		height: 413rpx;
+		position: relative;
+	
+		.swiper-item {
+			width: 100%;
+			height: 413rpx;
+	
+			.item-img {
+				width: 750rpx;
+				height: 413rpx;
+			}
+		}
+	}
+	
+	.top-box {
+		padding: 26rpx;
+		border-bottom: 20rpx solid #F9F5F0;
+		
+		.top-price {
+			font-weight: 500;
+			font-size: 24rpx;
+			color: #919191;
+			
+			span {
+				font-weight: bold;
+				font-size: 36rpx;
+				color: #DC2525;
+				margin-right: 12rpx;
+			}
+			span::before {
+				font-size: 23rpx;
+				font-weight: 500;
+				content: '￥';
+			}
+			span::after {
+				font-size: 23rpx;
+				font-weight: 500;
+				content: '/人';
+			}
+		}
+		
+		.top-title {
+			font-weight: bold;
+			font-size: 31rpx;
+			color: #333333;
+			margin-top: 20rpx;
+		}
+		
+		.top-subtitle {
+			font-weight: 500;
+			font-size: 24rpx;
+			color: #888888;
+			margin-top: 20rpx;
+		}
+		
+		.top-tags {
+			display: flex;
+			margin-top: 20rpx;
+			
+			.top-tag {
+				padding: 0 10rpx;
+				line-height: 35rpx;
+				border-radius: 7rpx;
+				border: 1rpx solid #96684F;
+				font-weight: 500;
+				font-size: 24rpx;
+				color: #96684F;
+				margin-right: 13rpx;
+			}
+		}
+	}
+	
+	.scroll-all-box {
+		margin: 24rpx 0;
+	
+		.scroll-menus {
+		    padding: 0 26rpx;
+		    display: flex;
+		    justify-content: space-around;
+		    align-items: center;
+		    font-size: 29rpx;
+		    color: #333;
+		    height: 84rpx;
+		    border-bottom: 1rpx solid #D8D8D8;
+			
+			.scroll-menu-item {
+			    position: relative;
+			    line-height: 84rpx;
+			}
+			
+			.scroll-menu-item.active::after {
+			    content: '1';
+			    font-size: 0;
+			    display: block;
+			    position: absolute;
+			    width: 53rpx;
+			    height: 5rpx;
+			    background: #96684F;
+			    left: 50%;
+			    margin-left: -26.5rpx;
+			    bottom: 0rpx;
+			}
+		}
+		
+		.fixed-menus {
+		    position: fixed;
+			top: 80rpx;
+		    left: 0;
+		    right: 0;
+		    background: white;
+		    z-index: 1;
+		}
+		
+		.info-box {
+		    padding: 42rpx 26rpx 0;
+			
+			.info-title {
+			    font-size: 33rpx;
+			    font-weight: bold;
+			    color: #333;
+			}
+			
+			.info-content {
+				width: 697rpx;
+				background: #FFFFFF;
+				border-radius: 20rpx;
+				padding: 22rpx 14rpx;
+				margin-top: 20rpx;
+			}
+		}
+	}
+	
+	footer {
+		position: fixed;
+		width: 750rpx;
+		height: 153rpx;
+		background: #FFFFFF;
+		box-shadow: 0rpx 0rpx 13rpx 0rpx rgba(82,82,82,0.25);
+		left: 0;
+		bottom: 0;
+		
+		view {
+			width: 697rpx;
+			line-height: 73rpx;
+			text-align: center;
+			background: #DC2525;
+			border-radius: 11rpx;
+			font-weight: bold;
+			font-size: 32rpx;
+			color: #FFFFFF;
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/subPackages/line/lineList.vue b/subPackages/line/lineList.vue
new file mode 100644
index 0000000..47206ae
--- /dev/null
+++ b/subPackages/line/lineList.vue
@@ -0,0 +1,116 @@
+<template>
+	<view class="bg">
+		<navigator :url="'/subPackages/line/detail?id=' + item.id" v-for="(item,index) in list" :key="index" class="item">
+			<image :src="showImg(item.image)" mode="aspectFill" class="item-img"></image>
+			<view class="item-content flex-column">
+				<view class="title text-overflowRows">{{item.title}}</view>
+				<view class="tags">
+					<view v-for="(tagItem,tagIndex) in item.goods_new_tag.split(',').slice(0,3)" :key="tagIndex" class="tag">
+						{{tagItem}}
+					</view>
+				</view>
+				<view class="flex-between">
+					<view class="price">{{item.money / 100}}</view>
+					<view class="btn">预订</view>
+				</view>
+			</view>
+		</navigator>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				list: []
+			}
+		},
+		onReady() {
+			this.getList()
+		},
+		methods: {
+			getList() {
+				this.Post({
+					type_id: 1,
+					offset: 0,
+					limit: 100
+				},'/api/goods/getGoodsByType').then(res => {
+					this.list = res.data
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.bg {
+		min-height: 100vh;
+		background: #F9F5F0;
+		padding: 27rpx 26rpx 100rpx;
+	}
+	
+	.item {
+		margin-bottom: 26rpx;
+		height: 547rpx;
+		background: #FFFFFF;
+		border-radius: 13rpx;
+		border: 1rpx solid #96684F;
+		padding: 21rpx;
+		
+		.item-img {
+			width: 653rpx;
+			height: 319rpx;
+		}
+		
+		.item-content {
+			height: 178rpx;
+			justify-content: space-between;
+			
+			.title {
+				font-weight: bold;
+				font-size: 31rpx;
+				color: #333333;
+			}
+			.tags {
+				display: flex;
+				
+				.tag {
+					font-weight: 500;
+					font-size: 24rpx;
+					color: #96684F;
+				}
+				.tag:not(:first-child)::before {
+					content: '丨';
+				}
+			}
+			
+			.price {
+				font-weight: bold;
+				font-size: 34rpx;
+				color: #DC2525;
+			}
+			.price::before {
+				font-size: 23rpx;
+				font-weight: 500;
+				content: '￥';
+			}
+			.price::after {
+				font-size: 23rpx;
+				font-weight: 500;
+				content: '起';
+				color: rgba(153, 153, 153, 1);
+			}
+			
+			.btn {
+				width: 133.33rpx;
+				line-height: 53.33rpx;
+				text-align: center;
+				background-image: url('https://static.ticket.sz-trip.com/tourist/daoyou/btnBg.png');
+				background-size: 100% 100%;
+				font-weight: 500;
+				font-size: 31rpx;
+				color: #FFFFFF;
+			}
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/subPackages/line/order.vue b/subPackages/line/order.vue
new file mode 100644
index 0000000..635494c
--- /dev/null
+++ b/subPackages/line/order.vue
@@ -0,0 +1,583 @@
+<template>
+	<view class="bg">
+		<view class="date-all-box">
+			<view class="month-box">
+			    <view @click="changeMonth(index)" :class="'month-item' + (monthIndex == index ? ' active' : '')"
+				 v-for="(item, index) in months" :key="index" v-if="emptyList[index].isShow">
+			        {{ item }}月
+			    </view>
+			</view>
+			
+			<view class="day-header">
+			    <view class="day-header-item">日</view>
+			    <view class="day-header-item">一</view>
+			    <view class="day-header-item">二</view>
+			    <view class="day-header-item">三</view>
+			    <view class="day-header-item">四</view>
+			    <view class="day-header-item">五</view>
+			    <view class="day-header-item">六</view>
+			</view>
+			
+			<view class="day-box" v-if="selectDate">
+				<view class="day-item" v-for="(item, index) in emptyList[monthIndex].empty" :key="index">
+				    <view class="date-item-in">
+				        <view class="date-num"></view>
+				        <view class="date-price-place"></view>
+				    </view>
+				</view>
+				<view
+				    :class="'day-item' + (selectDate['selectMonth'] == months[monthIndex] && selectDate['selectDate'] == index + 1 ? ' active' : '')"
+				    v-for="(item, index) in emptyList[monthIndex].days" :key="index"
+				>
+				    <view class="date-item-in" @click="selectDateFun(index + 1)">
+				        <view
+				            :class="
+				                'date-num' + (prices[months[monthIndex] + '-' + (index + 1)] && prices[months[monthIndex] + '-' + (index + 1)].product_price != null ? ' active' : '')
+				            "
+				        >
+				            {{ index + 1 >= 10 ? index + 1 : '0' + (index + 1) }}
+				        </view>
+				        <view
+				            class="price"
+				            v-if="
+				                prices[months[monthIndex] + '-' + (index + 1)] &&
+				                prices[months[monthIndex] + '-' + (index + 1)].product_price != null &&
+				                prices[months[monthIndex] + '-' + (index + 1)].store != null
+				            "
+				        >
+				            ￥{{ prices[months[monthIndex] + '-' + (index + 1)].m_price / 100 }}
+				        </view>
+				        <view class="date-price-place" v-else-if="prices[months[monthIndex] + '-' + (index + 1)] && prices[months[monthIndex] + '-' + (index + 1)].store == 0">
+				            售罄
+				        </view>
+				        <view class="date-price-place" v-else></view>
+				    </view>
+				</view>
+			</view>
+		</view>
+		
+		<view class="box" v-for="(item, index) in sku" :key="index">
+		    <view class="box-top">
+		        <view class="box-title">{{ item.title }}</view>
+		        <view class="box-tip text-overflow">{{ item.sku_type_info }}</view>
+		        <view :class="'iconfont' + (nums[index] == 0 ? ' disable' : '')" @click="minus(index)">-</view>
+		        <view class="number">{{ nums[index] }}</view>
+		        <view :class="'iconfont' + (nums[index] == selectDate['info'][index].store ? ' disable' : '')" @click="add(index)">+</view>
+		    </view>
+		
+		    <view class="single-price" v-if="selectDate">{{ selectDate['info'][index].money / 100 }}</view>
+		</view>
+		
+		<view class="fixed-bottom">
+		    <text class="fixed-text">合计：</text>
+		    <view class="price">{{ totalPrice() / 100 }}</view>
+		    <view class="btn" @tap="order">下一步</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				id: '',
+				months: [],
+				monthIndex: 0,
+				productInfo: null,
+				sku: [],
+				nums: [],
+				selectDate: null,
+				price: 0,
+				prices: {},
+				emptyList: [
+					{
+						empty: 0,
+						days: 0,
+						isShow: false
+					},
+					{
+						empty: 0,
+						days: 0,
+						isShow: false
+					},
+					{
+						empty: 0,
+						days: 0,
+						isShow: false
+					},
+					{
+						empty: 0,
+						days: 0,
+						isShow: false
+					},
+					{
+						empty: 0,
+						days: 0,
+						isShow: false
+					},
+					{
+						empty: 0,
+						days: 0,
+						isShow: false
+					}
+				],
+				years: []
+			}
+		},
+		onLoad(option) {
+			this.id = option.id
+			this.getSku()
+			this.initDate()
+		},
+		methods: {
+			// 下一步
+			order() {
+				let selectDate = this.selectDate;
+				let sku = this.sku;
+				let nums = this.nums;
+				let allNum = 0;
+				if (!selectDate) {
+				    uni.showToast({
+				        title: '请先选择日期',
+				        icon: 'none'
+				    });
+				    return;
+				}
+				sku.map((item, index) => {
+				    item.num = nums[index];
+				    allNum = allNum + nums[index];
+				    item.price = selectDate.info[index].money;
+				});
+				if (allNum == 0) {
+				    uni.showToast({
+				        title: '至少选择一个规格',
+				        icon: 'none'
+				    });
+				    return;
+				}
+				
+				let data = {
+					sku: sku,
+					selectDate: selectDate,
+					price: this.totalPrice()
+				}
+				this.$store.commit('changeLineInfo',data)
+				
+				uni.navigateTo({
+					url: '/subPackages/line/orders'
+				})
+			},
+			// 减少数量
+			minus(index) {
+			    if (!this.selectDate) {
+			        uni.showToast({
+			            title: '请先选择出行日期',
+			            icon: 'none'
+			        });
+			        return;
+			    }
+			    let nums = this.nums;
+			    if (nums[index] == 0) {
+			        return;
+			    }
+			    nums[index] = nums[index] - 1;
+				this.nums = nums
+				this.$forceUpdate()
+			},
+			// 添加数量
+			add(index) {
+				if (!this.selectDate) {
+				    uni.showToast({
+				        title: '请先选择出行日期',
+				        icon: 'none'
+				    });
+				    return;
+				}
+			    let nums = this.nums;
+			    let sku = this.sku;
+			    
+			    if (this.selectDate.info[index].store == nums[index]) {
+					uni.showToast({
+					    title: '无库存',
+					    icon: 'none'
+					});
+			        return;
+			    }
+			    nums[index] = nums[index] + 1;
+				this.nums = nums
+				this.$forceUpdate()
+			},
+			// 切换月份
+			changeMonth(index) {
+				this.monthIndex = index
+			},
+			// 选择日期
+			selectDateFun(item) {
+			    // 选择日期
+			    let selectMonth = this.months[this.monthIndex];
+			    if (!selectMonth) {
+			        return;
+			    }
+			    let info = this.prices[selectMonth + '-' + item];
+			    if (info && info.product_price && info.product_price !== null && info.store != 0) {
+			        info.selectMonth = selectMonth;
+			        info.selectDate = item;
+					
+					this.selectDate = info;
+			    }
+			},
+			// 获取产品下的规格
+			getSku() {
+				this.Post({
+					goods_id: this.id
+				},'/api/goods/getSpecificationsByGoodsId').then(res => {
+					let nums = [];
+					res.data.map((item) => {
+					    nums.push(0);
+					});
+					this.sku = res.data,
+					this.nums = nums
+				})
+			},
+			// 总价
+			totalPrice() {
+				let selectDate = this.selectDate;
+				let nums = this.nums;
+				let price = 0;
+				nums.map((num, index) => {
+				    price = price + num * selectDate.info[index].money;
+				});
+				return price
+			},
+			initDate() {
+				let today = new Date();
+				let month = today.getMonth() + 1;
+				this.months[0] = today.getMonth() + 1
+				for (let i = 1; i < 6; i++) {
+					this.months[i] = (month + i) % 12 == 0 ? 12 : (month + i) % 12
+				}
+				
+				let year1 = today.getFullYear();
+				let year2 = this.months[0] < this.months[1] ? year1 : year1 + 1
+				let year3 = this.months[1] < this.months[2] ? year2 : year2 + 1
+				let year4 = this.months[2] < this.months[3] ? year3 : year3 + 1
+				let year5 = this.months[3] < this.months[4] ? year4 : year4 + 1
+				let year6 = this.months[4] < this.months[5] ? year5 : year5 + 1
+				
+				this.years = [year1,year2,year3,year4,year5,year6]
+				
+				for (let i = 0; i < 6; i++) {
+					this.emptyList[i].empty = this.getMonthDays(this.months[i], this.years[i])[1]
+					this.emptyList[i].days = this.getMonthDays(this.months[i], this.years[i])[0]
+				}
+				
+				// 是否展示日历
+				this.Post({
+					goods_id: this.id,
+					start_date: this.formatDate(today),
+					end_date: this.years[5] + '-' + this.months[5] + '-' + this.emptyList[5].days
+				},'/api/goods/getStoreByMonth').then(res => {
+					let data = res.data
+					for (let i = 0; i < 6; i++) {
+						this.emptyList[i].isShow = data[i].store > 0 ? true : false
+					}
+				})
+				
+				let selectDate;
+			    let selectMonth;
+				this.Post({
+					goods_id: this.id,
+					start_date: this.formatDate(today),
+					end_date: this.years[5] + '-' + this.months[5] + '-' + this.emptyList[5].days
+				},'/api/goods/get_product_sku_price_by_date').then(res => {
+					let prices = {};
+					res.data.map((item) => {
+					    // 给规格排序
+					    for (let i = 0; i < item.info.length; i++) {
+					        for (let j = i + 1; j < item.info.length; j++) {
+					            if (item.info[i].sku_info.id > item.info[j].sku_info.id) {
+					                [item.info[i], item.info[j]] = [item.info[j], item.info[i]];
+					            }
+					        }
+					    }
+					    let store = 0;
+					    item.info.map((i) => {
+					        store = store + i.store;
+					    });
+					    item.store = store;
+					    if (item.store != 0) {
+					        let date = item.date.split('-').splice(1, 2);
+					        let newDate = [];
+					        date.map((d) => {
+					            d = parseInt(d);
+					            newDate.push(d);
+					        });
+					        if (!selectDate) {
+					            selectDate = newDate[1];
+					            selectMonth = newDate[0];
+					        }
+					        prices[newDate.join('-')] = item;
+					    }
+					});
+					this.prices = prices
+					if (!selectDate) {
+					    return;
+					}
+					let info = prices[selectMonth + '-' + selectDate];
+					info.selectMonth = selectMonth;
+					info.selectDate = selectDate;
+					this.selectDate = info;
+					this.monthIndex = this.emptyList.findIndex(i => i.isShow == true)
+				})
+			},
+			// 获取这个月有几天
+			getMonthDays(month, year) {
+			    let date = new Date(year + '/' + month + '/01').getDay();
+			    if (month == 2) {
+			        if ((year % 100 !== 0 && year % 4 == 0) || year % 400 == 0) {
+			            return [29, date];
+			        } else {
+			            return [28, date];
+			        }
+			    } else if ((month < 8 && month % 2 == 1) || (month >= 8 && month % 2 == 0)) {
+			        return [31, date];
+			    } else {
+			        return [30, date];
+			    }
+			},
+			formatDate(date){
+				const year = date.getFullYear();
+				const month = date.getMonth() + 1;
+				const day = date.getDate();
+				return [year, month, day].join('-');
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.bg {
+	    background: #f6f6f6;
+		padding-bottom: 200rpx;
+	}
+	
+	.date-all-box {
+	    margin: 0 25rpx;
+		
+		.month-box {
+		    padding: 0 20rpx;
+		    height: 116rpx;
+		    display: flex;
+		    border-bottom: 1rpx solid #ccc;
+		    align-items: center;
+			
+			.month-item {
+			    margin-right: 70rpx;
+			    font-size: 33rpx;
+			    color: #000;
+			    font-weight: 500;
+			    line-height: 116rpx;
+			    position: relative;
+				white-space: nowrap;
+			}
+			.month-item.active::after {
+			    content: '1';
+			    display: block;
+			    font-size: 0;
+			    position: absolute;
+			    left: 0;
+			    right: 0;
+			    height: 8rpx;
+			    background: #96684F;
+			    border-radius: 4rpx;
+			    bottom: 0;
+			}
+		}
+		
+		.day-header {
+		    padding-top: 40rpx;
+		    line-height: 45rpx;
+		    font-size: 29rpx;
+		    color: #000;
+		    display: flex;
+		    align-items: center;
+		    flex-wrap: wrap;
+		    margin-bottom: 50rpx;
+			
+			.day-header-item {
+			    width: calc(690rpx / 7);
+			    text-align: center;
+			    flex-shrink: 0;
+			}
+		}
+		
+		.day-box {
+		    display: flex;
+		    align-items: center;
+		    font-size: 35rpx;
+		    flex-wrap: wrap;
+		    color: #999;
+			
+			.day-item {
+				width: calc(690rpx / 7);
+				text-align: center;
+				flex-shrink: 0;
+				display: flex;
+				align-items: center;
+				justify-content: center;
+				margin-bottom: 30rpx;
+				
+				.date-item-in {
+				    width: 98rpx;
+				    display: flex;
+				    align-items: center;
+				    justify-content: space-around;
+				    flex-direction: column;
+				    height: 98rpx;
+					
+					.date-num {
+					    line-height: 40rpx;
+					}
+					.date-num.active {
+					    color: #000;
+					}
+					
+					.price {
+					    font-size: 23rpx;
+					    color: #D62828;
+					    line-height: 20rpx;
+					}
+					.price::after {
+					    content: '起';
+					    font-size: 17rpx;
+					}
+					
+					.date-price-place {
+					    height: 20rpx;
+					}
+				}
+			}
+			.day-item.active {
+			    .date-item-in {
+			        background: #96684F;
+			        color: #fff;
+			        border-radius: 7rpx;
+					
+					.price {
+					    color: #fff;
+					}
+					
+					.date-num {
+					    color: #fff;
+					}
+			    }
+			}
+		}
+	}
+	
+	.box {
+	    background: white;
+	    margin: 25rpx;
+	    background: #ffffff;
+	    border-radius: 9rpx;
+	    padding: 29rpx 20rpx;
+		
+		.box-top {
+		    display: flex;
+		    justify-content: space-between;
+		    align-items: center;
+		    line-height: 50rpx;
+		    font-size: 28rpx;
+			font-weight: bold;
+		    color: #666;
+			
+			.box-title {
+			    font-size: 31rpx;
+				font-weight: bold;
+			    color: #000;
+			}
+			
+			.box-tip {
+			    flex: 1;
+			    margin-left: 30rpx;
+			}
+			
+			.iconfont {
+			    color: #000;
+			    font-size: 34rpx;
+				width: 50rpx;
+				text-align: center;
+			}
+			
+			.iconfont.disable {
+			    color: #666;
+			}
+			
+			.number {
+			    width: 67rpx;
+			    height: 50rpx;
+			    background: #f0f0f0;
+			    border-radius: 7rpx;
+			    text-align: center;
+			    margin: 0 10rpx;
+			}
+		}
+		
+		.single-price {
+		    font-size: 33rpx;
+		    color: #d62828;
+		    text-align: right;
+		    margin-top: 20rpx;
+			font-weight: bold;
+		}
+		.single-price::before {
+		    content: '￥';
+		    font-size: 24rpx;
+		    margin-right: 4rpx;
+		}
+	}
+	
+	.fixed-bottom {
+	    position: fixed;
+	    left: 0;
+	    right: 0;
+	    bottom: 0;
+	    height: 148rpx;
+	    background: white;
+	    display: flex;
+	    justify-content: space-between;
+	    align-items: center;
+	    padding: 0 26rpx;
+	    box-shadow: 0px 0px 16rpx 0px rgba(6, 0, 1, 0.1);
+	    z-index: 999;
+		
+		.fixed-text {
+		    flex-shrink: 0;
+		    font-size: 32rpx;
+		}
+		
+		.price {
+		    flex: 1;
+		    font-size: 40rpx;
+		    color: #D62828;
+		    font-weight: bold;
+		}
+		.price::before {
+			font-weight: bold;
+			font-size: 24rpx;
+			content: '￥';
+		}
+		
+		.btn {
+		    width: 233rpx;
+		    text-align: center;
+		    line-height: 73rpx;
+		    background: #DC2525;
+			border-radius: 11rpx;
+		    color: #fff;
+		    font-weight: bold;
+		    font-size: 32rpx;
+		    margin-left: 30rpx;
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/subPackages/line/orders.vue b/subPackages/line/orders.vue
new file mode 100644
index 0000000..9a11b31
--- /dev/null
+++ b/subPackages/line/orders.vue
@@ -0,0 +1,823 @@
+<template>
+	<view class="bg">
+		<view class="top-box" v-if="product">
+		    <view class="product-title">{{ product.title }}</view>
+		    <view class="product-subtitle">出行日期：{{ selectDate.date }}</view>
+		    <view class="product-subtitle">
+		        已选：<text class="product-text" v-for="(item, index) in sku" :key="index">{{ item.title }}x{{ item.num }}</text>
+		    </view>
+		</view>
+		
+		<view class="user-box">
+			<view class="user-box-title">出行人信息</view>
+			
+			<view v-for="(skuItem, skuIndex) in sku" :key="skuIndex">
+			    <view class="user-item" v-for="(item, index) in skuItem.num" :key="index">
+					<text class="user-item-text">{{ skuItem.title }}</text>
+			
+			        <view v-if="linkmans[skuIndex][index]" class="user-info">
+			            <text style="margin-right: 30rpx">{{ linkmans[skuIndex][index].name }}</text>
+			            <text>{{ linkmans[skuIndex][index].tel }}</text>
+			        </view>
+			
+					<img @tap="showLinkman(skuIndex)" v-if="linkmans[skuIndex][index]" src="https://static.ticket.sz-trip.com/dongtai/images/index/edit.png" class="icon-bianji1" />
+					
+			        <view @tap="showLinkman(skuIndex)" v-else class="add-btn">
+			            + 添加
+			        </view>
+			    </view>
+			</view>
+			<!-- <view class="user-item">
+			    <text class="user-item-text">姓名</text>
+			    <input v-model="reserve_name" placeholder="输入您的姓名" class="user-input"/>
+			</view> -->
+			<view class="user-item">
+			    <text class="user-item-text">联系电话：</text>
+			    <input type="number" v-model="reserve_phone" placeholder="输入您的手机号" maxlength="11" class="user-input"/>
+				<uni-icons type="closeempty" size="20" @click="reserve_phone = ''" v-if="reserve_phone!= ''" style="margin-left: 30rpx;"></uni-icons>
+			</view>
+			<view class="user-item" style="border-bottom: none">
+			    <text class="user-item-text">订单备注：</text>
+			    <input type="text" v-model="remark" placeholder="选填"  class="user-input"/>
+			</view>
+		</view>
+		
+		<!-- <navigator :url="'/subPackages/order/orderCoupon?allprice='+ price + '&sku_ids='+ sku_ids.toString()" class="coupon-box flex-between">
+		    <text>优惠券</text>
+		    <view style="display: flex;align-items: center;">
+				<view class="add-btn" v-if="!coupon">选择优惠券</view>
+				<view style="display: flex;align-items: center;color: #C3282E;font-weight: bold;" v-if="coupon && coupon.CouponActivity">
+					<view>-￥{{coupon.CouponActivity.discounts/100}}</view>
+				</view>
+				<img src="https://static.ticket.sz-trip.com/changyoutaihu/images/user/rightIcon.png" class="icon-coupon">
+			</view>
+		</navigator> -->
+		
+		<!-- <view class="xy-box">
+			<view class="quan flex-center" @click="clickXy">
+				<view class="quan-seld" v-if="xySeld"></view>
+			</view>
+			<view style="margin-left: 20rpx;">
+				请您仔细阅读<span @click="openXz">线路标准退预定须知</span>，点击去支付即代表您已阅读条款内容
+			</view>
+		</view> -->
+		
+		<view class="fixed-bottom">
+		    <view class="order-all-price">
+		        合计：
+		        <text class="order-all-text">
+					¥{{ priceTotal() / 100 }}
+				</text>
+		    </view>
+		    <view class="order-btn" @tap="order">去支付</view>
+		</view>
+		
+		<!-- 协议弹框 -->
+		<!-- <uni-popup ref="popup" type="bottom" :safe-area="false">
+			<view class="xzPopup">
+				<view v-html="formateRichText(product.reserve_content)"></view>
+				<img src="https://static.ticket.sz-trip.com/taihu/images/scenic/cha.png" @click="closePopup">
+			</view>
+		</uni-popup> -->
+		
+		<!-- 选择出行人 -->
+		<uni-popup ref="contactPopup" type="bottom" backgroundColor="#F4F4F4" >
+			<view class="people-popup">
+				<view class="ptop-box">
+					<view class="top flex-between" style="padding-bottom: 14rpx;">
+						<text class="text-overflow" @click="$refs.contactPopup.close()">取消</text>
+						<text style="color: #96684F;" class="confirm" @click="$refs.contactPopup.close()">确定</text>
+					</view>
+				</view>
+				
+				<view class="button" @click="$refs.contactAddPopup.open()">添加出行人</view>
+				<view class="popup-list" v-if="peopleList.length > 0">
+					<view :class="['popup-item', item.is_seld ? 'active': '']"
+						v-for="(item, index) in peopleList" :key="index" @click="seldThisPeople(item,index)">
+						<view class="item-top flex flex-items-center">
+							<image src="https://static.ticket.sz-trip.com/tourist/daoyou/edit.png" class="edit-img" @click.stop="changeContactAddPopup('open',item)"></image>
+							<view class="name flex-shrink-0" style="padding-left: 32rpx;width: 180rpx;">{{item.name}}</view>
+							<view class="flex-1 w-1rpx" style="padding-left: 20rpx;">
+								<view class="name">
+									<text>手机号 {{ item.tel }}</text>
+									<text class="tag" v-if="item.is_default == 1">默认</text>
+								</view>
+								<view class="subtitle text-overflowRows">身份证 {{ item.id_number}}</view>
+							</view>
+							
+						</view>
+					</view>
+				</view>
+			</view>
+		</uni-popup>
+		
+		<!-- 新增编辑出行人弹窗 -->
+		<uni-popup ref="contactAddPopup" type="bottom" backgroundColor="#F4F4F4" style="border-radius: 13rpx 13rpx 0 0;">
+			<view class="people-popup" style="padding: 0;">
+				<view class="ptop-box">
+					<view class="top flex-between" style="height: fit-content;">
+						<text class="text-overflow" @click="changeContactAddPopup('close')">取消</text>
+						<text style="color: #96684F;" class="confirm" @click="saveContact">保存</text>
+					</view>
+				</view>
+				
+				<view class="add-edit-content">
+					<contactAddVue ref="contactAddVueRef"></contactAddVue>
+				</view>
+			</view>
+		</uni-popup>
+	</view>
+</template>
+
+<script>
+	import contactAddVue from '@/components/contactAdd.vue';
+	export default {
+		components: {contactAddVue},
+		data() {
+			return {
+				product: this.$store.state.user.lineInfo.product,
+				sku: this.$store.state.user.lineInfo.sku,
+				selectDate: this.$store.state.user.lineInfo.selectDate,
+				linkmans: [],
+				sku_ids: '',
+				price: this.$store.state.user.lineInfo.price,
+				skuIndex: null,
+				coupon: '',
+				reserve_name: '',
+				reserve_phone: '',
+				reserve_mobile: '',
+				remark: '',
+				peopleList: [],
+				linkmanList: [],
+				xySeld: false
+			}
+		},
+		onReady() {
+			// 清除优惠券
+			this.$store.commit("choseCoupon", "");
+			// 自动获取手机号
+			this.reserve_phone = JSON.parse(uni.getStorageSync('userInfo')).mobile
+			this.Post({
+				goods_id: this.sku[0].goods_id
+			},'/api/goods/getGoodDetail').then(res => {
+				this.product = res.data
+			})
+			
+			let linkmans = [];
+			let sku_ids = [];
+			this.sku.map((item) => {
+			    let num = Number(item.num);
+			    linkmans.push(new Array(num));
+			    sku_ids.push(item.id);
+			});
+			this.linkmans = linkmans
+			this.sku_ids = sku_ids
+			
+			this.getPeople()
+		},
+		onShow() {
+			this.coupon = this.$store.state.user.coupon
+			console.log('传过来的优惠券',this.coupon);
+		},
+		methods: {
+			// 协议
+			clickXy() {
+				this.xySeld = !this.xySeld
+			},
+			openXz() {
+				this.$refs.popup.open('bottom')
+			},
+			closePopup() {
+				this.$refs.popup.close()
+			},
+			// 去支付
+			order() {
+				let flag = true
+				let product_list = [];
+				this.sku.map((item, index) => {
+					if(item.num > 0) {
+						let linkman = this.linkmans[index].filter(i => i);
+						if(linkman.length < item.num) {
+							flag = false
+							uni.showToast({
+							    title: '请选择对应的出行人',
+							    icon: 'none'
+							});
+							return;
+						}
+						let pId = []
+						linkman.map(lItem => {
+							pId.push(lItem.id)
+						})
+						product_list.push({
+						    product_id: this.product.id,
+						    specifications_id: item.id,
+						    num: item.num,
+						    contact_id: pId,
+						    date: this.selectDate.date
+						});
+					}
+				})
+				
+				// if(!this.idChinaName(this.reserve_name)) {
+				// 	flag = false
+				// 	uni.showToast({
+				// 	    title: '请输入联系人',
+				// 	    icon: 'none'
+				// 	});
+				// 	return;
+				// }
+				
+				if(!this.IsTel(this.reserve_phone)) {
+					flag = false
+					uni.showToast({
+					    title: '请输入联系方式',
+					    icon: 'none'
+					});
+					return;
+				}
+				
+				// if(!this.xySeld) {
+				// 	flag = false
+				// 	uni.showToast({
+				// 	    title: '请先同意预订须知内容',
+				// 	    icon: 'none'
+				// 	});
+				// 	return;
+				// }
+				
+				if(flag){
+					let data = {
+					    goods: product_list,
+					    coupon: this.coupon ? this.coupon.id : null,
+						remark: this.remark,
+						reserve_phone: this.reserve_phone
+					};
+					
+					this.Post({
+						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);
+							this.$store.commit("choseCoupon", "");
+							
+							this.Post({
+								order_id: order_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: () => {
+											this.getSubscribeMessage()
+										},
+										fail() {
+											uni.navigateTo({
+												url: '/subPackages/order/trades'
+											})
+										}
+									})
+								}
+							})
+						}
+					})
+				}
+			},
+			// 总价
+			priceTotal() {
+				let price = 0
+				if(this.coupon) {
+					if (this.coupon.percent == 0) {
+						price = this.price - this.coupon.CouponActivity.discounts
+					} else{
+						price = this.price - (this.price * this.coupon.CouponActivity.percent/100)
+					}
+				}else {
+					price = this.price
+				}
+				return price < 0 ? 0 : price
+			},
+			// 获取出行人列表
+			getPeople() {
+				this.Post({
+					offset: 0,
+					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
+								}
+							}
+						}
+						this.$forceUpdate()
+					}
+				})
+			},
+			// 保存出行人
+			async saveContact () {
+				let res = await this.$refs.contactAddVueRef.submit()
+				if (res && res.code == 1) {
+					this.getPeople();
+					this.changeContactAddPopup('close')
+					console.log('this.linkmanList3',this.linkmanList)
+				}
+			},
+			// 选择出行人弹框
+			showLinkman(skuIndex) {
+				if(this.peopleList.length == 0) {
+					this.$refs.contactAddPopup.open()
+					return;
+				}
+				
+				this.skuIndex = skuIndex
+				
+				this.peopleList.map(item => {
+					if(item.is_seld && item.is_sku != this.sku[this.skuIndex].id) {
+						item.is_disable = true
+					}else {
+						item.is_disable = false
+					}
+				})
+				
+				this.$refs.contactPopup.open('bottom')
+				this.$forceUpdate()
+			},
+			// 出行人弹框
+			changeContactAddPopup(type, item) {
+				if(type == 'open') {
+					// 如果没有出行人或编辑 打开新增编辑弹窗
+					if (this.peopleList.length<=0 || item.id) {
+						
+						this.$refs.contactAddPopup.open()
+						
+						if(item.id) {
+							this.$nextTick(()=>{
+								this.$refs.contactAddVueRef.init(item)
+							})
+						}
+						return;
+					}
+					this.$refs.contactPopup.open()
+				}else {
+					this.$refs.contactAddPopup.close()
+				}
+			},
+			// 选择出行人
+			seldThisPeople(item,index) {
+				let num = 0
+				let list = []
+				
+				if(item.is_seld && item.is_disable) {
+					uni.showToast({
+					    title: '该联系人已选择为其他规格',
+					    icon: 'none'
+					});
+					return;
+				}
+				this.linkmans[this.skuIndex] = []
+				this.peopleList.map(items => {
+					if(items.id == item.id) {
+						items.is_seld = !items.is_seld
+					}
+					if(items.is_seld && !items.is_disable) {
+						num++;
+						items.is_sku = this.sku[this.skuIndex].id
+						this.linkmans[this.skuIndex].push(items)
+					}
+					if(items.is_seld) {
+						this.linkmanList.push(item)
+					}
+				})
+				if(num > this.sku[this.skuIndex].num) {
+					item.is_seld = false
+					this.linkmans[this.skuIndex].splice(this.linkmans[this.skuIndex].findIndex(i => i.id == item.id),1)
+					uni.showToast({
+					    title: '该规格最多只能选择'+this.sku[this.skuIndex].num+'个出行人',
+					    icon: 'none'
+					});
+					return;
+				}
+				this.$forceUpdate()
+			},
+			// 确定取消
+			changePeoplePopup(type,confirm) {
+				this.$refs.peoplePopup.close()
+				this.$forceUpdate()
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.bg {
+		background: #f6f6f6;
+		min-height: 100vh;
+		padding: 26.67rpx 26.67rpx 200rpx;
+	}
+	
+	.top-box {
+	    padding: 30rpx;
+		background: #FFFFFF;
+		border-radius: 13rpx;
+		
+		.product-title {
+			font-weight: bold;
+			font-size: 31rpx;
+			color: #000000;
+		}
+		
+		.product-subtitle {
+		    font-weight: 500;
+		    font-size: 27rpx;
+		    color: #333333;
+		    margin-top: 20rpx;
+		}
+	}
+	
+	.user-box {
+	    margin-top: 25rpx;
+	    background: #ffffff;
+	    border-radius: 13rpx;
+		
+		.user-box-title {
+		    // border-bottom: 1rpx solid #ccc;
+		    line-height: 113rpx;
+		    font-size: 33rpx;
+		    color: #000;
+		    font-weight: bold;
+		    padding: 0 20rpx;
+		}
+		
+		.user-item {
+		    margin: 0 20rpx;
+		    display: flex;
+		    align-items: center;
+		    justify-content: space-between;
+		    height: 126rpx;
+		    border-top: 1rpx solid rgba(184, 184, 184, .5);
+			
+			.user-item-text{
+				flex-shrink: 0;
+				font-size: 31rpx;
+				color: #000;
+				font-weight: bold;
+				margin-right: 20rpx;
+			}
+			
+			.user-info {
+			    font-size: 27rpx;
+			    margin-right: 20rpx;
+			    flex: 1;
+			    text-align: left;
+			}
+			
+			.icon-bianji1 {
+				width: 36rpx;
+				height: 36rpx;
+			    margin-right: 10rpx;
+			}
+			
+			.add-btn {
+			    display: flex;
+			    width: 153rpx;
+			    height: 57rpx;
+			    border: 1rpx solid #333333;
+			    border-radius: 29rpx;
+			    box-sizing: border-box;
+			    justify-content: center;
+			    align-items: center;
+			    font-size: 28rpx;
+			    color: #000;
+			}
+			
+			.user-input {
+			    flex: 1;
+			    font-size: 29rpx;
+			    display: block;
+				text-align: right;
+			}
+			
+			.icon-coupon{
+				width: 20rpx;
+				height: 20rpx;
+				margin-left: 15rpx;
+			}
+		}
+	}
+		
+	.fixed-bottom {
+	    position: fixed;
+	    left: 0;
+	    right: 0;
+	    bottom: 0;
+	    height: 148rpx;
+	    background: white;
+	    display: flex;
+	    justify-content: space-between;
+	    align-items: center;
+	    padding: 0 26rpx;
+		box-sizing: border-box;
+	    box-shadow: 0px 0px 16rpx 0px rgba(6, 0, 1, 0.1);
+	    z-index: 1;
+		
+		.order-all-price {
+		    flex: 1;
+		    font-size: 29rpx;
+		    color: #333;
+		    font-weight: 500;
+			
+			.order-all-text {
+			    flex: 1;
+			    font-size: 36rpx;
+			    color: #C3282E;
+				font-weight: bold;
+			}
+		}
+		
+		.order-btn {
+		    width: 233rpx;
+		    text-align: center;
+		    line-height: 73rpx;
+		    background: #DC2525;
+		    border-radius: 11rpx;
+		    color: #fff;
+		    font-weight: bold;
+		    font-size: 32rpx;
+		    margin-left: 30rpx;
+		}
+	}
+	
+	.xy-box {
+		width: 658rpx;
+		margin: 36rpx auto 0;
+		font-size: 27rpx;
+		font-family: PingFangSC;
+		font-weight: 400;
+		color: #999999;
+		display: flex;
+		
+		span {
+			color: #FEB419;
+		}
+		
+		.quan {
+			min-width: 23rpx;
+			min-height: 23rpx;
+			max-width: 23rpx;
+			max-height: 23rpx;
+			border: 1px solid #999999;
+			border-radius: 50%;
+			
+			.quan-seld {
+				width: 12rpx;
+				height: 12rpx;
+				background: #FEB419;
+				border-radius: 50%;
+			}
+		}
+	}
+	
+	.xzPopup {
+		width: 750rpx;
+		padding: 33rpx 26rpx 20rpx;
+		box-sizing: border-box;
+		background-color: #FFFFFF;
+		position: relative;
+		height: 1200rpx;
+		overflow-y: scroll;
+	
+		view {
+			padding: 0 20rpx;
+			box-sizing: border-box;
+			margin-top: 35rpx;
+		}
+	
+		img {
+			width: 32rpx;
+			height: 32rpx;
+			position: absolute;
+			top: 33rpx;
+			right: 27rpx;
+		}
+	}
+	
+	.coupon-box {
+		height: 113rpx;
+		background: #FFFFFF;
+		border-radius: 13rpx;
+		font-weight: bold;
+		font-size: 31rpx;
+		color: #000000;
+		padding: 0 20rpx;
+		margin: 0 20rpx;
+		
+		.add-btn {
+			width: 153rpx;
+			line-height: 40rpx;
+			background: #C3282E;
+			border-radius: 9rpx;
+			text-align: center;
+			font-weight: 500;
+			font-size: 24rpx;
+			color: #FFFFFF;
+		}
+		
+		.icon-coupon{
+			width: 20rpx;
+			height: 20rpx;
+			margin-left: 15rpx;
+		}
+	}
+	
+	.people-popup {
+		padding: 26rpx;
+		height: 800rpx;
+		background: #F7F7F7;
+	
+		.ptop-box {
+			height: 100rpx;
+			display: flex;
+			align-items: center;
+	
+			.top {
+				position: fixed;
+				left: 0;
+				right: 0;
+				color: #000;
+				height: 80rpx;
+				font-size: 0;
+				overflow: hidden;
+				padding: 0 26rpx;
+	
+				text {
+					text-align: left;
+					font-size: 35rpx;
+					font-weight: 400;
+					color: #000000;
+				}
+	
+				.confirm {
+					font-weight: 400;
+					color: #000000;
+				}
+			}
+		}
+		
+		.popup-list {
+			height: 666rpx;
+			overflow: scroll;
+		
+			.popup-item {
+				border-radius: 12rpx;
+				padding: 2rpx;
+				margin-top: 24rpx;
+				font-size: 24rpx;
+				color: #333333;
+				font-weight: 400;
+				background-color: #ffffff;
+		
+				.item-top {
+					border-radius: 12rpx;
+					padding: 30rpx 40rpx;
+					background-color: #ffffff;
+					
+					image {
+						color: #666666;
+						width: 40rpx;
+						height: 40rpx;
+					}
+		
+					.name {
+						overflow: hidden;
+						font-family: PingFang SC;
+						font-weight: 400;
+						font-size: 32rpx;
+		
+						text {
+							color: #666;
+							font-size: 25rpx;
+						}
+		
+						.tag {
+							padding: 0 8rpx;
+							height: 32rpx;
+							border-radius: 7rpx;
+							line-height: 30rpx;
+							text-align: center;
+							font-size: 23rpx;
+							font-family: PingFang SC;
+							font-weight: 500;
+							color: #ffffff;
+							background: #96684F;
+							margin-left: 10rpx;
+						}
+					}
+		
+					.com-flex-start {
+						margin: 0 0 30rpx;
+					}
+		
+					.subtitle {
+						font-weight: 400;
+						flex: 1;
+						text-align: left;
+						margin-top: 33rpx;
+						color: #666666;
+						font-size: 25rpx;
+		
+						.mobile {
+							margin-bottom: 36rpx;
+						}
+					}
+		
+					.status {
+						width: 40rpx;
+						height: 40rpx;
+						line-height: 40rpx;
+						border-radius: 50%;
+						text-align: center;
+						box-sizing: border-box;
+		
+						img {
+							width: 27rpx;
+							height: 21rpx;
+						}
+					}
+					.statuss {
+						background: linear-gradient(90deg, #fa2b66, #ff9834);
+						border: none;
+					}
+					.noSelect {
+						border: 1rpx solid #999999;
+					}
+				}
+		
+				.item-site {
+					color: #666666;
+					display: flex;
+					align-items: center;
+					padding: 36rpx 0;
+		
+					view {
+						width: 23rpx;
+						height: 23rpx;
+						margin-right: 10rpx;
+						border: 1rpx solid #999999;
+						border-radius: 50%;
+		
+						view {
+							width: 8rpx;
+							height: 8rpx;
+							background: #000000;
+							border-radius: 50%;
+							margin: auto;
+						}
+					}
+				}
+			}
+			
+			.popup-item.active{
+				border: 2rpx solid #96684F;
+			}
+			.popup-item.disabled{
+				.item-top {
+					background-color: #CCC;
+				}
+			}
+		}
+		
+		.button {
+			text-align: center;
+			width: 100%;
+			height: 80rpx;
+			line-height: 80rpx;
+			background-color: #ffffff;
+			border-radius: 40rpx;
+			font-family: PingFang SC;
+			font-weight: 400;
+			font-size: 33rpx;
+			color: #000000;
+		}
+		
+		.add-edit-content{
+			border-radius: 13rpx;
+			min-height: 800rpx;
+			margin: 0 22rpx;
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/subPackages/order/orderDetail.vue b/subPackages/order/orderDetail.vue
new file mode 100644
index 0000000..cea267e
--- /dev/null
+++ b/subPackages/order/orderDetail.vue
@@ -0,0 +1,1240 @@
+<template>
+	<view class="bg">
+		<view class="top-box">
+			<view>{{info.status_text}}</view>
+
+			<!-- 待支付时会显示自动取消时间 -->
+			<view v-if="info.status=='WAIT_PAYMENT'" class="close-time">订单将在{{info.close_time.slice(-8)}}自动取消</view>
+			
+			<!-- 待退款 -->
+			<view v-if="info.status=='WAIT_REFUND'" class="close-time">系统将在1-7个工作日内原路退回您的原支付账户</view>
+			
+			<!-- 退款完成 -->
+			<view v-if="info.status=='REFUND_SUCCESS'" class="close-time">您的退款金额已退还到您的原支付账户</view>
+		</view>
+
+		<!-- 景点、美食二维码 -->
+		<view v-if="isQrcode" style="margin-top: -66rpx;">
+			<view class="qrcode-remain">还剩<span>{{remainNum}}</span>张未核销</view>
+
+			<swiper class="qrcode-box" :circular="false" previous-margin="120rpx" next-margin="120rpx" :duration="800"
+				:current="current" @change="swiperChange">
+				<swiper-item v-for="(item, index) in info.order_child" :key="index" class="flex-center">
+					<view class="qrcode-item flex-column">
+						<view class="qrcode-title">{{item.specifications_name}}</view>
+						<image :src="item.qrcodeimg" style="width: 300rpx;height: 300rpx;" mode="aspectFill"></image>
+						<canvas :id="'qrcodeT'+index" :canvas-id="'qrcodeT'+index"
+							style="width:150px;height:150px;z-index: -20;bottom: -500px;position: absolute;"></canvas>
+						<view class="qrcode-subtitle">核销码:{{item.third_order_id||item.child_id}}</view>
+
+						<view class="complete-text flex-center"
+							v-if="['WAIT_REFUND','REFUND_SUCCESS','WAIT_COMMENT','COMPLETE'].includes(item.status)">
+							<view class="flex-center" v-if="item.status == 'WAIT_COMMENT'">
+								已核销
+							</view>
+							<view class="flex-center" v-else>
+								已失效
+							</view>
+						</view>
+					</view>
+				</swiper-item>
+			</swiper>
+
+			<!-- 指示点 -->
+			<view class="swiper-point flex-center">
+				<view v-for="(item,index) in info.order_child" :key="index"
+					:class="[{'swiper-points': index == current}]"></view>
+			</view>
+
+			<!-- 提示语 -->
+			<view class="swiper-prompt">左右滑动核销其他二维码</view>
+		</view>
+
+		<!-- 子订单里info.order_child[0].goods_genre：景点ticket、酒店hotel、美食food、邮寄自提pgoods、 -->
+
+		<view :style="{margin: isQrcode ? '0' : '-66rpx auto 0'}" v-if="info.order_child">
+			<!-- 景点订单 -->
+			<view>
+				<!-- 景点详情 -->
+				<view class="scenic-detail">
+					<view>
+						<view class="scenic-title" @click="gotoDetail">
+							{{info.order_child[0].goods_title}}
+							<image src="https://static.ticket.sz-trip.com/yandu/images/order/rightIcon.png"></image>
+						</view>
+						<view class="scenic-subtitle">
+							出行时间：<span>{{info.order_child[0].use_date}}</span>
+						</view>
+					</view>
+
+					<!-- 子订单规格 -->
+					<view>
+						<view v-for="(item,index) in info.order_child" :key="index"
+							class="specifications-item flex-between">
+							<view>{{item.specifications_name}}</view>
+							<view class="flex-between" style="width: 150rpx;">
+								<view>￥{{item.money / 100}}</view>
+								<view>x{{item.num}}</view>
+							</view>
+						</view>
+					</view>
+
+					<!-- 商品价格 -->
+					<view class="public-price">
+						<view class="flex-between">
+							商品总额：<span>￥{{info.money / 100}}</span>
+						</view>
+						<view class="flex-between" v-if="info.discounts">
+							优惠券：<span>-￥{{info.discounts / 100}}</span>
+						</view>
+						<view class="flex-between">
+							实付金额：<span style="font-size: 35rpx;color: #EE3E3B;">￥{{info.pay_money / 100}}</span>
+						</view>
+					</view>
+				</view>
+
+				<!-- 出行人 -->
+				<view class="novice-box" v-if="order_child[0].contact_name">
+					出行人
+					<view v-for="(item,index) in info.order_child" :key="index" class="novice-item">
+						<view class="novice-title">{{item.specifications_name}}</view>
+						<view class="novice-subtitle" v-if="item.contact_name">
+							<span>姓名：</span>{{item.contact_name}}
+						</view>
+						<view class="novice-subtitle" v-if="item.id_number">
+							<span>身份证：</span>{{item.id_number}}
+						</view>
+					</view>
+				</view>
+			</view>
+		</view>
+
+		<!-- 订单信息 -->
+		<view class="order-info">
+			订单信息
+			<view class="order-subtitle" style="display: flex;align-items: center;">
+				<span>订单账号：</span>{{info.order_id}}
+				<view class="copy flex-around" @click="clickCopy">
+					<image src="https://static.ticket.sz-trip.com/yandu/images/order/copy.png" class="copy-img"></image>
+					复制
+				</view>
+			</view>
+			<view class="order-subtitle">
+				<span>下单时间：</span>{{info.create_time}}
+			</view>
+			<view class="order-subtitle" v-if="info.pay_time">
+				<span>支付时间：</span>{{info.pay_time}}
+			</view>
+		</view>
+
+		<!-- 联系客服 -->
+		<!-- <view class="kefu-box" @click="$refs.popup.open()">
+			<image src="https://static.ticket.sz-trip.com/yandu/images/order/kefu.png" mode="" class="kefu-img"></image>
+			联系客服
+		</view> -->
+
+		<!-- 底部按钮 -->
+		<footer>
+			<view class="bottom-price" v-if="info.status == 'WAIT_PAYMENT'">
+				合计：
+				<span class="price">{{info.pay_money/100}}</span>
+			</view>
+			<view class="btn-box">
+				<view class="btn" v-if="info.status == 'PAYMENT_SUCCESSFULLY'" @click="refund(info.order_id)">
+					取消订单
+				</view>
+
+				<view class="btn" v-if="info.status == 'WAIT_PAYMENT'" @click="closeOrder(info.order_id)">
+					关闭订单
+				</view>
+
+				<view class="btn"
+					v-if="['WAIT_REFUND','REFUND_SUCCESS','WAIT_COMMENT','COMPLETE','CLOSED'].includes(info.status)"
+					@click="gotoDetailByTypeId(info.order_id[0].goods_id, info.order_id[0].type_id)">
+					再次购买
+				</view>
+
+				<view class="btn pay-btn" v-if="info.status == 'WAIT_PAYMENT'" @click="setOrderId(info.order_id)">
+					立即支付
+				</view>
+			</view>
+		</footer>
+		
+		<!-- 客服弹框 -->
+		<uni-popup ref="popup" type="center">
+			<view class="consult-popup">
+				即将拨打客服电话
+				<view class="consult-subtitle">服务时间：周一至周五<br>8:30-11:30，14:30-18:00</view>
+				<view class="consult-btns">
+					<view @click="$refs.popup.close()">取消</view>
+					<view @click="clickPhone('0515-69186109')">确定</view>
+				</view>
+			</view>
+		</uni-popup>
+	</view>
+</template>
+
+<script>
+	import QRCode from '@/static/js/weapp-qrcode.js'
+	export default {
+		data() {
+			return {
+				order_id: '',
+				info: {},
+				foodInfo: {},
+				current: 0,
+				isQrcode: false,
+				remainNum: 0,
+				postInfo: []
+			}
+		},
+		onLoad(option) {
+			this.order_id = option.id
+			this.getDetail()
+		},
+		onShow() {
+
+		},
+		methods: {
+			// 获取订单详情
+			getDetail() {
+				this.Post({
+					order_id: this.order_id,
+					lon: uni.getStorageSync('location').lon || '110.43785794300781',
+					lat: uni.getStorageSync('location').lat || '36.95286642085422'
+				}, '/api/order/orderDetail').then(res => {
+					this.info = res.data;
+
+					// 景点、美食二维码
+					if (['PAYMENT_SUCCESSFULLY', 'WAIT_REFUND', 'REFUND_SUCCESS', 'WAIT_COMMENT', 'COMPLETED']
+						.includes(this.info.status)) {
+						this.isQrcode = true
+						for (let i = 0; i < this.info.order_child.length; i++) {
+							// 有third_order_id 优先用third_order_id
+							this.getCodeImg(this.info.order_child[i].third_order_id||this.info.order_child[i].child_id, i);
+
+							// 未核销数量
+							if (this.info.order_child[i].status == 'SUCCESS') this.remainNum += 1
+						}
+					} else if (!['WAIT_PAYMENT', 'CLOSED'].includes(this.info.status)) {
+						for (let i = 0; i < this.info.order_child.length; i++) {
+							if (this.info.order_child[i].is_display_order_qrcode) {
+								this.isQrcode = true
+								this.getCodeImg(this.info.order_child[i].third_order_id||this.info.order_child[i].child_id, i);
+
+								// 未核销数量
+								if (this.info.order_child[i].status == 'SUCCESS') this.remainNum += 1
+							}
+						}
+					}
+				})
+			},
+			// 生成二维码
+			getCodeImg(code, index) {
+				new QRCode('qrcodeT' + index, {
+					text: code,
+					width: 150,
+					height: 150,
+					padding: 2,
+					colorDark: 'rgb(0,0,0)',
+					colorLight: 'rgb(255,255,255)',
+					correctLevel: QRCode.CorrectLevel.M, // 二维码可辨识度
+					callback: res => {
+						this.$set(this.info.order_child[index], 'qrcodeimg', res.path);
+						this.$forceUpdate();
+					}
+				});
+			},
+			//轮播图左右滑动
+			swiperChange(e) {
+				let {
+					current,
+					source
+				} = e.detail;
+				//在自动或手动的时候才赋予current值
+				if (source === 'autoplay' || source === 'touch') {
+					this.current = current;
+				}
+			},
+			// 复制订单号
+			clickCopy() {
+				uni.setClipboardData({
+					data: this.info.order_id, //要被复制的内容
+					success: () => {
+						//复制成功的回调函数
+						uni.showToast({
+							title: '复制成功',
+							icon: 'none'
+						});
+					}
+				});
+			},
+			// 申请退款
+			refund(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'
+									});
+									this.getDetail()
+									uni.$emit("updateDataByConnect", {
+										msgType: 'updateOrderTrades',
+										data: {}
+									})
+								}
+							});
+						}
+					}
+				});
+			},
+			// 关闭订单
+			closeOrder(id, 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.getDetail();
+									uni.$emit("updateDataByConnect", {
+										msgType: 'updateOrderTrades',
+										data: {}
+									})
+								}
+							});
+						}
+					}
+				});
+			},
+			// 立即支付
+			setOrderId(id) {
+				let that = this;
+				that.orderId = id;
+				that.Post({
+					order_id: id,
+					type: "miniprogram",
+					platform: 'miniprogram'
+				}, '/api/pay/unify').then(res => {
+					if (res.code == 1) {
+						uni.requestPayment({
+							nonceStr: res.data.nonceStr,
+							package: res.data.package,
+							paySign: res.data.paySign,
+							signType: res.data.signType,
+							timeStamp: res.data.timeStamp,
+							success: () => {
+								that.getDetail();
+								uni.$emit("updateDataByConnect", {
+									msgType: 'updateOrderTrades',
+									data: {}
+								})
+							}
+						});
+					}
+				});
+			},
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.bg {
+		width: 750rpx;
+		overflow-x: hidden;
+		min-height: 100vh;
+		background-color: #F7F7F7;
+		padding-bottom: 200rpx;
+	}
+
+	.title-box {
+		position: absolute;
+		left: 5rpx;
+		top: 101rpx;
+		font-size: 40rpx;
+		padding: 0 26.67rpx;
+		z-index: 2;
+		display: flex;
+		align-items: center;
+		width: 100%;
+
+		view {
+			font-weight: 400;
+			font-size: 36rpx;
+			color: #000000;
+			margin-left: 245rpx;
+		}
+	}
+
+	.top-box {
+		width: 750rpx;
+		height: 414rpx;
+		background: linear-gradient(180deg, #DDF2E2, #DDF2E2, #DDF2E2, #DDF2E2, #DDF2E2, #F7F7F7);
+		padding: 200rpx 0 0 50rpx;
+		font-weight: bold;
+		font-size: 43rpx;
+		color: #000000;
+
+		.close-time {
+			font-weight: 400;
+			font-size: 27rpx;
+			margin-top: 20rpx;
+		}
+	}
+
+	// 景点、美食 二维码
+	.qrcode-remain {
+		font-weight: bold;
+		font-size: 29rpx;
+		color: #000000;
+		text-align: center;
+
+		span {
+			width: 60rpx;
+			text-align: center;
+			color: rgba(238, 62, 59, 1);
+			display: inline-block;
+		}
+	}
+
+	.qrcode-box {
+		height: 456rpx;
+		display: flex;
+		align-items: center;
+		margin-top: 32rpx;
+
+		.qrcode-item {
+			width: 467rpx !important;
+			height: 456rpx !important;
+			background: #FFFFFF;
+			box-shadow: 0rpx 0rpx 33rpx 0rpx rgba(102, 102, 102, 0.2);
+			border-radius: 20rpx;
+			padding: 25rpx 0;
+			justify-content: space-between;
+			align-items: center;
+			position: relative;
+
+			image {
+				width: 300rpx;
+				height: 300rpx;
+			}
+
+			.qrcode-title {
+				font-weight: bold;
+				font-size: 32rpx;
+				color: #000000;
+			}
+
+			.qrcode-subtitle {
+				font-weight: 500;
+				font-size: 27rpx;
+				color: #888888;
+			}
+
+			.complete-text {
+				position: absolute;
+				width: 300rpx;
+				height: 300rpx;
+				left: 0;
+				top: 0;
+				right: 0;
+				bottom: 0;
+				margin: auto;
+				background: rgba(0, 0, 0, .5);
+
+				view {
+					width: 200rpx;
+					height: 200rpx;
+					background: #FFFFFF;
+					border-radius: 100rpx;
+					font-weight: bold;
+					font-size: 36rpx;
+					color: #000000;
+				}
+			}
+		}
+	}
+
+	.swiper-point {
+		height: 63rpx;
+
+		view {
+			width: 11rpx;
+			height: 11rpx;
+			background: #CCCCCC;
+			border-radius: 50%;
+		}
+
+		view:not(:first-child) {
+			margin-left: 13rpx;
+		}
+
+		.swiper-points {
+			background: #71B580;
+		}
+	}
+
+	.swiper-prompt {
+		font-weight: 500;
+		font-size: 29rpx;
+		color: #EE3E3B;
+		text-align: center;
+		margin-bottom: 45rpx;
+	}
+
+	// 景点订单详情
+	.scenic-detail {
+		width: 697rpx;
+		height: auto;
+		background: #FFFFFF;
+		border-radius: 20rpx;
+		padding: 26rpx;
+		margin: auto;
+
+		&>view:nth-child(2) {
+			margin: 30rpx 0;
+			border-top: 1rpx solid #D8D8D8;
+			border-bottom: 1rpx solid #D8D8D8;
+		}
+
+		.scenic-title {
+			font-weight: bold;
+			font-size: 36rpx;
+			color: #000000;
+
+			image {
+				width: 17.33rpx;
+				height: 29.33rpx;
+				margin-left: 20rpx;
+				vertical-align: middle;
+			}
+		}
+
+		.scenic-subtitle {
+			font-weight: 500;
+			font-size: 27rpx;
+			color: #666666;
+			margin-top: 20rpx;
+
+			span {
+				color: #000;
+			}
+		}
+
+		.specifications-item {
+			font-weight: 500;
+			font-size: 27rpx;
+			color: #000000;
+			margin: 25rpx 0;
+		}
+	}
+
+	.novice-box {
+		width: 697rpx;
+		height: auto;
+		background: #FFFFFF;
+		border-radius: 20rpx;
+		padding: 26rpx;
+		font-weight: bold;
+		font-size: 36rpx;
+		color: #010101;
+		margin: 20rpx auto;
+
+		.novice-item {
+			view {
+				margin: 20rpx 0;
+			}
+
+			.novice-title {
+				font-weight: 800;
+				font-size: 27rpx;
+				color: #333333;
+			}
+
+			.novice-subtitle {
+				font-weight: 500;
+				font-size: 27rpx;
+				color: #000000;
+
+				span {
+					display: inline-block;
+					width: 130rpx;
+					color: #666666;
+				}
+			}
+		}
+
+		.novice-item:nth-child(n+2) {
+			border-top: 1rpx solid #D8D8D8;
+		}
+	}
+
+	// 邮寄订单详情
+	.shipping-address {
+		width: 697rpx;
+		height: 235rpx;
+		background: #FFFFFF;
+		border-radius: 20rpx;
+		padding: 26rpx;
+		font-weight: bold;
+		font-size: 36rpx;
+		color: #000000;
+		margin: auto;
+
+		&>view {
+			margin-top: 25rpx;
+			font-weight: 500;
+		}
+
+		&>view:first-child {
+			font-size: 31rpx;
+			color: #222222;
+		}
+
+		&>view:last-child {
+			font-size: 31rpx;
+			color: #222222;
+			font-size: 27rpx;
+			color: #666666;
+		}
+	}
+
+	.pgoods-detail {
+		width: 697rpx;
+		height: auto;
+		background: #FFFFFF;
+		border-radius: 20rpx;
+		padding: 26rpx;
+		margin: 20rpx auto;
+		font-weight: bold;
+		font-size: 32rpx;
+		color: #000000;
+
+		.pgoods-product {
+			display: flex;
+			margin-top: 24rpx;
+			padding-bottom: 33rpx;
+			border-bottom: 1rpx solid #D8D8D8;
+
+			.product-img {
+				width: 140rpx;
+				height: 140rpx;
+				border-radius: 13rpx;
+			}
+
+			.product-content {
+				width: 485rpx;
+				height: 140rpx;
+				margin-left: 18rpx;
+				padding: 5rpx 0 12rpx;
+				justify-content: space-between;
+
+				.product-title {
+					font-weight: bold;
+					font-size: 27rpx;
+					color: #000000;
+				}
+
+				.product-subtitle {
+					font-weight: 500;
+					font-size: 24rpx;
+					color: #666666;
+
+					.product-tags {
+						display: flex;
+
+						&>view:not(:last-child)::after {
+							content: '丨';
+							width: 1rpx;
+							height: 26rpx;
+							color: #666666;
+						}
+					}
+				}
+			}
+		}
+	}
+
+	// 自提点信息
+	.pickup-box {
+		width: 697rpx;
+		height: auto;
+		background: #FFFFFF;
+		border-radius: 20rpx;
+		margin: 20rpx auto;
+		padding: 33rpx 26rpx;
+		font-weight: bold;
+		font-size: 36rpx;
+		color: #000000;
+
+		&>view {
+			margin-top: 40rpx;
+		}
+
+		.picker-img {
+			width: 33.33rpx;
+			height: 33.33rpx;
+		}
+
+		.pickup-user {
+			display: flex;
+			align-items: center;
+			font-weight: bold;
+			font-size: 31rpx;
+			color: #000000;
+
+			&>view:first-of-type {
+				margin: 0 63rpx 0 19rpx;
+			}
+		}
+
+		.pickup-address {
+			display: flex;
+
+			.pickup-addressImg {
+				width: 33.33rpx;
+				height: 33.33rpx;
+			}
+
+			&>view:first-of-type {
+				width: 305rpx;
+				margin-left: 18rpx;
+			}
+
+			.picker-shopName {
+				font-weight: bold;
+				font-size: 31rpx;
+				color: #222222;
+			}
+
+			.picker-shopAddress {
+				font-weight: 500;
+				font-size: 24rpx;
+				color: #666666;
+				margin-top: 15rpx;
+			}
+
+			.pickup-icon {
+				margin-left: auto;
+				font-weight: 500;
+				font-size: 24rpx;
+				color: #666666;
+
+				&>view {
+					text-align: center;
+				}
+
+				&>view:last-child {
+					margin-left: 40rpx;
+				}
+
+				image {
+					width: 56rpx;
+					height: 56rpx;
+					display: block;
+					margin-bottom: 5rpx;
+				}
+			}
+		}
+	}
+
+	// 美食
+	.food-name {
+		font-weight: bold;
+		font-size: 31rpx;
+		color: #000000;
+		margin-bottom: 40rpx;
+	}
+	
+	.shop-detail {
+		width: 697rpx;
+		height: auto;
+		background: #FFFFFF;
+		border-radius: 20rpx;
+		margin: 20rpx auto 0;
+		padding: 33rpx 26rpx;
+		font-weight: bold;
+		font-size: 36rpx;
+		color: #000000;
+
+		.shop-name {
+			font-weight: bold;
+			font-size: 30rpx;
+			color: #000000;
+			margin-top: 30rpx;
+		}
+
+		.shop-info {
+			.shop-time {
+				width: 28rpx;
+				height: 28rpx;
+				margin: 5rpx 8rpx 0 0;
+			}
+
+			.shop-title {
+				font-weight: 500;
+				font-size: 26rpx;
+				color: #000000;
+			}
+
+			.shop-subtitle {
+				font-weight: 500;
+				font-size: 24rpx;
+				color: #666666;
+				margin-top: 23rpx;
+			}
+
+			.shop-icon {
+				margin-left: auto;
+
+				image {
+					width: 56rpx;
+					height: 56rpx;
+				}
+
+				image:first-child {
+					margin-right: 40rpx;
+				}
+			}
+		}
+	}
+
+	// 酒店
+	.hotel-detail {
+		width: 697rpx;
+		height: auto;
+		background: #FFFFFF;
+		border-radius: 20rpx;
+		padding: 33rpx 26rpx;
+		font-weight: bold;
+		font-size: 36rpx;
+		color: #000000;
+		margin: auto;
+
+		.hotel-title {
+			font-size: 31rpx;
+			color: #222222;
+			margin-top: 30rpx;
+		}
+
+		.hotel-date {
+			font-weight: bold;
+			font-size: 31rpx;
+			color: #000000;
+			display: flex;
+			margin-top: 30rpx;
+
+			span {
+				font-weight: 500;
+				font-size: 24rpx;
+				color: #666666;
+				margin-left: 20rpx;
+			}
+		}
+
+		.hotel-days {
+			width: 113rpx;
+			line-height: 37rpx;
+			background: #E8F6EB;
+			border-radius: 18rpx;
+			text-align: center;
+			margin: 0 20rpx;
+			font-weight: 500;
+			font-size: 24rpx;
+			color: #000000;
+		}
+		
+		.hotel-address {
+			width: 533rpx;
+			height: 107rpx;
+			background: url('https://static.ticket.sz-trip.com/yandu/images/order/addreeBg.png') no-repeat right;
+			background-size: auto 100%;
+			background-color: #E8F6EB;
+			border-radius: 20rpx;
+			padding: 22rpx 18rpx;
+			
+			.address {
+				width: 398rpx;
+				font-weight: 500;
+				font-size: 27rpx;
+				color: #000000;
+			}
+			
+			.address-image {
+				font-weight: 500;
+				font-size: 24rpx;
+				color: #333333;
+				text-align: center;
+				
+				image {
+					width: 30.67rpx;
+					height: 30.67rpx;
+				}
+			}
+		}
+		
+		.hotel-phone {
+			width: 93rpx;
+			height: 107rpx;
+			background: #E8F6EB;
+			border-radius: 20rpx;
+			font-weight: 500;
+			font-size: 24rpx;
+			color: #333333;
+			flex-direction: column;
+			
+			image {
+				width: 30.67rpx;
+				height: 30.67rpx;
+				margin-bottom: 8rpx;
+			}
+		}
+		
+		.hotel-skuName {
+			font-weight: 500;
+			font-size: 27rpx;
+			color: #000000;
+			height: 94rpx;
+			border-top: 1rpx solid #D8D8D8;
+			border-bottom: 1rpx solid #D8D8D8;
+			margin-top: 34rpx;
+			
+			&>view:first-child {
+				width: 400rpx;
+			}
+			
+			&>view:last-child {
+				width: 140rpx;
+			}
+		}
+	}
+	
+	.hotel-information {
+		width: 697rpx;
+		height: auto;
+		background: #FFFFFF;
+		border-radius: 20rpx;
+		padding: 26rpx;
+		margin: 20rpx auto;
+		font-weight: bold;
+		font-size: 36rpx;
+		color: #000000;
+		
+		view {
+			font-weight: 500;
+			font-size: 27rpx;
+			margin-top: 30rpx;
+		}
+		
+		span {
+			display: inline-block;
+			width: 140rpx;
+			color: #666666;
+		}
+	}
+
+	// 商品价格
+	.public-price {
+
+		view {
+			font-weight: 500;
+			font-size: 27rpx;
+			color: #666666;
+			margin-top: 25rpx;
+
+			span {
+				font-weight: bold;
+				font-size: 27rpx;
+				color: #111111;
+			}
+		}
+	}
+
+	// 订单信息
+	.order-info {
+		width: 697rpx;
+		height: auto;
+		background: #FFFFFF;
+		border-radius: 20rpx;
+		margin: 20rpx auto;
+		padding: 33rpx 26rpx;
+		font-weight: bold;
+		font-size: 36rpx;
+		color: #000000;
+
+		.order-subtitle {
+			font-weight: 500;
+			font-size: 27rpx;
+			color: #000;
+			margin: 30rpx 0;
+
+			span {
+				display: inline-block;
+				width: 130rpx;
+				color: #666666;
+				white-space: nowrap;
+			}
+		}
+
+		.copy {
+			width: 93rpx;
+			height: 37rpx;
+			border-radius: 11rpx;
+			border: 1rpx solid #71B580;
+			font-weight: 500;
+			font-size: 22rpx;
+			color: #71B580;
+			margin-left: 30rpx;
+
+			.copy-img {
+				width: 22rpx;
+				height: 23.33rpx;
+			}
+		}
+	}
+
+	// 客服
+	.kefu-box {
+		width: 697rpx;
+		height: 96rpx;
+		background: #FFFFFF;
+		border-radius: 20rpx;
+		margin: 20rpx auto;
+		display: flex;
+		align-items: center;
+		font-weight: 500;
+		font-size: 31rpx;
+		color: #000000;
+		padding-left: 27rpx;
+
+		.kefu-img {
+			width: 44rpx;
+			height: 44rpx;
+			margin-right: 14rpx;
+		}
+	}
+
+	// 底部按钮
+	footer {
+		width: 750rpx;
+		height: 167rpx;
+		position: fixed;
+		bottom: 0;
+		display: flex;
+		align-items: center;
+		background-color: #fff;
+		border-top: 10rpx solid #F7F7F7;
+		padding: 0 26rpx;
+
+		.bottom-price {
+			font-weight: 500;
+			font-size: 28rpx;
+			color: #000000;
+
+			span {
+				font-weight: bold;
+				font-size: 48rpx;
+				color: #EE3E3B;
+			}
+
+			span::before {
+				content: '￥';
+				font-size: 27rpx;
+			}
+		}
+
+		.btn-box {
+			margin-left: auto;
+			display: flex;
+
+			.btn {
+				width: 213rpx;
+				line-height: 71rpx;
+				border-radius: 37rpx;
+				border: 1rpx solid #999999;
+				text-align: center;
+				margin-right: 14rpx;
+				font-weight: 500;
+				font-size: 31rpx;
+				color: #000000;
+			}
+
+			.btn:last-of-type {
+				margin-right: 0;
+			}
+
+			.pay-btn {
+				height: 73rpx;
+				background: linear-gradient(270deg, #FD6F34, #F4A61F);
+				border: none;
+				color: #FFFFFF;
+			}
+		}
+	}
+	
+	// 快递查询
+	.mask {
+		position: fixed;
+		left: 0;
+		right: 0;
+		top: 0;
+		bottom: 0;
+		background: rgba(0, 0, 0, 0.6);
+		z-index: 1000;
+		display: flex;
+		align-items: flex-end;
+		justify-content: center;
+	}
+	
+	.mask-bg {
+		position: fixed;
+		left: 0;
+		right: 0;
+		top: 0;
+		bottom: 0;
+	}
+	
+	.mask-content {
+		width: 100%;
+		padding: 28rpx 0;
+		border-radius: 20rpx 20rpx 0 0;
+		background: white;
+		height: 70%;
+		position: relative;
+		overflow-y: auto;
+	}
+	
+	.mask-content .icon-close {
+		position: absolute;
+		right: 20rpx;
+		top: 20rpx;
+	}
+	
+	.mask-content .close-btn {
+		background-image: url("https://static.ticket.sz-trip.com/taizhou/images/close.png");
+		width: 80rpx;
+		height: 80rpx;
+		position: absolute;
+		bottom: -100rpx;
+		left: 0;
+		right: 0;
+		margin: auto;
+	}
+	
+	.mask-title {
+		font-size: 36rpx;
+		font-weight: bold;
+		padding-left: 37rpx;
+	}
+	
+	.mask-content .iconfont {
+		position: absolute;
+		right: 30rpx;
+		top: 20rpx;
+	}
+	
+	.express-all {
+		margin: 40rpx;
+		position: relative;
+	}
+	
+	.express-item {
+		display: flex;
+		justify-content: space-between;
+		padding-bottom: 60rpx;
+		position: relative;
+		z-index: 1;
+	}
+	
+	
+	.line {
+		width: 1rpx;
+		height: 100%;
+		background: #CCCCCC;
+		position: absolute;
+		left: 13rpx;
+	}
+	
+	.express-info {
+		width: 600rpx;
+		font-size: 26rpx;
+		line-height: 40rpx;
+		color: #999;
+	}
+	
+	.express-info.active {
+		color: #000;
+	}
+	
+	.express-time {
+		font-size: 22rpx;
+		color: #666;
+		margin-top: 10rpx;
+	}
+	
+	.express-item-icon {
+		width: 27rpx;
+		height: 27rpx;
+		background: #CCCCCC;
+		border-radius: 50%;
+		position: relative;
+	}
+	
+	.express-item-icons {
+		background: #71B580;
+	}
+	
+	.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: #71B580;
+				line-height: 54rpx;
+			}
+			view:first-child {
+				border-right: 1rpx solid #D8D8D8;
+				color: #000000;
+			}
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/subPackages/order/trades.vue b/subPackages/order/trades.vue
new file mode 100644
index 0000000..0a2428e
--- /dev/null
+++ b/subPackages/order/trades.vue
@@ -0,0 +1,378 @@
+<template>
+	<view class="bg">
+		<view class="top-box">
+			<view class="search-box flex-between">
+				<view class="left">
+					<image src="https://static.ticket.sz-trip.com/tourist/index/search.png"></image>
+					<input v-model="keywords" type="text" placeholder="请输入关键字" @confirm="search()" />
+				</view>
+		
+				<view class="search-btn flex-center" @click="search()">搜索</view>
+			</view>
+			<view class="common-box">
+				<view @click="setType(index)" v-for="(item, index) in typeList" :key="index" :class="['common-type', typeIndex == index ? 'active' : '']">
+					{{ item.name }}
+				</view>
+			</view>
+		</view>
+		
+		<view v-if="list.length > 0">
+			<navigator :url="'/subPackages/order/orderDetail?id=' + item.order_id" class="item" v-for="(item, key) in list" :key="item.id">
+				<view class="item-top flex-between">
+					<view>
+						<view>{{item.order_child[0].type_id == 1 ? '线路产品' : '导游服务'}}</view>
+						<view>订单号：{{ item.order_id }}</view>
+					</view>
+					<view class="item-state">{{item.status_text}}</view>
+				</view>
+				
+				<view class="item-center">
+					<image :src="showImg(item.order_child[0].specifications_image)" class="item-img"></image>
+					<view class="item-content flex-column">
+						<view class="title text-overflow">{{item.order_name}}</view>
+						<view style="margin-bottom: 10rpx;">
+							<view class="subtitle flex-between" v-for="(sItem,sIndex) in item.order_child" :key="sItem.id">
+								<view>{{sItem.specifications_name}}</view>
+								<view>
+									￥{{sItem.pay_money}}
+									<span style="margin-left: 30rpx;">x{{sItem.num}}</span>
+								</view>
+							</view>
+						</view>
+						<view class="subtitle" style="text-align: right;color: #333333;">共{{item.order_child.length}}件商品</view>
+						<view class="price">
+							<view class="subtitle" style="margin-right: 15rpx;">总价￥{{item.money / 100}}</view>
+							实付款<span>{{item.pay_money / 100}}</span>
+						</view>
+					</view>
+				</view>
+				
+				<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 == 'COMPLETED'">再次购买</view>
+					<view class="pay-btn" @click.stop="setOrderId(item.order_id)" v-if="item.status == 'WAIT_PAYMENT'">立即支付</view>
+				</view>
+			</navigator>
+		</view>
+		
+		<view v-if="list.length === 0" class="noDate">
+			<view>暂无订单</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				finished: false,
+				list: [],
+				typeList: [
+					{
+						id: 'ALL',
+						name: '全部'
+					},
+					{
+						id: 'WAIT_PAYMENT',
+						name: '待支付'
+					},
+					{
+						id: 'PAYMENT_SUCCESSFULLY',
+						name: '已取消'
+					},
+					{
+						id: 'PAYMENT_SUCCESSFULLY',
+						name: '待出行'
+					},
+					{
+						id: 'WAIT_REFUND,REFUND_SUCCESS,REFUND_REFUSAL,REFUND_ERROR,REFUND_PART',
+						name: '退款/售后'
+					}
+				],
+				typeIndex: 0,
+				ajaxFlag: true,
+				keywords: '',
+				orderId: null,
+				dateRange: [],
+				type: ''
+			}
+		},
+		onLoad(options) {
+			if (options.type) this.typeIndex = this.typeList.findIndex(vm => vm.name === options.type);
+			this.getList();
+		},
+		methods: {
+			// 申请退款
+			refund(id, index) {
+				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();
+								}
+							});
+						}
+					}
+				});
+			},
+			// 关闭订单
+			closeOrder(id, 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.onReload()
+								}
+							});
+						}
+					}
+				});
+			},
+			// 立即支付
+			setOrderId(id) {
+				
+			},
+			onReload() {
+				this.list = [];
+				this.finished = false;
+				this.getList();
+			},
+			// 获取订单列表
+			getList() {
+				let data = {
+					status: this.typeList[this.typeIndex].id == 'ALL' ? '' : this.typeList[this.typeIndex].id,
+					offset: this.list.length,
+					limit: 5,
+					name: this.keywords
+				};
+				this.Post(data, '/api/order/orderList').then(res => {
+					this.list = [...this.list, ...res.data]
+					if (res.data.length < 5) {
+						this.finished = true;
+					}
+				});
+			},
+			setType(index) {
+				this.typeIndex = index;
+				this.onReload();
+			},
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.bg {
+		min-height: 100vh;
+		background: #F7F7F7;
+		padding-bottom: 100rpx;
+	}
+	
+	.top-box {
+		background: #FFFFFF;
+		
+		.search-box {
+			height: 84rpx;
+			padding: 0 26.67rpx;
+			
+			.left {
+				width: 563rpx;
+				height: 60rpx;
+				background: #FFFFFF;
+				border: 1rpx solid #96684F;
+				padding: 0 26rpx;
+				display: flex;
+				align-items: center;
+				
+				image {
+					width: 29.33rpx;
+					height: 29.33rpx;
+					margin-right: 21rpx;
+				}
+				
+				input {
+					flex: 1;
+					font-weight: 500;
+					font-size: 28rpx;
+					color: #999999;
+				}
+			}
+			
+			.search-btn {
+				width: 120rpx;
+				height: 60rpx;
+				background: #96684F;
+				font-weight: 500;
+				font-size: 28rpx;
+				color: #FFFFFF;
+			}
+		}
+		
+		.common-box {
+			height: 93rpx;
+			display: flex;
+			align-items: center;
+			
+			.common-type {
+				width: 20%;
+				text-align: center;
+				font-weight: 500;
+				font-size: 28rpx;
+				color: #666666;
+			}
+			
+			.common-type.active {
+				font-weight: bold;
+				font-size: 28rpx;
+				color: #96684F;
+				position: relative;
+			}
+			.common-type.active::after {
+				width: 20%;
+				height: 4rpx;
+				content: '1';
+				font-size: 0;
+				display: block;
+				position: absolute;
+				left: 0;
+				right: 0;
+				bottom: -10rpx;
+				margin: auto;
+				background: #96684F;
+			}
+		}
+	}
+	
+	.noDate {
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		margin-top: 200rpx;
+		font-size: 24rpx;
+		color: #777777;
+	}
+	
+	.item {
+		width: 697rpx;
+		height: auto;
+		background: #FFFFFF;
+		border-radius: 13rpx;
+		margin: 27rpx auto 0;
+		
+		.item-top {
+			height: 100rpx;
+			background: linear-gradient(90deg, #F4E8DD, #F9F2EC);
+			border-radius: 13rpx 13rpx 0rpx 0rpx;
+			padding: 0 20rpx;
+			font-weight: 500;
+			font-size: 27rpx;
+			color: #96684F;
+			
+			.item-state {
+				font-weight: bold;
+				font-size: 28rpx;
+				color: #DC2525;
+			}
+		}
+		
+		.item-center {
+			height: 270rpx;
+			padding: 20rpx;
+			display: flex;
+			
+			.item-img {
+				width: 140rpx;
+				height: 140rpx;
+				border-radius: 7rpx;
+				margin-right: 20rpx;
+			}
+			
+			.item-content {
+				flex: 1;
+				justify-content: space-between;
+				
+				.title {
+					font-weight: 500;
+					font-size: 31rpx;
+					color: #000000;
+				}
+				
+				.subtitle {
+					font-weight: 500;
+					font-size: 24rpx;
+					color: #999999;
+				}
+				
+				.price {
+					font-weight: 500;
+					font-size: 24rpx;
+					color: #333333;
+					display: flex;
+					align-items: baseline;
+					justify-content: flex-end;
+					
+					span {
+						font-weight: bold;
+						font-size: 32rpx;
+						color: #DC2525;
+					}
+					span::before {
+						font-size: 24rpx;
+						content: '￥';
+					}
+				}
+			}
+		}
+		
+		.item-btns {
+			height: 102rpx;
+			border-top: 1rpx solid rgba(216, 216, 216, .5);
+			padding-right: 20rpx;
+			display: flex;
+			align-items: center;
+			justify-content: flex-end;
+			
+			view {
+				width: 160rpx;
+				height: 60rpx;
+				line-height: 60rpx;
+				text-align: center;
+				background: rgba(237,237,237,0);
+				border-radius: 7rpx;
+				border: 1rpx solid #D8D8D8;
+				margin-left: 13rpx;
+			}
+			
+			.pay-btn {
+				background: #DC2525;
+				color: #fff;
+			}
+		}
+	}
+</style>
\ No newline at end of file