diff --git a/components/date-picker/date-picker.vue b/components/date-picker/date-picker.vue
index e860ce7..4ae0907 100644
--- a/components/date-picker/date-picker.vue
+++ b/components/date-picker/date-picker.vue
@@ -3,19 +3,19 @@
 		<u-popup v-model="show" mode="bottom">
 			<view class="date">
 				<view class="date-title">
-					<view>配送</view>
+					<view>发货时间</view>
 					<view @click="closePop">
 						<u-icon name="close-circle-fill" color="#f0efed" size="32"></u-icon>
 					</view>
 				</view>
-				<view class="date-express">
+				<!-- <view class="date-express">
 					<view v-for="(item,index) in express">
 						<view @click="chooseExpress(index,item)"
 							:class="{'date-express-item':true,'date-express-item_active':expressIndex==index}"
 							v-if="item.name">{{item.name}}</view>
 					</view>
-				</view>
-				<view class="date-stitle">送货时间</view>
+				</view> -->
+				<view class="date-stitle">非到货时间，预计发货后48小时左右可到货。</view>
 				<view class="date-list">
 					<view class="date-list-left">
 						<view v-for="(item,index) in data">
@@ -30,13 +30,13 @@
 							{{dateObj.lunarData?dateObj.lunarData:''}}
 							<view>今日剩余可提货量：{{dateObj.canUse.quantity - dateObj.canUse.booked}}</view>
 						</view>
-						<view class="hh">
+						<!-- <view class="hh">
 							<view @click="chooseHh(index,item)"
 								:class="{'hh-item':true,'hh-item_active':hhIndex==index}"
 								v-for="(item,index) in hhList">
 								{{item}}
 							</view>
-						</view>
+						</view> -->
 					</view>
 				</view>
 				<view class="date-btn">
@@ -62,63 +62,63 @@
 					return []
 				}
 			},
