地址下单等添加

pages/index/cart.vue

@@ -1,9 +1,9 @@
 <template>
 	<view style="height: 100vh;background-color: #F5F5F5;">
-		 <view class="titleright" @click="changeShop" v-if="isdelete">编辑</view>
+		 <view  class="titleright" @click="changeShop" v-if="isdelete">编辑</view>
 		  <view class="titleright" @click="changeShop" v-else>取消</view>
-		  <view v-if="list.length>0">
-			  <scroll-view  style="height: 100vh;" class="floor-list"
+		  <view v-if="list.length>0" style="margin-bottom: 150upx;">
+			  <scroll-view  style="height: 88vh;" class="floor-list"
 			  		   :scroll-top="scrollTop" scroll-y="true"  @scroll="scroll"  @scrolltoupper="upper" @scrolltolower="lower"
 			  		   refresher-enabled="true">
 			  		 <view class="cart-list">
@@ -52,7 +52,8 @@
 				   <view style="text-align: center;color: #909399;"> 去买点什么</view>
 			  </view>
 		  </view>
-		 <view style="position: fixed;bottom: 0;">
+		  
+		 <view style="position: fixed;bottom: 0;border-top:1px solid #eee;height: 8vh;">
 		 <van-submit-bar
 		   :price="prices"
 		   :button-text="listip"
@@ -108,19 +109,21 @@
 		methods: {
 			onClickButton(e) {
 				let array = [];
+				if(this.pricelist.length == 0) {
+					this.$msg('请选择商品');
+					return;
+				}
 				this.pricelist.forEach(item => {
 				  array.push(item.goods_id)
 				})
 				let ids = array.toString();
 				if(this.isdelete) {
-					if(this.pricelist.length == 0) {
-						this.$msg('请选择商品');
-						return;
-					}
 					// 结算
+					
+					this.getorderId(); // 保存订单生成订单id
 					uni.navigateTo({
-					   url: './sureBuy'  // 确认订单
-					})
+						// url: `/pages/index/sureBuy?store=${store}&pricelist=${pricelist}&prices=${prices}`
+					});
 				}else {
 					if(ids == '') {
 						this.$msg('请选择删除商品');
@@ -130,6 +133,33 @@
 					this.deleteshop(ids);
 				}
 			},
