diff --git a/pages.json b/pages.json
index b6727e3..6130a54 100644
--- a/pages.json
+++ b/pages.json
@@ -41,6 +41,37 @@
 			        "navigationBarTitleText" : "全部订单"
 			    }
 			},
+			{
+			    "path" : "order/detail",
+			    "style" : {
+			        "navigationBarTitleText" : "订单详情",
+					"navigationStyle": "custom"
+			    }
+			},
+			{
+			    "path" : "user/travelerList",
+			    "style" : {
+			        "navigationBarTitleText" : "收货地址"
+			    }
+			},
+			{
+				"path" : "user/myAddressAdd",
+				"style" : {
+					"navigationBarTitleText" : "收货地址"
+				}
+			},
+			{
+				"path" : "user/gwc",
+				"style" : {
+					"navigationBarTitleText" : "购物车"
+				}
+			},
+			{
+				"path" : "order/gwcOrder",
+				"style" : {
+					"navigationBarTitleText" : "下单"
+				}
+			},
 			{
 				"path": "letter/index",
 				"style": {
diff --git a/pages/user/user.vue b/pages/user/user.vue
index 1d44f47..af8b3a5 100644
--- a/pages/user/user.vue
+++ b/pages/user/user.vue
@@ -69,7 +69,7 @@
 		<!-- 旅游咨询弹框 -->
 		<uni-popup ref="popup" type="center">
 			<view class="consult-popup">
-				客服电话： 
+				即将拨打客服电话
 				<view class="consult-subtitle">服务时间：周一至周五<br>9:00-12:00，13:00-18:00</view>
 				<view class="consult-btns">
 					<view @click="$refs.popup.close()">取消</view>
@@ -122,7 +122,7 @@
 					{
 						src: 'https://static.ticket.sz-trip.com/cgc/images/user/gwc.png',
 						title: '购物车',
-						path: '',
+						path: '/subPackages/user/gwc',
 						isShow: true
 					},
 					{
diff --git a/static/js/request.js b/static/js/request.js
index 4a2c0a7..5b0db2c 100644
--- a/static/js/request.js
+++ b/static/js/request.js
@@ -40,7 +40,7 @@ Vue.prototype.NEWAPIURL = '/api';
 // #endif
 
 Vue.prototype.Post = (params = {}, apiurl) => {
-    const token = getToken() || 'aa3940ea-57f5-412e-9803-4035d5115994';
+    const token = getToken() || '948acca7-f801-4d65-beea-79dde49b1fa3';
     if (token) {
         params.token = token;
     }
diff --git a/subPackages/order/detail.vue b/subPackages/order/detail.vue
new file mode 100644
index 0000000..5f119f8
--- /dev/null
+++ b/subPackages/order/detail.vue
@@ -0,0 +1,1659 @@
+<template>
+	<view class="bg">
+		<view class="title-box">
+			<uni-icons type="left" size="25" color="#fff" @click="goBack"></uni-icons>
+			<view>订单状态</view>
+		</view>
+		<view class="top-box">
+			<view style="display: flex;justify-content: space-between;">
+				<view>{{info.status_text}}</view>
+				<view><span style="font-size: 24rpx;">￥</span>{{info.pay_money/100}}</view>
+			</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" v-if="!info.order_child[0].extract_id">还剩<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.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、线路line -->
+
+		<view :style="{margin: isQrcode ? '0' : '-66rpx auto 0'}" v-if="info.order_child">
+			<!-- 景点订单 -->
+			<view v-if="['ticket', 'line'].includes(info.order_child[0].goods_genre)">
+				<!-- 景点详情 -->
+				<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 class="scenic-subtitle" v-if="info.order_child[0].scenic_data.open_description">
+							开放时间：<span>{{info.order_child[0].scenic_data.open_description}}</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: #C3282E;">￥{{info.pay_money / 100}}</span>
+						</view>
+					</view>
+				</view>
+
+				<!-- 景点出行人 -->
+				<view class="novice-box"
+					v-if="info.order_child[0].contact_name && info.order_child[0].goods_genre == 'ticket'">
+					出行人
+					<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 class="novice-box" v-if="info.reserve_name && info.order_child[0].goods_genre == 'line'">
+					出行人
+					<view class="novice-item">
+						<view class="novice-subtitle" v-if="info.reserve_name">
+							<span>姓名：</span>{{info.reserve_name}}
+						</view>
+						<view class="novice-subtitle" v-if="info.reserve_phone">
+							<span>手机号：</span>{{info.reserve_phone}}
+						</view>
+					</view>
+				</view>
+			</view>
+		</view>
+
+		<!-- 邮寄、自提订单 -->
+		<view v-if="info.order_child[0].goods_genre == 'pgoods'">
+			<view class="shipping-address" v-if="info.order_child[0].consignee_id">
+				收货地址
+				<view>{{info.order_child[0].consignee.name}} {{info.order_child[0].consignee.tel}}</view>
+				<view class="text-overflowRows">{{info.order_child[0].consignee.address}}</view>
+			</view>
+
+			<!-- 产品详情 -->
+			<view class="pgoods-detail">
+				商家名称
+				<view class="pgoods-product" v-for="(item,index) in info.order_child" :key="index" :style="{paddingBottom: item.status == 'WAIT_COMMENT' ? '107rpx' : ''}">
+					<image :src="showImg(item.specifications_image)" mode="aspectFill" class="product-img"></image>
+					<view class="product-content flex-column">
+						<view class="product-title">{{item.goods_title}}</view>
+						<view class="product-subtitle flex-between">
+							{{item.specifications_name}}
+							<span>x{{item.num}}</span>
+						</view>
+					</view>
+					 <!-- <view class="evaluate-btn flex-center" v-if="item.status == 'WAIT_COMMENT'" @click="goComment(index)">去评价</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: #C3282E;">￥{{info.pay_money / 100}}</span>
+					</view>
+				</view>
+			</view>
+
+			<!-- 自提信息 -->
+			<view class="pickup-box" v-if="info.order_child[0].contact_id && info.order_child[0].extract_id">
+				自提信息
+				<view class="pickup-user">
+					<image src="https://static.ticket.sz-trip.com/yandu/images/order/user.png" class="picker-img">
+					</image>
+					<view>{{info.order_child[0].contact.name}}</view>
+					<view>{{info.order_child[0].contact.tel}}</view>
+				</view>
+				<view class="pickup-address">
+					<image src="https://static.ticket.sz-trip.com/yandu/images/order/location.png" class="picker-img"
+						style="margin-top: 6rpx;"></image>
+
+					<view>
+						<view class="picker-shopName">{{info.order_child[0].extract.extract_name}}</view>
+						<view class="picker-shopAddress">{{info.order_child[0].extract.detail_addr}}</view>
+					</view>
+
+					<view class="pickup-icon flex-center">
+						<view @click="clickPhone(info.order_child[0].extract.mobile)">
+							<image src="https://static.ticket.sz-trip.com/yandu/images/order/phone.png" mode="">
+							</image>
+							电话
+						</view>
+						<view @click="openLocation(info.order_child[0].extract.lat,info.order_child[0].extract.lon)">
+							<image src="https://static.ticket.sz-trip.com/yandu/images/order/navigations.png" mode="">
+							</image>
+							导航
+						</view>
+					</view>
+				</view>
+			</view>
+		</view>
+
+		<!-- 美食 -->
+		<view v-if="info.order_child[0].goods_genre == 'food'">
+			<view class="pgoods-detail">
+				购买信息
+				<view class="pgoods-product" style="border-bottom: none;">
+					<image :src="showImg(foodInfo.image)" mode="aspectFill" class="product-img"></image>
+					<view class="product-content flex-column">
+						<view class="product-title">{{foodInfo.title}}</view>
+						<view class="product-subtitle flex-between">
+							<view class="product-tags" v-if="foodInfo.specifications_new_tag">
+								<view v-for="(item,index) in foodInfo.specifications_new_tag.split(',').slice(0,3)"
+									:key="index">{{item}}</view>
+							</view>
+							<span>x{{info.order_child[0].num}}</span>
+						</view>
+					</view>
+				</view>
+				<view class="food-name flex-between">
+					{{info.order_child[0].contact_name}}
+					<span>{{info.order_child[0].phone}}</span>
+				</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: #C3282E;">￥{{info.pay_money / 100}}</span>
+					</view>
+				</view>
+			</view>
+
+			<view class="shop-detail">
+				商家信息
+				<view class="shop-name">店铺名称</view>
+				<view class="shop-info">
+					<view>
+						<view style="margin-top: 23rpx; display: flex;"
+							v-if="info.order_child[0].goods_data.open_description">
+							<image src="https://static.ticket.sz-trip.com/yandu/images/order/time.png"
+								class="shop-time"></image>
+							<view>
+								<view class="shop-title">营业时间</view>
+								<view class="shop-subtitle">{{info.order_child[0].goods_data.open_description}}</view>
+							</view>
+						</view>
+					</view>
+
+					<view>
+						<view class="flex-center" style="margin-top: 23rpx;">
+							<view style="display: flex;">
+								<image src="https://static.ticket.sz-trip.com/yandu/images/order/location.png"
+									class="shop-time"></image>
+								<view style="width: 420rpx;">
+									<view class="shop-title text-overflow">
+										{{info.order_child[0].goods_data.address}}
+									</view>
+									<view class="shop-subtitle" v-if="info.order_child[0].goods_data.distance">
+										距您约{{info.order_child[0].goods_data.distance > 1000 ? (info.order_child[0].goods_data.distance / 1000).toFixed(2) + 'km' : info.order_child[0].goods_data.distance + 'm'}}
+									</view>
+								</view>
+							</view>
+
+							<view class="shop-icon">
+								<image src="https://static.ticket.sz-trip.com/yandu/images/order/phone.png"
+									@click="clickPhone(info.order_child[0].goods_data.tel)"></image>
+								<image src="https://static.ticket.sz-trip.com/yandu/images/order/navigations.png"
+									@click="openLocation(info.order_child[0].goods_data.tengxun_map.lat,info.order_child[0].goods_data.tengxun_map.lon)">
+								</image>
+							</view>
+						</view>
+					</view>
+				</view>
+			</view>
+		</view>
+
+		<!-- 酒店 -->
+		<view v-if="info.order_child[0].goods_genre == 'hotel'">
+			<view class="hotel-detail">
+				入住信息
+				<view class="hotel-title">{{info.order_child[0].goods_title}}</view>
+
+				<view class="hotel-date">
+					<view>
+						{{(info.order_child[0].start_date).slice(5)}}
+						<span>{{ShowDateDay(new Date(info.order_child[0].start_date).getDay())}}入住</span>
+					</view>
+					<view class="hotel-days">共{{calDate(info.order_child[0].start_date, info.order_child[0].end_date)}}晚
+					</view>
+					<view class="use-date">
+						{{info.order_child[0].end_date.slice(5)}}
+						<span>{{ShowDateDay(new Date(info.order_child[0].end_date).getDay())}}离店</span>
+					</view>
+				</view>
+
+				<view class="flex-between" style="margin-top: 30rpx;">
+					<view class="hotel-address flex-between">
+						<view class="address text-overflowRows">{{info.order_child[0].scenic_data.address}}</view>
+						<view class="address-image"
+							@click="openLocation(info.order_child[0].scenic_data.tengxun_map.lat,info.order_child[0].scenic_data.tengxun_map.lon)">
+							<image src="https://static.ticket.sz-trip.com/yandu/images/order/navigation.png"></image>
+							<view>地图</view>
+						</view>
+					</view>
+					<view class="hotel-phone flex-center" @click="clickPhone(info.order_child[0].scenic_data.tel)">
+						<image src="https://static.ticket.sz-trip.com/yandu/images/order/hotelPhone.png"></image>
+						<view>电话</view>
+					</view>
+				</view>
+
+				<view class="hotel-skuName flex-between">
+					<view class="text-overflow">{{info.order_child[0].specifications_name}}</view>
+					<view class="flex-between">
+						<view>￥{{info.order_child[0].money / 100}}</view>
+						<view>x{{info.order_child[0].num}}</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: #C3282E;">￥{{info.pay_money / 100}}</span>
+					</view>
+				</view>
+			</view>
+
+			<view class="hotel-information">
+				预订信息
+				<view><span>房间数：</span>{{info.order_child[0].num}}间</view>
+				<view><span>入住姓名：</span>{{info.reserve_name}}</view>
+				<view><span>联系电话：</span>{{info.reserve_phone}}</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/cgc/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="openKf(1)">
+			<image src="https://static.ticket.sz-trip.com/cgc/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="(info.status == 'WAIT_COMMENT' && info.order_child[0].goods_genre != 'pgoods') || 
+				 (info.status == 'WAIT_COMMENT' && info.order_child[0].goods_genre == 'pgoods' && info.order_child[0].contact_id && info.order_child[0].extract_id)" @click="goComment(0)">
+					立即评价
+				</view> -->
+
+				<view class="btn"
+					v-if="['WAIT_REFUND','REFUND_SUCCESS','WAIT_COMMENT','COMPLETE','CLOSED'].includes(info.status)"
+					@click="gotoDetail">
+					再次购买
+				</view>
+
+				<view class="btn pay-btn" v-if="info.status == 'WAIT_PAYMENT'" @click="setOrderId(info.order_id)">
+					立即支付
+				</view>
+
+				<view class="btn" v-if="info.status == 'POST' && info.order_child[0].goods_genre == 'pgoods'"
+					@click="openMask()">
+					快递查询
+				</view>
+
+				<view class="btn" v-if="info.status == 'POST' && info.order_child[0].goods_genre == 'pgoods'"
+					@click="confirmGoods()">
+					确认收货
+				</view>
+			</view>
+		</footer>
+
+		<!-- 快递详情 -->
+		<view class="mask" v-if="maskShow">
+			<view class="mask-bg" @click="maskShow = false"></view>
+			<view class="mask-content">
+				<p class="mask-title">物流信息</p>
+				<view class="iconfont" @click="maskShow = false">x</view>
+				<view class="express-all">
+					<view class="express-item" v-for="item,index in postInfo" :key="index">
+						<view class="line" v-if="index != postInfo.length - 1"></view>
+						<view class="express-item-icon" v-if="index!=0">·</view>
+						<view class="express-item-icon express-item-icons" v-else>·</view>
+						<view :class="['express-info',index==0?'active':'']">
+							<p>{{item.AcceptStation}}</p>
+							<p class="express-time">{{item.AcceptTime}}</p>
+						</view>
+					</view>
+				</view>
+			</view>
+		</view>
+
+		<!-- 客服弹框 -->
+		<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="openKf(0)">取消</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,
+				maskShow: false,
+				postInfo: []
+			}
+		},
+		onLoad(option) {
+			this.order_id = option.id
+			this.getDetail()
+		},
+		onShow() {
+
+		},
+		methods: {
+			// 去评价
+			goComment(index) {
+				let order_id = this.info.order_child[index].order_id
+				// for(let item of this.info.order_child) {
+				// 	if (item.status == 'WAIT_COMMENT') {
+				// 		order_id = item.order_id
+				// 		break;
+				// 	}
+				// }
+				uni.navigateTo({
+					url: '/subPackages/order/writeComment?order_id=' + order_id
+				})
+			},
+			// 客服
+			openKf(flag) {
+				if(flag) {
+					this.$refs.popup.open()
+				}else {
+					this.$refs.popup.close()
+				}
+			},
+			// 计算两个日期间的天数
+			calDate(startDate, endDate) {
+				var start = new Date(startDate);
+				var end = new Date(endDate);
+				var diff = end - start;
+				var days = Math.floor(diff / (1000 * 60 * 60 * 24)); // 计算天数差
+				return days;
+			},
+			// 获取订单详情
+			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 (this.info.order_child[0].goods_genre == 'food') {
+						// 美食类的需要调取规格详情
+						this.Post({
+							goods_id: this.info.order_child[0].goods_id
+						}, '/api/goods/getSpecificationsByGoodsId').then(res => {
+							res.data.forEach(item => {
+								if (item.id == this.info.order_child[0].specifications_id) this
+									.foodInfo = item
+							})
+						})
+					}
+
+					// 景点、美食、线路二维码
+					if (['ticket', 'food', 'line'].includes(this.info.order_child[0].goods_genre) || (this.info
+							.order_child[0].contact_id && this.info.order_child[0].extract_id)) {
+						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++) {
+								if(this.info.order_child[i].third_order_id) {
+									this.getCodeImg(this.info.order_child[i].third_order_id, i);
+								}else {
+									this.getCodeImg(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].child_id, i);
+
+									// 未核销数量
+									if (this.info.order_child[i].status == 'SUCCESS') this.remainNum += 1
+								}
+							}
+						}
+					}
+					setTimeout(() => {
+						console.log(this.info.order_child)
+					}, 1000)
+				})
+			},
+			// 生成二维码
+			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'
+						});
+					}
+				});
+			},
+			// 再次购买：跳转产品详情
+			gotoDetail() {
+				// 子订单里info.order_child[0].goods_genre：景点ticket、酒店hotel、美食food、邮寄自提pgoods、线路line
+				let url = ''
+				switch (this.info.order_child[0].goods_genre) {
+					case 'ticket':
+						url = '/subPackages/ticketBooking/detail?id=' + this.info.order_child[0].scenic_data.id
+						break;
+					case 'hotel':
+						url = '/subPackages/hotelHomestay/detail?id=' + this.info.order_child[0].scenic_data.id
+						break;
+					case 'food':
+						url = '/subPackages/food/foodDetail?id=' + this.info.order_child[0].goods_id
+						break;
+					case 'pgoods':
+						url = '/subPackages/techan/detail?id=' + this.info.order_child[0].goods_id
+						break;
+					case 'line':
+						url = '/subPackages/line/detail?id=' + this.info.order_child[0].goods_id
+						break;
+					default:
+						break;
+				}
+				uni.navigateTo({
+					url: url
+				})
+			},
+			// 申请退款
+			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: () => {
+								const templateIds = [
+									// 退款成功通知
+									'hRZoiEES2BWtKb6Xgsnn8khLQH9un5j_11qu0bwlhfE',
+									// 出票结果通知
+									'YyTCUIYBnrj9CyKks8cOjNX_Rk8a4yVdswMP-zXVbhc'
+								]
+								uni.requestSubscribeMessage({
+									tmplIds: templateIds,
+									complete (res) {
+										that.getDetail();
+										uni.$emit("updateDataByConnect", {
+											msgType: 'updateOrderTrades',
+											data: {}
+										})
+									}
+								})
+							}
+						});
+					}
+				});
+			},
+			// 快递查询
+			openMask() {
+				this.Post({
+					child_order_id: this.info.order_child[0].child_id
+				}, '/api/order/getExpress').then(res => {
+					if (res.data.length > 0) {
+						this.postInfo = res.data.reverse()
+						this.maskShow = true
+					} else {
+						uni.showToast({
+							title: '暂未查询到物流信息，请联系客服',
+							icon: 'none'
+						});
+					}
+				})
+			},
+			// 确认收货
+			confirmGoods() {
+				uni.showModal({
+					title: '提示',
+					content: '是否确认收货？',
+					success: successRes => {
+						if (successRes.confirm) {
+							this.Post({
+								order_id: this.info.order_id
+							}, '/api/order/confirmPost').then(res => {
+								if (res.code == 1) {
+									uni.showToast({
+										title: '确认收货成功',
+										icon: 'none'
+									});
+									this.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: #FFF;
+			margin-left: 245rpx;
+		}
+	}
+
+	.top-box {
+		width: 750rpx;
+		height: 414rpx;
+		background: linear-gradient(180deg, #60989E, #60989E, #60989E, #60989E, #60989E, #60989E, #F7F7F7);
+		padding: 200rpx 50rpx 0 50rpx;
+		font-weight: 500;
+		font-size: 42rpx;
+		color: #FFFFFF;
+
+		.close-time {
+			font-weight: 500;
+			font-size: 24rpx;
+			margin-top: 20rpx;
+		}
+	}
+
+	// 景点、美食 二维码
+	.qrcode-remain {
+		font-weight: bold;
+		font-size: 29rpx;
+		color: #000000;
+		text-align: center;
+
+		span {
+			width: 60rpx;
+			text-align: center;
+			color: #C3282E;
+			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: #248BAA;
+		}
+	}
+
+	.swiper-prompt {
+		font-weight: 500;
+		font-size: 29rpx;
+		color: #C3282E;
+		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;
+			position: relative;
+
+			.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;
+						}
+					}
+				}
+			}
+			
+			.evaluate-btn {
+				width: 147rpx;
+				height: 53rpx;
+				border-radius: 27rpx;
+				border: 1rpx solid #999999;
+				font-weight: 500;
+				font-size: 27rpx;
+				color: #000000;
+				margin-left: auto;
+				position: absolute;
+				right: 0;
+				bottom: 26rpx;
+			}
+		}
+	}
+
+	// 自提点信息
+	.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: 80rpx;
+			height: 37rpx;
+			border-radius: 11rpx;
+			font-weight: 500;
+			font-size: 22rpx;
+			color: #74A5AA;
+			margin-left: 30rpx;
+
+			.copy-img {
+				width: 22.67rpx;
+				height: 22.67rpx;
+			}
+		}
+	}
+
+	// 客服
+	.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: #C3282E;
+			}
+
+			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: bold;
+				font-size: 31rpx;
+				color: #6C7A94;
+			}
+
+			.btn:last-of-type {
+				margin-right: 0;
+			}
+
+			.pay-btn {
+				height: 73rpx;
+				background: rgba(116, 165, 170, 1);
+				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: #248BAA;
+	}
+
+	.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: #000000;
+				line-height: 54rpx;
+			}
+
+			view:first-child {
+				border-right: 1rpx solid #D8D8D8;
+			}
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/subPackages/order/gwcOrder.vue b/subPackages/order/gwcOrder.vue
new file mode 100644
index 0000000..bec631c
--- /dev/null
+++ b/subPackages/order/gwcOrder.vue
@@ -0,0 +1,903 @@
+<template>
+	<view class="bg" v-if="info">
+		<view class="address box" @click="changeAddressPopup('open', '', key)" v-if="!contacts && info[0].is_post == 1">
+			<image src="https://kunshan.xmainc.com/uploads/20230105/870e4ce1d5a661986d8a54e9f3c2b0b3.png" mode="aspectFill"></image>
+			<view class="text">添加邮寄地址</view>
+		</view>
+		<view class="contacts box" v-if="contacts && info[0].is_post == 1">
+			<view class="contacts-left">
+				<view class="name-phone">
+					<view class="name">{{ contacts.name }}</view>
+					<view class="phone">{{ contacts.tel }}</view>
+				</view>
+				<view class="adds text-overflowRows">{{ contacts.province_text + contacts.city_text + contacts.district_text + contacts.detail_addr }}</view>
+			</view>
+			<image @click="changeAddressPopup('open', '', key)" src="https://kunshan.xmainc.com/uploads/20230105/327cfda2cc308fc01e34f40498dbe9b6.png" mode="aspectFill"></image>
+		</view>
+		<view class="commodity box">
+			<view class="merchant-name">
+				{{info[0].merchant_name}}
+			</view>
+			<view style="margin-top: 20rpx;" class="" v-for="(item,index) in info" :key="item.id">
+				<view class="goods">
+					<image class="img" :src="showImg(item.goods_image)" mode=""></image>
+					<view class="" style="display: flex;flex-direction: column;justify-content: space-between;">
+						<view class="">
+							{{item.good_name}}
+						</view>
+						<view>
+							<span class="info-tags" v-for="(itemT,indexT) in item.goods_new_tag.split(',').splice(0,2)" :key="indexT">{{itemT}}</span>
+						</view>
+					</view>
+				</view>
+				<view class="sku-info">
+					<view class="title">
+						<view class="text-overflowRows" style="font-size: 31rpx;font-weight: 500;color: #000;">{{ item.Specifications_name }}</view>
+						<view class="price-list">
+							<view class="price-r">{{ item.Specifications_money / 100 }}</view>
+							<!-- <view class="price-g">¥{{ info.skuInfo.price / 100 }}</view> -->
+						</view>
+					</view>
+					<view class="num-box">
+						<view class="ctrl" @click="reduce(item)">-</view>
+						<view class="num">{{item.num}}</view>
+						<!-- <input class="num" :disabled="true" type="text" v-model="item.num" @input="rge($event)" @blur="setV()" /> -->
+						<view class="ctrl" @click="plus(item)">+</view>
+					</view>
+				</view>
+			</view>
+		</view>
+		<view class="person-info box" v-if="info[0].is_post == 0 && info[0].is_card == 1">
+			<view class="person-title">购买信息</view>
+			<view class="p_name line flex">
+				<view class="left">用户姓名：</view>
+				<input class="input" type="text" placeholder="请输入姓名" v-model="reserve_name" />
+			</view>
+			<view class="p_id line flex">
+				<view class="left">身份证号：</view>
+				<input class="input" type="text" placeholder="请输入身份证号" v-model="reserve_idcard" />
+			</view>
+			<view class="p_tel flex">
+				<view class="left">手机号码：</view>
+				<input class="input" type="text" placeholder="接受预定信息的号码" v-model="reserve_phone" />
+			</view>
+		</view>
+		
+		<!-- 优惠 -->
+		<view class="youhui">
+			<view class="" style="font-size: 32rpx;font-weight: bold;color: #000;">优惠</view>
+			<view class="youhui-price">
+				<view class="" style="color: #4D526C;font-weight: 500;">
+					活动促销：
+				</view>
+				<view class="" style="color: #FC5109;font-weight: bold;">
+					-￥{{delPrice}}
+				</view>
+			</view>
+		</view>
+		
+		<!-- <view class="remark">
+			<view class="">备注:</view>
+			<input type="text" placeholder="订单备注" v-model="remark" maxlength="50"/>
+		</view> -->
+		<!-- <view class="" style="font-size: 24rpx;font-weight: 500;color: #FC5109;margin-left: 26.7rpx;margin-top: 27.33rpx;">
+			*温馨提示：本商品不支持退换货
+		</view> -->
+		<view class="btn-list">
+			<view class="price-box">
+				<view class="text">合计:</view>
+				<view class="price">{{ (allPrice + post)/100}}</view>
+				<!-- <view class="price">{{ getAllPrice() - disPrice + (post / 100) }}</view> -->
+				<view class="post" v-if="post">含邮费:¥{{ post / 100 }}</view>
+			</view>
+			<view class="btn" @click="order()">立即购买</view>
+		</view>
+
+		<!-- 选择收货地址弹窗 -->
+		<uni-popup ref="addressPopup" type="bottom" backgroundColor="#F4F4F4">
+			<view class="people-popup">
+				<view class="top-box">
+					<view class="top flex-between">
+						<text class="text-overflow" @click="changeAddressPopup('close')">取消</text>
+						<text class="confirm" @click="changeAddressPopup('close', 'confirm')">确定</text>
+					</view>
+				</view>
+				<navigator url="/subPackages/user/myAddressAdd" class="button">添加收货地址</navigator>
+				<view class="popup-list" v-if="addressList.length > 0">
+					<view class="popup-item" v-for="(item, index) in addressList" :key="index" @click="seldThisAddress(item)">
+						<view class="item-top flex-between">
+							<view>
+								<view class="name flex-start">
+									{{ item.name }}
+									<text>{{ item.tel }}</text>
+									<text class="tag" v-if="item.is_default == 1">默认</text>
+								</view>
+								<view class="subtitle">{{ item.address }}</view>
+							</view>
+							<navigator :url="`/subPackages/user/myAddressAdd?id=${item.id}`">
+								<img src="https://static.ticket.sz-trip.com/taizhou/images/detail/edit.png" alt="" />
+							</navigator>
+						</view>
+					</view>
+				</view>
+			</view>
+		</uni-popup>
+	</view>
+</template>
+
+<script>
+export default {
+	data() {
+		return {
+			contacts: null,
+			info: null,
+			num: 1,
+			post: 0,
+			flag: true,
+			addressList: [],
+			reserve_name: '',
+			reserve_idcard: '',
+			reserve_phone: '',
+			remark: '',
+			allPrice: 0, // 折扣后总价
+			discounts:null,
+			disPrice: {}, // 折扣对象
+			delPrice:0
+			// disPrice: 0
+		};
+	},
+	onLoad() {
+		this.info = this.$store.state.user.sshoppingCart
+		console.log('info',this.info);
+		
+		this.info.forEach(item => {
+			this.getDiscount(item)
+		})
+		if (!this.info) {
+			uni.navigateBack();
+		}
+		console.log('----***info***------',this.info);
+	},
+	onShow() {
+		this.getContacts();
+		this.getAllAddressList();
+		// this.getAllPrice()
+		// this.getTotal()
+	},
+	methods: {
+		// 获取总价
+		getAllPrice() {
+			this.info.forEach(item => {
+				if ((item.Specifications_money * item.num) - (this.disPrice[item.specifications_id]*100) <= 0) {
+					item.price1 = this.disPrice[item.specifications_id]
+					item.price = 0
+				} else{
+					item.price1 = this.disPrice[item.specifications_id]
+					let price = (item.Specifications_money * item.num) - (this.disPrice[item.specifications_id]*100)
+					item.price  = +price.toFixed(2)
+				}
+			})
+			let allPrice = 0
+			let delPrice = 0
+			this.info.forEach(item => {
+				delPrice += item.price1
+				allPrice += item.price
+			})
+			this.delPrice =  delPrice
+			console.log('delPrice',this.delPrice);
+			this.allPrice =  allPrice
+		},
+		
+		getContacts() {
+			if (this.info[0].is_post == 0) {
+				return;
+			}
+			this.Post({}, '/api/user/getDefaultConsignee').then(res => {
+				if (res) {
+					this.contacts = res.data;
+					this.getPost();
+				}
+			});
+		},
+		getPost() {
+			if (this.info[0].is_post == 0) {
+				return;
+			}
+			console.log(this.info);
+			this.flag = false;
+			let data = this.info.map((item) => {
+				return { specifications_id:item.specifications_id, num: item.num, consignee_id: this.contacts.id }
+			})
+			// let data = [{ specifications_id: this.info.skuInfo.id, num: this.num, consignee_id: this.contacts.id }];
+			console.log(data);
+			this.Post({ data:JSON.stringify(data)}, '/api/order/getNewPost').then(res => {
+				if (res) {
+					this.post = 0
+					res.data.forEach((item)=> {
+						this.post += item.post_money
+					})
+					this.flag = true;
+				}
+			});
+		},
+		rge(val) {
+			this.$nextTick(() => {
+				this.num = val.detail.value.replace(/^(0+)|[^\d]+/g, '');
+			});
+		},
+		setV() {
+			if (!this.num) {
+				this.$nextTick(() => {
+					this.num = 1;
+					if (this.flag) {
+						this.getPost();
+					}
+				});
+			} else {
+				if (this.flag) {
+					this.getPost();
+				}
+			}
+		},
+		plus(item) {
+			// this.num = Number(this.num);
+			this.$nextTick(() => {
+				item.num += 1;
+				this.getDiscount(item)
+				// this.disPrice = this.calculateTotalPrice(this.discounts,this.num)
+				// console.log(this.disPrice);
+				if (this.flag) {
+					this.getPost();
+				}
+			});
+		},
+		reduce(item) {
+			if (item.num > 1) {
+				this.$nextTick(() => {
+					item.num -= 1;
+					this.getDiscount(item)
+					// this.disPrice =  this.calculateTotalPrice(item.discounts,item.num)
+					console.log(this.disPrice);
+					if (this.flag) {
+						this.getPost();
+					}
+				});
+			}
+			// this.num = Number(this.num);
+			// if (this.num > 1) {
+			// 	this.$nextTick(() => {
+			// 		this.num -= 1;
+			// 		this.disPrice =  this.calculateTotalPrice(this.discounts,this.num)
+			// 		console.log(this.disPrice);
+			// 		if (this.flag) {
+			// 			this.getPost();
+			// 		}
+			// 	});
+			// }
+		},
+		//获取数量折扣
+		getDiscount(item) { 
+			this.Post({ specifications_id: item.specifications_id }, '/api/goods/getSpeNumDiscount').then(res => {
+				this.discounts = res.data.discount_rule;
+				if (this.discounts) {
+					let disPrice_item = this.calculateTotalPrice(this.discounts,item.num)
+					this.disPrice[item.specifications_id] = +disPrice_item
+				} else {
+					this.disPrice[item.specifications_id] = 0
+				} 
+				this.getAllPrice()
+			});
+		},
+		//计算折扣价
+		calculateTotalPrice(discounts, selectedQuantity) {
+			if (discounts) {
+				let totalPrice = 0;
+				for (const discount of discounts) {
+					if (selectedQuantity >= discount.num) {
+						totalPrice = discount.money;
+					}
+				}
+				return totalPrice;
+			} else {
+				return 0;
+			}
+		},
+		// 选择收货地址弹窗
+		changeAddressPopup(type, confirm, index) {
+			if (type == 'open') {
+				this.$refs.addressPopup.open('bottom');
+			}
+			else this.$refs.addressPopup.close();
+			this.$forceUpdate();
+		},
+		// 获取收货地址列表
+		getAllAddressList() {
+			this.Post({}, '/api/user/consigneeList').then(res => {
+				if (res.code === 200) this.addressList = res.data;
+			});
+		},
+		// 选择收货地址
+		seldThisAddress(item) {
+			if (!this.contacts) this.contacts = {};
+			Object.assign(this.contacts, item);
+			if (this.flag) {
+				this.getPost();
+			}
+			this.$refs.addressPopup.close();
+			this.$forceUpdate();
+		},
+		// 预定
+		order() {
+			if (this.info[0].is_post == 1 && !this.contacts) {
+				uni.showToast({
+					title: '请选择收货地址',
+					icon: 'none'
+				});
+				return;
+			}
+			if (this.info[0].is_post == 0 && this.info[0].is_card == 1) {
+				if (!this.reserve_name) {
+					uni.showToast({
+						title: '请输入姓名',
+						icon: 'none'
+					});
+					return;
+				}
+				if (!this.reserve_phone) {
+					uni.showToast({
+						title: '请输入电话',
+						icon: 'none'
+					});
+					return;
+				}
+				if (!this.reserve_idcard) {
+					uni.showToast({
+						title: '请输入身份证',
+						icon: 'none'
+					});
+					return;
+				}
+			}
+			// let goods = [];
+			let goods = this.info.map((item) => {
+				return { specifications_id:item.specifications_id, num: item.num, consignee_id: item.is_post == 1 ? this.contacts.id : null }
+			})
+			// let goodsItem = {
+			// 	specifications_id: this.info.skuInfo.id,
+			// 	num: this.num,
+			// 	consignee_id: this.info.skuInfo.is_post == 1 ? this.contacts.id : null
+			// };
+			// goods.push(goodsItem);
+			let data = {
+				goods: goods,
+				coupon: null,
+				remark: this.remark,
+				is_post: this.info[0].is_post,
+				reserve_name: this.reserve_name,
+				reserve_phone: this.reserve_phone,
+				reserve_idcard: this.reserve_idcard
+			};
+			this.Post(
+				{
+					method: 'POST',
+					data: JSON.stringify(data)
+				},
+				'/api/order/place'
+			).then(resT => {
+				if (resT.code == 200) {
+					this.Post(
+						{
+							order_id: resT.data.order_id,
+							type: "miniprogram",
+							// #ifdef MP-WEIXIN
+							platform: 'miniprogram',
+							// #endif
+							// #ifdef H5
+							platform: 'JSAPI',
+							// #endif
+						},
+						'/api/pay/unify'
+					).then(res => {
+						if (res.data) {
+							// #ifdef MP-WEIXIN
+							uni.requestPayment({
+								nonceStr: res.data.nonceStr,
+								package: res.data.package,
+								paySign: res.data.paySign,
+								signType: res.data.signType,
+								timeStamp: res.data.timeStamp,
+								complete() {
+
+								},
+								success(){
+									uni.showLoading({
+										title:'加载中...'
+									})
+									setTimeout(()=>{
+										uni.hideLoading()
+										uni.navigateTo({
+											url: '/subPackages/order/detail?id='+resT.data.order_id
+										});
+									},2000)
+								}
+							});
+							// #endif
+							// #ifdef H5
+							WeixinJSBridge.invoke('getBrandWCPayRequest', {
+								appId: res.data.appId,
+								timeStamp: res.data.timeStamp,
+								nonceStr: res.data.nonceStr,
+								package: res.data.package,
+								signType: res.data.signType,
+								paySign: res.data.paySign
+							}, function(Twores) {
+								if (Twores.err_msg === 'get_brand_wcpay_request:ok') {
+									uni.showLoading({
+										title:'加载中...'
+									})
+									setTimeout(()=>{
+										uni.hideLoading()
+										uni.navigateTo({
+											url: '/subPackages/order/detail?id='+resT.data.order_id
+										});
+									},2000)
+								} else {
+							
+								}
+							});
+							// #endif
+						}
+					});
+				}
+			});
+		}
+	}
+};
+</script>
+
+<style lang="scss" scoped>
+.bg {
+	min-height: 100vh;
+	overflow-x: hidden;
+	background: #f2f4f7;
+	padding-bottom: 200rpx;
+}
+view {
+	box-sizing: border-box;
+}
+.box {
+	width: 710rpx;
+	min-height: 100rpx;
+	padding: 30rpx;
+	background: #ffffff;
+	border-radius: 16rpx;
+	margin: 0 auto;
+	margin-top: 20rpx;
+}
+.address {
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	image {
+		width: 32rpx;
+		height: 32rpx;
+	}
+	.text {
+		font-size: 28rpx;
+		font-family: PingFangSC-Regular, PingFang SC;
+		font-weight: 400;
+		color: #6c7a94;
+		margin-left: 18rpx;
+	}
+}
+.commodity {
+	// display: flex;
+	// align-items: center;
+	.img {
+		width: 140rpx;
+		height: 140rpx;
+		background: #f2f4f7;
+		border-radius: 10rpx;
+		margin-right: 18rpx;
+	}
+	.title {
+		width: 300rpx;
+		margin-left: 20rpx;
+		font-size: 30rpx;
+		font-family: PingFangSC-Medium, PingFang SC;
+		font-weight: 500;
+		color: #000000;
+
+		.price-list {
+			display: flex;
+			margin-top: 18rpx;
+			align-items: center;
+			.price-r {
+				font-size: 32rpx;
+				font-family: PingFangSC-Regular, PingFang SC;
+				font-weight: 500;
+				color: #fc5109;
+				&:before {
+					content: '¥';
+					display: inline-block;
+					color: #fc5109;
+					font-size: 24rpx;
+				}
+			}
+			.price-g {
+				font-size: 24rpx;
+				font-family: PingFangSC-Regular, PingFang SC;
+				font-weight: 400;
+				color: #b5bcc9;
+				text-decoration: line-through;
+				margin-left: 10rpx;
+			}
+		}
+	}
+	.num-box {
+		display: flex;
+		align-items: center;
+		margin-left: 20rpx;
+		width: 200rpx;
+		justify-content: space-between;
+		.num {
+			text-align: center;
+			width: 50rpx;
+		}
+		.ctrl {
+			width: 70rpx;
+			height: 60rpx;
+			line-height: 60rpx;
+			text-align: center;
+			font-weight: bold;
+			font-size: 36rpx;
+		}
+	}
+}
+.btn-list {
+	width: 750rpx;
+	height: 166rpx;
+	background: #ffffff;
+	box-shadow: 0rpx -3rpx 9rpx 1rpx rgba(227, 229, 232, 0.5);
+	display: flex;
+	position: fixed;
+	bottom: 0;
+	padding: 20rpx 50rpx;
+	align-items: center;
+	justify-content: space-between;
+	.btn {
+		width: 250rpx;
+		height: 80rpx;
+		background: linear-gradient(270deg, #fc5109 0%, #fdc43a 100%);
+		border-radius: 44rpx;
+		text-align: center;
+		line-height: 80rpx;
+		font-size: 32rpx;
+		font-family: PingFangSC-Medium, PingFang SC;
+		font-weight: 500;
+		color: #ffffff;
+	}
+	.price-box {
+		display: flex;
+		align-items: center;
+		.text {
+			font-size: 28rpx;
+			font-family: PingFangSC-Regular, PingFang SC;
+			font-weight: 400;
+			color: #393b3e;
+		}
+		.price {
+			margin-left: 15rpx;
+			font-size: 48rpx;
+			font-family: PingFangSC-Regular, PingFang SC;
+			font-weight: 400;
+			color: #fc5109;
+			&:before {
+				content: '¥';
+				display: inline-block;
+				color: #fc5109;
+				font-size: 24rpx;
+			}
+		}
+		.post {
+			margin-left: 15rpx;
+			color: #fc5109;
+			font-size: 24rpx;
+		}
+	}
+}
+.contacts {
+	display: flex;
+	align-items: center;
+	justify-content: space-between;
+	image {
+		width: 31rpx;
+		height: 36rpx;
+	}
+	.contacts-left {
+		.name-phone {
+			display: flex;
+			align-items: center;
+			.name {
+				font-size: 32rpx;
+				font-family: PingFangSC-Medium, PingFang SC;
+				font-weight: 500;
+				color: #222222;
+			}
+			.phone {
+				margin-left: 27rpx;
+				font-size: 28rpx;
+				font-family: PingFangSC-Regular, PingFang SC;
+				font-weight: 400;
+				color: #303030;
+			}
+		}
+		.adds {
+			font-size: 28rpx;
+			font-family: PingFangSC-Regular, PingFang SC;
+			font-weight: 400;
+			color: #6c7a94;
+			margin-top: 20rpx;
+			max-width: 500rpx;
+		}
+	}
+}
+.people-popup {
+	padding: 26rpx;
+	min-height: 800rpx;
+
+	.top-box {
+		height: 80rpx;
+
+		.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: 30rpx;
+				font-weight: 400;
+				color: #000000;
+			}
+
+			.confirm {
+				font-weight: 400;
+				color: #000000;
+			}
+		}
+	}
+
+	.popup-list {
+		height: 666rpx;
+		overflow: scroll;
+
+		.popup-item {
+			border-radius: 12rpx;
+			padding: 0 20rpx;
+			margin-top: 24rpx;
+			font-size: 24rpx;
+			color: #333333;
+			font-weight: 400;
+			background-color: #ffffff;
+
+			.item-top {
+				padding: 32rpx;
+
+				img {
+					color: #666666;
+					width: 40rpx;
+					height: 40rpx;
+				}
+
+				.name {
+					font-size: 30rpx;
+					color: #000000;
+					overflow: hidden;
+
+					text {
+						color: #999999;
+					}
+
+					.tag {
+						width: 70rpx;
+						height: 32rpx;
+						background: #00d7ed;
+						border-radius: 7rpx;
+						line-height: 32rpx;
+						text-align: center;
+						font-size: 21rpx;
+						font-family: PingFang SC;
+						font-weight: 500;
+						color: #ffffff;
+					}
+				}
+
+				.com-flex-start {
+					margin: 0 0 30rpx;
+				}
+
+				.subtitle {
+					font-weight: 400;
+					flex: 1;
+					text-align: left;
+					margin-top: 33rpx;
+
+					.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;
+			// 		}
+			// 	}
+			// }
+		}
+	}
+
+	.button {
+		font-size: 30rpx;
+		font-weight: 400;
+		color: #000000;
+		text-align: center;
+		width: 100%;
+		height: 80rpx;
+		line-height: 80rpx;
+		background-color: #ffffff;
+		border-radius: 60rpx;
+	}
+}
+
+.person-info {
+	padding: 30rpx 30rpx 15rpx 30rpx;
+	background: #fff;
+	margin-top: 30rpx;
+	border-radius: 16rpx;
+}
+.person-title {
+	font-size: 32rpx;
+	font-weight: bold;
+	color: #000;
+}
+.line {
+	border-bottom: 1px solid #e3e5e8;
+}
+.flex {
+	display: flex;
+	align-items: center;
+}
+.left {
+	width: 140rpx;
+	font-size: 28rpx;
+	font-weight: 500;
+	color: #4d526c;
+	height: 104rpx;
+	line-height: 104rpx;
+}
+.input {
+	font-size: 28rpx;
+	font-weight: 400;
+}
+.remark {
+	padding: 30rpx;
+	display: flex;
+	align-items: center;
+	width: 710rpx;
+	min-height: 150rpx;
+	background: #ffffff;
+	border-radius: 16rpx;
+	margin: 0 auto;
+	margin-top: 30rpx;
+	view {
+		color: #4d526c;
+		font-size: 28rpx;
+	}
+	input {
+		margin-left: 64rpx;
+		width: 500rpx;
+		font-size: 28rpx;
+	}
+}
+
+.info-tags {
+	padding: 8rpx 7rpx;
+	text-align: center;
+	line-height: 35rpx;
+	font-size: 20rpx;
+	font-weight: 500;
+}
+
+.info-tags:first-child {
+	background: rgba(252,81,9,.08);
+	color: #FC5109;
+}
+
+.info-tags:last-child {
+	background: rgba(73,143,239,.1);
+	color: #498FEF;
+}
+
+.merchant-name {
+	margin-bottom: 24rpx;
+}
+
+.goods {
+	display: flex;
+}
+
+.sku-info {
+	display: flex;
+	margin-top: 26rpx;
+	align-items: baseline;
+	justify-content: space-between;
+	border-bottom: 1rpx solid #ccc;
+	padding-bottom: 25.3rpx;
+}
+
+.sku-info:last-child {
+	border:none !important;
+}
+
+.youhui {
+	width: 710rpx;
+	margin: 0 auto;
+	margin-top: 22rpx;
+	padding: 32.67rpx 19.33rpx 32.67rpx 24rpx;
+	background: #FFFFFF;
+	border-radius: 13rpx;
+}
+
+.youhui-price {
+	margin-top: 52.67rpx;
+	display: flex;
+	justify-content: space-between;
+	margin-left: .67rpx;
+	font-size: 27rpx;
+}
+
+</style>
diff --git a/subPackages/order/trades.vue b/subPackages/order/trades.vue
index 81f31e4..91ae977 100644
--- a/subPackages/order/trades.vue
+++ b/subPackages/order/trades.vue
@@ -362,7 +362,9 @@
 	.common-types {
 		background: white;
 		height: 90rpx;
-		font-size: 31rpx;
+		font-weight: 500;
+font-size: 31rpx;
+color: #333333;
 		z-index: 10;
 		margin: auto;
 		color: #666;
@@ -386,9 +388,9 @@
 	}
 
 	.common-type.active {
-		font-size: 31rpx;
 		font-weight: bold;
-		color: #000;
+		font-size: 31rpx;
+		color: #000000;
 	}
 
 	.common-type.active:after {
@@ -402,7 +404,7 @@
 		right: 0;
 		bottom: 1rpx;
 		height: 4rpx;
-		background: #C3282E;
+		background: #74A5AA;
 		border-radius: 2rpx;
 	}
 
@@ -457,7 +459,7 @@
 		font-size: 27rpx;
 		font-family: PingFang SC;
 		font-weight: bold;
-		color: #C3282E;
+		color: #FC5109;
 	}
 
 	.trade-item-head-name {
@@ -521,7 +523,7 @@
 		padding: 0 20rpx;
 		font-weight: 500;
 		font-size: 24rpx;
-		color: #C3282E;
+		color: #888888;
 		margin-top: 20rpx;
 	}
 