-			// 快递
-			express: {
-				type: Array,
-				default () {
-					return []
-				}
-			}
+			// // 快递
+			// express: {
+			// 	type: Array,
+			// 	default () {
+			// 		return []
+			// 	}
+			// }
 
 		},
 		data() {
 			return {
 				show: false,
-				expressIndex: -1,
-				expressObj: {},
+				// expressIndex: -1,
+				// expressObj: {},
 				dateIndex: -1,
 				dateObj: {},
-				hhList: ['09:00-15:00', '15:00-21:00'],
-				hhIndex: -1,
+				// hhList: ['09:00-15:00', '15:00-21:00'],
+				// hhIndex: -1,
 
 			}
 		},
 		methods: {
-			chooseExpress(index, item) {
-				this.expressObj = item
-				this.expressIndex = index
-			},
+			// chooseExpress(index, item) {
+			// 	this.expressObj = item
+			// 	this.expressIndex = index
+			// },
 			chooseDate(index, item) {
 				this.dateIndex = index
 				this.dateObj = item
 			},
-			chooseHh(index, item) {
-				this.hhTime = item
-				this.hhIndex = index
-			},
+			// chooseHh(index, item) {
+			// 	this.hhTime = item
+			// 	this.hhIndex = index
+			// },
 			closePop() {
 				this.show = false
 			},
 			confirmPop() {
 				if (isEmptyObject(this.dateObj)) {
-					toast('请选择日期')
-					return
-				}
-				if (isEmptyObject(this.expressObj)) {
-					toast('请选择快递')
-					return
-				}
-				if (isNull(this.hhTime)) {
-					toast('请选择时间')
+					toast('请选择发货时间')
 					return
 				}
+				// if (isEmptyObject(this.expressObj)) {
+				// 	toast('请选择快递')
+				// 	return
+				// }
+				// if (isNull(this.hhTime)) {
+				// 	toast('请选择时间')
+				// 	return
+				// }
 				// 将对象A的值插入到对象B中
-				for (const key in this.expressObj) {
-					if (this.expressObj.hasOwnProperty(key)) {
-						this.dateObj[`express${key}`] = this.expressObj[key];
-					}
-				}
-				this.dateObj.hhtime = this.hhTime
+				// for (const key in this.expressObj) {
+				// 	if (this.expressObj.hasOwnProperty(key)) {
+				// 		this.dateObj[`express${key}`] = this.expressObj[key];
+				// 	}
+				// }
+				// this.dateObj.hhtime = this.hhTime
 				this.$emit('refresh', this.dateObj)
 				this.show = false
 				console.log("this.dateObj", this.dateObj)
@@ -145,6 +145,7 @@
 			justify-content: space-between;
 			align-items: center;
 			padding-left: 35rpx;
+			padding-bottom: 10rpx;
 		}
 
 		&-express {
@@ -178,9 +179,9 @@
 
 		&-stitle {
 			font-size: 24rpx;
-			color: #000;
+			color: #787877;
 			padding-left: 35rpx;
-			margin-bottom: 35rpx;
+			margin-bottom: 20rpx;
 		}
 
 		&-list {
diff --git a/packages/change/change.vue b/packages/change/change.vue
index cb1103e..cb2baeb 100644
--- a/packages/change/change.vue
+++ b/packages/change/change.vue
@@ -160,7 +160,7 @@
 
 	.systemtext text {
 		display: block;
-		font-size: 20rpx;
+		font-size: 28rpx;
 		color: #000;
 		line-height: 36rpx;
 	}
@@ -202,7 +202,7 @@
 		height: 74rpx;
 		line-height: 74rpx;
 		color: #676767 !important;
-		font-size: 20rpx !important;
+		font-size: 26rpx !important;
 		padding-left: 94rpx;
 		padding-right: 30rpx;
 		background-position: left 30rpx center;
@@ -219,15 +219,15 @@
 	}
 
 	/deep/ .u-btn {
-		color: #b98b44 !important;
-		font-size: 24rpx !important;
+		color: #fff !important;
+		font-size: 26rpx !important;
 		font-weight: bold;
 		padding: 0;
 		height: 74rpx !important;
 		width: 100%;
 		line-height: 74rpx !important;
 		border-radius: 50rpx;
-		background-color: #f4f3f2 !important;
+		background-color: #b98b44 !important;
 	}
 
 	/deep/ .u-btn::after {
diff --git a/packages/my/addaddress.vue b/packages/my/addaddress.vue
index a73e446..1464a60 100644
--- a/packages/my/addaddress.vue
+++ b/packages/my/addaddress.vue
@@ -11,11 +11,7 @@
 					</u-form-item>
 					<!-- <view class="orderForm-address"> -->
 					<u-form-item label="所在地区" required prop="area" label-position="left">
-						<u-input v-model="form.area" placeholder="请选择所在地区" @click="openArea" />
-						<view slot="right" class="arearight" @click="changeLocation">
-							<u-icon name="map"></u-icon>
-							定位
-						</view>
+						<u-input type="select" v-model="form.area" placeholder="请选择所在地区" @click="openArea" />
 					</u-form-item>
 
 					<!-- </view> -->
@@ -23,7 +19,11 @@
 						<u-input v-model="form.area" placeholder="请选择地区" @click="openArea" type="select" />
 					</u-form-item> -->
 					<u-form-item label="详细地址" required prop="address" label-position="left">
-						<u-input v-model="form.address" placeholder="请填写详细地址" />
+						<u-input v-model="form.address" placeholder="请填写详细地址" />
+						<view slot="right" class="arearight" @click="changeLocation" style="color:#000">
+							<u-icon name="map"></u-icon>
+							定位
+						</view>
 					</u-form-item>
 					<u-form-item label="设置默认地址" label-width="180" :border-bottom="false" prop="defalut"
 						label-position="left">
@@ -124,7 +124,8 @@
 				const res = await this.$u.api.getRegion()
 				this.listArea = res.regions
 			},
-			openArea() {
+			openArea() {
+				uni.hideKeyboard()
 				this.$refs.pickers.open().then(function() {
 					console.log('picker打开');
 				});
@@ -190,7 +191,7 @@
 						uni.chooseLocation({
 							success(res) {
 								console.log("res", res)
-								_this.form.area = res.address
+								// _this.form.area = res.address
 								_this.form.address = res.name
 							},
 							fail(res) {
diff --git a/packages/myorder/infoconfirm.vue b/packages/myorder/infoconfirm.vue
index ba639c8..fb77339 100644
--- a/packages/myorder/infoconfirm.vue
+++ b/packages/myorder/infoconfirm.vue
@@ -14,13 +14,13 @@
 				<image src="../../static/icon1.png" mode="widthFix"></image>
 			</view>
 			<view class="confirmright">
-				<text class="confirmmarker">收货日期</text>
+				<text class="confirmmarker">发货时间</text>
 				<view class="flex-li confirmdate">
 					<text>{{details.send_date?$moment(details.send_date).format("YYYY年M月DD日"):''}}</text>
 					<text class="smallfont">{{details.lunarData?details.lunarData:""}}</text>
 				</view>
 				<view class="flex-li confirmdate">
-					<text>{{details.hh?details.hh:''}}</text>
+					<!-- <text>{{details.hh?details.hh:''}}</text> -->
 					<text class="smallfont">{{details.week?'['+details.week+']':''}}</text>
 				</view>
 			</view>
diff --git a/packages/myorder/myorder.vue b/packages/myorder/myorder.vue
index 41f937a..a92ac90 100644
--- a/packages/myorder/myorder.vue
+++ b/packages/myorder/myorder.vue
@@ -36,9 +36,10 @@
 							</view>
 						</view>
 						<view class="ordertime" @click="toDetail(item)">
-							<text>预计送达时间</text>
+							<text>预计发货时间</text>
 							<view>{{item.send_date?$moment(item.send_date).format("M月DD日"):''}}<text
-									class="orderweek">{{item.week?'['+item.week+']':''}}</text>{{item.hh?item.hh:''}}
+									class="orderweek">{{item.week?'['+item.week+']':''}}</text>
+									<!-- {{item.hh?item.hh:''}} -->
 							</view>
 						</view>
 						<view class="ordertab">
diff --git a/packages/order/order.vue b/packages/order/order.vue
index f148760..1ad5243 100644
--- a/packages/order/order.vue
+++ b/packages/order/order.vue
@@ -2,7 +2,9 @@
 	<!-- <page-meta :page-style="'overflow:'+(showinfo?'hidden':'visible')"></page-meta> -->
 	<view class="cotainer">
 
-		<date-picker ref="datePickers" @refresh="backDate" :data="listDates" :express="listExpress"></date-picker>
+		<!-- <date-picker ref="datePickers" @refresh="backDate" :data="listDates" :express="listExpress"></date-picker> -->
+		<date-picker ref="datePickers" @refresh="backDate" :data="listDates"></date-picker>
+
 
 
 		<view class="orderForm">
@@ -25,24 +27,25 @@
 							</view> -->
 							<view>
 								<view>卡券状态</view>
-								<view class="status" v-html="type=='edit'?cardInfo.first_card.status_label:cardInfo.status_label"></view>
+								<view class="status"
+									v-html="type=='edit'?cardInfo.first_card.status_label:cardInfo.status_label"></view>
 							</view>
 
 						</view>
 					</view>
 					<view class="orderInfo-status">
-						<u-form-item label="提货时间" :border-bottom="false" style="width:100%" prop="send_date"
+						<u-form-item label="发货时间" :border-bottom="false" style="width:100%" prop="send_date"
 							label-position="left">
 							<!-- <view></view> -->
 							<view class="hh" @click="openDatePicker">
 								<view class="" v-if="form.send_date">
-									<view>{{form.express}}</view>
+									<!-- <view>{{form.express}}</view> -->
 									<view>{{form.ymd}} <text style="color:#b62828;margin:0 10rpx">[{{form.week}}]</text>
-										{{form.hh}}
+										<!-- {{form.hh}} -->
 									</view>
 								</view>
 								<view v-else>
-									<view>选择提货时间</view>
+									<view>选择发货时间</view>
 								</view>
 								<view>
 									<u-icon name="arrow-down-fill" color="#ccc" size='28'></u-icon>
@@ -63,24 +66,23 @@
 						<u-input v-model="form.mobile2" placeholder="请填写备用号码" />
 					</u-form-item>
 					<u-form-item label="所在地区" prop="area" label-position="left">
-						<u-input v-model="form.area" placeholder="请选择所在地区" @click="openArea" />
+						<u-input type="select" v-model="form.area" placeholder="请选择所在地区" @click="openArea" />
+					</u-form-item>
+					<u-form-item label="详细地址" prop="address" label-position="left">
+						<u-input v-model="form.address" placeholder="请填写详细地址" />
 						<view slot="right" class="arearight" @click="changeLocation">
 							<u-icon name="map"></u-icon>
 							定位
 						</view>
 					</u-form-item>
-					<u-form-item label="详细地址" prop="address" label-position="left">
-						<u-input v-model="form.address" placeholder="请填写详细地址" />
-					</u-form-item>
 					<u-form-item label="设置默认地址" :border-bottom="false" prop="defalut" label-position="left">
 						<u-switch slot="right" v-model="form.defalut" active-color="#ba8b45" inactive-color="#adadac"
 							size="40"></u-switch>
 					</u-form-item>
+					<u-form-item label="备注" prop="remark" label-position="top">
+						<u-input type="textarea" v-model="form.remark" placeholder="请填写备注" />
+					</u-form-item>
 				</view>
-				<!-- 				<view class="orderForm-address">
-					<text><text>*</text>收货地址</text>
-					<u-button @click="changeLocation" size="mini">获取位置</u-button>
-				</view> -->
 				<view class="orderForm-wrap">
 					<u-form-item label="是否本人收货" prop="myself" label-position="left">
 						<u-input v-model="myself" placeholder="选填" @click="showIsMySelf = true" type="select" />
@@ -102,12 +104,30 @@
 
 
 		<u-select @confirm="changeIsMySelf" v-model="showIsMySelf" :list="listIsMySelf"></u-select>
+
+		<!-- 免责协议 -->
+		<view class="agreeinfo" v-if="showagree">
+			<view class="agreeinfo-wrap">
+				<view class="agreeinfo-title">温馨提示</view>
+				<view class="agreeinfo-content">
+					<view>1、下单时请注意填写正确的收货信息。</view>
+					<view>2、因收件方信息有误导致产生的多余运费或退件由收件方自付。</view>
+					<view>3、此商品为生鲜产品，非质量问题不退换。</view>
+					<view>4、如出现售后或快递问题，请于签收日期起1日内反馈，超出不再受理。</view>
+				</view>
+				<view class="agreeinfo-btn">
+					<view @click="showagree = false,showinfo=true">我同意</view>
+				</view>
+			</view>
+		</view>
 		<!-- 确认信息 -->
 		<view class="ordercontainer" v-if="showinfo">
 			<view class="confirmbox">
 				<view class="confirmpicinfo">
 					<view class="imgbox">
-						<image :src="cardInfo.sku?(cardInfo.sku.image_url?cardInfo.sku.image_url:require('@/static/logo-xietaitai.png')):require('@/static/logo-xietaitai.png')" mode="widthFix"></image>
+						<image
+							:src="cardInfo.sku?(cardInfo.sku.image_url?cardInfo.sku.image_url:require('@/static/logo-xietaitai.png')):require('@/static/logo-xietaitai.png')"
+							mode="widthFix"></image>
 					</view>
 					<view class="pictitle">{{cardInfo.sku?cardInfo.sku.name:''}}</view>
 					<text>{{cardInfo.sku?cardInfo.sku.specs:''}}</text>
@@ -118,13 +138,13 @@
 					<image src="../../static/icon1.png" mode="widthFix"></image>
 				</view>
 				<view class="confirmright">
-					<text class="confirmmarker">收货日期</text>
+					<text class="confirmmarker">发货时间</text>
 					<view class="flex-li confirmdate">
 						<text>{{form.ymd}}</text>
 						<text class="smallfont">{{form.lunarData}}</text>
 					</view>
 					<view class="flex-li confirmdate">
-						<text>{{form.hh}}</text>
+						<!-- <text>{{form.hh}}</text> -->
 						<text class="smallfont">[{{form.week}}]</text>
 					</view>
 				</view>
@@ -157,6 +177,7 @@
 				<text class="confirmtab" @click="submit">{{type=='edit'?'确认修改':'确认提货'}}</text>
 			</view>
 		</view>
+
 		<!-- 选择地址 -->
 		<view class="addressinfo" v-if="showAddress">
 			<u-popup v-model="showAddress" mode="bottom">
@@ -197,11 +218,12 @@
 		data() {
 			return {
 				showinfo: false,
+				showagree: false,
 				showAddress: false,
 				listAddress: [],
 				addressInfo: '',
-				cardInfo: {},
-				type:'',
+				cardInfo: {},
+				type: '',
 				form: {
 					card_number: '',
 					password: '',
@@ -209,8 +231,8 @@
 					send_date: '',
 					ymd: '',
 					lunarData: '',
-					express: '',
-					hh: '',
+					// express: '',
+					// hh: '',
 					week: '',
 
 					area: '',
@@ -226,13 +248,13 @@
 					buy_name: '',
 					buy_mobile: ''
 				},
-				listExpress: [{
-					id: 0,
-					value: '顺丰快递'
-				}, {
-					id: 1,
-					value: '中通快递'
-				}],
+				// listExpress: [{
+				// 	id: 0,
+				// 	value: '顺丰快递'
+				// }, {
+				// 	id: 1,
+				// 	value: '中通快递'
+				// }],
 				listDates: [],
 				date: '',
 				listArea: [],
@@ -249,7 +271,7 @@
 				rules: {
 					send_date: [{
 						required: true,
-						message: '请选择提货时间',
+						message: '请选择发货时间',
 						trigger: ['change', 'blur'],
 					}],
 					area: [{
@@ -285,37 +307,39 @@
 			this.$refs.uForm.setRules(this.rules);
 
 		},
-		onLoad(option) {
+		onLoad(option) {
 			let that = this
-			if (option.hasCard) {
-				if(option.type=='edit'){
-					this.type = 'edit'
-					this.form = uni.getStorageSync("vuex_update_card") ? uni.getStorageSync("vuex_update_card") : {},
-					this.cardInfo = uni.getStorageSync("vuex_update_card") ? uni.getStorageSync("vuex_update_card") : {},
-					this.form.ymd = this.momentDay(this.form.send_date).ymd
-					uni.removeStorageSync("vuex_update_card")
-					uni.setNavigationBarTitle({
-						title: '修改订单',
-						success: function() {
-							console.log('标题设置成功');
-							that.showinfo = false
-						},
-						fail: function(err) {
-							console.error('标题设置失败', err);
-						}
-					});
-					console.log("this.form",this.form)
-					// uni.removeStorageSync("vuex_update_card")
-				}else{
-					this.cardInfo = uni.getStorageSync("vuex_card") ? uni.getStorageSync("vuex_card").card : {}
-					this.form.card_number = uni.getStorageSync("vuex_card") ? uni.getStorageSync("vuex_card").card_number : ''
-					this.form.password = uni.getStorageSync("vuex_card") ? uni.getStorageSync("vuex_card").password : ''
-					uni.removeStorageSync("vuex_card")
+			if (option.hasCard) {
+				if (option.type == 'edit') {
+					this.type = 'edit'
+					this.form = uni.getStorageSync("vuex_update_card") ? uni.getStorageSync("vuex_update_card") : {},
+						this.cardInfo = uni.getStorageSync("vuex_update_card") ? uni.getStorageSync("vuex_update_card") :
+						{},
+						this.form.ymd = this.momentDay(this.form.send_date).ymd
+					uni.removeStorageSync("vuex_update_card")
+					uni.setNavigationBarTitle({
+						title: '修改订单',
+						success: function() {
+							console.log('标题设置成功');
+							that.showinfo = false
+						},
+						fail: function(err) {
+							console.error('标题设置失败', err);
+						}
+					});
+					console.log("this.form", this.form)
+					// uni.removeStorageSync("vuex_update_card")
+				} else {
+					this.cardInfo = uni.getStorageSync("vuex_card") ? uni.getStorageSync("vuex_card").card : {}
+					this.form.card_number = uni.getStorageSync("vuex_card") ? uni.getStorageSync("vuex_card").card_number :
+						''
+					this.form.password = uni.getStorageSync("vuex_card") ? uni.getStorageSync("vuex_card").password : ''
+					// uni.removeStorageSync("vuex_card")
 				}
-				
+
 				this.getAddress()
 				this.getDates()
-				this.getExpress()
+				// this.getExpress()
 				this.getArea()
 			} else {
 				toast("未查询到卡券信息")
@@ -328,15 +352,15 @@
 		methods: {
 			async getAddress() {
 				const res = await this.$u.api.getUserAddress()
-				this.listAddress = res.address
-				if(!this.type == 'edit'){
-					this.showAddress = this.listAddress.length > 0 ? true : false
+				this.listAddress = res.address
+				if (!this.type == 'edit') {
+					this.showAddress = this.listAddress.length > 0 ? true : false
 				}
 			},
-			async getExpress() {
-				const res = await this.$u.api.getExpress()
-				this.listExpress = res
-			},
+			// async getExpress() {
+			// 	const res = await this.$u.api.getExpress()
+			// 	this.listExpress = res
+			// },
 			changeAddress(e) {
 				console.log("e", e)
 				if (e) {
@@ -398,9 +422,9 @@
 				if (e) {
 					this.form.send_date = e.date
 					this.form.ymd = e.ymd
-					this.form.express = e.expressname
-					this.form.express_type_id = e.expressid
-					this.form.hh = e.hhtime
+					// this.form.express = e.expressname
+					// this.form.express_type_id = e.expressid
+					// this.form.hh = e.hhtime
 					this.form.week = e.week
 					this.form.lunarData = e.lunarData
 				}
@@ -411,11 +435,9 @@
 			async getArea() {
 				const res = await this.$u.api.getRegion()
 				this.listArea = res.regions
-
-				console.log(res)
-				console.log(this.listArea)
 			},
 			openArea() {
+				uni.hideKeyboard()
 				this.$refs.pickers.open().then(function() {
 					console.log('picker打开');
 				});
@@ -425,7 +447,7 @@
 				// return
 				if (e) {
 					let data = e.data
-					let _this = this
+					let _this = this
 					_this.form.area = ''
 					data.forEach(function(item, index) {
 						_this.form.area += item.value + '   ';
@@ -464,7 +486,7 @@
 						uni.chooseLocation({
 							success(res) {
 								console.log("res", res)
-								_this.form.area = res.address
+								// _this.form.area = res.address
 								_this.form.address = res.name
 							},
 							fail(res) {
@@ -503,49 +525,50 @@
 						city_id: this.form.city_id,
 						district_id: this.form.district_id,
 						defalut: 1
-					}).then(res => {
-						if(this.type=='edit'){
-							uni.redirectTo({
-								url: '/packages/myorder/myorder'
-							})
-						}else{
-							uni.redirectTo({
-								url: '/packages/product/public'
-							})
+					}).then(res => {
+						if (this.type == 'edit') {
+							uni.redirectTo({
+								url: '/packages/myorder/myorder'
+							})
+						} else {
+							uni.redirectTo({
+								url: '/packages/product/public'
+							})
 						}
-						
+
 					}).then(res => {
-						if(this.type=='edit'){
-							uni.redirectTo({
-								url: '/packages/myorder/myorder'
-							})
-						}else{
-							uni.redirectTo({
-								url: '/packages/product/public'
-							})
+						if (this.type == 'edit') {
+							uni.redirectTo({
+								url: '/packages/myorder/myorder'
+							})
+						} else {
+							uni.redirectTo({
+								url: '/packages/product/public'
+							})
 						}
 					})
 				} else {
-					if(this.type=='edit'){
-						uni.redirectTo({
-							url: '/packages/myorder/myorder'
-						})
-					}else{
-						uni.redirectTo({
-							url: '/packages/product/public'
-						})
+					if (this.type == 'edit') {
+						uni.redirectTo({
+							url: '/packages/myorder/myorder'
+						})
+					} else {
+						uni.redirectTo({
+							url: '/packages/product/public'
+						})
 					}
 				}
 
 			},
 			submit() {
 				let that = this
-				if ((!isNull(this.form.mobile2) && this.form.mobile2.length > 0) || (!isNull(this.form.buy_mobile) && this
-						.form.buy_mobile.length > 0)) {
+				if (!isNull(this.form.mobile2) && this.form.mobile2.length > 0) {
 					if (!isMobile(this.form.mobile2)) {
 						toast('备用电话不正确')
 						return
 					}
+				}
+				if (!isNull(this.form.buy_mobile) && this.form.buy_mobile.length > 0) {
 					if (!isMobile(this.form.buy_mobile)) {
 						toast('购买人电话不正确')
 						return
@@ -559,6 +582,7 @@
 								title: '信息确认',
 								success: function() {
 									console.log('标题设置成功');
+									that.showagree = true
 									that.showinfo = true
 								},
 								fail: function(err) {
@@ -566,40 +590,40 @@
 								}
 							});
 						} else {
-							this.form.show = 0
-							if(this.type=='edit'){
-								console.log("this.form",this.form)
-								// return
-								this.$u.api.saveUserOrder(this.form).then(res => {
-									uni.removeStorageSync('vuex_update_card')
-									toast(res.msg, 1000, function() {
-										setTimeout(function() {
-											that.saveDefalutAddress()
-										}, 500)
-								
-									})
-								
-								}).then(res => {
-									console.log('res1', res)
-								
-								})
-							}else{
-								this.$u.api.addUserOrder(this.form).then(res => {
-									console.log("res", res)
-									uni.removeStorageSync('vuex_card')
-									toast(res.msg, 1000, function() {
-										setTimeout(function() {
-											that.saveDefalutAddress()
-										}, 500)
-								
-									})
-								
-								}).then(res => {
-									console.log('res1', res)
-								
-								})
+							this.form.show = 0
+							if (this.type == 'edit') {
+								console.log("this.form", this.form)
+								// return
+								this.$u.api.saveUserOrder(this.form).then(res => {
+									uni.removeStorageSync('vuex_update_card')
+									toast(res.msg, 1000, function() {
+										setTimeout(function() {
+											that.saveDefalutAddress()
+										}, 500)
+
+									})
+
+								}).then(res => {
+									console.log('res1', res)
+
+								})
+							} else {
+								this.$u.api.addUserOrder(this.form).then(res => {
+									console.log("res", res)
+									uni.removeStorageSync('vuex_card')
+									toast(res.msg, 1000, function() {
+										setTimeout(function() {
+											that.saveDefalutAddress()
+										}, 500)
+
+									})
+
+								}).then(res => {
+									console.log('res1', res)
+
+								})
 							}
-							
+
 						}
 
 					} else {
@@ -965,5 +989,51 @@
 			border: 1rpx solid #ba8b45;
 			background: #ba8b45;
 		}
+
+		.agreeinfo {
+			position: fixed;
+			top: 0;
+			left: 0;
+			background: rgba(0, 0, 0, 0.7);
+			display: flex;
+			align-items: center;
+			width: 100vw;
+			height: 100vh;
+			z-index: 9;
+			padding: 0 50rpx;
+
+			&-wrap {
+				background: #fff;
+				padding: 60rpx 40rpx;
+				border-radius: 20rpx;
+			}
+
+			&-title {
+				font-size: 32rpx;
+				color: #000;
+				margin-bottom: 30rpx
+			}
+
+			&-content {
+				line-height: 1.8;
+				font-size: 30rpx;
+			}
+
+			&-btn {
+
+				>view {
+					background-color: #ba8b45;
+					color: #fff;
+					border-radius: 40rpx;
+					width: 60%;
+					margin: 0 auto;
+					height: 75rpx;
+					text-align: center;
+					line-height: 75rpx;
+					margin: 40rpx auto;
+					margin-top: 60rpx;
+				}
+			}
+		}
 	}
 </style>
\ No newline at end of file