From 78af8c28dc05b8c3017cd997926e36dbacf592d8 Mon Sep 17 00:00:00 2001
From: huliyong <2783385703@qq.com>
Date: Mon, 16 Sep 2024 22:32:39 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E4=BC=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/base/tabbar.vue                       |   4 +-
 components/list/videoList.vue                    | 101 +++++++
 pages/index/index.vue                            |  88 +-----
 pages_order/components/address/addressList.vue   | 137 ++++++---
 pages_order/components/address/redactAddress.vue | 198 ++++++------
 pages_order/mine/address.vue                     | 368 ++---------------------
 static/image/tabbar/tourGuide-a.png              | Bin 0 -> 1917 bytes
 static/image/tabbar/tourGuide.png                | Bin 0 -> 1889 bytes
 8 files changed, 335 insertions(+), 561 deletions(-)
 create mode 100644 components/list/videoList.vue
 create mode 100644 static/image/tabbar/tourGuide-a.png
 create mode 100644 static/image/tabbar/tourGuide.png

diff --git a/components/base/tabbar.vue b/components/base/tabbar.vue
index abbfa18..6e32780 100644
--- a/components/base/tabbar.vue
+++ b/components/base/tabbar.vue
@@ -34,8 +34,8 @@
 						"title": "首页"
 					},
 					{
-						"selectedIconPath": "/static/image/tabbar/home-a.png",
-						"iconPath": "/static/image/tabbar/home.png",
+						"selectedIconPath": "/static/image/tabbar/tourGuide-a.png",
+						"iconPath": "/static/image/tabbar/tourGuide.png",
 						"pagePath": "/pages/index/tourGuide",
 						"title": "导览"
 					},