+            getorderId() {
+				let goods = [];
+				let store = JSON.stringify(this.store);
+				let pricelist = JSON.stringify(this.pricelist);
+				let prices = this.prices;
+				this.pricelist.forEach((item,index) => {
+					 goods.push({});
+					 goods[index].goods_id = item.goods_id;
+					 goods[index].buy_num = item.goods_num;
+				 })
+				 this.request({
+					 url:'/v1/order/save_og',
+					 method: 'post',
+					 data: {
+						 store_id: this.store.store_id,
+						 goods: JSON.stringify(goods)
+					 },
+					 success:(res) => {
+						 console.log(res);
+						 let order_id = res.data.data.order_id;
+						 uni.navigateTo({
+						   url: `/pages/index/sureBuy?store=${store}&pricelist=${pricelist}&prices=${prices}&order_id=${order_id}`
+						 });
+						 
+					 }
+				 })
+			},
 			deleteshop(ids) {
 				this.request({
 					url: '/v2/order/cart_drop',
@@ -233,8 +263,9 @@
 						this.$set(this.checkboxList, idx, idx.toString())
 					})
 					 this.pricelist = this.list;
+					 console.log(this.pricelist);
 					 this.lengthnumber = this.pricelist.length;
-					 this.listip = this.isdelete ? "结算" + (this.lengthnumber) :'删除'+ (this.lengthnumber);
+					 this.listip = this.isdelete ? `结算(${this.lengthnumber})` :'删除'+ (this.lengthnumber);
 					 this.checkoutprice();
 				}else {
 					for (let i = 0, lenI = items.length; i < lenI; ++i) {
@@ -266,6 +297,7 @@
 		padding: 10upx 30upx;
 		background: #fff;
 		border-bottom: 1px solid #eee;
+		height: 4vh;
 		
 	}
 	.changewidth {

pages/index/hotel.vue

@@ -140,6 +140,7 @@
         },
         data() {
             return {
+				firstwo: 1,
 				isDetail: 1,
 				pictureUrl: this.pictureUrl,
 				showdialog: false,
@@ -194,16 +195,16 @@
         
         // 初次渲染进来关闭分享菜单栏
         onReady:function(){
-            uni.hideShareMenu({
-                  success(res) {
-                      console.log(res)
-                      console.log("kkkkkkkkkkkk")
-                  },
-                  fail(res){
-                      console.log(res)
-                      console.log("dddddd")
-                  } 
-            });
+            // uni.hideShareMenu({
+            //       success(res) {
+            //           console.log(res)
+            //           console.log("kkkkkkkkkkkk")
+            //       },
+            //       fail(res){
+            //           console.log(res)
+            //           console.log("dddddd")
+            //       } 
+            // });
         },
 		onLoad(options){
 			this.goodId = options.id;  // 商品和酒店Id
@@ -295,22 +296,22 @@
 			
 			// 获取商品详情
 			getshopdetail() {
-				let _this = this;
 				this.request({
 				                url:"/v2/entry/storeGoods",
 				                method:'get',
 				                data: {
-				                         store_id: _this.goodId,
-										 page: _this.page,
-										 goods_commonid: _this.goods_commonid, // 上新排序
-										 goods_price: _this.goods_price,
-										 gc_id_1: _this.gc_id_1
+				                         store_id: this.goodId,
+										 page: this.page,
+										 goods_commonid: this.goods_commonid, // 上新排序
+										 goods_price: this.goods_price,
+										 gc_id_1: this.gc_id_1
 				                    },
-								success: function(res) {
+								success: (res) => {
+									
+									this.goods_list = this.goods_list.concat(res.data.data.goods_list);
 									if(res.data.data.goods_list.length < 10) {
-										_this.isDetail = 2;
+										this.isDetail = 2;
 									}
-									_this.goods_list = _this.goods_list.concat(res.data.data.goods_list);
 								},
 			    })
 			},
@@ -397,12 +398,14 @@
             
             // 滚到底部
             lower(e) {
+				console.log(this.activeindex)
+				console.log(this.isDetail)
 				if(this.activeindex == 1) {
 					if(this.isnexttwo == 1) {
 						this.page = this.page + 1;
 					}
 					this.getcomment();
-					
+				
 				}else if(this.activeindex == 0 && this.isDetail == 1) {
 					this.page = this.page + 1;
 					this.getshopdetail();

pages/index/shop.vue

@@ -124,15 +124,20 @@
  					<image :src="nuberImg"></image>
  					<view class="right">
  						<text class="price" style="font-size: 36upx;color: #303133">{{datalist.goods_price}}</text>
- 						<view class="selected" v-if="specSelected.length > 0">
- 							<text class="selected-text" v-for="(sItem, sIndex) in specSelected" :key="sIndex">
- 								{{sItem.value_name}}X {{shopnumber}}
- 							</text>
- 						</view>
-						<view class="selected" v-else>
-							<text class="selected-text">
-								请选择规格数量
-							</text>
+						<view v-if="datalist.spec_list.length > 0 ">
+							<view class="selected" v-if="specSelected.length > 0 ">
+								<text class="selected-text" v-for="(sItem, sIndex) in specSelected" :key="sIndex">
+									{{sItem.value_name}}X {{shopnumber}}
+								</text>
+							</view>
+							<view class="selected" v-else>
+								<text class="selected-text">
+									请选择规格数量
+								</text>
+							</view>
+						</view>
+ 						<view v-else>
+							X {{shopnumber}}
 						</view>
  					</view>
 					<view @click="closeCar" style="position: absolute;right: 10%;"> 
@@ -195,14 +200,14 @@
 				cartnumber: 0, // 购物车数量
 				changnumber: 100,
 				ismax: false, // 输入狂禁止数量
-				goods_storage: 0, // 规格商品参数
+				goods_storage: '', // 规格商品参数
 				nuberImg:'',
 				shopnumber: 1,
 				pictureUrl: this.pictureUrl,
 				datalist: {},
 				store_id: 0, // 酒店id
 				goodId: 0, // 商品公共id
-				goods_id: 0, // 商品相信id
+				goods_id: 0, // 商品规格id
 				windowHeight: 0, // 窗口高度
 				iScrolltop: 1,
 				active: 0,
@@ -275,23 +280,29 @@
 			},
 			// 获取商品详情
 			getshopdetail() {
-				let _this = this;
 				let params = {};
-				params.goods_commonid =_this.goodId;
-				params.store_id = _this.store_id;
+				params.goods_commonid =this.goodId;
+				params.store_id = this.store_id;
 				this.request({
 					url:'/v2/goods/detail',
 					method:'POST',
 					data: params,
-					success: function(res) {
+					success: (res)=> {
 						let { data } = res.data;
-						_this.cartnumber = data.cart;
-						_this.has_collected = data.has_collected;
+						this.cartnumber = data.cart;
+						this.has_collected = data.has_collected;
 						let array = data;
-					    array.spec_list[0].value_list.forEach( (item,idx) => {
-							item.goods_storage = data.goods_list[idx].goods_storage;
-						})
-						_this.datalist = array;
+						if(array.spec_list.length == 0) {
+							this.datalist = data;
+							this.goods_id = data.goods_list[0].goods_id;
+							this.goods_storage = data.goods_storage;
+						}else {
+							array.spec_list[0].value_list.forEach( (item,idx) => {
+								item.goods_storage = data.goods_list[idx].goods_storage;
+							})
+							this.datalist = array;
+						}
+					    
 					}
 				})
 			},
@@ -346,8 +357,7 @@
 			// 加入购物车
 			addCar() {
 				if(this.hasLogin) {
-					 
-						if(this.specSelected.length == 0) {
+						if(this.specSelected.length == 0 && this.datalist.spec_list.length != 0) {
 							this.specClass = 'show';
 							this.$msg("请选择规格数量");
 							return;
@@ -384,6 +394,7 @@
 			},
  			//选择规格
  			selectSpec(index, pid,value_name,goods_storage){
+				this.specSelected = []; 
 				if(goods_storage == 0) {
 					return;
 				}
@@ -395,38 +406,58 @@
 						this.$set(item, 'selected', false);
 					}
  				})
-				let obj = {};
-				obj.firstId = index;
-				obj.pid = pid;
-				this.arrayId.push(obj);
-				let arr = this.arrayId;
-						   for(var i=0; i<arr.length; i++){
-						             for(var j=i+1; j<arr.length; j++){
-						                 if(arr[i].firstId==arr[j].firstId){         
-						                     arr.splice(j,1);
-						                     j--;
-						                 }
-						             }
-						         }
-				let newarray = []
-				arr.forEach(item => {
-					newarray.push(item.pid);
-				})
-				this.arrayId = arr;
-				if(this.arrayId.length == 0) {
-					this.scopemapId = newarray.toString(); ;
-				}else {
-					this.scopemapId = newarray.join("_");
+				let array = [];	
+			    for(let i = 0; i < this.datalist.spec_list.length; i++) {
+					for(let j = 0; j<this.datalist.spec_list[i].value_list.length;j++) {
+						if(this.datalist.spec_list[i].value_list[j].selected) {
+							array.push(this.datalist.spec_list[i].value_list[j].value_id);
+						}
+					}
+				}
+				this.arrayId = array;
+				if(this.arrayId.length == this.datalist.spec_list.length) {
+					console.log("进来了")
+					this.scopemapId = array.join("_");
+					let goodId = this.datalist.spec_map[this.scopemapId]; //
+					let items = this.datalist.goods_list[goodId]
+					items.value_name = value_name;
+					this.nuberImg = items.spec_img;
+					this.specSelected.push(items)
+					this.goods_storage = items.goods_storage;
+					this.goods_id = items.goods_id;
 				}
-				this.datalist.spec_list[index].value_list = list;
-				let goodId = this.datalist.spec_map[this.scopemapId]; //  
-				let items = this.datalist.goods_list[goodId]
-				items.value_name = value_name;
-				this.nuberImg = items.spec_img;
- 				this.specSelected = []; 
- 				this.specSelected.push(items)
- 				this.goods_storage = items.goods_storage;
-				this.goods_id = items.goods_id;
+				
+				// if(this.arrayId.length == this.datalist.spec_list.length) {
+					
+				// }
+			
+				// let obj = {};
+				// obj.firstId = index;
+				// obj.pid = pid;
+				// this.arrayId.push(obj);
+				// console.log(this.arrayId)
+				// let arr = this.arrayId;
+				// 		   for(var i=0; i<arr.length; i++){
+				// 		             for(var j=i+1; j<arr.length; j++){
+				// 		                 if(arr[i].firstId==arr[j].firstId){
+				// 								 arr.splice(j,1);
+				// 								 j--;
+				// 		                 }
+				// 		             }
+				// 		         }
+				// let newarray = []
+				// arr.forEach(item => {
+				// 	newarray.push(item.pid);
+				// })
+				// this.arrayId = arr;
+				// if(this.arrayId.length == 0) {
+				// 	this.scopemapId = newarray.toString(); ;
+				// }else {
+				// 	this.scopemapId = newarray.join("_");
+				// }
+				// console.log(this.scopemapId);
+				//this.datalist.spec_list[index].value_list = list;
+				
  				
  			}, 					 					
  			// 滚动到顶部

pages/index/sureBuy.vue

@@ -76,38 +76,47 @@
 			    placeholder="请输入备注"
 			  />
 		    </view>
-		 <van-cell v-if="radio === 1" @click="goAdress" class="LinkAdress" title="选择地址"  is-link/>
+		 <van-cell v-if="radio === 1&&choseadress == '' " @click="goAdress" class="LinkAdress" title="选择地址"  is-link/>
+		  <view v-if="radio === 1&&choseadress != ''" class="wrapper">
+		  	<view class="u-box" @click="goAdress" >
+		  		<text class="name" style="padding-right: 20upx;">{{choseadress.address_realname}}</text>
+		  		<text class="mobile">{{choseadress.address_mob_phone}}</text>
+		  	</view>
+		  	<view class="u-box">
+		  		<text class="address">{{choseadress.area_info}} {{choseadress.address_detail}}</text>
+		  	</view>
+		  </view>
 		  
 		 <view @tap="goDetail()" class="cart-list">
 		  <view class="topTip">
-			   <view>
-				  <image src="" style="width: 50upx;height: 50upx; vertical-align: middle;background-color: #007AFF;"></image>
-				  <span style="padding-left: 16upx;">华南酒店</span>
+			   <view style="display: flex;align-items: center;border-bottom: 1px solid #F5F5F5;">
+				<image :src="pictureUrl+'/uploads/home/store/'+store.store_id+'/'+store.store_logo" style="border-radius: 50%;
+				width: 50upx;height: 50upx;"></image>
+				<span style="padding-left: 8upx;">{{store.store_name}}</span>
 			   </view>
 		  </view>
 		  
-		  <view class="shoplist" style="background-color: #fff;">
+		  <view v-for="(item,index) in pricelist" :key="index" class="shoplist" style="background-color: #fff;">
 			  <view>
 				  <van-card
 					title-class="changewidth"
 					price-class ="priceClass"
-					price="10.00"
-					desc="描述信息"
-					title="商品标题"
-					thumb="https://gd3.alicdn.com/imgextra/i3/0/O1CN01IiyFQI1UGShoFKt1O_!!0-item_pic.jpg_400x400.jpg"
+					:price="item.goods_price"
+					:desc="item.desarray[1]+'X'+item.goods_num"
+					:title="item.desarray[0]"
+					:thumb="pictureUrl + '/uploads/home/store/goods/' + item.goods_image.substr(0, item.goods_image.indexOf('\_')) + '/' + item.goods_image"
 				  >
 				  </van-card>
 			  </view>
 		  </view>
-			   <view class="topTip">
-				  <view style="font-size: 28upx;">合计：50</view>
+			   <view class="topTip"  v-if="radio === 1">
+				  <view style="font-size: 28upx;">运费：{{ralodprice}}</view>
 			   </view>
 		 </view>
-		 
 		 <!-- 底部付款 -->
 		 <view class="adressbutton">
 		 		<view class="buttonStatus">
-		 			<view @click="estimate" class="deleteOrder">应付<span>￥0.25</span></view>
+		 			<view @click="estimate" class="deleteOrder">应付<span>￥{{prices}}</span></view>
 		 			<view class="payOrder" @click="goPay">付款</view>
 		 		</view>
 		 </view>
@@ -120,16 +129,47 @@
 	export default {
 		data() {
 			return {
+				ralodprice: 0,
+				prices:'',
+				pictureUrl: this.pictureUrl,
 				list:[
 					{title:'请送到我的房间'},
 					{title:'快递到我的地址'},
 					{title:'处理我的客房预定'}
 				],
 				username:'',
-				radio: 0
+				radio: 0,
+				store: {},
+				pricelist: [],
+				choseadress: '',
+				order_id:''
 			}
 		},
+		onLoad(options) {
+			console.log(options);
+			this.order_id = options.order_id;
+			this.store = JSON.parse(options.store);
+			this.pricelist = JSON.parse(options.pricelist);
+			let prices =  Number((options.prices/100).toFixed(2));
+			this.prices = prices; 
+			 uni.$on("getadress",(adress)=>{
+			        this.choseadress = adress;
+					console.log(this.choseadress)
+					this.address_id = this.choseadress.address_id;
+					this.getralodprice();
+			 })
+		},
 		methods: {
+			// 核算运费
+			getralodprice() {
+				this.request({
+					url: '/v2/entry/orderFreight',
+					method: 'POST',
+					data: {
+						
+					}
+				})
+			},
 			onChange(index) {
 				this.radio = index;
 			},
@@ -149,6 +189,14 @@
 		border-top: 15upx solid #F5F5F5;
 		border-bottom: 15upx solid #F5F5F5;
 	}
+	.wrapper{
+		border-top: 15rpx solid #F5F5F5;
+		border-bottom: 15rpx solid #F5F5F5;
+        padding: 0 32upx;
+	}
+	.u-box {
+		padding: 15upx 0;
+	}
 	.topTip {
 		display: flex;
 		align-items: center;

pages/myOrder/adress.vue

@@ -1,14 +1,14 @@
 <template>
 	<view class="content b-t">
-		<view class="list b-b" v-for="(item, index) in addressList" :key="index" @click="checkAddress(item)">
-			<view class="wrapper">
-				<view class="address-box">
-					<text v-if="item.default" class="tag">↑</text>
-					<text class="address">{{item.addressName}} {{item.area}}</text>
-				</view>
+		<view class="list b-b" v-for="(item, index) in addressList" :key="index">
+			<view  @click="checkAddress(item)" class="wrapper">
 				<view class="u-box">
-					<text class="name">{{item.name}}</text>
-					<text class="mobile">{{item.mobile}}</text>
+					<text v-if="item.address_is_default" class="tag">↑</text>
+					<text class="name">{{item.address_realname}}</text>
+					<text class="mobile">{{item.address_mob_phone}}</text>
+				</view>
+				<view class="address-box">
+					<text class="address">{{item.area_info}} {{item.address_detail}}</text>
 				</view>
 			</view>
 			<van-icon size="30" name="edit" @click="addAddress('edit', item)" color="#D9332E" />
@@ -44,17 +44,39 @@
 			}
 		},
 		onLoad(option){
+			console.log("kkkkk")
 			console.log(option.source);
 			this.source = option.source;
+			this.getlist();
+			uni.$on("refeshadress",(adress)=>{
+			      this.getlist();
+			  })
 		},
 		methods: {
+			// 获取地址列表
+			getlist() {
+				this.request({
+					url: '/v2/address/index',
+					method: 'get',
+					success: (res) => {
+						this.addressList = res.data.data.address_list;
+					}
+				})
+			},
 			//选择地址
 			checkAddress(item){
-				if(this.source == 1){
-					//this.$api.prePage()获取上一页实例，在App.vue定义
-					this.$api.prePage().addressData = item;
-					uni.navigateBack()
-				}
+				console.log(item);
+				 uni.$emit('getadress', item)
+				 uni.navigateBack();
+				// if(this.source == 1){
+				// 	//this.$api.prePage()获取上一页实例，在App.vue定义
+					
+					
+				// }
+				// let items = JSON.stringify(item);
+				// uni.redirectTo({
+				//     url: `/pages/index/sureBuy?item=${items}`
+				// });
 			},
 			addAddress(type, item){
 				console.log(type)

pages/myOrder/adressManger.vue

@@ -15,8 +15,23 @@
 			<input class="input" type="number" v-model="addressData.mobile" placeholder="电话" placeholder-class="placeholder" />
 		</view>
 		<button class="add-btn" @click="confirm">保存</button>
-		<van-area v-if="show" class="overadress" @confirm="choseCity" @cancel="cancelCity" :area-list="areaList" />
-		<view  v-if="show" class="over"></view>
+	     <view  v-if="show" class="over"></view>
+		<view   v-if="show" class="overadress"  style="position: fixed;bottom:0;width: 100%;height: 50%;background-color: #fff;">
+			<view style="display: flex;flex-direction: row;justify-content: space-between;padding:40upx 32upx;">
+				<view>请选择</view>
+				<view>{{adress}}</view>
+				<view>确定</view>
+			</view>
+			<scroll-view style="height: 100%;"  :scroll-top="scrollTop" scroll-y="true"  @scroll="scroll"  @scrolltoupper="upper" @scrolltolower="lower"
+			  refresher-enabled="true">
+				<view style="padding: 30upx 34upx;border-bottom: 1px solid #eee;" v-for="(item,index) in areaList" 
+				 @click="chosecity(item)"
+				 :key="index">
+					{{item.area_name}}
+				</view>
+			</scroll-view>
+		</view>
+	<!-- 	<van-area v-if="show" class="overadress" @confirm="choseCity" @cancel="cancelCity" :area-list="areaList" /> -->
 		</view>
 </template>
 
@@ -28,57 +43,92 @@
 		},
 		data() {
 			return {
+				address_id:'',
+				scrollTop: 0,
+				old: {
+					scrollTop: 0
+				},
+				area_id:　'',
 				addressData: {
-					name: '',
+					addressName: '',
 					mobile: '',
-					address: '',
+					name: '',
 					area: '',
 					default: false
 				},
+				adress:'',
 				show: false,
-				areaList:{
-				  province_list: {
-				    110000: '北京市',
-				    120000: '天津市'
-				  },
-				  city_list: {
-				    110100: '北京市',
-				    110200: '县',
-				    120100: '天津市',
-				    120200: '县'
-				  },
-				  county_list: {
-				    110101: '东城区',
-				    110102: '西城区',
-				    110105: '朝阳区',
-				    110106: '丰台区',
-				    120101: '和平区',
-				    120102: '河东区',
-				    120103: '河西区',
-				    120104: '南开区',
-				    120105: '河北区'
-				  }
-				}
+				province_list:{},
+				areaList:[]
 			}
 		},
 		onLoad(option){
+			console.log(option)
 			let title = '新增收货地址';
 			if(option.type==='edit'){
 				title = '编辑收货地址'
-				
-				this.addressData = JSON.parse(option.data)
+				let data = JSON.parse(option.data);
+				console.log(data.area_info);
+				this.addressData.addressName = data.area_info;
+				console.log(this.addressData.addressName);
+				this.addressData.mobile = data.address_mob_phone;
+				this.addressData.name = data.address_realname;
+				this.addressData.area = data.address_detail;
+				this.address_id = data.address_id;
+				this.area_id = data.area_id;
 			}
+			console.log(JSON.parse(option.data))
 			this.manageType = option.type;
 			uni.setNavigationBarTitle({
 				title
-			})
+			});
+			this.getadress();
 		},
 		methods: {
+			chosecity(item){
+				this.adress += item.area_name;
+				this.area_id = item.area_id;
+				this.getadress();
+			},
+			upper(e) {
+				console.log(e)
+				console.log("顶部")
+			},
+			
+			// 滚到底部
+			lower(e) {
+				console.log("底部")
+			},
+			
+			// 滚动时触发
+			scroll(e) {
+				this.old.scrollTop = e.detail.scrollTop
+			},
+			getadress() {
+				this.request({
+					url:'/v2/entry/areaList',
+					method: 'get',
+					data: {
+						area_parent_id: this.area_id
+					},
+					success: (res) => {
+						this.areaList = res.data.data.area_list;
+						if(this.areaList.length == 0 &&　this.area_id != '' && this.manageType != 'edit') {
+							this.addressData.addressName = this.adress;
+							this.show = false;
+						}
+					}
+				})
+			},
 			switchChange(e){
 				this.addressData.default = e.detail;
 			},
 			changeshow() {
+				this.adress = '';
+				this.area_id = '';
+				this.getadress();
 				this.show = !this.show;
+				
 			},
 			cancelCity() {
 				this.show = false;
@@ -89,31 +139,57 @@
 			},
 			
 			//提交
-			confirm(){
+			confirm(){ 
 				let data = this.addressData;
-				if(!data.name){
-					this.$api.msg('请填写收货人姓名');
+				console.log(data);
+				if(!data.addressName){
+					this.$msg('请选择省市区');
 					return;
 				}
-				if(!/(^1[3|4|5|7|8][0-9]{9}$)/.test(data.mobile)){
-					this.$api.msg('请输入正确的手机号码');
+				if(!data.area){
+					this.$msg('请输入详细地址');
 					return;
 				}
-				if(!data.address){
-					this.$api.msg('请在地图选择所在位置');
+				if(!data.name){
+					this.$msg('请输入姓名');
 					return;
 				}
-				if(!data.area){
-					this.$api.msg('请填写门牌号信息');
+				if(!/(^1[3|4|5|7|8][0-9]{9}$)/.test(data.mobile)){
+					this.$msg('请输入正确的手机号码');
 					return;
 				}
+				let url = '';
+				let params = {};
+				params.area_id = this.area_id;
+				params.address_detail= data.area; // 详细地址
+				params.address_mob_phone= data.mobile;
+				params.address_realname= data.name;
+				params.area_info= data.addressName;
+				params.is_free=0
+				if(this.manageType == 'edit') {
+					url = '/v1/member/address_edit';
+					params.address_id = this.address_id;
+				}else {
+					url = '/v2/address/add';
+				}
+				this.request({
+					url: url,
+					method: 'post',
+					data: params,
+					success: (res) => {
+						uni.$emit('refeshadress')
+						setTimeout(()=>{
+						 	uni.navigateBack();
+						 }, 800)
+					}
+				})
 				
 				//this.$api.prePage()获取上一页实例，可直接调用上页所有数据和方法，在App.vue定义
-				this.$api.prePage().refreshList(data, this.manageType);
-				this.$api.msg(`地址${this.manageType=='edit' ? '修改': '添加'}成功`);
-				setTimeout(()=>{
-					uni.navigateBack()
-				}, 800)
+				// this.$api.prePage().refreshList(data, this.manageType);
+				// this.$api.msg(`地址${this.manageType=='edit' ? '修改': '添加'}成功`);
+				// setTimeout(()=>{
+				// 	uni.navigateBack()
+				// }, 800)
 			},
 		}
 	}

unpackage/dist/dev/mp-weixin/app.json

@@ -62,6 +62,5 @@
     "van-dialog": "/wxcomponents/dist/dialog/index",
     "van-rate": "/wxcomponents/dist/rate/index",
     "van-cell": "/wxcomponents/dist/cell/index"
-  },
-  "sitemapLocation": "sitemap96.json"
+  }
 }

unpackage/dist/dev/mp-weixin/common/vendor.js

@@ -757,7 +757,7 @@ function initData(vueOptions, context) {
     try {
       data = data.call(context); // 支持 Vue.prototype 上挂的数据
     } catch (e) {
-      if (Object({"NODE_ENV":"development","VUE_APP_PLATFORM":"mp-weixin","BASE_URL":"/"}).VUE_APP_DEBUG) {
+      if (Object({"VUE_APP_PLATFORM":"mp-weixin","NODE_ENV":"development","BASE_URL":"/"}).VUE_APP_DEBUG) {
         console.warn('根据 Vue 的 data 函数初始化小程序 data 失败，请尽量确保 data 函数中不访问 vm 对象，否则可能影响首次数据渲染速度。', data);
       }
     }
@@ -8328,7 +8328,7 @@ function type(obj) {
 
 function flushCallbacks$1(vm) {
     if (vm.__next_tick_callbacks && vm.__next_tick_callbacks.length) {
-        if (Object({"NODE_ENV":"development","VUE_APP_PLATFORM":"mp-weixin","BASE_URL":"/"}).VUE_APP_DEBUG) {
+        if (Object({"VUE_APP_PLATFORM":"mp-weixin","NODE_ENV":"development","BASE_URL":"/"}).VUE_APP_DEBUG) {
             var mpInstance = vm.$scope;
             console.log('[' + (+new Date) + '][' + (mpInstance.is || mpInstance.route) + '][' + vm._uid +
                 ']:flushCallbacks[' + vm.__next_tick_callbacks.length + ']');
@@ -8349,14 +8349,14 @@ function nextTick$1(vm, cb) {
     //1.nextTick 之前 已 setData 且 setData 还未回调完成
     //2.nextTick 之前存在 render watcher
     if (!vm.__next_tick_pending && !hasRenderWatcher(vm)) {
-        if(Object({"NODE_ENV":"development","VUE_APP_PLATFORM":"mp-weixin","BASE_URL":"/"}).VUE_APP_DEBUG){
+        if(Object({"VUE_APP_PLATFORM":"mp-weixin","NODE_ENV":"development","BASE_URL":"/"}).VUE_APP_DEBUG){
             var mpInstance = vm.$scope;
             console.log('[' + (+new Date) + '][' + (mpInstance.is || mpInstance.route) + '][' + vm._uid +
                 ']:nextVueTick');
         }
         return nextTick(cb, vm)
     }else{
-        if(Object({"NODE_ENV":"development","VUE_APP_PLATFORM":"mp-weixin","BASE_URL":"/"}).VUE_APP_DEBUG){
+        if(Object({"VUE_APP_PLATFORM":"mp-weixin","NODE_ENV":"development","BASE_URL":"/"}).VUE_APP_DEBUG){
             var mpInstance$1 = vm.$scope;
             console.log('[' + (+new Date) + '][' + (mpInstance$1.is || mpInstance$1.route) + '][' + vm._uid +
                 ']:nextMPTick');
@@ -8432,7 +8432,7 @@ var patch = function(oldVnode, vnode) {
     });
     var diffData = this.$shouldDiffData === false ? data : diff(data, mpData);
     if (Object.keys(diffData).length) {
-      if (Object({"NODE_ENV":"development","VUE_APP_PLATFORM":"mp-weixin","BASE_URL":"/"}).VUE_APP_DEBUG) {
+      if (Object({"VUE_APP_PLATFORM":"mp-weixin","NODE_ENV":"development","BASE_URL":"/"}).VUE_APP_DEBUG) {
         console.log('[' + (+new Date) + '][' + (mpInstance.is || mpInstance.route) + '][' + this._uid +
           ']差量更新',
           JSON.stringify(diffData));
@@ -8838,7 +8838,7 @@ function AMapWX(a) {this.key = a.key, this.requestConfig = { key: a.key, s: "rsx
 
 /***/ }),
 
-/***/ 280:
+/***/ 287:
 /*!***************************************************************************!*\
   !*** D:/uinapp/myuinapp/component/mpvue-citypicker/city-data/province.js ***!
   \***************************************************************************/
@@ -8988,7 +8988,7 @@ provinceData;exports.default = _default;
 
 /***/ }),
 
-/***/ 281:
+/***/ 288:
 /*!***********************************************************************!*\
   !*** D:/uinapp/myuinapp/component/mpvue-citypicker/city-data/city.js ***!
   \***********************************************************************/
@@ -10502,7 +10502,7 @@ cityData;exports.default = _default;
 
 /***/ }),
 
-/***/ 282:
+/***/ 289:
 /*!***********************************************************************!*\
   !*** D:/uinapp/myuinapp/component/mpvue-citypicker/city-data/area.js ***!
   \***********************************************************************/

unpackage/dist/dev/mp-weixin/component/uinNumberCart.json

@@ -1,4 +1,4 @@
 {
-  "component": true,
-  "usingComponents": {}
+  "usingComponents": {},
+  "component": true
 }

unpackage/dist/dev/mp-weixin/component/uni-nav-bar/uni-nav-bar.js

@@ -114,7 +114,7 @@ __webpack_require__.r(__webpack_exports__);
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });exports.default = void 0;var uniStatusBar = function uniStatusBar() {__webpack_require__.e(/*! require.ensure | component/uni-status-bar/uni-status-bar */ "component/uni-status-bar/uni-status-bar").then((function () {return resolve(__webpack_require__(/*! ../uni-status-bar/uni-status-bar.vue */ 285));}).bind(null, __webpack_require__)).catch(__webpack_require__.oe);};var uniIcon = function uniIcon() {__webpack_require__.e(/*! require.ensure | component/uni-icon/uni-icon */ "component/uni-icon/uni-icon").then((function () {return resolve(__webpack_require__(/*! ../uni-icon/uni-icon.vue */ 216));}).bind(null, __webpack_require__)).catch(__webpack_require__.oe);};var _default =
+Object.defineProperty(exports, "__esModule", { value: true });exports.default = void 0;var uniStatusBar = function uniStatusBar() {__webpack_require__.e(/*! require.ensure | component/uni-status-bar/uni-status-bar */ "component/uni-status-bar/uni-status-bar").then((function () {return resolve(__webpack_require__(/*! ../uni-status-bar/uni-status-bar.vue */ 292));}).bind(null, __webpack_require__)).catch(__webpack_require__.oe);};var uniIcon = function uniIcon() {__webpack_require__.e(/*! require.ensure | component/uni-icon/uni-icon */ "component/uni-icon/uni-icon").then((function () {return resolve(__webpack_require__(/*! ../uni-icon/uni-icon.vue */ 216));}).bind(null, __webpack_require__)).catch(__webpack_require__.oe);};var _default =
 
 
 

unpackage/dist/dev/mp-weixin/pages/index/cart.js

@@ -218,6 +218,7 @@ __webpack_require__.r(__webpack_exports__);
 
 
 
+
 
 
 {
@@ -257,18 +258,20 @@ __webpack_require__.r(__webpack_exports__);
   methods: {
     onClickButton: function onClickButton(e) {
       var array = [];
+      if (this.pricelist.length == 0) {
+        this.$msg('请选择商品');
+        return;
+      }
       this.pricelist.forEach(function (item) {
         array.push(item.goods_id);
       });
       var ids = array.toString();
       if (this.isdelete) {
-        if (this.pricelist.length == 0) {
-          this.$msg('请选择商品');
-          return;
-        }
         // 结算
+
+        this.getorderId(); // 保存订单生成订单id
         uni.navigateTo({
-          url: './sureBuy' // 确认订单
+          // url: `/pages/index/sureBuy?store=${store}&pricelist=${pricelist}&prices=${prices}`
         });
       } else {
         if (ids == '') {
@@ -279,6 +282,33 @@ __webpack_require__.r(__webpack_exports__);
         this.deleteshop(ids);
       }
     },
+    getorderId: function getorderId() {
+      var goods = [];
+      var store = JSON.stringify(this.store);
+      var pricelist = JSON.stringify(this.pricelist);
+      var prices = this.prices;
+      this.pricelist.forEach(function (item, index) {
+        goods.push({});
+        goods[index].goods_id = item.goods_id;
+        goods[index].buy_num = item.goods_num;
+      });
+      this.request({
+        url: '/v1/order/save_og',
+        method: 'post',
+        data: {
+          store_id: this.store.store_id,
+          goods: JSON.stringify(goods) },
+
+        success: function success(res) {
+          console.log(res);
+          var order_id = res.data.data.order_id;
+          uni.navigateTo({
+            url: "/pages/index/sureBuy?store=".concat(store, "&pricelist=").concat(pricelist, "&prices=").concat(prices, "&order_id=").concat(order_id) });
+
+
+        } });
+
+    },
     deleteshop: function deleteshop(ids) {var _this = this;
       this.request({
         url: '/v2/order/cart_drop',
@@ -382,8 +412,9 @@ __webpack_require__.r(__webpack_exports__);
           _this4.$set(_this4.checkboxList, idx, idx.toString());
         });
         this.pricelist = this.list;
+        console.log(this.pricelist);
         this.lengthnumber = this.pricelist.length;
-        this.listip = this.isdelete ? "结算" + this.lengthnumber : '删除' + this.lengthnumber;
+        this.listip = this.isdelete ? "\u7ED3\u7B97(".concat(this.lengthnumber, ")") : '删除' + this.lengthnumber;
         this.checkoutprice();
       } else {
         for (var i = 0, lenI = items.length; i < lenI; ++i) {

unpackage/dist/dev/mp-weixin/pages/index/cart.wxss

@@ -11,6 +11,7 @@
 		padding: 10rpx 30rpx;
 		background: #fff;
 		border-bottom: 1px solid #eee;
+		height: 4vh;
 }
 .changewidth {
 		color: #303133;

unpackage/dist/dev/mp-weixin/pages/index/hotel.js

@@ -273,6 +273,7 @@ var _default = {
 
   data: function data() {
     return {
+      firstwo: 1,
       isDetail: 1,
       pictureUrl: this.pictureUrl,
       showdialog: false,
@@ -327,16 +328,16 @@ var _default = {
 
   // 初次渲染进来关闭分享菜单栏
   onReady: function onReady() {
-    uni.hideShareMenu({
-      success: function success(res) {
-        console.log(res);
-        console.log("kkkkkkkkkkkk");
-      },
-      fail: function fail(res) {
-        console.log(res);
-        console.log("dddddd");
-      } });
-
+    // uni.hideShareMenu({
+    //       success(res) {
+    //           console.log(res)
+    //           console.log("kkkkkkkkkkkk")
+    //       },
+    //       fail(res){
+    //           console.log(res)
+    //           console.log("dddddd")
+    //       } 
+    // });
   },
   onLoad: function onLoad(options) {
     this.goodId = options.id; // 商品和酒店Id
@@ -427,23 +428,23 @@ var _default = {
     },
 
     // 获取商品详情
-    getshopdetail: function getshopdetail() {
-      var _this = this;
+    getshopdetail: function getshopdetail() {var _this2 = this;
       this.request({
         url: "/v2/entry/storeGoods",
         method: 'get',
         data: {
-          store_id: _this.goodId,
-          page: _this.page,
-          goods_commonid: _this.goods_commonid, // 上新排序
-          goods_price: _this.goods_price,
-          gc_id_1: _this.gc_id_1 },
+          store_id: this.goodId,
+          page: this.page,
+          goods_commonid: this.goods_commonid, // 上新排序
+          goods_price: this.goods_price,
+          gc_id_1: this.gc_id_1 },
 
         success: function success(res) {
+
+          _this2.goods_list = _this2.goods_list.concat(res.data.data.goods_list);
           if (res.data.data.goods_list.length < 10) {
-            _this.isDetail = 2;
+            _this2.isDetail = 2;
           }
-          _this.goods_list = _this.goods_list.concat(res.data.data.goods_list);
         } });
 
     },
@@ -530,6 +531,8 @@ var _default = {
 
     // 滚到底部
     lower: function lower(e) {
+      console.log(this.activeindex);
+      console.log(this.isDetail);
       if (this.activeindex == 1) {
         if (this.isnexttwo == 1) {
           this.page = this.page + 1;

unpackage/dist/dev/mp-weixin/pages/index/sureBuy.js

@@ -111,6 +111,22 @@ var render = function() {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
+  var l0 = _vm.__map(_vm.pricelist, function(item, index) {
+    var g0 = item.goods_image.substr(0, item.goods_image.indexOf("_"))
+    return {
+      $orig: _vm.__get_orig(item),
+      g0: g0
+    }
+  })
+
+  _vm.$mp.data = Object.assign(
+    {},
+    {
+      $root: {
+        l0: l0
+      }
+    }
+  )
 }
 var recyclableRender = false
 var staticRenderFns = []
@@ -261,21 +277,61 @@ __webpack_require__.r(__webpack_exports__);
 //
 //
 //
+//
+//
+//
+//
+//
+//
+//
+//
+//
 var _default =
 
 {
   data: function data() {
     return {
+      ralodprice: 0,
+      prices: '',
+      pictureUrl: this.pictureUrl,
       list: [
       { title: '请送到我的房间' },
       { title: '快递到我的地址' },
       { title: '处理我的客房预定' }],
 
       username: '',
-      radio: 0 };
+      radio: 0,
+      store: {},
+      pricelist: [],
+      choseadress: '',
+      order_id: '' };
 
   },
+  onLoad: function onLoad(options) {var _this = this;
+    console.log(options);
+    this.order_id = options.order_id;
+    this.store = JSON.parse(options.store);
+    this.pricelist = JSON.parse(options.pricelist);
+    var prices = Number((options.prices / 100).toFixed(2));
+    this.prices = prices;
+    uni.$on("getadress", function (adress) {
+      _this.choseadress = adress;
+      console.log(_this.choseadress);
+      _this.address_id = _this.choseadress.address_id;
+      _this.getralodprice();
+    });
+  },
   methods: {
+    // 核算运费
+    getralodprice: function getralodprice() {
+      this.request({
+        url: '/v2/entry/orderFreight',
+        method: 'POST',
+        data: {} });
+
+
+
+    },
     onChange: function onChange(index) {
       this.radio = index;
     },

unpackage/dist/dev/mp-weixin/pages/index/sureBuy.wxss

@@ -34,6 +34,14 @@
   border-top: 15rpx solid #F5F5F5;
   border-bottom: 15rpx solid #F5F5F5;
 }
+.wrapper {
+  border-top: 15rpx solid #F5F5F5;
+  border-bottom: 15rpx solid #F5F5F5;
+  padding: 0 32rpx;
+}
+.u-box {
+  padding: 15rpx 0;
+}
 .topTip {
   display: -webkit-box;
   display: -webkit-flex;

unpackage/dist/dev/mp-weixin/pages/myCenter/Settled.js

@@ -129,7 +129,7 @@ __webpack_require__.r(__webpack_exports__);
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });exports.default = void 0;var uploadImage = function uploadImage() {__webpack_require__.e(/*! require.ensure | component/uploadImage */ "component/uploadImage").then((function () {return resolve(__webpack_require__(/*! @/component/uploadImage.vue */ 268));}).bind(null, __webpack_require__)).catch(__webpack_require__.oe);};var _default =
+Object.defineProperty(exports, "__esModule", { value: true });exports.default = void 0;var uploadImage = function uploadImage() {__webpack_require__.e(/*! require.ensure | component/uploadImage */ "component/uploadImage").then((function () {return resolve(__webpack_require__(/*! @/component/uploadImage.vue */ 275));}).bind(null, __webpack_require__)).catch(__webpack_require__.oe);};var _default =
 
 
 

unpackage/dist/dev/mp-weixin/pages/myCenter/applyfor.js

@@ -131,7 +131,7 @@ __webpack_require__.r(__webpack_exports__);
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
-/* WEBPACK VAR INJECTION */(function(uni) {Object.defineProperty(exports, "__esModule", { value: true });exports.default = void 0;var uploadImage = function uploadImage() {__webpack_require__.e(/*! require.ensure | component/uploadImage */ "component/uploadImage").then((function () {return resolve(__webpack_require__(/*! @/component/uploadImage.vue */ 268));}).bind(null, __webpack_require__)).catch(__webpack_require__.oe);};var _default =
+/* WEBPACK VAR INJECTION */(function(uni) {Object.defineProperty(exports, "__esModule", { value: true });exports.default = void 0;var uploadImage = function uploadImage() {__webpack_require__.e(/*! require.ensure | component/uploadImage */ "component/uploadImage").then((function () {return resolve(__webpack_require__(/*! @/component/uploadImage.vue */ 275));}).bind(null, __webpack_require__)).catch(__webpack_require__.oe);};var _default =
 
 
 

unpackage/dist/dev/mp-weixin/pages/myCenter/commentback.js

@@ -131,7 +131,7 @@ __webpack_require__.r(__webpack_exports__);
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });exports.default = void 0;var TextArea = function TextArea() {__webpack_require__.e(/*! require.ensure | component/textarea */ "component/textarea").then((function () {return resolve(__webpack_require__(/*! @/component/textarea.vue */ 261));}).bind(null, __webpack_require__)).catch(__webpack_require__.oe);};var uploadImage = function uploadImage() {__webpack_require__.e(/*! require.ensure | component/uploadImage */ "component/uploadImage").then((function () {return resolve(__webpack_require__(/*! @/component/uploadImage.vue */ 268));}).bind(null, __webpack_require__)).catch(__webpack_require__.oe);};var _default =
+Object.defineProperty(exports, "__esModule", { value: true });exports.default = void 0;var TextArea = function TextArea() {__webpack_require__.e(/*! require.ensure | component/textarea */ "component/textarea").then((function () {return resolve(__webpack_require__(/*! @/component/textarea.vue */ 268));}).bind(null, __webpack_require__)).catch(__webpack_require__.oe);};var uploadImage = function uploadImage() {__webpack_require__.e(/*! require.ensure | component/uploadImage */ "component/uploadImage").then((function () {return resolve(__webpack_require__(/*! @/component/uploadImage.vue */ 275));}).bind(null, __webpack_require__)).catch(__webpack_require__.oe);};var _default =
 
 
 

unpackage/dist/dev/mp-weixin/pages/myOrder/adress.js

@@ -176,18 +176,40 @@ var _default =
 
 
   },
-  onLoad: function onLoad(option) {
+  onLoad: function onLoad(option) {var _this = this;
+    console.log("kkkkk");
     console.log(option.source);
     this.source = option.source;
+    this.getlist();
+    uni.$on("refeshadress", function (adress) {
+      _this.getlist();
+    });
   },
   methods: {
+    // 获取地址列表
+    getlist: function getlist() {var _this2 = this;
+      this.request({
+        url: '/v2/address/index',
+        method: 'get',
+        success: function success(res) {
+          _this2.addressList = res.data.data.address_list;
+        } });
+
+    },
     //选择地址
     checkAddress: function checkAddress(item) {
-      if (this.source == 1) {
-        //this.$api.prePage()获取上一页实例，在App.vue定义
-        this.$api.prePage().addressData = item;
-        uni.navigateBack();
-      }
+      console.log(item);
+      uni.$emit('getadress', item);
+      uni.navigateBack();
+      // if(this.source == 1){
+      // 	//this.$api.prePage()获取上一页实例，在App.vue定义
+
+
+      // }
+      // let items = JSON.stringify(item);
+      // uni.redirectTo({
+      //     url: `/pages/index/sureBuy?item=${items}`
+      // });
     },
     addAddress: function addAddress(type, item) {
       console.log(type);

unpackage/dist/dev/mp-weixin/pages/myOrder/adress.wxml

@@ -1 +1 @@
-<view class="content b-t"><block wx:for="{{addressList}}" wx:for-item="item" wx:for-index="index" wx:key="index"><view data-event-opts="{{[['tap',[['checkAddress',['$0'],[[['addressList','',index]]]]]]]}}" class="list b-b" bindtap="__e"><view class="wrapper"><view class="address-box"><block wx:if="{{item.default}}"><text class="tag">↑</text></block><text class="address">{{item.addressName+" "+item.area}}</text></view><view class="u-box"><text class="name">{{item.name}}</text><text class="mobile">{{item.mobile}}</text></view></view><van-icon vue-id="{{'67e69dac-1-'+index}}" size="30" name="edit" color="#D9332E" data-event-opts="{{[['^click',[['addAddress',['edit','$0'],[[['addressList','',index]]]]]]]}}" data-com-type="wx" bind:click="__e" bind:__l="__l"></van-icon></view></block><button data-event-opts="{{[['tap',[['addAddress',['add',['o']]]]]]}}" class="add-btn" bindtap="__e">新增地址</button></view>
+<view class="content b-t"><block wx:for="{{addressList}}" wx:for-item="item" wx:for-index="index" wx:key="index"><view class="list b-b"><view data-event-opts="{{[['tap',[['checkAddress',['$0'],[[['addressList','',index]]]]]]]}}" class="wrapper" bindtap="__e"><view class="u-box"><block wx:if="{{item.address_is_default}}"><text class="tag">↑</text></block><text class="name">{{item.address_realname}}</text><text class="mobile">{{item.address_mob_phone}}</text></view><view class="address-box"><text class="address">{{item.area_info+" "+item.address_detail}}</text></view></view><van-icon vue-id="{{'67e69dac-1-'+index}}" size="30" name="edit" color="#D9332E" data-event-opts="{{[['^click',[['addAddress',['edit','$0'],[[['addressList','',index]]]]]]]}}" data-com-type="wx" bind:click="__e" bind:__l="__l"></van-icon></view></block><button data-event-opts="{{[['tap',[['addAddress',['add',['o']]]]]]}}" class="add-btn" bindtap="__e">新增地址</button></view>

unpackage/dist/dev/mp-weixin/pages/myOrder/adressManger.js

@@ -131,7 +131,22 @@ __webpack_require__.r(__webpack_exports__);
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
-/* WEBPACK VAR INJECTION */(function(uni) {Object.defineProperty(exports, "__esModule", { value: true });exports.default = void 0;var mpvueCityPicker = function mpvueCityPicker() {Promise.all(/*! require.ensure | component/mpvue-citypicker/mpvueCityPicker */[__webpack_require__.e("common/vendor"), __webpack_require__.e("component/mpvue-citypicker/mpvueCityPicker")]).then((function () {return resolve(__webpack_require__(/*! @/component/mpvue-citypicker/mpvueCityPicker.vue */ 275));}).bind(null, __webpack_require__)).catch(__webpack_require__.oe);};var _default =
+/* WEBPACK VAR INJECTION */(function(uni) {Object.defineProperty(exports, "__esModule", { value: true });exports.default = void 0;var mpvueCityPicker = function mpvueCityPicker() {Promise.all(/*! require.ensure | component/mpvue-citypicker/mpvueCityPicker */[__webpack_require__.e("common/vendor"), __webpack_require__.e("component/mpvue-citypicker/mpvueCityPicker")]).then((function () {return resolve(__webpack_require__(/*! @/component/mpvue-citypicker/mpvueCityPicker.vue */ 282));}).bind(null, __webpack_require__)).catch(__webpack_require__.oe);};var _default =
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 
 
@@ -161,57 +176,92 @@ __webpack_require__.r(__webpack_exports__);
 
   data: function data() {
     return {
+      address_id: '',
+      scrollTop: 0,
+      old: {
+        scrollTop: 0 },
+
+      area_id: '',
       addressData: {
-        name: '',
+        addressName: '',
         mobile: '',
-        address: '',
+        name: '',
         area: '',
         default: false },
 
+      adress: '',
       show: false,
-      areaList: {
-        province_list: {
-          110000: '北京市',
-          120000: '天津市' },
-
-        city_list: {
-          110100: '北京市',
-          110200: '县',
-          120100: '天津市',
-          120200: '县' },
-
-        county_list: {
-          110101: '东城区',
-          110102: '西城区',
-          110105: '朝阳区',
-          110106: '丰台区',
-          120101: '和平区',
-          120102: '河东区',
-          120103: '河西区',
-          120104: '南开区',
-          120105: '河北区' } } };
-
-
+      province_list: {},
+      areaList: [] };
 
   },
   onLoad: function onLoad(option) {
+    console.log(option);
     var title = '新增收货地址';
     if (option.type === 'edit') {
       title = '编辑收货地址';
-
-      this.addressData = JSON.parse(option.data);
+      var data = JSON.parse(option.data);
+      console.log(data.area_info);
+      this.addressData.addressName = data.area_info;
+      console.log(this.addressData.addressName);
+      this.addressData.mobile = data.address_mob_phone;
+      this.addressData.name = data.address_realname;
+      this.addressData.area = data.address_detail;
+      this.address_id = data.address_id;
+      this.area_id = data.area_id;
     }
+    console.log(JSON.parse(option.data));
     this.manageType = option.type;
     uni.setNavigationBarTitle({
       title: title });
 
+    this.getadress();
   },
   methods: {
+    chosecity: function chosecity(item) {
+      this.adress += item.area_name;
+      this.area_id = item.area_id;
+      this.getadress();
+    },
+    upper: function upper(e) {
+      console.log(e);
+      console.log("顶部");
+    },
+
+    // 滚到底部
+    lower: function lower(e) {
+      console.log("底部");
+    },
+
+    // 滚动时触发
+    scroll: function scroll(e) {
+      this.old.scrollTop = e.detail.scrollTop;
+    },
+    getadress: function getadress() {var _this = this;
+      this.request({
+        url: '/v2/entry/areaList',
+        method: 'get',
+        data: {
+          area_parent_id: this.area_id },
+
+        success: function success(res) {
+          _this.areaList = res.data.data.area_list;
+          if (_this.areaList.length == 0 && _this.area_id != '' && _this.manageType != 'edit') {
+            _this.addressData.addressName = _this.adress;
+            _this.show = false;
+          }
+        } });
+
+    },
     switchChange: function switchChange(e) {
       this.addressData.default = e.detail;
     },
     changeshow: function changeshow() {
+      this.adress = '';
+      this.area_id = '';
+      this.getadress();
       this.show = !this.show;
+
     },
     cancelCity: function cancelCity() {
       this.show = false;
@@ -224,29 +274,55 @@ __webpack_require__.r(__webpack_exports__);
     //提交
     confirm: function confirm() {
       var data = this.addressData;
-      if (!data.name) {
-        this.$api.msg('请填写收货人姓名');
+      console.log(data);
+      if (!data.addressName) {
+        this.$msg('请选择省市区');
         return;
       }
-      if (!/(^1[3|4|5|7|8][0-9]{9}$)/.test(data.mobile)) {
-        this.$api.msg('请输入正确的手机号码');
+      if (!data.area) {
+        this.$msg('请输入详细地址');
         return;
       }
-      if (!data.address) {
-        this.$api.msg('请在地图选择所在位置');
+      if (!data.name) {
+        this.$msg('请输入姓名');
         return;
       }
-      if (!data.area) {
-        this.$api.msg('请填写门牌号信息');
+      if (!/(^1[3|4|5|7|8][0-9]{9}$)/.test(data.mobile)) {
+        this.$msg('请输入正确的手机号码');
         return;
       }
+      var url = '';
+      var params = {};
+      params.area_id = this.area_id;
+      params.address_detail = data.area; // 详细地址
+      params.address_mob_phone = data.mobile;
+      params.address_realname = data.name;
+      params.area_info = data.addressName;
+      params.is_free = 0;
+      if (this.manageType == 'edit') {
+        url = '/v1/member/address_edit';
+        params.address_id = this.address_id;
+      } else {
+        url = '/v2/address/add';
+      }
+      this.request({
+        url: url,
+        method: 'post',
+        data: params,
+        success: function success(res) {
+          uni.$emit('refeshadress');
+          setTimeout(function () {
+            uni.navigateBack();
+          }, 800);
+        } });
+
 
       //this.$api.prePage()获取上一页实例，可直接调用上页所有数据和方法，在App.vue定义
-      this.$api.prePage().refreshList(data, this.manageType);
-      this.$api.msg("\u5730\u5740".concat(this.manageType == 'edit' ? '修改' : '添加', "\u6210\u529F"));
-      setTimeout(function () {
-        uni.navigateBack();
-      }, 800);
+      // this.$api.prePage().refreshList(data, this.manageType);
+      // this.$api.msg(`地址${this.manageType=='edit' ? '修改': '添加'}成功`);
+      // setTimeout(()=>{
+      // 	uni.navigateBack()
+      // }, 800)
     } } };exports.default = _default;
 /* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 1)["default"]))
 

unpackage/dist/dev/mp-weixin/pages/myOrder/estimate.js

@@ -131,7 +131,7 @@ __webpack_require__.r(__webpack_exports__);
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });exports.default = void 0;var TextArea = function TextArea() {__webpack_require__.e(/*! require.ensure | component/textarea */ "component/textarea").then((function () {return resolve(__webpack_require__(/*! @/component/textarea.vue */ 261));}).bind(null, __webpack_require__)).catch(__webpack_require__.oe);};var uploadImage = function uploadImage() {__webpack_require__.e(/*! require.ensure | component/uploadImage */ "component/uploadImage").then((function () {return resolve(__webpack_require__(/*! @/component/uploadImage.vue */ 268));}).bind(null, __webpack_require__)).catch(__webpack_require__.oe);};var _default =
+Object.defineProperty(exports, "__esModule", { value: true });exports.default = void 0;var TextArea = function TextArea() {__webpack_require__.e(/*! require.ensure | component/textarea */ "component/textarea").then((function () {return resolve(__webpack_require__(/*! @/component/textarea.vue */ 268));}).bind(null, __webpack_require__)).catch(__webpack_require__.oe);};var uploadImage = function uploadImage() {__webpack_require__.e(/*! require.ensure | component/uploadImage */ "component/uploadImage").then((function () {return resolve(__webpack_require__(/*! @/component/uploadImage.vue */ 275));}).bind(null, __webpack_require__)).catch(__webpack_require__.oe);};var _default =
 
 
 

unpackage/dist/dev/mp-weixin/pages/myOrder/order.js

@@ -131,7 +131,7 @@ __webpack_require__.r(__webpack_exports__);
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
-/* WEBPACK VAR INJECTION */(function(uni) {Object.defineProperty(exports, "__esModule", { value: true });exports.default = void 0;var Dialog = function Dialog() {__webpack_require__.e(/*! require.ensure | component/Dialog */ "component/Dialog").then((function () {return resolve(__webpack_require__(/*! @/component/Dialog.vue */ 254));}).bind(null, __webpack_require__)).catch(__webpack_require__.oe);};var _default =
+/* WEBPACK VAR INJECTION */(function(uni) {Object.defineProperty(exports, "__esModule", { value: true });exports.default = void 0;var Dialog = function Dialog() {__webpack_require__.e(/*! require.ensure | component/Dialog */ "component/Dialog").then((function () {return resolve(__webpack_require__(/*! @/component/Dialog.vue */ 261));}).bind(null, __webpack_require__)).catch(__webpack_require__.oe);};var _default =
 
 
 

unpackage/dist/dev/mp-weixin/pages/myOrder/reminder.js

@@ -131,7 +131,7 @@ __webpack_require__.r(__webpack_exports__);
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });exports.default = void 0;var TextArea = function TextArea() {__webpack_require__.e(/*! require.ensure | component/textarea */ "component/textarea").then((function () {return resolve(__webpack_require__(/*! @/component/textarea.vue */ 261));}).bind(null, __webpack_require__)).catch(__webpack_require__.oe);};var _default =
+Object.defineProperty(exports, "__esModule", { value: true });exports.default = void 0;var TextArea = function TextArea() {__webpack_require__.e(/*! require.ensure | component/textarea */ "component/textarea").then((function () {return resolve(__webpack_require__(/*! @/component/textarea.vue */ 268));}).bind(null, __webpack_require__)).catch(__webpack_require__.oe);};var _default =
 
 
 

unpackage/dist/dev/mp-weixin/sitemap45.json

@@ -0,0 +1,7 @@
+{
+  "desc": "关于本文件的更多信息，请参考文档 https://developers.weixin.qq.com/miniprogram/dev/framework/sitemap.html",
+  "rules": [{
+  "action": "allow",
+  "page": "*"
+  }]
+}