From cd17bebf7e47043ad7e65fba9d0f49ea4d8975d2 Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Fri, 27 Jun 2025 16:25:30 +0800
Subject: [PATCH] 1

---
 pages.json                        |   14 +-
 pages/cart/cart.vue               |    3 +-
 static/js/CommonFunction.js       |    4 +-
 subPackages/techan/cartOrder.vue  | 1225 +++++++++++++++++++++++++++++
 subPackages/techan/cartOrder1.vue | 1218 ++++++++++++++++++++++++++++
 5 files changed, 2460 insertions(+), 4 deletions(-)
 create mode 100644 subPackages/techan/cartOrder.vue
 create mode 100644 subPackages/techan/cartOrder1.vue

diff --git a/pages.json b/pages.json
index 1e94595..97d579b 100644
--- a/pages.json
+++ b/pages.json
@@ -105,7 +105,19 @@
 			{
 				"path": "techan/order",
 				"style": {
-					"navigationBarTitleText" : "详情"
+					"navigationBarTitleText" : "提交订单"
+				}
+			},
+			{
+				"path": "techan/cartOrder",
+				"style": {
+					"navigationBarTitleText": "提交订单"
+				}
+			},
+			{
+				"path": "techan/cartOrder1",
+				"style": {
+					"navigationBarTitleText": "提交订单"
 				}
 			},
 			{
diff --git a/pages/cart/cart.vue b/pages/cart/cart.vue
index 94ce067..da7d668 100644
--- a/pages/cart/cart.vue
+++ b/pages/cart/cart.vue
@@ -159,7 +159,7 @@
 
 						v.goods.forEach(x=>{
 							x.is_seld = skuSelectIds.includes(x.sku_id)
-							if (x.product.type == 'hotel') {
+							if (x.product&& x.product.type == 'hotel') {
 								let xData = skus.find(s=>s.sku_id == x.sku_id) 
 								if (xData) {
 									x.startDay = xData.startDay
@@ -418,6 +418,7 @@
 				this.$store.commit("changeFoodOrderList", foodOrderList);
 				this.$store.commit("changeHotelOrderList", hotelOrderList);
 				uni.setStorageSync('hotelOrderInfo', JSON.stringify(hotelOrderList))
+				uni.setStorageSync('techanOrderList', techanOrderList)
 				// 邮寄 > 门票 > 农家乐 > 酒店
 				this.goCartNextPage(0)
 				
diff --git a/static/js/CommonFunction.js b/static/js/CommonFunction.js
index b457d8e..1723a7f 100644
--- a/static/js/CommonFunction.js
+++ b/static/js/CommonFunction.js
@@ -297,7 +297,7 @@ Vue.prototype.goCartNextPage= function(currentPageIndex){
 	console.log(hotelOrderList)
 	
 	let orderPage = [
-		{path: '/subPackages/techan/order', length: techanOrderList.length}, 
+		{path: '/subPackages/techan/cartOrder', length: techanOrderList.length}, 
 		{path: '/subPackages/ticket/order', length: ticketOrderList.length},
 		{path: '/subPackages/food/order', length: foodOrderList.length},
 		{path: '/subPackages/homestay/order',length: hotelOrderList.length}
@@ -311,7 +311,7 @@ Vue.prototype.goCartNextPage= function(currentPageIndex){
 	} else {
 		console.log(orderPage, nextPage, '结束')
 		// todo 最后下单页面
-		uni.navigateTo({
+		uni.reLaunch({
 			url: '/subPackages/order/cartOrder'
 		})
 		
diff --git a/subPackages/techan/cartOrder.vue b/subPackages/techan/cartOrder.vue
new file mode 100644
index 0000000..e581bfe
--- /dev/null
+++ b/subPackages/techan/cartOrder.vue
@@ -0,0 +1,1225 @@
+<template>
+	<!-- 购物车下单 解决滚动穿透 -->
+	<page-meta :page-style="'overflow:'+(popShow?'hidden':'visible')"></page-meta>
+	<view class="bg" v-if="orderList.length>0">
+		<view class="order-container" style="margin-bottom: 20rpx;" v-for="(info,i) in orderList" :key="i">
+			<view class="address" v-if="orderList.some(v=>v.is_user_post==1) && (step==2&&i==0)">
+				<view class="a-title">
+					<view>收货地址</view>
+					<view v-if="contactsEdit">
+						<view class="more-person flex-center" v-if="addressList.length>0" @click="changeAddressPopup('open', '', info)">
+							更多<uni-icons style="width: 14rpx;" type="right" size="14"></uni-icons>
+						</view>
+					</view>
+				</view>
+			
+				<view class="btn-box">
+					<view class="contacts box" v-if="info.contacts">
+						<view class="contacts-left">
+							<view class="name-phone">
+								<view class="name">{{ info.contacts.name }}</view>
+								<view class="phone">{{ info.contacts.tel }}</view>
+							</view>
+							<view class="adds text-overflowRows">{{ info.contacts.address }}</view>
+						</view>
+						<image v-if="contactsEdit" @click="changeAddressAddPopup('open', '', info.contacts)" :src="showImg('/uploads/20250612/7408965e126a86023f2e33856622a749.png')" mode="aspectFill"></image>
+					</view>
+					<view v-else class="a-img flex-center" @click.stop="changeAddressAddPopup('open','',{})">
+						<uni-icons style="width: 32rpx;" type="plusempty" size="14"></uni-icons>添加
+					</view>
+				</view>
+			</view>
+			
+			
+			<view class="sendwayArea" v-if="step==2&&info.is_post>=1&&info.is_post<=3">
+				<view v-if="info.is_post!=2" :class="['sendway-item',info.is_user_post==1?'active':'']"
+				 @click="changeUserPost(info,1)" >邮寄</view>
+				<view v-if="info.is_post!=1" :class="['sendway-item',info.is_user_post==2?'active':'']" 
+				@click="changeUserPost(info,2)">自提</view>
+			</view>
+			
+			
+			<!-- 邮寄 -->
+			<view class="address" v-if="info.is_user_post==1 && ((step==1&&i==0))">
+				<view class="a-title">
+					<view>收货地址</view>
+					<view>
+						<view class="more-person flex-center" v-if="addressList.length>0" @click="changeAddressPopup('open', '', info)">
+							更多<uni-icons style="width: 14rpx;" type="right" size="14"></uni-icons>
+						</view>
+					</view>
+				</view>
+			
+				<view class="btn-box">
+					<view class="contacts box" v-if="info.contacts">
+						<view class="contacts-left">
+							<view class="name-phone">
+								<view class="name">{{ info.contacts.name }}</view>
+								<view class="phone">{{ info.contacts.tel }}</view>
+							</view>
+							<view class="adds text-overflowRows">{{ info.contacts.address }}</view>
+						</view>
+						<image @click="changeAddressAddPopup('open', '', info.contacts)" :src="showImg('/uploads/20250612/7408965e126a86023f2e33856622a749.png')" mode="aspectFill"></image>
+					</view>
+					<view v-else class="a-img flex-center" @click.stop="changeAddressAddPopup('open','',{})">
+						<uni-icons style="width: 32rpx;" type="plusempty" size="14"></uni-icons>添加
+					</view>
+				</view>
+			</view>
+			
+			<!-- 自提 -->
+			<view v-if="info.is_user_post!=1">
+				<view class="pickself" >
+					<navigator :url="`/subPackages/techan/selfPickUpPoint?pickupId=null&goodsId=${info.pInfo.id}&skuId=${info.sInfo.id}`">
+						<view class="pickpoint">
+							<view class="flex-shrink-0">自提点</view>
+							<view class="pickpointAddress">
+								<view class="pointAddressText text-overflow" v-if="info.pickupAddress&&info.pickupAddress.title">
+									{{info.pickupAddress.title}}
+								</view>
+								<view class="pointAddressText text-overflow" v-else>选择提货地址</view>
+								<uni-icons style="height: 36rpx;" type="right" size="18"></uni-icons>
+							</view>
+						</view>
+					</navigator>
+				</view>
+			</view>
+		
+			<view class="new-box" >
+				<view class="commodity box">
+					<image class="img" :src="showImg(info.sInfo.headimg)" mode="aspectFill"></image>
+					<view class="sku-content">
+						<view class="text-overflowRows">{{ info.pInfo.title }}</view>
+						
+						<view class="text-overflow" style="font-size: 24rpx;color: #666666;">{{ info.sInfo.sku_name }}</view>
+						<view class="tag text-overflow" v-if="info.sInfo.display_tags">
+							<view class="tag-item" v-for="(item, index) in info.sInfo.display_tags.split(',')" :key="index">
+								{{ item }}
+							</view>
+						</view>
+						
+						<view class="flex-between">
+							<view class="commodity-price">
+								{{info.sInfo.price/100}}
+							</view>
+							<view class="num-box">
+								<view :class="['ctrl',info.sInfo.buyNum>1?'':'disabled']" @click="reduce(info.sInfo)">-</view>
+								<input class="num" type="text" v-model="info.sInfo.buyNum" :disabled='true' />
+								<view :class="['ctrl']" @click="plus(info.sInfo)">+</view>
+							</view>
+						</view>
+						
+					</view>
+				</view>
+
+				<view class="post top-line flex-between" v-show="info.is_user_post==1">
+					<view class="">
+						运费
+					</view>
+					<view style="font-weight: 500;" >
+						{{!info.post?'免邮':info.post/100}}
+					</view>
+				</view>
+			
+				
+			</view>
+
+			
+			<view class="tickets-box flex-between">
+				<view class="remark">
+					<view class="remark-title" >订单备注:</view>
+					<input style="z-index:0;text-align: right;" type="text" placeholder="选填" v-model="info.remark" maxlength="50"/>
+				</view>
+			</view>
+		</view>
+	
+	
+		
+		<!-- 优惠券 -->
+		<view @click="goOrderCoupon" class="tickets-container flex-between" v-if="!isShoppingCart">
+			<view class="order-title">优惠券</view>
+			<view class="coupon-btn" v-if="coupon==''">
+				<view class="select">选择优惠券</view>
+				<uni-icons style="height: 42rpx;" color="#999999" type="right" size="18"></uni-icons>
+			</view>
+			<div class="coupon-price" v-else>
+				<span v-if="coupon.activity.fold == 0">-￥{{coupon.activity.money/100}}</span>
+				<span v-else>-{{coupon.activity.fold*10}}%</span>
+				<span style="margin:0 31rpx 0 8rpx;color: #6C7A94;">></span>
+			</div>
+		 </view>
+
+		
+
+
+		
+		<view class="btn-list">
+			<view class="price-box">
+				<view class="text">合计:</view>
+				<view class="price">{{ total() }}</view>
+				<!-- <view class="post-text" v-if="info.is_user_post==1&&post">含邮费:¥{{ post / 100 }}</view> -->
+			</view>
+			<view class="btn" @click="order()">下一步</view>
+		</view>
+
+		<!-- 选择收货地址弹窗 -->
+		<uni-popup ref="addressPopup" type="bottom" backgroundColor="#F4F4F4" @change="changPopShow">
+			<view class="people-popup">
+				
+				<view class="button" @click="changeAddressAddPopup('open','',{})">添加收货地址</view>
+				<view class="popup-list" v-if="addressList.length > 0">
+					<view :class="['popup-item',selectInfo.contacts.id==item.id?'active':'']" v-for="(item, index) in addressList" :key="index" @click="seldThisAddress(item)">
+						<view class="item-top flex-between">
+							<view style="padding-right: 71rpx;">
+								<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 text-overflowRows">{{ item.address }}</view>
+							</view>
+							<view>
+								<img @click.stop="changeAddressAddPopup('open', '', item)" :src="showImg('/uploads/20250612/7408965e126a86023f2e33856622a749.png')" alt="" />
+							</view>
+						</view>
+					</view>
+				</view>
+			</view>
+		</uni-popup>
+		<!-- 新增编辑收货地址弹窗 -->
+		<uni-popup ref="addressAddPopup" type="bottom" backgroundColor="#F4F4F4" 
+			@change="changPopShow" style="border-radius: 13rpx 13rpx 0 0;">
+			<view class="people-popup">
+				<view class="top-box">
+					<view class="top flex-between" style="height: fit-content;">
+						<text class="text-overflow" @click="changeAddressAddPopup('close')">取消</text>
+						<text style="font-size: 35rpx;font-weight: 600;">{{addressTitle}}</text>
+						<text style="color: #515150;" class="confirm" @click="saveAddress">保存</text>
+					</view>
+				</view>
+				
+				<view class="add-edit-content">
+					<addressAddVue ref="addressAddVueRef"></addressAddVue>
+				</view>
+			</view>
+		</uni-popup>
+	</view>
+</template>
+
+<script>
+import addressAddVue from '../../components/addressAdd.vue';
+export default {
+	components: {addressAddVue},
+	data() {
+		return {
+			// isPost: "1", //0=核销，1=邮寄，2=自取，3=邮寄/自提
+			contacts: null, // 默认收货地址
+			contactsEdit: true,
+			addressList: [],
+			
+			allOrderList: [],
+			step: 1,
+			orderList: [],
+			selectInfo: null, // 选中的要修改的产品
+			
+			info: null,//规格的信息
+			detail:null,//商品的信息
+			
+			
+			
+			orderGoods: [],
+			
+			post: 0,
+			flag: true,
+
+			coupon: "",
+			allprice: 0,
+
+			popShow: false, // 解决滚动穿透
+			
+			addressTitle: '添加收货地址',
+			
+			isShoppingCart: false,
+			
+			
+		};
+	},
+	onLoad(options) {
+		
+		this.isShoppingCart = 1;
+		
+		this.$store.commit("choseCoupon", "");
+		this.handleOrderGoods()
+	},
+	onShow() {
+		// 更新自提点
+		uni.$on("updateDataByConnect",this.getDataByConnect)
+	},
+	onUnload(){
+		uni.$off("updateDataByConnect",this.getDataByConnect)
+	},
+	onReady () {
+	},
+	methods: {
+		// 只处理邮寄
+		handleOrderGoods () {
+			let orderList = this.$store.state.user.techanOrderList;
+			
+			orderList = uni.getStorageSync("techanOrderList")
+			if (!Array.isArray(orderList) || orderList.length<=0) {
+				uni.navigateBack();
+				return
+			}
+			console.log(orderList)
+			// use_type  0邮寄 1自提 3邮寄或自提
+			// is_post   1邮寄  2自提 默认邮寄1
+			orderList.forEach(v=>{
+				v.is_post = v.sInfo.use_type==3?3:v.sInfo.use_type==1?2:1 // 产品自己的方式
+				v.is_user_post = v.sInfo.use_type==1?2:1 // 用户自选方式
+				v.pickupAddress = v.pickupAddress || null // 自提信息
+				v.contacts = v.contacts || null // 收货地址
+				v.post = v.post || null // 运费信息
+				v.remark =  v.remark||""
+			})
+			
+			this.allOrderList = orderList;
+			
+			let tempOrderList = []
+			orderList.forEach(v=>{
+				if (v.is_post == 1) {
+					tempOrderList.push(v)
+				}
+			})
+			if (tempOrderList.length>0) {
+				this.orderList = tempOrderList
+				this.step = 1
+				this.getContacts()
+			} else {
+				this.order()
+			}
+			console.log(this.orderList)
+		},
+		// 更换收获方式
+		changeUserPost (item,value) {
+			console.log(item)
+			item.is_user_post = value
+			this.getPost()
+		},
+		
+		goOrderCoupon () {
+			let allPrice = 0
+			let skuIds= []
+			this.orderList.forEach(v=>{
+				allPrice+= v.sInfo.price*v.sInfo.buyNum
+				if (v.sInfo.buyNum>0) {
+					skuIds.push(v.sInfo.id)
+				}
+			})
+			uni.navigateTo({
+				url: `/subPackages/order/orderCoupon?allprice=${allPrice}&sku_ids=${skuIds.join(',')}`
+			})
+		},
+		
+		// 获取收获地址
+		getContacts() {
+			this.Post({
+				contactType: "CONSIGNEE",
+				offset: '0',
+				limit: '100'
+			}, '/api/uservice/user/getContactOrConsignee').then(res => {
+				if (res) {
+					this.addressList = res.data || []
+					let defaultData = this.addressList.find(v=>v.is_default)
+					if (defaultData) {
+						this.contacts = defaultData
+					} else if (this.addressList[0]) {
+						this.contacts = this.addressList[0]
+					}
+					// todo 每个邮寄类要设置 并获取邮费
+					this.orderList.forEach(v=>{
+						if (v.is_user_post == 1) {
+							let selfContacts = this.addressList.find(x=>x.id == (v.contacts||{}).id)
+							if (!selfContacts) {
+								v.contacts = JSON.parse(JSON.stringify(this.contacts))
+							} else {
+								v.contacts = JSON.parse(JSON.stringify(selfContacts))
+							}
+						}
+					})
+					this.getPost()
+				}
+			});
+		},
+		getPost() {
+			let _this = this
+			let tempList = []
+			 this.orderList.forEach(v=>{
+				 if( v.contacts && v.is_user_post == 1) {
+					 tempList.push(v)
+				 }
+			 })
+			
+			let param = []
+			tempList.forEach(v=>{
+				param.push({sku_id: v.sInfo.id, num: v.sInfo.buyNum, consignee_id:v.contacts.id})
+			})
+			
+			let data = JSON.stringify(param);
+			// console.log(data);
+			this.flag = false;
+			
+			Promise.all(param.map(v=>_this.Post({...v},"/api/order/get_post_price"))).then(res=>{
+				if (res) {
+					console.log("promise" ,res)
+					for(let i=0;i<tempList.length;i++) {
+						tempList[i].post = res[i].data.price;
+					}
+					
+				}
+			}).finally(()=>{this.flag = true;})
+		},
+
+		plus(sku) {
+			this.$nextTick(() => {
+				this.$store.commit("choseCoupon","");
+				this.coupon = this.$store.state.user.coupon
+				sku.buyNum += 1;
+				if (this.flag) {
+					this.getPost();
+				}
+			});
+		},
+		
+		setAddress () {
+			if (this.contacts) {
+				this.contactsEdit = false;
+				this.orderList.forEach(v=>{
+					v.contacts = JSON.parse(JSON.stringify(this.contacts))
+				})
+			} else {
+				this.getContacts()
+			}
+		},
+		
+		reduce(sku) {
+			if (sku.buyNum > 1) {
+				this.$store.commit("choseCoupon","");
+				this.coupon = this.$store.state.user.coupon
+				this.$nextTick(() => {
+					sku.buyNum -= 1;
+					if (this.flag) {
+						this.getPost();
+					}
+				});
+			}
+		},
+		
+		// 选择收货地址弹窗
+		changeAddressPopup(type, confirm, item) {
+			this.selectInfo = item
+			
+			if (type == 'open') this.$refs.addressPopup.open('bottom');
+			else this.$refs.addressPopup.close();
+		},
+
+		// 选择收货地址
+		seldThisAddress(item) {
+			console.log(this.selectInfo, item)
+			
+			this.selectInfo.contacts = item
+			
+			// 赋值全局地址
+			this.contacts = item
+			
+			if (this.flag) {
+				this.getPost();
+			}
+			this.$refs.addressPopup.close();
+		},
+		// 收货地址新增弹窗
+		changeAddressAddPopup(type, confirm, item) {
+			
+			if (type == 'open') {
+				this.addressTitle = '新增收货地址'
+				if (item.id) { this.addressTitle = '编辑收货地址' }
+				// this.id = item.id
+
+				this.$refs.addressAddPopup.open('bottom');
+				
+				this.$nextTick(()=>{
+					this.$refs.addressAddVueRef.init(item)
+				})
+			}
+			else {this.$refs.addressAddPopup.close();}
+			this.$forceUpdate();
+		},
+		
+		// 保存地址
+		async saveAddress () {
+			let res = await this.$refs.addressAddVueRef.postSave()
+			if (res && res.code == 1) {
+				// 更新所有地址
+				this.getContacts()
+				// this.getAllAddressList();
+				this.changeAddressAddPopup('close')
+			}
+		},
+
+
+
+		// 总价
+		total() {
+			let price = 0
+			let postPrice = 0
+			let allPrice = 0
+			
+			
+			if (this.orderList && Array.isArray(this.orderList)) {
+				this.orderList.forEach(v=>{
+					allPrice += v.sInfo.price*v.sInfo.buyNum
+					if (v.is_user_post == 1) {
+						postPrice+=v.post
+					}
+				})
+			}
+			console.log(postPrice)
+			this.allprice = allPrice + postPrice
+			if (this.coupon) {
+				if (this.coupon.activity.fold == 0) {
+					if (this.coupon.activity.money>allPrice) {
+						price =0
+					}else{
+						price = allPrice  - (this.coupon.activity.money)
+					}
+					
+				} else{
+					price = allPrice - allPrice * (this.coupon.activity.fold*10/100)
+				}
+			} else {
+				price = allPrice
+			}
+			price=price+postPrice
+			return price < 0 ? 0 : (price/100).toFixed(2)
+		},
+		// 预定
+		order() {
+			
+			
+			let goods = [];
+			for(let info of this.orderList)  {
+				let param = {
+					type: info.pInfo.type,
+					product_id: info.pInfo.id,
+					sku_id: info.sInfo.id,
+					product_num: info.sInfo.buyNum,
+					remark: info.remark
+				}
+				if (info.is_user_post == 1) {
+					if(!info.contacts) {
+						uni.showToast({
+							title: '请选择收货地址',
+							icon: 'none'
+						});
+						return;
+					} else {
+						param.use_type = 1
+						param.post = info.contacts.id
+					}
+				}
+				if (info.is_user_post == 2) {
+					if (!info.pickupAddress||!info.pickupAddress.id) {
+						uni.showToast({title: '请选择自提点',icon: 'none'});
+						return;
+					} else {
+						param.use_type = 2
+						param.pickup_shop_id = info.pickupAddress.id
+						param.pickup_shop_info = info.pickupAddress
+					}
+				}
+				goods.push(param)
+			}
+			
+			let flag = false
+			if (this.step == 1) {
+				let tempOrderList = []
+				this.allOrderList.forEach(v=>{
+					if (v.is_post != 1) {
+						tempOrderList.push(v)
+					}
+				})
+				console.log(tempOrderList)
+				if (tempOrderList.length>0) {
+					this.orderList = tempOrderList
+					this.step = 2
+					// 设置收货地址
+					this.setAddress()
+					flag = true
+				}
+			}
+			if (flag) return
+			
+			// 如果是购物车下单
+			if (this.isShoppingCart) {
+				this.$store.commit("changeTechanOrderList", this.allOrderList);
+				// uni.setStorageSync("techanOrderList", JSON.stringify(this.orderList))
+				// console.log(this.orderList)
+				this.goCartNextPage(1)
+				return
+			}
+
+			
+			let data = {
+				product_list: goods,
+				coupon_id: this.coupon ? this.coupon.id : null,
+			};
+			
+		},
+		
+		// ---------------自提-----------------------
+		changPopShow (e) {
+			this.popShow = e.show
+		},
+		
+		getDataByConnect(data) {
+			if (data.msgType == "updatePickUpPoint") {
+				for(let p of this.orderList) {
+					if (p.sInfo.id == data.data.skuId) {
+						let selectItem = data.data.selectItem
+						p.pickupAddress = selectItem
+						p.pickupAddress.address = selectItem.address;
+						p.pickupAddress.title = selectItem.title;
+						p.pickupAddress.id = selectItem.id;
+						p.pickupAddress.tel = selectItem.tel;
+						break;
+					}
+				}
+				this.$forceUpdate()
+			}
+		},
+		
+		// 获取最大优惠券
+		async getMaxCouponData () {
+			let allPrice =0
+			let skuIds = []
+			if (this.info && Array.isArray(this.info.goods)) {
+				this.info.goods.forEach(v=>{
+					allPrice += v.skuInfo.money*v.skuInfo.buyNum
+					if (v.skuInfo.buyNum>0) {
+						skuIds.push(v.skuInfo.id)
+					}
+				})
+			}
+			let param = {money:allPrice,sku_ids:skuIds.join(',')}
+			let res = await this.getMaxCoupon(param)
+			if (res.id) {
+				this.coupon = res
+			}
+		}
+	}
+};
+</script>
+
+<style lang="scss" scoped>
+.bg {
+	min-height: 100vh;
+	overflow-x: hidden;
+	background: #f2f4f7;
+	padding-bottom: 200rpx;
+}
+view {
+	box-sizing: border-box;
+}
+.flex-shrink-0{
+	flex-shrink: 0;
+}
+.box {
+	width: 100%;
+	min-height: 100rpx;
+	padding: 20rpx;
+	background: #ffffff;
+	// border-radius: 16rpx;
+}
+.address {
+	width: 697rpx;
+	height: 291rpx;
+	background: #FFFFFF;
+	border-radius: 13rpx;
+	margin: 0 auto;
+	margin-top: 26rpx;
+	.a-title{
+		font-size: 31rpx;
+		font-family: PingFang SC;
+		font-weight: bold;
+		color: #000000;
+		padding: 30rpx 18rpx;
+		justify-content: space-between;
+		align-items: center;
+		display: flex;
+		width: 100%;
+		.more-person{
+			width: 133rpx;
+			height: 60rpx;
+			border-radius: 30rpx;
+			border: 1px solid #999999;
+			font-family: PingFang SC;
+			font-weight: 400;
+			font-size: 28rpx;
+			color: #000000;
+			line-height: 16rpx;
+		}
+	}
+	.btn-box{
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		border-top:1rpx solid rgba(216, 216, 216, 1) ;
+		height: 176rpx;
+		.a-img{
+			width: 219rpx;
+			height: 73rpx;
+			border-radius: 37rpx;
+			border: 1px solid #333333;
+			font-family: PingFang SC;
+			font-weight: 400;
+			font-size: 29rpx;
+			color: #000000;
+		}
+	}
+}
+
+.pickself{
+	width: 697rpx;
+	height: 120rpx;
+	background: #FFFFFF;
+	margin: 0rpx auto;
+	.pickpoint{
+		display: flex;
+		width: 100%;
+		font-size: 31rpx;
+		font-weight: bold;
+		padding: 40rpx 18rpx;
+	}
+	.pickpointAddress{
+		display: flex;
+		font-weight: 500;
+		flex: 1;
+		width: 10rpx;
+		align-items: center;
+		justify-content: flex-end;
+	}
+	.pickpointImg{
+		width: 20rpx;
+		height: 20rpx;
+	}
+	.pointAddressText{
+		padding: 0 20rpx 0 40rpx;
+		flex: 1;
+		text-align: right;
+		width: 10rpx;
+	}
+
+}
+
+
+.new-box{
+		background: #fff;
+		width: 698rpx;
+		margin: 0 auto 0rpx;
+		// border-radius: 14rpx;
+		.commodity {
+			display: flex;
+			.num-box {
+				display: flex;
+				align-items: center;
+				margin-left: 20rpx;
+				width: 160rpx;
+				justify-content: space-between;
+				.num {
+					text-align: center;
+					width: 50rpx;
+				}
+				.ctrl {
+					width: 47rpx;
+					height: 47rpx;
+					background: #6A8A2D;
+					border-radius: 50%;
+					font-family: PingFang SC;
+					font-weight: 400;
+					font-size: 34rpx;
+					color: #FFFFFF;
+					line-height: 47rpx;
+					text-align: center;
+				}
+				.ctrl.disabled{
+					background: #E8E8E8;
+					color: #999999;
+				}
+			}
+		}
+		.img {
+			width: 174rpx;
+			height: 174rpx;
+			background: #f2f4f7;
+			border-radius: 10rpx;
+			flex-shrink: 0;
+		}
+		.sku-content{
+			flex: 1;
+			width: 1rpx;
+			display: flex;
+			flex-direction: column;
+			justify-content: space-between;
+			font-weight: 500;
+			font-size: 28rpx;
+			color: #333333;
+			padding-left: 12rpx;
+		}
+		.tag {
+			margin-top: 10rpx;
+			display: flex;
+			.tag-item {
+				border-radius: 7rpx;
+				border: 1px solid #6A8A2D;
+				padding: 2rpx 6rpx;
+				font-weight: 500;
+				font-size: 20rpx;
+				color: #6A8A2D;
+				margin-right: 10rpx;
+			}
+		}
+		.commodity-price{
+			&:before{
+				
+				content:"￥";
+				font-size: 24rpx;
+			}
+		}
+}
+	
+.btn-list {
+	width: 100%;
+	height: 166rpx;
+	background: #ffffff;
+	box-shadow: 0rpx -3rpx 9rpx 1rpx rgba(227, 229, 232, 0.5);
+	display: flex;
+	position: fixed;
+	bottom: 0;
+	padding: 20rpx 20rpx;
+	align-items: center;
+	justify-content: space-between;
+	.btn {
+			width: 294rpx;
+			height: 88rpx;
+			background: #6A8A2D;
+			border-radius: 11rpx;
+			text-align: center;
+			line-height: 88rpx;
+
+			font-size: 36rpx;
+			font-family: PingFang SC;
+			font-weight: 500;
+			color: #FFFFFF;
+	
+	}
+	.price-box {
+		display: flex;
+		align-items: center;
+		.text {
+			font-size: 29rpx;
+			font-family: PingFangSC-Regular, PingFang SC;
+			font-weight: 500;
+			color: #333;
+		}
+		.price {
+			margin-left: 15rpx;
+			font-size: 36rpx;
+			font-family: PingFangSC-Regular, PingFang SC;
+			font-weight: bold;
+			color: #DC2525;
+			&:before {
+				content: '¥';
+				display: inline-block;
+				font-size: 36rpx;
+			}
+		}
+		.post-text {
+			margin-left: 15rpx;
+			color: #fc5109;
+			font-size: 24rpx;
+		}
+	}
+}
+.contacts {
+	display: flex;
+	align-items: center;
+	justify-content: space-between;
+	height: 100%;
+	image {
+		width: 36rpx;
+		height: 36rpx;
+	}
+	.contacts-left {
+		.name-phone {
+			display: flex;
+			align-items: baseline;
+			.name {
+				font-size: 32rpx;
+				font-family:  PingFang SC;
+				font-weight: 400;
+				color: #222222;
+			}
+			.phone {
+				margin-left: 27rpx;
+				font-size: 25rpx;
+				font-family:  PingFang SC;
+				font-weight: 400;
+				color: #666666;
+			}
+		}
+		.adds {
+			font-size: 27rpx;
+			font-family: PingFang SC;
+			font-weight: 400;
+			color: #000;
+			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: 31rpx;
+				font-weight: 400;
+				color: #000000;
+			}
+
+			.confirm {
+				font-weight: 400;
+				color: #000000;
+			}
+		}
+	}
+
+	.popup-list {
+		height: 666rpx;
+		overflow: scroll;
+
+		.popup-item {
+			border-radius: 12rpx;
+			padding: 2rpx;
+			margin-top: 24rpx;
+			font-size: 24rpx;
+			color: #333333;
+			font-weight: 400;
+			background-color: #ffffff;
+
+			.item-top {
+				border-radius: 12rpx;
+				padding: 30rpx 40rpx;
+				background-color: #ffffff;
+				
+				img {
+					color: #666666;
+					width: 40rpx;
+					height: 40rpx;
+				}
+
+				.name {
+					overflow: hidden;
+					font-family: PingFang SC;
+					font-weight: 400;
+					font-size: 32rpx;
+					display: flex;
+					align-items: baseline;
+
+					text {
+						color: #666;
+						font-size: 25rpx;
+						padding: 0 24rpx;
+					}
+
+					.tag {
+						padding: 0 8rpx;
+						height: 32rpx;
+						border-radius: 7rpx;
+						line-height: 30rpx;
+						text-align: center;
+						font-size: 23rpx;
+						font-family: PingFang SC;
+						font-weight: 500;
+						color: #ffffff;
+						background: #6A8A2D;
+
+					}
+				}
+
+				.com-flex-start {
+					margin: 0 0 30rpx;
+				}
+
+				.subtitle {
+					font-weight: 400;
+					flex: 1;
+					text-align: left;
+					margin-top: 33rpx;
+					color: #666666;
+					font-size: 25rpx;
+
+					.mobile {
+						margin-bottom: 36rpx;
+					}
+				}
+
+				.status {
+					width: 40rpx;
+					height: 40rpx;
+					line-height: 40rpx;
+					border-radius: 50%;
+					text-align: center;
+					box-sizing: border-box;
+
+					img {
+						width: 27rpx;
+						height: 21rpx;
+					}
+				}
+				.statuss {
+					background: linear-gradient(90deg, #fa2b66, #ff9834);
+					border: none;
+				}
+				.noSelect {
+					border: 1rpx solid #999999;
+				}
+			}
+
+			.item-site {
+				color: #666666;
+				display: flex;
+				align-items: center;
+				padding: 36rpx 0;
+
+				view {
+					width: 23rpx;
+					height: 23rpx;
+					margin-right: 10rpx;
+					border: 1rpx solid #999999;
+					border-radius: 50%;
+
+					view {
+						width: 8rpx;
+						height: 8rpx;
+						background: #000000;
+						border-radius: 50%;
+						margin: auto;
+					}
+				}
+			}
+		}
+		
+		.popup-item.active{
+			background: #6A8A2D;
+		}
+	}
+
+	.button {
+
+		text-align: center;
+		width: 100%;
+		height: 80rpx;
+		line-height: 80rpx;
+		background-color: #ffffff;
+		border-radius: 40rpx;
+		font-family: PingFang SC;
+		font-weight: 400;
+		font-size: 33rpx;
+		color: #000000;
+
+	}
+}
+
+.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;
+}
+
+.left {
+	width: 140rpx;
+	height: 104rpx;
+	line-height: 104rpx;
+	font-family: PingFang;
+	font-weight: bold;
+	font-size: 31rpx;
+	color: #000000;
+}
+.input {
+	font-size: 31rpx;
+	font-weight: 400;
+	text-align: right;
+}
+.remark {
+	padding:30rpx;
+	display: flex;
+	align-items: center;
+	width: 698rpx;
+	min-height: 120rpx;
+	background: #ffffff;
+	margin: 0 auto;
+	// border-radius: 14rpx;
+	.remark-title{
+
+		font-size: 31rpx;
+		font-family: PingFang SC;
+		font-weight: bold;
+		color: #000000;
+		flex-shrink: 0;
+
+	}
+	input {
+		margin-left: 64rpx;
+		width: 500rpx;
+		font-size: 31rpx;
+	}
+}
+
+
+
+	.tickets-box {
+		width: 698rpx;
+		margin: 0rpx auto 0;
+		border-radius: 13rpx;
+		background: #fff;
+		height: 120rpx;
+		.order-title {
+			margin: 31rpx 0 31rpx 30rpx;
+			font-size: 31rpx;
+			font-family: PingFang SC;
+			font-weight: bold;
+			color: #000000;
+		}
+
+		.coupon-price {
+			color:#DD0000;
+			font-size: 30rpx;
+			font-weight: bold;
+		}
+	}
+	
+
+		
+	
+	.top-line{
+		border-top:rgba(216, 216, 216, 1) solid 2rpx ;
+	}
+	.post{
+		height: 120rpx;
+		padding: 0 30rpx;
+
+		font-size: 32rpx;
+		font-family: PingFang SC;
+		font-weight: bold;
+		color: #000000;
+
+	}
+
+.sendwayArea{
+	padding: 26rpx 26rpx;
+	display: flex;
+	justify-content: space-between;
+	.sendway-item{
+		font-weight: 500;
+		font-size: 27rpx;
+		color: #111111;
+		width: 48%;
+		text-align: center;
+		height: 57rpx;
+		line-height: 57rpx;
+		background: #FFFFFF;
+		border-radius: 13rpx;
+	}
+	.sendway-item.active{
+		border: 1px solid #6A8A2D;
+		color: #6A8A2D;
+	}
+
+}
+
+.add-edit-content{
+	background-color: white;
+	padding: 0 20rpx;
+	border-radius: 20rpx;
+}
+
+		.coupon-btn {
+			color: #999999;;
+			display: flex;
+			align-items: center;
+			.select {
+				display: block;
+				width: 153rpx;
+				height: 40rpx;
+				background: #6A8A2D;
+				border-radius: 9rpx;
+				font-weight: 500;
+				font-size: 24rpx;
+				color: #FFFFFF;
+				text-align: center;
+				line-height: 40rpx;
+				font-family: PingFang SC;
+				margin-right: 20rpx;
+		
+			}
+		}
+.shop-name{
+	font-weight: bold;
+	font-size: 31rpx;
+	color: #333333;
+	padding-bottom: 12rpx;
+	min-height: fit-content;
+}
+	.tickets-container {
+		width: 698rpx;
+		background: #fff;
+		height: 120rpx;
+		margin: 22rpx auto 0;
+		.order-title {
+			margin: 31rpx 0 31rpx 30rpx;
+			font-size: 31rpx;
+			font-family: PingFang SC;
+			font-weight: bold;
+			color: #000000;
+		}
+
+		.coupon-price {
+			color:#DD0000;
+			font-size: 30rpx;
+			font-weight: bold;
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/subPackages/techan/cartOrder1.vue b/subPackages/techan/cartOrder1.vue
new file mode 100644
index 0000000..9f3fc34
--- /dev/null
+++ b/subPackages/techan/cartOrder1.vue
@@ -0,0 +1,1218 @@
+<template>
+	<!-- 购物车下单 解决滚动穿透 -->
+	<page-meta :page-style="'overflow:'+(popShow?'hidden':'visible')"></page-meta>
+	<view class="bg" v-if="orderList.length>0">
+		<view class="order-container" style="margin-bottom: 20rpx;" v-for="(info,i) in orderList" :key="i">
+			<view class="address" v-if="orderList.some(v=>v.is_user_post==1) && (step==2&&i==0)">
+				<view class="a-title">
+					<view>收货地址</view>
+					<view v-if="contactsEdit">
+						<view class="more-person flex-center" v-if="addressList.length>0" @click="changeAddressPopup('open', '', info)">
+							更多<uni-icons style="width: 14rpx;" type="right" size="14"></uni-icons>
+						</view>
+					</view>
+				</view>
+			
+				<view class="btn-box">
+					<view class="contacts box" v-if="info.contacts">
+						<view class="contacts-left">
+							<view class="name-phone">
+								<view class="name">{{ info.contacts.name }}</view>
+								<view class="phone">{{ info.contacts.tel }}</view>
+							</view>
+							<view class="adds text-overflowRows">{{ info.contacts.address }}</view>
+						</view>
+						<image v-if="contactsEdit" @click="changeAddressAddPopup('open', '', info.contacts)" :src="showImg('/uploads/20250612/7408965e126a86023f2e33856622a749.png')" mode="aspectFill"></image>
+					</view>
+					<view v-else class="a-img flex-center" @click.stop="changeAddressAddPopup('open','',{})">
+						<uni-icons style="width: 32rpx;" type="plusempty" size="14"></uni-icons>添加
+					</view>
+				</view>
+			</view>
+			
+			
+			<view class="sendwayArea" v-if="step==2&&info.is_post>=1&&info.is_post<=3">
+				<view v-if="info.is_post!=2" :class="['sendway-item',info.is_user_post==1?'active':'']"
+				 @click="changeUserPost(info,1)" >邮寄</view>
+				<view v-if="info.is_post!=1" :class="['sendway-item',info.is_user_post==2?'active':'']" 
+				@click="changeUserPost(info,2)">自提</view>
+			</view>
+			
+			
+			<!-- 邮寄 -->
+			<view class="address" v-if="info.is_user_post==1 && ((step==1&&i==0))">
+				<view class="a-title">
+					<view>收货地址</view>
+					<view>
+						<view class="more-person flex-center" v-if="addressList.length>0" @click="changeAddressPopup('open', '', info)">
+							更多<uni-icons style="width: 14rpx;" type="right" size="14"></uni-icons>
+						</view>
+					</view>
+				</view>
+			
+				<view class="btn-box">
+					<view class="contacts box" v-if="info.contacts">
+						<view class="contacts-left">
+							<view class="name-phone">
+								<view class="name">{{ info.contacts.name }}</view>
+								<view class="phone">{{ info.contacts.tel }}</view>
+							</view>
+							<view class="adds text-overflowRows">{{ info.contacts.address }}</view>
+						</view>
+						<image @click="changeAddressAddPopup('open', '', info.contacts)" :src="showImg('/uploads/20250612/7408965e126a86023f2e33856622a749.png')" mode="aspectFill"></image>
+					</view>
+					<view v-else class="a-img flex-center" @click.stop="changeAddressAddPopup('open','',{})">
+						<uni-icons style="width: 32rpx;" type="plusempty" size="14"></uni-icons>添加
+					</view>
+				</view>
+			</view>
+			
+			<!-- 自提 -->
+			<view v-if="info.is_user_post!=1">
+				<view class="pickself" >
+					<navigator :url="`/subPackages/techan/selfPickUpPoint?pickupId=null&goodsId=${info.pInfo.id}&skuId=${info.sInfo.id}`">
+						<view class="pickpoint">
+							<view class="flex-shrink-0">自提点</view>
+							<view class="pickpointAddress">
+								<view class="pointAddressText text-overflow" v-if="info.pickupAddress&&info.pickupAddress.title">
+									{{info.pickupAddress.title}}
+								</view>
+								<view class="pointAddressText text-overflow" v-else>选择提货地址</view>
+								<uni-icons style="height: 36rpx;" type="right" size="18"></uni-icons>
+							</view>
+						</view>
+					</navigator>
+				</view>
+			</view>
+		
+			<view class="new-box" >
+				<view class="commodity box">
+					<image class="img" :src="showImg(info.sInfo.headimg)" mode="aspectFill"></image>
+					<view class="sku-content">
+						<view class="text-overflowRows">{{ info.pInfo.title }}</view>
+						
+						<view class="text-overflow" style="font-size: 24rpx;color: #666666;">{{ info.sInfo.sku_name }}</view>
+						<view class="tag text-overflow" v-if="info.sInfo.display_tags">
+							<view class="tag-item" v-for="(item, index) in info.sInfo.display_tags.split(',')" :key="index">
+								{{ item }}
+							</view>
+						</view>
+						
+						<view class="flex-between">
+							<view class="commodity-price">
+								{{info.sInfo.price/100}}
+							</view>
+							<view class="num-box">
+								<view :class="['ctrl',info.sInfo.buyNum>1?'':'disabled']" @click="reduce(info.sInfo)">-</view>
+								<input class="num" type="text" v-model="info.sInfo.buyNum" :disabled='true' />
+								<view :class="['ctrl']" @click="plus(info.sInfo)">+</view>
+							</view>
+						</view>
+						
+					</view>
+				</view>
+
+				<view class="post top-line flex-between" v-show="info.is_user_post==1">
+					<view class="">
+						运费
+					</view>
+					<view style="font-weight: 500;" >
+						{{!info.post?'免邮':info.post/100}}
+					</view>
+				</view>
+			
+				
+			</view>
+
+			
+			<view class="tickets-box flex-between">
+				<view class="remark">
+					<view class="remark-title" >订单备注:</view>
+					<input style="z-index:0;text-align: right;" type="text" placeholder="选填" v-model="info.remark" maxlength="50"/>
+				</view>
+			</view>
+		</view>
+	
+	
+		
+		<!-- 优惠券 -->
+		<view @click="goOrderCoupon" class="tickets-container flex-between" v-if="!isShoppingCart">
+			<view class="order-title">优惠券</view>
+			<view class="coupon-btn" v-if="coupon==''">
+				<view class="select">选择优惠券</view>
+				<uni-icons style="height: 42rpx;" color="#999999" type="right" size="18"></uni-icons>
+			</view>
+			<div class="coupon-price" v-else>
+				<span v-if="coupon.activity.fold == 0">-￥{{coupon.activity.money/100}}</span>
+				<span v-else>-{{coupon.activity.fold*10}}%</span>
+				<span style="margin:0 31rpx 0 8rpx;color: #6C7A94;">></span>
+			</div>
+		 </view>
+
+		
+
+
+		
+		<view class="btn-list">
+			<view class="price-box">
+				<view class="text">合计:</view>
+				<view class="price">{{ total() }}</view>
+				<!-- <view class="post-text" v-if="info.is_user_post==1&&post">含邮费:¥{{ post / 100 }}</view> -->
+			</view>
+			<view class="btn" @click="order()">下一步</view>
+		</view>
+
+		<!-- 选择收货地址弹窗 -->
+		<uni-popup ref="addressPopup" type="bottom" backgroundColor="#F4F4F4" @change="changPopShow">
+			<view class="people-popup">
+				
+				<view class="button" @click="changeAddressAddPopup('open','',{})">添加收货地址</view>
+				<view class="popup-list" v-if="addressList.length > 0">
+					<view :class="['popup-item',selectInfo.contacts.id==item.id?'active':'']" v-for="(item, index) in addressList" :key="index" @click="seldThisAddress(item)">
+						<view class="item-top flex-between">
+							<view style="padding-right: 71rpx;">
+								<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 text-overflowRows">{{ item.address }}</view>
+							</view>
+							<view>
+								<img @click.stop="changeAddressAddPopup('open', '', item)" :src="showImg('/uploads/20250612/7408965e126a86023f2e33856622a749.png')" alt="" />
+							</view>
+						</view>
+					</view>
+				</view>
+			</view>
+		</uni-popup>
+		<!-- 新增编辑收货地址弹窗 -->
+		<uni-popup ref="addressAddPopup" type="bottom" backgroundColor="#F4F4F4" 
+			@change="changPopShow" style="border-radius: 13rpx 13rpx 0 0;">
+			<view class="people-popup">
+				<view class="top-box">
+					<view class="top flex-between" style="height: fit-content;">
+						<text class="text-overflow" @click="changeAddressAddPopup('close')">取消</text>
+						<text style="font-size: 35rpx;font-weight: 600;">{{addressTitle}}</text>
+						<text style="color: #515150;" class="confirm" @click="saveAddress">保存</text>
+					</view>
+				</view>
+				
+				<view class="add-edit-content">
+					<addressAddVue ref="addressAddVueRef"></addressAddVue>
+				</view>
+			</view>
+		</uni-popup>
+	</view>
+</template>
+
+<script>
+import addressAddVue from '../../components/addressAdd.vue';
+export default {
+	components: {addressAddVue},
+	data() {
+		return {
+			// isPost: "1", //0=核销，1=邮寄，2=自取，3=邮寄/自提
+			contacts: null, // 默认收货地址
+			contactsEdit: true,
+			addressList: [],
+			
+			allOrderList: [],
+			step: 2,
+			orderList: [],
+			selectInfo: null, // 选中的要修改的产品
+			
+			info: null,//规格的信息
+			detail:null,//商品的信息
+			
+			
+			
+			orderGoods: [],
+			
+			post: 0,
+			flag: true,
+
+			coupon: "",
+			allprice: 0,
+
+			popShow: false, // 解决滚动穿透
+			
+			addressTitle: '添加收货地址',
+			
+			isShoppingCart: false,
+			
+			
+		};
+	},
+	onLoad(options) {
+		
+		this.isShoppingCart = 1;
+		
+		this.$store.commit("choseCoupon", "");
+		this.handleOrderGoods()
+	},
+	onShow() {
+		// 更新自提点
+		uni.$on("updateDataByConnect",this.getDataByConnect)
+	},
+	onUnload(){
+		uni.$off("updateDataByConnect",this.getDataByConnect)
+	},
+	onReady () {
+	},
+	methods: {
+		// 只处理邮寄/自提、自提
+		handleOrderGoods () {
+			let orderList = this.$store.state.user.techanOrderList;
+			
+			orderList = uni.getStorageSync("techanOrderList")
+			if (!Array.isArray(orderList) || orderList.length<=0) {
+				uni.navigateBack();
+				return
+			}
+			console.log(orderList)
+			// use_type  0邮寄 1自提 3邮寄或自提
+			// is_post   1邮寄  2自提 默认邮寄1
+			orderList.forEach(v=>{
+				v.is_post = v.sInfo.use_type==3?3:v.sInfo.use_type==1?2:1 // 产品自己的方式
+				v.is_user_post = v.sInfo.use_type==1?2:1 // 用户自选方式
+				v.pickupAddress = v.pickupAddress || null // 自提信息
+				v.contacts = v.contacts || null // 收货地址
+				v.post = v.post || null // 运费信息
+				v.remark =  v.remark||""
+			})
+			let contactsData = orderList.find(v=>v.contacts && v.is_post==1) 
+			if (contactsData) {
+				this.contacts = JSON.parse(JSON.stringify(contactsData.contacts))
+			}
+			this.allOrderList = orderList;
+			
+			
+			this.order()
+			
+			console.log(this.orderList)
+		},
+		// 更换收获方式
+		changeUserPost (item,value) {
+			console.log(item)
+			item.is_user_post = value
+			this.getPost()
+		},
+		
+		goOrderCoupon () {
+			let allPrice = 0
+			let skuIds= []
+			this.orderList.forEach(v=>{
+				allPrice+= v.sInfo.price*v.sInfo.buyNum
+				if (v.sInfo.buyNum>0) {
+					skuIds.push(v.sInfo.id)
+				}
+			})
+			uni.navigateTo({
+				url: `/subPackages/order/orderCoupon?allprice=${allPrice}&sku_ids=${skuIds.join(',')}`
+			})
+		},
+		
+		// 获取收获地址
+		getContacts() {
+			this.Post({
+				contactType: "CONSIGNEE",
+				offset: '0',
+				limit: '100'
+			}, '/api/uservice/user/getContactOrConsignee').then(res => {
+				if (res) {
+					this.addressList = res.data || []
+					let defaultData = this.addressList.find(v=>v.is_default)
+					if (defaultData) {
+						this.contacts = defaultData
+					} else if (this.addressList[0]) {
+						this.contacts = this.addressList[0]
+					}
+					// todo 每个邮寄类要设置 并获取邮费
+					this.orderList.forEach(v=>{
+						if (v.is_user_post == 1) {
+							let selfContacts = this.addressList.find(x=>x.id == (v.contacts||{}).id)
+							if (!selfContacts) {
+								v.contacts = JSON.parse(JSON.stringify(this.contacts))
+							} else {
+								v.contacts = JSON.parse(JSON.stringify(selfContacts))
+							}
+						}
+					})
+					this.getPost()
+				}
+			});
+		},
+		getPost() {
+			let _this = this
+			let tempList = []
+			 this.orderList.forEach(v=>{
+				 if( v.contacts && v.is_user_post == 1) {
+					 tempList.push(v)
+				 }
+			 })
+			
+			let param = []
+			tempList.forEach(v=>{
+				param.push({sku_id: v.sInfo.id, num: v.sInfo.buyNum, consignee_id:v.contacts.id})
+			})
+			
+			let data = JSON.stringify(param);
+			// console.log(data);
+			this.flag = false;
+			
+			Promise.all(param.map(v=>_this.Post({...v},"/api/order/get_post_price"))).then(res=>{
+				if (res) {
+					console.log("promise" ,res)
+					for(let i=0;i<tempList.length;i++) {
+						tempList[i].post = res[i].data.price;
+					}
+					
+				}
+			}).finally(()=>{this.flag = true;})
+		},
+
+		plus(sku) {
+			this.$nextTick(() => {
+				this.$store.commit("choseCoupon","");
+				this.coupon = this.$store.state.user.coupon
+				sku.buyNum += 1;
+				if (this.flag) {
+					this.getPost();
+				}
+			});
+		},
+		
+		setAddress () {
+			if (this.contacts) {
+				this.contactsEdit = false;
+				this.orderList.forEach(v=>{
+					v.contacts = JSON.parse(JSON.stringify(this.contacts))
+				})
+			} else {
+				this.getContacts()
+			}
+		},
+		
+		reduce(sku) {
+			if (sku.buyNum > 1) {
+				this.$store.commit("choseCoupon","");
+				this.coupon = this.$store.state.user.coupon
+				this.$nextTick(() => {
+					sku.buyNum -= 1;
+					if (this.flag) {
+						this.getPost();
+					}
+				});
+			}
+		},
+		
+		// 选择收货地址弹窗
+		changeAddressPopup(type, confirm, item) {
+			this.selectInfo = item
+			
+			if (type == 'open') this.$refs.addressPopup.open('bottom');
+			else this.$refs.addressPopup.close();
+		},
+
+		// 选择收货地址
+		seldThisAddress(item) {
+			console.log(this.selectInfo, item)
+			
+			this.selectInfo.contacts = item
+			
+			// 赋值全局地址
+			this.contacts = item
+			
+			if (this.flag) {
+				this.getPost();
+			}
+			this.$refs.addressPopup.close();
+		},
+		// 收货地址新增弹窗
+		changeAddressAddPopup(type, confirm, item) {
+			
+			if (type == 'open') {
+				this.addressTitle = '新增收货地址'
+				if (item.id) { this.addressTitle = '编辑收货地址' }
+				// this.id = item.id
+
+				this.$refs.addressAddPopup.open('bottom');
+				
+				this.$nextTick(()=>{
+					this.$refs.addressAddVueRef.init(item)
+				})
+			}
+			else {this.$refs.addressAddPopup.close();}
+			this.$forceUpdate();
+		},
+		
+		// 保存地址
+		async saveAddress () {
+			let res = await this.$refs.addressAddVueRef.postSave()
+			if (res && res.code == 1) {
+				// 更新所有地址
+				this.getContacts()
+				// this.getAllAddressList();
+				this.changeAddressAddPopup('close')
+			}
+		},
+
+
+
+		// 总价
+		total() {
+			let price = 0
+			let postPrice = 0
+			let allPrice = 0
+			
+			
+			if (this.orderList && Array.isArray(this.orderList)) {
+				this.orderList.forEach(v=>{
+					allPrice += v.sInfo.price*v.sInfo.buyNum
+					if (v.is_user_post == 1) {
+						postPrice+=v.post
+					}
+				})
+			}
+			console.log(postPrice)
+			this.allprice = allPrice + postPrice
+			if (this.coupon) {
+				if (this.coupon.activity.fold == 0) {
+					if (this.coupon.activity.money>allPrice) {
+						price =0
+					}else{
+						price = allPrice  - (this.coupon.activity.money)
+					}
+					
+				} else{
+					price = allPrice - allPrice * (this.coupon.activity.fold*10/100)
+				}
+			} else {
+				price = allPrice
+			}
+			price=price+postPrice
+			return price < 0 ? 0 : (price/100).toFixed(2)
+		},
+		// 预定
+		order() {
+			
+			
+			let goods = [];
+			for(let info of this.orderList)  {
+				let param = {
+					type: info.pInfo.type,
+					product_id: info.pInfo.id,
+					sku_id: info.sInfo.id,
+					product_num: info.sInfo.buyNum,
+					remark: info.remark
+				}
+				if (info.is_user_post == 1) {
+					if(!info.contacts) {
+						uni.showToast({
+							title: '请选择收货地址',
+							icon: 'none'
+						});
+						return;
+					} else {
+						param.use_type = 1
+						param.post = info.contacts.id
+					}
+				}
+				if (info.is_user_post == 2) {
+					if (!info.pickupAddress||!info.pickupAddress.id) {
+						uni.showToast({title: '请选择自提点',icon: 'none'});
+						return;
+					} else {
+						param.use_type = 2
+						param.pickup_shop_id = info.pickupAddress.id
+						param.pickup_shop_info = info.pickupAddress
+					}
+				}
+				goods.push(param)
+			}
+			
+			let flag = false
+			if (this.step == 1) {
+				let tempOrderList = []
+				this.allOrderList.forEach(v=>{
+					if (v.is_post != 1) {
+						tempOrderList.push(v)
+					}
+				})
+				console.log(tempOrderList)
+				if (tempOrderList.length>0) {
+					this.orderList = tempOrderList
+					this.step = 2
+					// 设置收货地址
+					this.setAddress()
+					flag = true
+				}
+			}
+			if (flag) return
+			
+			// 如果是购物车下单
+			if (this.isShoppingCart) {
+				this.$store.commit("changeTechanOrderList", this.allOrderList);
+				// uni.setStorageSync("techanOrderList", JSON.stringify(this.orderList))
+				// console.log(this.orderList)
+				this.goCartNextPage(1)
+				return
+			}
+
+			
+			let data = {
+				product_list: goods,
+				coupon_id: this.coupon ? this.coupon.id : null,
+			};
+			
+		},
+		
+		// ---------------自提-----------------------
+		changPopShow (e) {
+			this.popShow = e.show
+		},
+		
+		getDataByConnect(data) {
+			if (data.msgType == "updatePickUpPoint") {
+				for(let p of this.orderList) {
+					if (p.sInfo.id == data.data.skuId) {
+						let selectItem = data.data.selectItem
+						p.pickupAddress = selectItem
+						p.pickupAddress.address = selectItem.address;
+						p.pickupAddress.title = selectItem.title;
+						p.pickupAddress.id = selectItem.id;
+						p.pickupAddress.tel = selectItem.tel;
+						break;
+					}
+				}
+				this.$forceUpdate()
+			}
+		},
+		
+		// 获取最大优惠券
+		async getMaxCouponData () {
+			let allPrice =0
+			let skuIds = []
+			if (this.info && Array.isArray(this.info.goods)) {
+				this.info.goods.forEach(v=>{
+					allPrice += v.skuInfo.money*v.skuInfo.buyNum
+					if (v.skuInfo.buyNum>0) {
+						skuIds.push(v.skuInfo.id)
+					}
+				})
+			}
+			let param = {money:allPrice,sku_ids:skuIds.join(',')}
+			let res = await this.getMaxCoupon(param)
+			if (res.id) {
+				this.coupon = res
+			}
+		}
+	}
+};
+</script>
+
+<style lang="scss" scoped>
+.bg {
+	min-height: 100vh;
+	overflow-x: hidden;
+	background: #f2f4f7;
+	padding-bottom: 200rpx;
+}
+view {
+	box-sizing: border-box;
+}
+.flex-shrink-0{
+	flex-shrink: 0;
+}
+.box {
+	width: 100%;
+	min-height: 100rpx;
+	padding: 20rpx;
+	background: #ffffff;
+	// border-radius: 16rpx;
+}
+.address {
+	width: 697rpx;
+	height: 291rpx;
+	background: #FFFFFF;
+	border-radius: 13rpx;
+	margin: 0 auto;
+	margin-top: 26rpx;
+	.a-title{
+		font-size: 31rpx;
+		font-family: PingFang SC;
+		font-weight: bold;
+		color: #000000;
+		padding: 30rpx 18rpx;
+		justify-content: space-between;
+		align-items: center;
+		display: flex;
+		width: 100%;
+		.more-person{
+			width: 133rpx;
+			height: 60rpx;
+			border-radius: 30rpx;
+			border: 1px solid #999999;
+			font-family: PingFang SC;
+			font-weight: 400;
+			font-size: 28rpx;
+			color: #000000;
+			line-height: 16rpx;
+		}
+	}
+	.btn-box{
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		border-top:1rpx solid rgba(216, 216, 216, 1) ;
+		height: 176rpx;
+		.a-img{
+			width: 219rpx;
+			height: 73rpx;
+			border-radius: 37rpx;
+			border: 1px solid #333333;
+			font-family: PingFang SC;
+			font-weight: 400;
+			font-size: 29rpx;
+			color: #000000;
+		}
+	}
+}
+
+.pickself{
+	width: 697rpx;
+	height: 120rpx;
+	background: #FFFFFF;
+	margin: 0rpx auto;
+	.pickpoint{
+		display: flex;
+		width: 100%;
+		font-size: 31rpx;
+		font-weight: bold;
+		padding: 40rpx 18rpx;
+	}
+	.pickpointAddress{
+		display: flex;
+		font-weight: 500;
+		flex: 1;
+		width: 10rpx;
+		align-items: center;
+		justify-content: flex-end;
+	}
+	.pickpointImg{
+		width: 20rpx;
+		height: 20rpx;
+	}
+	.pointAddressText{
+		padding: 0 20rpx 0 40rpx;
+		flex: 1;
+		text-align: right;
+		width: 10rpx;
+	}
+
+}
+
+
+.new-box{
+		background: #fff;
+		width: 698rpx;
+		margin: 0 auto 0rpx;
+		// border-radius: 14rpx;
+		.commodity {
+			display: flex;
+			.num-box {
+				display: flex;
+				align-items: center;
+				margin-left: 20rpx;
+				width: 160rpx;
+				justify-content: space-between;
+				.num {
+					text-align: center;
+					width: 50rpx;
+				}
+				.ctrl {
+					width: 47rpx;
+					height: 47rpx;
+					background: #6A8A2D;
+					border-radius: 50%;
+					font-family: PingFang SC;
+					font-weight: 400;
+					font-size: 34rpx;
+					color: #FFFFFF;
+					line-height: 47rpx;
+					text-align: center;
+				}
+				.ctrl.disabled{
+					background: #E8E8E8;
+					color: #999999;
+				}
+			}
+		}
+		.img {
+			width: 174rpx;
+			height: 174rpx;
+			background: #f2f4f7;
+			border-radius: 10rpx;
+			flex-shrink: 0;
+		}
+		.sku-content{
+			flex: 1;
+			width: 1rpx;
+			display: flex;
+			flex-direction: column;
+			justify-content: space-between;
+			font-weight: 500;
+			font-size: 28rpx;
+			color: #333333;
+			padding-left: 12rpx;
+		}
+		.tag {
+			margin-top: 10rpx;
+			display: flex;
+			.tag-item {
+				border-radius: 7rpx;
+				border: 1px solid #6A8A2D;
+				padding: 2rpx 6rpx;
+				font-weight: 500;
+				font-size: 20rpx;
+				color: #6A8A2D;
+				margin-right: 10rpx;
+			}
+		}
+		.commodity-price{
+			&:before{
+				
+				content:"￥";
+				font-size: 24rpx;
+			}
+		}
+}
+	
+.btn-list {
+	width: 100%;
+	height: 166rpx;
+	background: #ffffff;
+	box-shadow: 0rpx -3rpx 9rpx 1rpx rgba(227, 229, 232, 0.5);
+	display: flex;
+	position: fixed;
+	bottom: 0;
+	padding: 20rpx 20rpx;
+	align-items: center;
+	justify-content: space-between;
+	.btn {
+			width: 294rpx;
+			height: 88rpx;
+			background: #6A8A2D;
+			border-radius: 11rpx;
+			text-align: center;
+			line-height: 88rpx;
+
+			font-size: 36rpx;
+			font-family: PingFang SC;
+			font-weight: 500;
+			color: #FFFFFF;
+	
+	}
+	.price-box {
+		display: flex;
+		align-items: center;
+		.text {
+			font-size: 29rpx;
+			font-family: PingFangSC-Regular, PingFang SC;
+			font-weight: 500;
+			color: #333;
+		}
+		.price {
+			margin-left: 15rpx;
+			font-size: 36rpx;
+			font-family: PingFangSC-Regular, PingFang SC;
+			font-weight: bold;
+			color: #DC2525;
+			&:before {
+				content: '¥';
+				display: inline-block;
+				font-size: 36rpx;
+			}
+		}
+		.post-text {
+			margin-left: 15rpx;
+			color: #fc5109;
+			font-size: 24rpx;
+		}
+	}
+}
+.contacts {
+	display: flex;
+	align-items: center;
+	justify-content: space-between;
+	height: 100%;
+	image {
+		width: 36rpx;
+		height: 36rpx;
+	}
+	.contacts-left {
+		.name-phone {
+			display: flex;
+			align-items: baseline;
+			.name {
+				font-size: 32rpx;
+				font-family:  PingFang SC;
+				font-weight: 400;
+				color: #222222;
+			}
+			.phone {
+				margin-left: 27rpx;
+				font-size: 25rpx;
+				font-family:  PingFang SC;
+				font-weight: 400;
+				color: #666666;
+			}
+		}
+		.adds {
+			font-size: 27rpx;
+			font-family: PingFang SC;
+			font-weight: 400;
+			color: #000;
+			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: 31rpx;
+				font-weight: 400;
+				color: #000000;
+			}
+
+			.confirm {
+				font-weight: 400;
+				color: #000000;
+			}
+		}
+	}
+
+	.popup-list {
+		height: 666rpx;
+		overflow: scroll;
+
+		.popup-item {
+			border-radius: 12rpx;
+			padding: 2rpx;
+			margin-top: 24rpx;
+			font-size: 24rpx;
+			color: #333333;
+			font-weight: 400;
+			background-color: #ffffff;
+
+			.item-top {
+				border-radius: 12rpx;
+				padding: 30rpx 40rpx;
+				background-color: #ffffff;
+				
+				img {
+					color: #666666;
+					width: 40rpx;
+					height: 40rpx;
+				}
+
+				.name {
+					overflow: hidden;
+					font-family: PingFang SC;
+					font-weight: 400;
+					font-size: 32rpx;
+					display: flex;
+					align-items: baseline;
+
+					text {
+						color: #666;
+						font-size: 25rpx;
+						padding: 0 24rpx;
+					}
+
+					.tag {
+						padding: 0 8rpx;
+						height: 32rpx;
+						border-radius: 7rpx;
+						line-height: 30rpx;
+						text-align: center;
+						font-size: 23rpx;
+						font-family: PingFang SC;
+						font-weight: 500;
+						color: #ffffff;
+						background: #6A8A2D;
+
+					}
+				}
+
+				.com-flex-start {
+					margin: 0 0 30rpx;
+				}
+
+				.subtitle {
+					font-weight: 400;
+					flex: 1;
+					text-align: left;
+					margin-top: 33rpx;
+					color: #666666;
+					font-size: 25rpx;
+
+					.mobile {
+						margin-bottom: 36rpx;
+					}
+				}
+
+				.status {
+					width: 40rpx;
+					height: 40rpx;
+					line-height: 40rpx;
+					border-radius: 50%;
+					text-align: center;
+					box-sizing: border-box;
+
+					img {
+						width: 27rpx;
+						height: 21rpx;
+					}
+				}
+				.statuss {
+					background: linear-gradient(90deg, #fa2b66, #ff9834);
+					border: none;
+				}
+				.noSelect {
+					border: 1rpx solid #999999;
+				}
+			}
+
+			.item-site {
+				color: #666666;
+				display: flex;
+				align-items: center;
+				padding: 36rpx 0;
+
+				view {
+					width: 23rpx;
+					height: 23rpx;
+					margin-right: 10rpx;
+					border: 1rpx solid #999999;
+					border-radius: 50%;
+
+					view {
+						width: 8rpx;
+						height: 8rpx;
+						background: #000000;
+						border-radius: 50%;
+						margin: auto;
+					}
+				}
+			}
+		}
+		
+		.popup-item.active{
+			background: #6A8A2D;
+		}
+	}
+
+	.button {
+
+		text-align: center;
+		width: 100%;
+		height: 80rpx;
+		line-height: 80rpx;
+		background-color: #ffffff;
+		border-radius: 40rpx;
+		font-family: PingFang SC;
+		font-weight: 400;
+		font-size: 33rpx;
+		color: #000000;
+
+	}
+}
+
+.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;
+}
+
+.left {
+	width: 140rpx;
+	height: 104rpx;
+	line-height: 104rpx;
+	font-family: PingFang;
+	font-weight: bold;
+	font-size: 31rpx;
+	color: #000000;
+}
+.input {
+	font-size: 31rpx;
+	font-weight: 400;
+	text-align: right;
+}
+.remark {
+	padding:30rpx;
+	display: flex;
+	align-items: center;
+	width: 698rpx;
+	min-height: 120rpx;
+	background: #ffffff;
+	margin: 0 auto;
+	// border-radius: 14rpx;
+	.remark-title{
+
+		font-size: 31rpx;
+		font-family: PingFang SC;
+		font-weight: bold;
+		color: #000000;
+		flex-shrink: 0;
+
+	}
+	input {
+		margin-left: 64rpx;
+		width: 500rpx;
+		font-size: 31rpx;
+	}
+}
+
+
+
+	.tickets-box {
+		width: 698rpx;
+		margin: 0rpx auto 0;
+		border-radius: 13rpx;
+		background: #fff;
+		height: 120rpx;
+		.order-title {
+			margin: 31rpx 0 31rpx 30rpx;
+			font-size: 31rpx;
+			font-family: PingFang SC;
+			font-weight: bold;
+			color: #000000;
+		}
+
+		.coupon-price {
+			color:#DD0000;
+			font-size: 30rpx;
+			font-weight: bold;
+		}
+	}
+	
+
+		
+	
+	.top-line{
+		border-top:rgba(216, 216, 216, 1) solid 2rpx ;
+	}
+	.post{
+		height: 120rpx;
+		padding: 0 30rpx;
+
+		font-size: 32rpx;
+		font-family: PingFang SC;
+		font-weight: bold;
+		color: #000000;
+
+	}
+
+.sendwayArea{
+	padding: 26rpx 26rpx;
+	display: flex;
+	justify-content: space-between;
+	.sendway-item{
+		font-weight: 500;
+		font-size: 27rpx;
+		color: #111111;
+		width: 48%;
+		text-align: center;
+		height: 57rpx;
+		line-height: 57rpx;
+		background: #FFFFFF;
+		border-radius: 13rpx;
+	}
+	.sendway-item.active{
+		border: 1px solid #6A8A2D;
+		color: #6A8A2D;
+	}
+
+}
+
+.add-edit-content{
+	background-color: white;
+	padding: 0 20rpx;
+	border-radius: 20rpx;
+}
+
+		.coupon-btn {
+			color: #999999;;
+			display: flex;
+			align-items: center;
+			.select {
+				display: block;
+				width: 153rpx;
+				height: 40rpx;
+				background: #6A8A2D;
+				border-radius: 9rpx;
+				font-weight: 500;
+				font-size: 24rpx;
+				color: #FFFFFF;
+				text-align: center;
+				line-height: 40rpx;
+				font-family: PingFang SC;
+				margin-right: 20rpx;
+		
+			}
+		}
+.shop-name{
+	font-weight: bold;
+	font-size: 31rpx;
+	color: #333333;
+	padding-bottom: 12rpx;
+	min-height: fit-content;
+}
+	.tickets-container {
+		width: 698rpx;
+		background: #fff;
+		height: 120rpx;
+		margin: 22rpx auto 0;
+		.order-title {
+			margin: 31rpx 0 31rpx 30rpx;
+			font-size: 31rpx;
+			font-family: PingFang SC;
+			font-weight: bold;
+			color: #000000;
+		}
+
+		.coupon-price {
+			color:#DD0000;
+			font-size: 30rpx;
+			font-weight: bold;
+		}
+	}
+</style>
\ No newline at end of file