@@ -585,7 +587,7 @@
 
 	.trade-item-btns .pay-btn {
 		color: #FFFFFF;
-		background: #C3282E;
+		background: #74A5AA;
 		border: none;
 		padding: 10rpx 16rpx;
 	}
diff --git a/subPackages/shiguang/shiguang.vue b/subPackages/shiguang/shiguang.vue
new file mode 100644
index 0000000..30cc112
--- /dev/null
+++ b/subPackages/shiguang/shiguang.vue
@@ -0,0 +1,19 @@
+<template>
+	<view class="bg">
+		
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	
+</style>
\ No newline at end of file
diff --git a/subPackages/user/gwc.vue b/subPackages/user/gwc.vue
new file mode 100644
index 0000000..728526f
--- /dev/null
+++ b/subPackages/user/gwc.vue
@@ -0,0 +1,556 @@
+<template>
+	<view class="bg">
+		<view class="guanli" v-if="list && list.length>0" @click="guanli">{{operate}}</view>
+		<view v-for="(item,index) in list" :key="index">
+			<view class="goodBox" v-if="item.data && item.data.length > 0  ">
+				<view class="title" v-if="item.data.some(v => v.flag === 1)">{{item.merchant_name}} ></view>
+				<view class="goodItem" v-for="(goodItem,goodIndex) in item.data" :key="goodIndex"
+					v-if="goodItem.flag != 0">
+					<view class="noSelect" v-if="!goodItem.is_select" @click="changeSelect(goodItem)"></view>
+					<view class="selectBox flex-around" v-else @click="changeSelect(goodItem)">
+						<img src="https://static.ticket.sz-trip.com/cgc/images/order/dui.png">
+					</view>
+					<image :src="showImg(goodItem.Specifications_image)" mode="aspectFill"
+						@click="goDetails(goodItem.good_id)"></image>
+					<view class="contentBox">
+						<view class="title text-overflow">{{goodItem.good_name}}</view>
+						<view class="subTitle text-overflow">{{goodItem.Specifications_name}}</view>
+						<view class="priceBox flex-between">
+							<view class="price">{{showPrice(goodItem.Specifications_money)}}</view>
+							<view class="flex-between" style="width: 165rpx;font-size: 29rpx;">
+								<view :class="['jian', goodItem.num == 1 ? 'zhihui' : '']" @click="delNum(goodItem)">-
+								</view>
+								<view>{{goodItem.num}}</view>
+								<view class="jia" @click="addNum(goodItem)">+</view>
+							</view>
+						</view>
+					</view>
+				</view>
+			</view>
+		</view>
+
+		<view class="loseGood" v-if="loseList && loseList.length>0">
+			<view class="title flex-between">失效商品<span @click="delLoseGood('',1)">清空失效商品</span></view>
+			<view class="goodItem" v-for="(goodItem,goodIndex) in loseList" :key="goodIndex">
+				<view class="noSelect"></view>
+				<image :src="showImg(goodItem.Specifications_image)" mode="aspectFill"></image>
+				<view class="contentBox">
+					<view class="title text-overflow">{{goodItem.good_name}}</view>
+					<view class="subTitle text-overflow">{{goodItem.Specifications_name}}</view>
+					<view class="priceBox flex-between">
+						<view class="price">{{showPrice(goodItem.Specifications_money)}}</view>
+						<view class="btn" @click="delLoseGood(goodItem.id,0)">删除</view>
+					</view>
+				</view>
+			</view>
+		</view>
+
+		<!-- 预定按钮 -->
+		<view class="orderBox flex-between">
+			<view class="priceBox">
+				<view class="selectBox flex-around" v-if="allSelect" @click="changeAllSelect">
+					<img src="https://static.ticket.sz-trip.com/cgc/images/order/dui.png" alt="">
+				</view>
+				<view class="noSelect" v-else @click="changeAllSelect"></view>全选
+				<span v-if="operate == '管理'">在线付:</span>
+				<p v-if="operate == '管理'">￥{{getAllPrice()}}</p>
+			</view>
+			<view class="btn" @click="order" v-if="operate == '管理'">提交订单</view>
+			<view class="btn" @click="delGood" v-else>删除</view>
+		</view>
+
+		<view class="noProduct" v-if="list.length == 0 && loseList.length == 0">
+			暂无商品
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				operate: '管理',
+				list: [],
+				loseList: [],
+				allSelect: false,
+			}
+		},
+		onShow() {
+			this.getShoppingList()
+			this.allSelect = false
+		},
+		methods: {
+			getShoppingList() {
+				this.Post({
+					is_post: 2,
+					lon: this.$store.state.user.location.lon || '120.63132',
+					lat: this.$store.state.user.location.lat || '31.30227'
+				}, '/api/shopping/getShoppingList').then(res => {
+					this.list = res.data
+					this.loseList = []
+					this.list.forEach(item => {
+						item.data.forEach(items => {
+							if (items.flag === 0) {
+								this.loseList.push(items)
+							}
+
+						})
+					})
+					console.log('打印', this.loseList);
+				})
+			},
+			// 管理
+			guanli() {
+				if (this.operate == '管理') {
+					this.operate = '退出管理'
+				} else {
+					this.operate = '管理'
+				}
+				console.log(this.operate)
+			},
+			delNum(item) {
+				if (item.num <= 1) {
+					item.num = 1
+					uni.showToast({
+						title: '已经最少了，不能再减了',
+						icon: 'none'
+					})
+				} else {
+					item.num -= 1
+					this.updateCart(item)
+				}
+			},
+			addNum(item) {
+				item.num += 1
+				this.updateCart(item)
+			},
+			updateCart(item) {
+				let that = this
+				that.Post({
+					s_id: item.id,
+					num: item.num
+				}, '/api/shopping/updateShopping').then(function(res) {
+					if (res) {
+						// that.$toast.clear()
+					}
+				})
+			},
+			// 更改选中状态
+			changeSelect(item) {
+				item.is_select = !item.is_select
+				this.list.forEach(item => {
+					let checkAll = item.data.findIndex(items => {
+						return !items.is_select
+					})
+					if (checkAll == -1) {
+						this.allSelect = true
+					} else {
+						this.allSelect = false
+					}
+				})
+				this.$forceUpdate()
+			},
+			// 去商品详情
+			goDetails(id) {
+				uni.navigateTo({
+					url: '/subPackages/goods/goodsInfo?id=' + id
+				});
+			},
+			// 改变所有选中
+			changeAllSelect() {
+				this.allSelect = !this.allSelect
+				this.list.forEach(item => {
+					item.data.forEach(items => {
+						if (this.allSelect) items.is_select = true
+						else items.is_select = false
+					})
+				})
+			},
+			// 删除失效商品
+			delLoseGood(id, index) {
+				if (index == 0) {
+					this.Post({
+						s_id: id
+					}, '/api/shopping/delShopping').then(res => {
+						this.getShoppingList()
+						this.$forceUpdate()
+					})
+				} else {
+					let ids = []
+					this.loseList.forEach(item => {
+						ids.push(item.id)
+					})
+					this.Post({
+						s_id: ids.toString()
+					}, '/api/shopping/delShopping').then(res => {
+						this.getShoppingList()
+						this.$forceUpdate()
+					})
+				}
+			},
+			// 删除商品
+			delGood() {
+				let ids = []
+				this.list.forEach(item => {
+					item.data.forEach(items => {
+						if (items.is_select == true) {
+							ids.push(items.id)
+						}
+					})
+				})
+				this.Post({
+					s_id: ids.toString()
+				}, '/api/shopping/delShopping').then(res => {
+					this.getShoppingList()
+					this.$forceUpdate()
+				})
+			},
+			// 获取总价
+			getAllPrice() {
+				let allPrice = 0
+				this.list.forEach(item => {
+					item.data.forEach(items => {
+						if (items.is_select == true) {
+							allPrice += items.Specifications_money * items.num
+						}
+					})
+				})
+				return (allPrice / 100).toFixed(2)
+			},
+			// 结算
+			order() {
+				let list = []
+				let ids = []
+				this.list.forEach(item => {
+					item.data.forEach((items, index) => {
+						if (items.is_select == true) {
+							ids.push(items.merchant_id)
+							list.push(items)
+						}
+					})
+				})
+				if (Array.from(new Set(ids)).length > 1) {
+					uni.showToast({
+						title: '请选择同一商户下的商品',
+						icon: 'none'
+					})
+					return;
+				}
+				if (list.length == 0) {
+					uni.showToast({
+						title: '请选择商品',
+						icon: 'none'
+					})
+					return;
+				}
+				console.log('list参数', list);
+				this.$store.commit("changeOrderSCart", list)
+				// this.gotoPath('/subPackages/order/eCartOrder')
+				this.gotoPath('/subPackages/order/gwcOrder')
+				// this.gotoPath('/subPackages/goods/goodsOrder')
+			}
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+	.bg {
+		width: 100%;
+		min-height: 100vh;
+		padding: 0 27rpx 200rpx;
+		box-sizing: border-box;
+		background-color: #F8F8F8;
+	}
+
+	.guanli {
+		height: 76rpx;
+		text-align: right;
+		font-size: 32rpx;
+		font-family: PingFang SC;
+		font-weight: 400;
+		color: #000000;
+		line-height: 76rpx;
+	}
+
+	.goodBox {
+		width: 697rpx;
+		height: auto;
+		background: #FFFFFF;
+		border-radius: 20rpx;
+		margin: 0 auto 27rpx;
+		padding: 25rpx 20rpx;
+		box-sizing: border-box;
+
+		.title {
+			font-size: 35rpx;
+			font-family: PingFang SC;
+			font-weight: 500;
+			color: #000000;
+		}
+
+		.goodItem {
+			width: 100%;
+			height: 173rpx;
+			margin-top: 46rpx;
+			display: flex;
+
+			.noSelect {
+				width: 37rpx;
+				height: 37rpx;
+				border-radius: 50%;
+				border: 2rpx solid #666666;
+				box-sizing: border-box;
+				margin-right: 25rpx;
+				margin-top: 68rpx;
+			}
+
+			.selectBox {
+				width: 37rpx;
+				height: 37rpx;
+				// background: linear-gradient(90deg, #FA2B66, #FF9834);
+				// border-radius: 50%;
+				margin-right: 25rpx;
+				margin-top: 68rpx;
+
+				img {
+					width: 100%;
+					height: 100%;
+				}
+			}
+
+			image {
+				width: 173rpx;
+				height: 173rpx;
+				border-radius: 13rpx;
+			}
+
+			.contentBox {
+				width: 400rpx;
+				height: 173rpx;
+				margin-left: 23rpx;
+
+				.title {
+					font-size: 31rpx;
+					font-family: PingFang SC;
+					font-weight: 500;
+					color: #000000;
+				}
+
+				.subTitle {
+					font-size: 27rpx;
+					font-family: PingFang SC;
+					font-weight: 400;
+					color: #7C7C7C;
+					margin-top: 13rpx;
+				}
+
+				.priceBox {
+					margin-top: 35rpx;
+
+					.price {
+						font-size: 40rpx;
+						font-family: PingFang SC;
+						font-weight: 500;
+						color: #FF2D3B;
+					}
+
+					.price:before {
+						content: "￥";
+						font-size: 27rpx;
+					}
+
+					.jian,
+					.jia {
+						width: 47rpx;
+						height: 47rpx;
+						background: #2791F7;
+						border-radius: 50%;
+						text-align: center;
+						color: #FFFFFF;
+						line-height: 47rpx;
+					}
+				}
+			}
+		}
+	}
+
+	.loseGood {
+		width: 697rpx;
+		height: auto;
+		background: #FFFFFF;
+		border-radius: 20rpx;
+		margin: 0 auto 27rpx;
+		padding: 25rpx 20rpx;
+		box-sizing: border-box;
+
+		.title {
+			font-size: 35rpx;
+			font-family: PingFang SC;
+			font-weight: 500;
+			color: #666666;
+
+			span {
+				font-size: 32rpx;
+				font-family: PingFang SC;
+				font-weight: 400;
+				color: #2791F7;
+			}
+		}
+
+		.goodItem {
+			width: 100%;
+			height: 173rpx;
+			margin-top: 46rpx;
+			display: flex;
+			color: #999999;
+
+			.noSelect {
+				width: 37rpx;
+				height: 37rpx;
+				border-radius: 50%;
+				border: 2rpx solid #CCCCCC;
+				background: #F1F1F1;
+				box-sizing: border-box;
+				margin-right: 25rpx;
+				margin-top: 68rpx;
+			}
+
+			image {
+				width: 173rpx;
+				height: 173rpx;
+				border-radius: 13rpx;
+				margin-right: 23rpx;
+			}
+
+			.contentBox {
+				width: 421rpx;
+				height: 173rpx;
+
+				.title {
+					font-size: 31rpx;
+					font-family: PingFang SC;
+					font-weight: 500;
+				}
+
+				.subTitle {
+					font-size: 27rpx;
+					font-family: PingFang SC;
+					font-weight: 400;
+				}
+
+				.priceBox {
+					margin-top: 35rpx;
+
+					.price {
+						font-size: 40rpx;
+						font-family: PingFang SC;
+						font-weight: 500;
+					}
+
+					.price:before {
+						content: "￥";
+						font-size: 27rpx;
+					}
+
+					.btn {
+						width: 125rpx;
+						height: 53rpx;
+						background: #999999;
+						border-radius: 13rpx;
+						text-align: center;
+						line-height: 53rpx;
+						font-size: 29rpx;
+						font-family: PingFang SC;
+						font-weight: 500;
+						color: #FFFFFF;
+					}
+				}
+			}
+		}
+	}
+
+	.noProduct {
+		width: 100%;
+		height: 300rpx;
+		text-align: center;
+		line-height: 300rpx;
+		color: #999999;
+		font-size: 32rpx;
+	}
+
+	.orderBox {
+		width: 750rpx;
+		height: 151rpx;
+		background: #FFFFFF;
+		box-shadow: 0px 0px 16rpx 0px rgba(6, 0, 1, 0.1);
+		padding: 0 27rpx;
+		box-sizing: border-box;
+		position: fixed;
+		left: 0;
+		bottom: 0;
+
+		.priceBox {
+			display: flex;
+			font-size: 27rpx;
+			font-family: PingFang SC;
+			font-weight: 400;
+			color: #666666;
+
+			span {
+				font-size: 27rpx;
+				font-family: PingFang SC;
+				font-weight: 400;
+				color: #333333;
+				margin-left: 20rpx;
+			}
+
+			p {
+				font-size: 36rpx;
+				font-family: PingFang SC;
+				font-weight: 500;
+				color: #FF2D3B;
+				margin-top: -5rpx;
+			}
+
+			.noSelect {
+				width: 41rpx;
+				height: 41rpx;
+				border-radius: 50%;
+				border: 2rpx solid #666666;
+				box-sizing: border-box;
+				margin-right: 10rpx;
+			}
+
+			.selectBox {
+				width: 41rpx;
+				height: 41rpx;
+				// background: linear-gradient(90deg, #FA2B66, #FF9834);
+				border-radius: 50%;
+				margin-right: 10rpx;
+
+				img {
+					width: 100%;
+					height: 100%;
+				}
+			}
+		}
+
+		.btn {
+			width: 219rpx;
+			height: 77rpx;
+			background: #6CA5AA;
+			border-radius: 39rpx;
+			text-align: center;
+			line-height: 77rpx;
+			font-size: 33rpx;
+			font-family: PingFang SC;
+			font-weight: 500;
+			color: #FFFFFF;
+		}
+	}
+
+	.zhihui {
+		background: #E8E8E8 !important;
+		color: #999999 !important;
+	}
+</style>
\ No newline at end of file
diff --git a/subPackages/user/myAddressAdd.vue b/subPackages/user/myAddressAdd.vue
new file mode 100644
index 0000000..0b8f945
--- /dev/null
+++ b/subPackages/user/myAddressAdd.vue
@@ -0,0 +1,387 @@
+<template>
+	<view class="bg">
+		<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"><input type="number" v-model="mobile" placeholder="请输入手机号" maxlength="11"
+						 /></view>
+			</view>
+			<view class="list-item" style="position: relative;">
+				<view class="list-item-title">选择地区:</view>
+				<view class="list-item-input" style="flex: 1;">
+					<picker mode="multiSelector" :range="newProvinceDataList" range-key="name" @change="changeArea" @columnchange="pickerColumnchange"
+					style="position: relative;z-index: 2;">
+						<input type="text" readonly style="text-align: right;font-size: 33rpx;position: relative;z-index: -1;"
+								v-model="citySeld" 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="detailAddr" placeholder="请输入详细地址" /></view>
+			</view>
+			<view class="list-item">
+				<view class="list-item-title">设为默认:</view>
+				<view class="list-item-switch">
+					<switch :checked="idDefault" @change="switchChange" color="#6CA5AA"/>
+				</view>
+			</view>
+			<view class="list-item-btn">
+				<view class="list-item-post" @click="postSave()">保存</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import District from 'ydui-district/dist/jd_province_city_area_id';
+	export default {
+		data() {
+			return {
+				username: '',
+				mobile: '',
+				citySeld: '',
+				detailAddr: '',
+				idDefault: false,
+				title: '新增收货地址',
+				show: false,
+				district: District, //数据
+				ready: false,
+				province: null,
+				city: null,
+				area: '',
+				provinceId: null,
+				cityId: null,
+				areaId: null,
+				columns: [],
+				id: '',
+				newProvinceDataList:[
+					[],[],[]
+				],
+				multiIndex: [0, 0, 0],
+			}
+		},
+		onLoad(option){
+			this.id = option.id
+			if (option.id > 0) {
+			  this.title = '编辑收货地址'
+			  this.getDetail()
+			}
+			else {
+			  this.getSeldCityList()
+			}
+		},
+		methods: {
+			switchChange(e){
+				this.idDefault = e.detail.value
+			},
+			changeArea(e){
+				// 数组内的下标
+				this.multiIndex = e.detail.value;
+				this.citySeld = this.newProvinceDataList[0][this.multiIndex[0]].name + this.newProvinceDataList[1][this.multiIndex[1]].name + this.newProvinceDataList[2][this.multiIndex[2]].name
+				this.provinceId = this.newProvinceDataList[0][this.multiIndex[0]].id
+				this.cityId = this.newProvinceDataList[1][this.multiIndex[1]].id
+				this.areaId = this.newProvinceDataList[2][this.multiIndex[2]].id
+			},
+			getSeldCityList() {
+				let that = this
+				that.Post({}, '/api/areas/getAll').then(res => {
+					if (res.code === 1) {
+						var data = res.data;
+						var result = {};
+						for (var i = 0; i < data.length; i++) {
+							var item = data[i];
+							if (item.parent_id == 0) {
+								continue;
+							}
+							//获取省
+							if (item.parent_id == "1") {
+								result[item.id.toString()] = {};
+								result[item.id.toString()].children = []
+								result[item.id.toString()].name = item.name;
+								result[item.id.toString()].id = item.id;
+							} else if (result[item.parent_id.toString()]) {
+								//填充市
+								var t = {
+									id: item.id,
+									name: item.name,
+									children: []
+								}
+								result[item.parent_id.toString()].children.push(t)
+							} else {
+								//填充区
+								var k = {
+									id: item.id,
+									name: item.name
+								}
+								for (var j = 0; j < result[item.parent_id.toString().substr(0, 2) + "0000"].children
+									.length; j++) {
+									if (result[item.parent_id.toString().substr(0, 2) + "0000"].children[j].id == item
+										.parent_id) {
+										result[item.parent_id.toString().substr(0, 2) + "0000"].children[j].children.push(k)
+									}
+								}
+							}
+						}
+						var r = [];
+						//将Object转为Array
+						for (var i in result) {
+							r.push(result[i]);
+						}
+						//将数据赋值给省市区联动选择器
+						that.district = r;
+						let arr = []
+						let	arr1 = []
+						let arr2 = []
+						that.district.forEach(item => {
+							arr.push(item)
+						})
+						that.district[0].children.forEach(item => {
+							arr1.push(item)
+						})
+						that.district[0].children[0].children.forEach(item => {
+							arr2.push(item)
+						})
+						that.columns = arr
+						//控制异步数据
+						that.ready = true;
+						console.log(this.columns)
+						for(let i=0; i<this.columns.length; i++){
+							this.newProvinceDataList[0].push({name:this.columns[i].name,id:this.columns[i].id});
+						}
+						console.log(this.columns[0].children)
+						for(let i=0; i<this.columns[0].children.length; i++){
+							this.newProvinceDataList[1].push({name:this.columns[0].children[i].name,id:this.columns[0].children[i].id});
+						}
+						for(let i=0; i<this.columns[0].children[0].children.length; i++){
+							this.newProvinceDataList[2].push({name:this.columns[0].children[0].children[i].name,id:this.columns[0].children[0].children[i].id});
+						}
+					}
+				})
+			},
+			// 滑动
+			pickerColumnchange(e){
+				// 第几列滑动
+				// console.log(e.detail.column);
+				// 第几列滑动的下标
+				// console.log(e.detail.value)
+				// 第一列滑动
+				if(e.detail.column === 0){
+					this.multiIndex[0] =  e.detail.value
+					// console.log('第一列滑动');
+					// this.newProvinceDataList[1] = [];
+					this.newProvinceDataList[1] = this.columns[this.multiIndex[0]].children.map((item,index)=>{
+						// console.log(item)
+						return item
+					})
+					// console.log(this.multiIndex)
+					if(this.columns[this.multiIndex[0]].children.length === 1){
+						this.newProvinceDataList[2] = this.columns[this.multiIndex[0]].children[0].children.map((item,index)=>{
+							// console.log(item)
+							return item
+						})
+					}else{
+						this.newProvinceDataList[2] = this.columns[this.multiIndex[0]].children[this.multiIndex[1]].children.map((item,index)=>{
+							// console.log(item)
+							return item
+						})
+					}
+					// 第一列滑动  第二列 和第三列 都变为第一个
+					this.multiIndex.splice(1, 1, 0)
+					this.multiIndex.splice(2, 1, 0)
+				}
+				// 第二列滑动
+				if(e.detail.column === 1){
+					this.multiIndex[1] =  e.detail.value
+					// console.log('第二列滑动');
+					// console.log(this.multiIndex)
+					this.newProvinceDataList[2] = this.columns[this.multiIndex[0]].children[this.multiIndex[1]].children.map((item,index)=>{
+						// console.log(item)
+						return item
+					})
+					// 第二列 滑动 第三列 变成第一个
+					this.multiIndex.splice(2, 1, 0)
+				}
+				// 第三列滑动
+				if(e.detail.column === 2){
+					this.multiIndex[2] =  e.detail.value
+					// console.log('第三列滑动')
+					// console.log(this.multiIndex)
+				}
+			},
+			getDetail() {
+				this.Post({
+					id: this.id
+				}, "/api/user/contactDetail").then(res => {
+					res = res.data;
+					if (res && res.id > 0) {
+						this.username = res.name
+						this.mobile = res.tel
+						this.idDefault = res.is_default == 1 ? true : false
+						this.provinceId = res.province_id
+						this.cityId = res.city_id
+						this.areaId = res.district_id
+						this.citySeld = res.province_text + '' + res.city_text + '' + res.district_text
+						this.detailAddr = res.detail_addr;
+						this.getSeldCityList();
+					}
+				})
+			},
+			postSave() {
+				this.username = this.username.trim()
+				this.mobile = this.mobile.trim()
+				this.detailAddr = this.detailAddr.trim()
+				if (this.username.length < 1) {
+					uni.showToast({
+						title: '请输入姓名',
+						icon: 'none'
+					})
+					return
+				}
+				if (this.username.length > 6) {
+					uni.showToast({
+						title: '姓名最多6个字',
+						icon: 'none'
+					})
+					return
+				}
+				if (!this.IsTel(this.mobile)) {
+					uni.showToast({
+						title: '请输入正确的手机号',
+						icon: 'none'
+					})
+					return
+				}
+				if (this.citySeld.length < 1) {
+					uni.showToast({
+						title: '请选择地区',
+						icon: 'none'
+					})
+					return
+				}
+				if (this.detailAddr.length < 2) {
+					uni.showToast({
+						title: '请输入具体地址',
+						icon: 'none'
+					})
+					return
+				}
+				this.Post({
+					name: this.username,
+					tel: this.mobile,
+					is_default: this.idDefault ? '1' : '0',
+					province_id: this.provinceId,
+					city_id: this.cityId,
+					district_id: this.areaId,
+					detail_addr: this.detailAddr,
+					id: this.id || null
+				},'/api/user/' + (this.id > 0 ? 'edit' : 'add') + 'Consignee').then(res => {
+					if(res.code == 1){
+						uni.setStorageSync('addressNow',JSON.stringify(res.data))
+						uni.showModal({
+							title: '提示',
+							content: this.id>0?'编辑成功':'添加成功',
+							showCancel: false,
+							success: res => {
+								if(res.confirm){
+									uni.navigateBack({})
+								}
+							}
+						})
+					}else{
+						uni.showModal({
+							title: '提示',
+							content: res.msg,
+							showCancel: false,
+							success: res => {
+								
+							}
+						})
+					}
+				})
+			}
+		}
+	}
+</script>
+
+<style scoped>
+	.bg {
+		min-height: 100vh;
+		background-color: white;
+		display: flex;
+		flex-direction: column;
+	}
+
+	.list-forms {
+		display: flex;
+		flex-direction: column;
+		border-top: 1rpx solid #D8D8D8;
+		padding: 20rpx 40rpx;
+		box-sizing: content-box
+	}
+
+	.list-item {
+		display: flex;
+		border-bottom: 1rpx solid #D8D8D8;
+		padding: 30rpx 0;
+		height: 60rpx;
+		align-items: center;
+		box-sizing: content-box
+	}
+
+	.list-item-title {
+		width: 150rpx;
+		font-size: 31rpx;
+		margin-right: 20rpx;
+	}
+
+	.list-item-input {
+		flex: 1;
+	}
+
+	.list-item-input input {
+		width: 100%;
+		height: 100%;
+		padding: 0;
+		margin: 0;
+		border: 0;
+		background-color: transparent;
+		line-height: 34rpx;
+		font-size: 31rpx;
+		text-align: right;
+		font-weight: 500;
+	}
+
+	.list-item-input input::placeholder {
+		font-size: 26rpx;
+	}
+
+	.list-item-switch {
+		display: flex;
+		flex: 1;
+		justify-content: flex-end;
+	}
+
+	.list-item-btn {
+		display: flex;
+		justify-content: center;
+		margin-top: 20rpx;
+	}
+
+	.list-item-post {
+		display: flex;
+		color: #FFFFFF;
+		font-size: 36rpx;
+		width: 697rpx;
+		height: 73rpx;
+		background: #6CA5AA;
+		border-radius: 37rpx;
+		justify-content: center;
+		align-items: center;
+		margin-top: 650rpx;
+	}
+</style>
diff --git a/subPackages/user/travelerList.vue b/subPackages/user/travelerList.vue
new file mode 100644
index 0000000..a8a3e4f
--- /dev/null
+++ b/subPackages/user/travelerList.vue
@@ -0,0 +1,339 @@
+<template>
+	<view class="bg">
+		<!-- <view class="cancat-nav flex-around">
+			<view :class="['concat-nav-item',showType===0?'active':'']" @click="showType=0">
+				<view>出行人信息</view>
+				<view v-if="showType===0" class="active-bar"></view>
+			</view>
+			<view :class="['concat-nav-item',showType===1?'active':'']" @click="showType=1">
+				<view>收货地址</view>
+				<view v-if="showType===1" class="active-bar"></view>
+			</view>
+		</view> -->
+		
+		<!-- 出行人信息 -->
+		<view v-if="showType===0">
+			<view class="item" v-for="(item,index) in travelList" :key="index">
+				<view class="name">
+					<view class="">
+						{{item.name}}
+					</view>
+					<view class="">
+						{{item.tel}}
+						<span v-if="item.is_default==1">默认</span>
+					</view>
+				</view>
+				<view class="idcard">
+					<view class="">
+						{{item.document_type_text}}:
+					</view>
+					<view class="">
+						{{item.id_number}}
+					</view>
+				</view>
+				<view class="item-btn">
+					<view class="choice">
+						<!-- <image src="https://static.ticket.sz-trip.com/yandu/images/user/dui.png" mode="aspectFill"
+							v-if="item.is_default==1">
+						</image>
+						<view class="yuan" v-else @click.stop="defaultC(item)">
+			
+						</view>
+						<view class="">
+							默认出行人
+						</view> -->
+					</view>
+					<view class="btn-list">
+						<view class="btn-item" @click.stop="edit(item.id)">
+							修改
+						</view>
+						<view class="btn-item" @click.stop="delet(item)">
+							删除
+						</view>
+					</view>
+				</view>
+			</view>
+		</view>
+		
+		<!-- 收货地址 -->
+		<view v-else>
+			<view class="item" v-for="(item,index) in addressList" :key="index">
+				<view class="name">
+					<view>
+						{{item.name}}
+					</view>
+					<view class="">
+						{{item.tel}}
+						<span v-if="item.is_default==1">默认</span>
+					</view>
+				</view>
+				<view class="idcard">
+					<view class="">
+						收货地址:
+					</view>
+					<view class="text-overflow">
+						{{item.address}}
+					</view>
+				</view>
+				<view class="item-btn" style="justify-content: flex-end;">
+					<view class="btn-list">
+						<view class="btn-item" @click.stop="edit(item.id)">
+							修改
+						</view>
+						<view class="btn-item" @click.stop="delet(item)">
+							删除
+						</view>
+					</view>
+				</view>
+			</view>
+		</view>
+		
+		<view class="btn-box">
+			<navigator :url="showType ? '/subPackages/user/myAddressAdd' : '/subPackages/user/myContactsAdd'" class="btn">
+				{{showType ? '新增收货地址' : '添加联系人'}}
+			</navigator>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		name: "travelerList",
+		data() {
+			return {
+				showType: 1,
+				travelList: [],
+				addressList: []
+			};
+		},
+		onShow() {
+			this.init()
+		},
+		methods: {
+			init () {
+				// 出行人信息
+				// this.Post({}, "/api/user/contactList").then(res => {
+				// 	if (res) this.travelList = res.data
+				// })
+				
+				// 收货地址
+				this.Post({}, '/api/user/consigneeList').then(res => {
+					if(res) this.addressList = res.data
+				})
+			},
+			delet(item) {
+				let that = this
+				uni.showModal({
+					title: '提示',
+					content: '确定要删除该出行人吗?',
+					success: function(res) {
+						if (res.confirm) {
+							that.Post({
+								id: item.id
+							}, "/api/user/delDetail").then(res => {
+								if (res) {
+									uni.showToast({
+										icon: "none",
+										title: res.msg
+									})
+								}
+								that.init()
+							})
+						} else if (res.cancel) {
+							console.log('用户点击取消');
+						}
+					}
+				});
+			},
+			defaultC(item) {
+				this.Post({
+					id: item.id,
+					is_default: 1
+				}, "/api/user/editContact").then(res => {
+					if (res.code == 1) {
+						this.travelList.forEach(i => i.is_default = 0)
+						item.is_default = !item.is_default
+					}
+				})
+			},
+			// 修改出行人信息
+			edit(id){
+				let url = ''
+				if(this.showType) {
+					url = '/subPackages/user/myAddressAdd?id='+id
+				}else {
+					url = "/subPackages/user/myContactsAdd?type=edit&id="+id
+				}
+				uni.navigateTo({
+					url: url
+				});
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.bg {
+		position: relative;
+		background: #F7F7F7;
+		height: 100vh;
+		overflow-x: hidden;
+		padding-bottom: 200rpx;
+	}
+	
+	.cancat-nav{
+		width: 100%;
+		display: flex;
+		height: 112rpx;
+		flex-shrink: 0;
+		background-color: #fff;
+		.concat-nav-item{
+			ffont-weight: 500;
+			font-size: 35rpx;
+			color: #000000;
+			height: 100%;
+			text-align: center;
+			position: relative;
+			padding-top: 35rpx;
+		}
+		.concat-nav-item.active{
+			color: #000000;
+		}
+		.active-bar{
+			width: 73rpx;
+			height: 7rpx;
+			background: #515150;
+			border-radius: 3rpx;
+			margin: auto;
+			position: absolute;
+			bottom: 0;
+			left: 0;
+			right: 0;
+		}
+	}
+	
+	.item {
+		width: 697rpx;
+		background: #FFFFFF;
+		border-radius: 13rpx;
+		margin: 28rpx auto 0;
+		padding: 26rpx;
+		
+		.name,
+		.idcard {
+			display: flex;
+			font-size: 31rpx;
+			font-weight: bold;
+			color: #333333;
+		
+		}
+		
+		.name {
+			view:last-child{
+				margin-left: 40rpx;
+			}
+			
+			span {
+				padding: 3rpx 9rpx;
+				background: #515150;
+				border-radius: 7rpx;
+				font-weight: bold;
+				font-size: 24rpx;
+				color: #FFFFFF;
+				margin-left: 15rpx;
+			}
+		}
+		
+		.idcard {
+			margin-top: 26rpx;
+		
+			view:last-child {
+				margin-left: 14rpx;
+				font-weight: 400;
+				max-width: 492rpx;
+		
+			}
+		}
+		
+		.item-btn {
+			display: flex;
+			align-items: center;
+			justify-content: space-between;
+			margin-top: 40rpx;
+		
+			.choice {
+				display: flex;
+				align-items: center;
+		
+				view:last-child {
+					margin-left: 20rpx;
+		
+					font-size: 27rpx;
+		
+					font-weight: 500;
+					color: #333333;
+				}
+		
+				image {
+					width: 40rpx;
+					height: 40rpx;
+				}
+				
+				.yuan {
+					width: 40rpx;
+					height: 40rpx;
+					background: rgba(255, 200, 37, 0);
+					border: 1rpx solid #999999;
+					border-radius: 20rpx;
+				}
+			}
+		
+			.btn-list {
+				display: flex;
+				align-items: center;
+		
+				view {
+					width: 134rpx;
+					height: 54rpx;
+					background: #FFFFFF;
+					border: 1px solid #999999;
+					border-radius: 27rpx;
+		
+		
+					font-size: 27rpx;
+					font-weight: 500;
+					color: #333333;
+					line-height: 52rpx;
+					text-align: center;
+				}
+		
+				view:last-child {
+					margin-left: 14rpx;
+				}
+			}
+		}
+	}
+	
+	.btn-box {
+		position: fixed;
+		bottom: 0;
+		left: 0;
+		width: 100%;
+		height: 200rpx;
+		background-color: #fff;
+		
+		.btn {
+			width: 697rpx;
+			line-height: 80rpx;
+			background: #6CA5AA;
+			border-radius: 37rpx;
+			font-weight: 500;
+			font-size: 36rpx;
+			color: #fff;
+			text-align: center;
+			position: fixed;
+			bottom: 53rpx;
+			left: 26.67rpx;
+		}
+	}
+</style>