diff --git a/components/list/videoList.vue b/components/list/videoList.vue
new file mode 100644
index 0000000..15d4ef5
--- /dev/null
+++ b/components/list/videoList.vue
@@ -0,0 +1,101 @@
+<template>
+	<view class="videoList">
+		<view class="video-item" v-for="(item, index) in 10" :key="index">
+			<view class="image">
+				<image src="https://img-s-msn-com.akamaized.net/tenant/amp/entityid/BB1msKSi.img" mode="aspectFill">
+				</image>
+				<view class="icon">
+					<uv-icon size="35rpx" name="play-right-fill">
+					</uv-icon>
+				</view>
+			</view>
+			<view class="bottom">
+				<view class="headImage">
+					<image src="https://img-s-msn-com.akamaized.net/tenant/amp/entityid/BB1msKSi.img" mode="aspectFill">
+					</image>
+					爱旅行的小张
+				</view>
+				<view class="like">
+					<uv-icon size="45rpx" v-if="false" name="heart"></uv-icon>
+					<uv-icon size="45rpx" color="#FF4340" v-else name="heart-fill"></uv-icon>
+					300
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+
+			}
+		},
+		methods: {
+
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+	.videoList {
+		display: flex;
+		flex-wrap: wrap;
+
+		.video-item {
+			margin: 20rpx;
+			width: 335rpx;
+
+			.image {
+				position: relative;
+				width: 100%;
+				height: 420rpx;
+				border-radius: 30rpx;
+				overflow: hidden;
+
+				image {
+					width: 100%;
+					height: 100%;
+				}
+
+				.icon {
+					position: absolute;
+					right: 30rpx;
+					top: 30rpx;
+					width: 60rpx;
+					height: 60rpx;
+					background-color: #ffffffaa;
+					border-radius: 50%;
+					display: flex;
+					justify-content: center;
+					align-items: center;
+				}
+			}
+
+			.bottom {
+				padding: 10rpx 0;
+				font-size: 22rpx;
+				display: flex;
+				justify-content: space-between;
+
+				.headImage {
+					display: flex;
+					align-items: center;
+
+					image {
+						width: 50rpx;
+						height: 50rpx;
+						border-radius: 50%;
+						margin-right: 6rpx;
+					}
+				}
+
+				.like {
+					display: flex;
+					align-items: center;
+				}
+			}
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/pages/index/index.vue b/pages/index/index.vue
index ffdd870..36f1f9c 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -40,39 +40,7 @@
 			<view class="video-title">
 				视频中的景徳镇
 			</view>
-			<view class="videoList">
-				<view class="video-item"
-				v-for="(item, index) in 10"
-				:key="index">
-					<view class="image">
-						<image src="https://img-s-msn-com.akamaized.net/tenant/amp/entityid/BB1msKSi.img" mode="aspectFill"></image>
-						<view class="icon">
-							<uv-icon
-							size="35rpx"
-							name="play-right-fill">
-							</uv-icon>
-						</view>
-					</view>
-					<view class="bottom">
-						<view class="headImage">
-							<image src="https://img-s-msn-com.akamaized.net/tenant/amp/entityid/BB1msKSi.img" mode="aspectFill"></image>
-							爱旅行的小张
-						</view>
-						<view class="like">
-							<uv-icon 
-							size="45rpx" 
-							v-if="false"
-							name="heart"></uv-icon>
-							<uv-icon
-							size="45rpx" 
-							color="#FF4340"
-							v-else
-							name="heart-fill"></uv-icon>
-							300
-						</view>
-					</view>
-				</view>
-			</view>
+			<videoList/>
 			
 		</view>
 		
@@ -85,9 +53,11 @@
 
 <script>
 	import PrivacyAgreementPoup from '@/components/config/PrivacyAgreementPoup.vue'
+	import videoList from '@/components/list/videoList.vue'
 	export default {
 		components : {
 			PrivacyAgreementPoup,
+			videoList,
 		},
 		data() {
 			return {
@@ -230,57 +200,7 @@
 				width: fit-content;
 				border-radius: 20rpx;
 			}
-			.videoList{
-				display: flex;
-				flex-wrap: wrap;
-				.video-item{
-					margin: 20rpx;
-					width: 335rpx;
-					.image{
-						position: relative;
-						width: 100%;
-						height: 460rpx;
-						border-radius: 30rpx;
-						overflow: hidden;
-						image{
-							width: 100%;
-							height: 100%;
-						}
-						.icon{
-							position: absolute;
-							right: 30rpx;
-							top: 30rpx;
-							width: 60rpx;
-							height: 60rpx;
-							background-color: #ffffffaa;
-							border-radius: 50%;
-							display: flex;
-							justify-content: center;
-							align-items: center;
-						}
-					}
-					.bottom{
-						padding: 10rpx 0;
-						font-size: 22rpx;
-						display: flex;
-						justify-content: space-between;
-						.headImage{
-							display: flex;
-							align-items: center;
-							image{
-								width: 50rpx;
-								height: 50rpx;
-								border-radius: 50%;
-								margin-right: 6rpx;
-							}
-						}
-						.like{
-							display: flex;
-							align-items: center;
-						}
-					}
-				}
-			}
+			
 		}
 	}
 </style>
diff --git a/pages_order/components/address/addressList.vue b/pages_order/components/address/addressList.vue
index 489449f..827d1dc 100644
--- a/pages_order/components/address/addressList.vue
+++ b/pages_order/components/address/addressList.vue
@@ -1,52 +1,67 @@
 <template>
-	<uv-radio-group v-model="selectAddress">
-		<view v-for="item in addressList" :key="item.id" class="address-item">
-	
-			<view class="address-item-top"
-			@click="select(item)">
-				<view class="img-box">
-					<image src="../../static/address/icon.png" mode="aspectFill"></image>
-				</view>
-	
-				<view class="address-info">
-					<view class="user-info">
-						<text class="user-name">{{ item.name }}</text>
-						<text class="user-phone">{{ item.phone }}</text>
-						<text v-if="item.defaultId == '1'" class="is-default">默认</text>
+	<scroll-view 
+	scroll-y="true" 
+	:style="{height: height}"
+	@scrolltolower="moreAddress">
+		<uv-radio-group v-model="selectAddress"
+		@change="editDefault"
+		v-if="addressList.length > 0">
+			<view v-for="item in addressList" :key="item.id" class="address-item">
+		
+				<view class="address-item-top"
+				@click="select(item)">
+					<view class="img-box">
+						<image src="../../static/address/icon.png" mode="aspectFill"></image>
 					</view>
-	
-					<view class="address-detail">
-						{{ item.address + " " + item.addressDetail }}
+		
+					<view class="address-info">
+						<view class="user-info">
+							<text class="user-name">{{ item.name }}</text>
+							<text class="user-phone">{{ item.phone }}</text>
+							<text v-if="item.defaultId == '1'" class="is-default">默认</text>
+						</view>
+		
+						<view class="address-detail">
+							{{ item.address + " " + item.addressDetail }}
+						</view>
 					</view>
 				</view>
-			</view>
-	
-			<view class="controls"
-			v-if="controls">
-	
-				<view class="default-checkbox">
-					<uv-radio @click="editDefault(item)" 
-					:name="item.id" 
-					label-disabled 
-					size="30rpx"
-					icon-size="30rpx">
-						默认地址
-					</uv-radio>
-				</view>
-	
-				<view class="edit-btn">
-					<uv-icon name="edit-pen"></uv-icon>
-					<text @click="editAddress(item.id)" class="control-title">编辑</text>
-				</view>
-	
-				<view class="del-btn">
-					<uv-icon name="trash"></uv-icon>
-					<text class="control-title" @click="deleteAddress(item.id)">删除</text>
+		
+				<view class="controls"
+				v-if="controls">
+		
+					<view class="default-checkbox">
+						<uv-radio
+						:name="item.id" 
+						label-disabled 
+						size="30rpx"
+						icon-size="30rpx">
+							默认地址
+						</uv-radio>
+					</view>
+		
+					<view class="edit-btn">
+						<uv-icon name="edit-pen"></uv-icon>
+						<text @click="editAddress(item)" class="control-title">编辑</text>
+					</view>
+		
+					<view class="del-btn">
+						<uv-icon name="trash"></uv-icon>
+						<text class="control-title" @click="deleteAddress(item.id)">删除</text>
+					</view>
+		
 				</view>
-	
 			</view>
+		</uv-radio-group>
+		<view
+		style="padding: 100rpx 0;"
+		v-else>
+			<uv-empty 
+			mode="history"
+			textSize="28rpx"
+			iconSize="100rpx"/>
 		</view>
-	</uv-radio-group>
+	</scroll-view>
 </template>
 
 <script>
@@ -56,17 +71,47 @@
 				default : false,
 				type : Boolean,
 			},
-			addressList : {
-				default : [],
-				type : Array,
+			height : {
+				default : 'calc(90vh - 180rpx)'
 			}
 		},
 		data() {
 			return {
 				selectAddress : 0,
+				queryParams: {
+					pageNo: 1,
+					pageSize: 10,
+				},
+				addressList: [],
+				total : 0,
 			}
 		},
 		methods: {
+			//获取地址列表
+			getAddressList() {
+				return new Promise((success, fail) => {
+					this.$api('addressPage', this.queryParams, res => {
+						if (res.code == 200) {
+							this.addressList = res.result.records || [];
+							this.total = res.result.total || 0;
+							this.addressList.forEach(n => { //筛选默认地址
+								if (n.defaultId == '1') {
+									this.selectAddress = n.id
+								}
+							})
+							success(res.result)
+						}
+					})
+				})
+			},
+			// 加载更多
+			moreAddress(){
+				if(this.queryParams.pageSize > this.total){
+					return
+				}
+				this.queryParams.pageSize += 10
+				this.getAddressList()
+			},
 			// 删除地址
 			deleteAddress(e){
 				this.$emit('deleteAddress', e)
@@ -82,7 +127,7 @@
 			// 选择了地址
 			select(e){
 				this.$emit('select', e)
-			}
+			},
 		}
 	}
 </script>
diff --git a/pages_order/components/address/redactAddress.vue b/pages_order/components/address/redactAddress.vue
index 1775a92..e11d971 100644
--- a/pages_order/components/address/redactAddress.vue
+++ b/pages_order/components/address/redactAddress.vue
@@ -1,126 +1,140 @@
 <template>
-	<view class="redact-address">
+	<uv-popup round="40rpx" ref="addressPopup" :customStyle="{ height: 'auto' , width : '100%' , padding : '20rpx'}">
+		<view class="redact-address">
 			<view class="redact-address-title">{{title}}</view>
-			
-			<uv-form label-width="210rpx"
-			:model="addressDetail"
-			ref="form" :rules="rules">
-				<!-- <uv-field v-model="addressDetail.name" name="联系人" label="联系人" placeholder="请输入联系人姓名"
-					:rules="[{ required: true, message: '请填写联系人' }]" />
-					
-				<uv-field v-model="addressDetail.phone" name="手机号" label="手机号" placeholder="请输入手机号"
-					:rules="[{ required: true, message: '请填写手机号' }]" />
-					
-				<uv-field @click="$emit('clickAddressIcon')" v-model="addressDetail.address" name="所在地区" label="所在地区" placeholder="选择省市区街道"
-					:rules="[{ required: true, message: '请选择省市区街道' }]">
-					<template #right-icon>
-						<image @click.stop="$emit('clickAddressIcon')" src="../static/address/selectIcon.png" mode="aspectFit"></image>定位
-					</template>
-				</uv-field>
-				
-				<uv-field v-model="addressDetail.addressDetail" name="详细地址" label="详细地址" placeholder="小区楼栋、门牌号、村等"
-					:rules="[{ required: true, message: '请填写详细地址' }]" /> -->
-					
-				<uv-form-item label="联系人" 
-				prop="name" 
-				>
-					<uv-input v-model="addressDetail.name" 
-					placeholder="请输入联系人姓名"
-					border="none">
+
+			<uv-form label-width="210rpx" :model="addressDetail" ref="form">
+				<uv-form-item label="联系人" prop="name">
+					<uv-input v-model="addressDetail.name" placeholder="请输入联系人姓名" border="none">
 					</uv-input>
 				</uv-form-item>
-				
-				<uv-form-item label="手机号"
-				prop="phone" 
-				>
-					<uv-input v-model="addressDetail.phone" 
-					placeholder="请输入手机号"
-					border="none">
+
+				<uv-form-item label="手机号" prop="phone">
+					<uv-input v-model="addressDetail.phone" placeholder="请输入手机号" border="none">
 					</uv-input>
 				</uv-form-item>
-				
-				<uv-form-item label="所在地区"
-				prop="address" 
-				>
-					<uv-input 
-					v-model="addressDetail.address" 
-					placeholder="请选择所在地区"
-					border="none">
+
+				<uv-form-item label="所在地区" prop="address">
+					<uv-input v-model="addressDetail.address" placeholder="请选择所在地区" border="none">
 					</uv-input>
 					<template #right>
-						<view style="padding-right: 40rpx;color: #FBAB32;"
-						@click.stop="$emit('clickAddressIcon')">
-							<image
-							src="../../static/address/selectIcon.png" 
-							mode="aspectFit"></image>定位
+						<view style="padding-right: 40rpx;color: #FBAB32;" @click.stop="selectAddr">
+							<image src="../../static/address/selectIcon.png" mode="aspectFit"></image>定位
 						</view>
 					</template>
 				</uv-form-item>
-				
-				<uv-form-item label="详细地址"
-				prop="addressDetail" 
-				>
-					<uv-input v-model="addressDetail.addressDetail" 
-					placeholder="请输入详细地址"
-					border="none">
+
+				<uv-form-item label="详细地址" prop="addressDetail">
+					<uv-input v-model="addressDetail.addressDetail" placeholder="请输入详细地址" border="none">
 					</uv-input>
 				</uv-form-item>
 			</uv-form>
-			
+
 			<view @click="onSubmit" class="save">{{ addressDetail.id ? '修改地址' : '新增地址'}}</view>
-			
-	</view>
+
+		</view>
+	</uv-popup>
 </template>
 
 <script>
+	import Position from '@/utils/position.js'
 	export default {
 		data() {
 			return {
-				rules: {
-					'name': {
-						type: 'string',
-						required: true,
-						message: '请填写姓名',
-						trigger: ['blur', 'change']
-					},
-					'addressDetail': {
-						type: 'string',
-						max: 50,
-						required: true,
-						message: '请输入详细地址',
-						trigger: ['blur', 'change']
-					},
-				},
+				addressDetail: {}
 			}
 		},
-		props : {
-			addressDetail : {
-				type : Object,
-				default : function(){ return {} }
-			},
-			title : {
-				type : String,
-				default : '新增地址'
+		props: {
+			title: {
+				type: String,
+				default: '新增地址'
 			}
 		},
 		methods: {
+			open(addressDetail) {
+				this.addressDetail = addressDetail
+				this.$refs.addressPopup.open('bottom')
+			},
+			close(){
+				this.$refs.addressPopup.close()
+			},
 			//新增和修改地址
 			onSubmit() {
-				
-				this.$refs.form.validate().then(res => {
-					console.log(res);
-					uni.showToast({
-						icon: 'success',
-						title: '校验通过'
+				let isOk = this.parameterVerification(this.addressDetail)
+				if (isOk && !isOk.auth) {
+					return uni.showToast({
+						icon: 'none',
+						title: isOk.title,
+						'zIndex': 10000
 					})
-				}).catch(errors => {
-					uni.showToast({
-						icon: 'error',
-						title: '校验失败'
+				}
+				this.$emit('saveOrUpdate', this.addressDetail)
+			},
+			//验证用户参数合法性
+			parameterVerification(addressDetaila) {
+				let {
+					name,
+					phone,
+					address,
+					addressDetail
+				} = addressDetaila
+				if (name.trim() == '') {
+					return {
+						title: '请填写联系人',
+						auth: false
+					}
+				} else if (phone.trim() == '') {
+					return {
+						title: '请填写手机号',
+						auth: false
+					}
+				} else if (address.trim() == '') {
+					return {
+						title: '请填写所在地区',
+						auth: false
+					}
+				} else if (addressDetail.trim() == '') {
+					return {
+						title: '请填写详细地址',
+						auth: false
+					}
+				} else if (phone.trim() != '') {
+					if (!this.$utils.verificationPhone(phone)) {
+						return {
+							title: '手机号格式不合法',
+							auth: false
+						}
+					}
+				}
+				return {
+					title: '验证通过',
+					auth: true
+				}
+			},
+
+			//地图上选择地址
+			selectAddr() {
+				Position.getLocation(res => {
+					Position.selectAddress(res.longitude, res.latitude, success => {
+						this.setAddress(success)
 					})
 				})
-				// this.$emit('saveOrUpdate', this.addressDetail)
-			}
+			},
+
+			//提取用户选择的地址信息复制给表单数据
+			setAddress(res) {
+				//经纬度信息
+				this.addressDetail.latitude = res.latitude
+				this.addressDetail.longitude = res.longitude
+
+				if (!res.address && res.name) { //用户直接选择城市的逻辑
+					return this.addressDetail.address = res.name
+				}
+				if (res.address || res.name) {
+					return this.addressDetail.address = res.address + res.name
+				}
+				this.addressDetail.address = '' //用户啥都没选就点击勾选
+			},
 		}
 	}
 </script>
diff --git a/pages_order/mine/address.vue b/pages_order/mine/address.vue
index c5f9ba8..d76d7e1 100644
--- a/pages_order/mine/address.vue
+++ b/pages_order/mine/address.vue
@@ -3,77 +3,22 @@
 		
 		<navbar title="地址管理" leftClick @leftClick="leftClick" />
 
-		<view v-if="addressList.length > 0" class="address-list">
-			<!-- <uv-radio-group v-model="selectAddress">
-				<view v-for="item in addressList" :key="item.id" class="address-item">
-
-					<view class="address-item-top">
-						<view class="img-box">
-							<image src="../static/address/icon.png" mode="aspectFill"></image>
-						</view>
-
-						<view class="address-info">
-							<view class="user-info">
-								<text class="user-name">{{ item.name }}</text>
-								<text class="user-phone">{{ item.phone }}</text>
-								<text v-if="item.defaultId == '1'" class="is-default">默认</text>
-							</view>
-
-							<view class="address-detail">
-								{{ item.address + " " + item.addressDetail }}
-							</view>
-						</view>
-					</view>
-
-					<view class="controls">
-
-						<view class="default-checkbox">
-							<uv-radio @click="addDefault(item)" 
-							:name="item.id" 
-							label-disabled 
-							size="30rpx"
-							icon-size="30rpx">
-								默认地址
-							</uv-radio>
-						</view>
-
-						<view class="edit-btn">
-							<uv-icon name="edit-pen"></uv-icon>
-							<text @click="getAddressDetail(item.id)" class="control-title">编辑</text>
-						</view>
-
-						<view class="del-btn">
-							<uv-icon name="trash"></uv-icon>
-							<text class="control-title" @click="deleteAddress(item.id)">删除</text>
-						</view>
-
-					</view>
-				</view>
-			</uv-radio-group> -->
+		<view class="address-list">
 			<addressList 
 			controls
+			ref="addressList"
 			@deleteAddress="deleteAddress"
-			@editAddress="getAddressDetail"
-			@editDefault="addDefault"
-			:addressList="addressList"/>
+			@editAddress="editAddress"
+			@editDefault="editDefault"/>
 		</view>
 
-		<view
-		style="padding: 100rpx 0;"
-		v-else>
-			<uv-empty 
-			mode="history"
-			textSize="28rpx"
-			iconSize="100rpx"/>
-		</view>
-
-		<uv-popup
-		round="40rpx"
+		
+		<redactAddress 
 		ref="addressPopup"
-			:customStyle="{ height: 'auto' , width : '100%' , padding : '20rpx'}">
-			<redactAddress :addressDetail="addressDetail" @saveOrUpdate="saveOrUpdate" :title="title"
-				@clickAddressIcon="selectAddr"></redactAddress>
-		</uv-popup>
+		:addressDetail="addressDetail" 
+		@saveOrUpdate="saveOrUpdate" 
+		:title="title"></redactAddress>
+		
 
 		<view class="add-btn">
 			<view @click="addBtn" class="btn">
@@ -86,7 +31,6 @@
 <script>
 	import redactAddress from '../components/address/redactAddress.vue'
 	import addressList from '../components/address/addressList.vue'
-	import Position from '@/utils/position.js'
 
 	export default {
 		components: {
@@ -95,81 +39,22 @@
 		},
 		data() {
 			return {
-				selectAddress: 0, //单选框选中的地址
-				queryParams: {
-					pageNo: 1,
-					pageSize: 10
-				},
-				addressList: [
-					{
-						id : 1,
-						name : 'xx',
-						phone : '1305xxxx802',
-						address : '广东省广州市越秀区',
-						addressDetail : '城南故事C3栋2802',
-					},
-					{
-						id : 2,
-						name : 'xx',
-						phone : '1305xxxx802',
-						address : '广东省广州市越秀区',
-						addressDetail : '城南故事C3栋2802',
-					},
-					{
-						id : 3,
-						name : 'xx',
-						phone : '1305xxxx802',
-						address : '广东省广州市越秀区',
-						addressDetail : '城南故事C3栋2802',
-					},
-				],
-				addressDetail: {},
 				title: '新增地址'
 			}
 		},
 		onShow() {
-			// if (this.$route.query.current == 'payOrder') {
-			// 	this.$refs.addressPopup.open('bottom')
-			// }
-			// this.getAddressList()
+			this.getAddressList()
 		},
 		methods: {
 
-			//list列表滑动到底部自动新增数据列表
-			onLoad() {
-				this.queryParams.pageSize += 10
-				this.getAddressList()
-			},
-
 			//获取地址列表
 			getAddressList() {
-				this.$api('getAddressList', this.queryParams, res => {
-					if (res.code == 200) {
-						this.addressList = res.result.records || [];
-						this.addressList.forEach(n => { //筛选默认地址
-							if (n.defaultId == '1') {
-								this.selectAddress = n.id
-							}
-						})
-						if (this.queryParams.pageSize > res.result.total) {
-							this.finished = true
-						}
-					}
-					this.loading = false
-				})
+				this.$refs.addressList.getAddressList()
 			},
 
 			//获取地址详情
-			getAddressDetail(id) {
-				this.title = '修改地址'
-				this.$api('getAddressDetail', {
-					id
-				}, res => {
-					if (res.code == 200) {
-						this.addressDetail = res.result;
-						this.$refs.addressPopup.open('bottom')
-					}
-				})
+			editAddress(address) {
+				this.$refs.addressPopup.open({...address})
 			},
 
 			//返回个人中心
@@ -178,31 +63,23 @@
 			},
 
 			//添加和修改地址
-			saveOrUpdate() {
-				let isOk = this.parameterVerification()
-				if (isOk && !isOk.auth) {
-					return showNotify({
-						type: 'warning',
-						message: isOk.title,
-						'z-index': 10000
-					});
-				}
+			saveOrUpdate(addressDetail) {
 
 				let data = {
-					name: this.addressDetail.name,
-					phone: this.addressDetail.phone,
-					address: this.addressDetail.address,
-					addressDetail: this.addressDetail.addressDetail,
-					defaultId: this.addressDetail.defaultId || '0',
-					latitude: this.addressDetail.latitude,
-					longitude: this.addressDetail.longitude
+					name: addressDetail.name,
+					phone: addressDetail.phone,
+					address: addressDetail.address,
+					addressDetail: addressDetail.addressDetail,
+					defaultId: addressDetail.defaultId || '0',
+					latitude: addressDetail.latitude,
+					longitude: addressDetail.longitude
 				}
 
-				if (this.addressDetail.id) {
-					data.id = this.addressDetail.id
+				if (addressDetail.id) {
+					data.id = addressDetail.id
 				}
 
-				this.$api('addOrUpdateAddress', data, res => {
+				this.$api(data.id ? 'addressEdit' : 'addressAdd', data, res => {
 					if (res.code == 200) {
 						this.$refs.addressPopup.close()
 						this.getAddressList()
@@ -210,21 +87,14 @@
 							title: '操作成功',
 							icon: 'none'
 						})
-						if (this.$route.query.current == 'payOrder') { //如果是从订单支付过来添加地址的就再调回去
-							uni.navigateTo({
-								url: `/pages/order/payOrder?orderId=${this.$route.query.orderId}`
-							})
-						}
 					}
 				})
 			},
 
-			//新增默认地址
-			addDefault(item) {
-				this.selectAddress = item.id
-				this.$api('addOrUpdateAddress', {
-					id: item.id,
-					defaultId: '1',
+			//修改默认地址
+			editDefault(id) {
+				this.$api('addressDefault', {
+					id: id,
 				}, res => {
 					if (res.code == 200) {
 						this.$refs.addressPopup.close()
@@ -245,7 +115,7 @@
 					content: '确认删除此地址?删除后数据不可恢复',
 					success(e) {
 						if(e.confirm){
-							self.$api('deleteAddress', {
+							self.$api('addressDelete', {
 								id
 							}, res => {
 								if (res.code == 200) {
@@ -264,7 +134,7 @@
 			//点击新增按钮
 			addBtn() {
 				this.title = '新增地址'
-				this.addressDetail = { //初始化数据
+				this.$refs.addressPopup.open({ //初始化数据
 					name: '',
 					phone: '',
 					address: '',
@@ -272,75 +142,8 @@
 					defaultId: '',
 					latitude: '',
 					longitude: ''
-				}
-				this.$refs.addressPopup.open('bottom')
-			},
-
-			//验证用户参数合法性
-			parameterVerification() {
-				let {
-					name,
-					phone,
-					address,
-					addressDetail
-				} = this.addressDetail
-				if (name.trim() == '') {
-					return {
-						title: '请填写联系人',
-						auth: false
-					}
-				} else if (phone.trim() == '') {
-					return {
-						title: '请填写手机号',
-						auth: false
-					}
-				} else if (address.trim() == '') {
-					return {
-						title: '请填写所在地区',
-						auth: false
-					}
-				} else if (addressDetail.trim() == '') {
-					return {
-						title: '请填写详细地址',
-						auth: false
-					}
-				} else if (phone.trim() != '') {
-					if (!this.$utils.verificationPhone(phone)) {
-						return {
-							title: '手机号格式不合法',
-							auth: false
-						}
-					}
-				}
-				return {
-					title: '验证通过',
-					auth: true
-				}
-			},
-
-			//地图上选择地址
-			selectAddr() {
-				Position.getLocation(res => {
-					Position.selectAddress(res.longitude, res.latitude, success => {
-						this.setAddress(success)
-					})
 				})
 			},
-
-			//提取用户选择的地址信息复制给表单数据
-			setAddress(res) {
-				//经纬度信息
-				this.addressDetail.latitude = res.latitude
-				this.addressDetail.longitude = res.longitude
-
-				if (!res.address && res.name) { //用户直接选择城市的逻辑
-					return this.addressDetail.address = res.name
-				}
-				if (res.address || res.name) {
-					return this.addressDetail.address = res.address + res.name
-				}
-				this.addressDetail.address = '' //用户啥都没选就点击勾选
-			}
 		}
 	}
 </script>
@@ -355,115 +158,6 @@
 
 		.address-list {
 			padding: 40rpx 20rpx 120rpx 20rpx;
-
-			// .address-item {
-			// 	background: white;
-			// 	border-radius: 20rpx;
-			// 	overflow: hidden;
-			// 	margin-bottom: 20rpx;
-			// 	padding: 15rpx 15rpx 0rpx 15rpx;
-			// 	width: 680rpx;
-
-			// 	.address-item-top {
-			// 		border-bottom: 1px dashed #D3D1D1;
-			// 		display: flex;
-			// 		align-items: center;
-			// 		padding: 0rpx 0rpx 15rpx 0rpx;
-
-			// 		.img-box {
-			// 			width: 120rpx;
-			// 			height: 120rpx;
-
-			// 			image {
-			// 				width: 75%;
-			// 				height: 75%;
-			// 				display: block;
-			// 				margin: 12.5% auto;
-			// 			}
-			// 		}
-
-			// 		.address-info {
-			// 			width: calc(100% - 120rpx);
-			// 			height: 100%;
-			// 			display: flex;
-			// 			flex-direction: column;
-			// 			justify-content: space-between;
-
-			// 			.user-info {
-			// 				display: flex;
-			// 				align-items: center;
-
-			// 				text {
-			// 					display: block;
-			// 					line-height: 40rpx;
-			// 					margin-right: 20rpx;
-			// 				}
-
-			// 				.user-name,
-			// 				.user-phone {
-			// 					font-size: 30rpx;
-			// 				}
-
-			// 				.is-default {
-			// 					display: flex;
-			// 					align-items: center;
-			// 					justify-content: center;
-			// 					background: #FEB773;
-			// 					color: white;
-			// 					width: 80rpx;
-			// 					height: 35rpx;
-			// 					border-radius: 20rpx;
-			// 					font-size: 22rpx;
-			// 				}
-			// 			}
-
-			// 			.address-detail {
-			// 				color: #4a4a4a;
-			// 				font-size: 26rpx;
-			// 				overflow: hidden;
-			// 				display: -webkit-box;
-			// 				-webkit-box-orient: vertical;
-			// 				-webkit-line-clamp: 2;
-			// 				text-overflow: ellipsis;
-			// 			}
-			// 		}
-			// 	}
-
-			// 	.controls {
-			// 		display: flex;
-			// 		align-items: center;
-			// 		justify-content: space-between;
-			// 		align-items: center;
-			// 		font-size: 26rpx;
-			// 		padding: 15rpx 15rpx 25rpx 15rpx;
-
-			// 		.default-checkbox {
-			// 			display: flex;
-
-			// 			text {
-			// 				margin-left: 8rpx;
-			// 			}
-			// 		}
-
-			// 		.control-title {
-			// 			height: 30rpx;
-			// 			line-height: 30rpx;
-			// 			color: #666666;
-			// 		}
-
-			// 		view {
-			// 			display: flex;
-			// 			align-items: center;
-			// 		}
-
-			// 		image {
-			// 			width: 23rpx;
-			// 			height: 23rpx;
-			// 			vertical-align: middle;
-			// 			margin-right: 8rpx;
-			// 		}
-			// 	}
-			// }
 		}
 
 		.add-btn {
diff --git a/static/image/tabbar/tourGuide-a.png b/static/image/tabbar/tourGuide-a.png
new file mode 100644
index 0000000000000000000000000000000000000000..bd4d89b1224b49e06f77d35ef0b5ea35a4f5bb88
GIT binary patch
literal 1917
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
DBTb7O

literal 0
HcmV?d00001

diff --git a/static/image/tabbar/tourGuide.png b/static/image/tabbar/tourGuide.png
new file mode 100644
index 0000000000000000000000000000000000000000..f90d4644788c13924751afa2ced3aa9d7df5d05d
GIT binary patch
literal 1889
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
bgMRy8!*-E|hyzqg00000NkvXXu0mjf?l`1%

literal 0
HcmV?d00001