update token

common/api/user.js

@@ -68,6 +68,16 @@ export default {
 					launch_id: launch_id
 				});
 			},
+			// 获取地区列表
+			getAreaList({ pid }) {
+				return vm.$u.post('Area/areaList', {
+					pid: pid
+				});
+			},
+			// 用户收货地址列表
+			getAddressList() {
+				return vm.$u.post('MemberAddress/addressList');
+			}
         }
     }
 }

common/http.interceptor.js

@@ -25,7 +25,7 @@ const install = (Vue, vm) => {
 		const token = uni.getStorageSync('token');
 		// console.log(token);
 		// config.header.token = token;
-		config.header.Authorization = token;
+		config.header.Authorization = 'Bearer' + " " + token;
 		// config.header.Token = 'xxxxxx';
 		
 		// 可以对某个url进行特别处理，此url参数为this.$u.get(url)中的url值 

components/mine/address-active/index.vue

@@ -7,8 +7,8 @@
 			<view>
 				<input type="text" placeholder="手机号" />
 			</view>
-			<view class="area">
+			<view class="area" @click="show=true">
-				<input type="text" placeholder="省市区" />
+				<input type="text" placeholder="省市区" disabled />
 			</view>
 			<view>
 				<input type="text" placeholder="详细地址" />
@@ -21,16 +21,34 @@
 			</view>
 		</view>
 		<view class="edit-btn">保存地址</view>
+		<!-- <u-picker mode="region" v-model="show" @confirm="setArea"></u-picker> -->
+		<u-select v-model="show" mode="mutil-column-auto" :list="areaList" @confirm="setArea"></u-select>
 	</view>
 </template>
 <script>
 export default {
 	data() {
 		return {
-			checked: false
+			checked: false,
+			show: false,
+			areaList: []
+		}
+	},
+	mounted() {
+		this.getAreaList(0);
+	},
+	methods: {
+		setArea(e) {
+			console.log(e);
+		},
+		getAreaList(pid) {
+			this.$u.api.getAreaList({
+				pid: pid
+			}).then((res)=>{
+				if (res.errCode == 0) {}
+			})
 		}
 	},
-	onLoad() {}
 }
 </script>
 <style lang="scss" scoped>

components/mine/address-block/address-item.vue

@@ -1,23 +1,21 @@
 <template>
-	<view class="address">
+	<view class="items">
-		<u-radio-group v-model="current" @change="changeDefault" size="29" active-color="#FF780F">
-			<view v-for="(item, index) in addressList" :key="index" class="address-item">
 		<view class="item-top">
 			<view class="user-info">
-						<view class="user-name">王先生</view>
+				<view class="user-name">{{ item.address_realname }}</view>
-						<view class="user-pnone">174****7492</view>
+				<view class="user-pnone">{{ item.address_tel_phone }}</view>
 			</view>
-					<view class="user-address">山东省临沂市兰山区金雀山街道巴啦啦小区三号楼101室</view>
+			<view class="user-address u-line-2">{{ $u.trim(item.area_info + item.address_detail, 'all') }}</view>
 		</view>
 		<view class="item-bottom">
 			<view class="item-default">
 				<u-radio 
-							:name="item" 
+					:name="item.address_id" 
 					shape="circle"
 					label-size="22"
 				>
-							<view :class="[item == current ? 'radio-default' : 'radio-others']">
+					<view :class="[item.address_is_default == '0' ? 'radio-others' : 'radio-default']">
-								{{ item == current ? '已设为默认' : '设为默认' }}
+						{{ item.address_is_default == '0' ? '设为默认' : '已设为默认' }}
 					</view>
 				</u-radio>
 			</view>
@@ -33,23 +31,18 @@
 			</view>
 		</view>
 	</view>
-		</u-radio-group>
-		<view class="address-btn" @click="addAddress">添加地址</view>
-	</view>
 </template>
 <script>
 export default {
 	name: 'address-item',
 	data() {
 		return {
-			current: 0
+			
 		}
 	},
-	props: {
+	props: ['item', 'current'],
-		addressList: Array
+	mounted() {
-	},
+		console.log(this.item);
-	onLoad() {
-		console.log(22)
 	},
 	methods: {
 		editAddress() {
@@ -57,27 +50,12 @@ export default {
 				url: '/pageE/more/EditAddress'
 			});
 		},
-		addAddress() {
-			uni.navigateTo({
-				url: '/pageE/more/AddAddress'
-			});
-		},
-		changeDefault(event) {
-			console.log(event)
-			// this.current = event
-		}
 	},
 }
 </script>
 <style lang="scss" scoped>
-.address {
+.items {
-	padding: 1rpx 0 40rpx;
+	padding: 1rpx 0 0;
-	.u-radio-group {
-		display: block;
-		.address-item {
-			background-color: #ffffff;
-			margin-bottom: 20rpx;
-			padding: 30rpx;
 	.item-top {
 		position: relative;
 		padding-bottom: 30rpx;
@@ -109,6 +87,7 @@ export default {
 		.user-address {
 			font-size: 26rpx;
 			color: rgba(51,51,51,1);
+			line-height: 32rpx;
 		}
 	}
 	.item-bottom {
@@ -155,18 +134,5 @@ export default {
 			}
 		}
 	}
-		}
-	}
-	.address-btn {
-		margin: 322rpx auto 0;
-		width: 690rpx;
-		height: 98rpx;
-		background: rgba(255,119,15,1);
-		border-radius: 49rpx;
-		font-size: 36rpx;
-		color: rgba(255,255,255,1);
-		line-height: 98rpx;
-		text-align: center;
-	}
 }
 </style>

pageA/login/login.vue

@@ -115,7 +115,7 @@
 						// 存储接口请求所需token
 						uni.setStorage({
 						    key: 'token',
-						    data: res.data.data.token,
+						    data: res.data.token,
 						});
 						// 注册返回参数
 						this.$refs.uToast.show({

pageE/more/AddAddress.vue

@@ -14,7 +14,11 @@ export default {
 	components: {
 		AddressActive
 	},
-	onLoad() {}
+	onLoad() {
+	},
+	methods: {
+		
+	},
 }
 </script>
 <style lang="scss" scoped>

pageE/more/Address.vue

@@ -1,6 +1,11 @@
 <template>
 	<view class="address">
-		<AddressItem :addressList='addressList'></AddressItem>
+		<u-radio-group v-model="current" @change="changeDefault" size="29" active-color="#FF780F">
+			<view v-for="(item, index) in addressList" :key="index" class="address-item">
+				<AddressItem :item="item" :current='current'></AddressItem>
+			</view>
+		</u-radio-group>
+		<view class="address-btn" @click="addAddress">添加地址</view>
 	</view>
 </template>
 <script>
@@ -8,18 +13,64 @@ import AddressItem from '@/components/mine/address-block/address-item'
 export default {
 	data() {
 		return {
-			addressList: ['0', '1', '2', '3']
+			current: 0,
+			addressList: []
 		}
 	},
 	components: {
 		AddressItem
 	},
-	onLoad() {}
+	onLoad() {
+		this.getAddressList();
+	},
+	methods: {
+		getAddressList() {
+			this.$u.api.getAddressList().then((res)=>{
+				if (res.errCode == 0) {
+					this.addressList = res.data.addressList;
+					let defaultAddress = this.addressList.filter(item => {
+						return item.address_is_default == '1';
+					})
+					this.current = defaultAddress[0].address_id;
+				}
+			})
+		},
+		addAddress() {
+			uni.navigateTo({
+				url: '/pageE/more/AddAddress'
+			});
+		},
+		changeDefault(event) {
+			console.log(event)
+			// this.current = event
+		},
+	},
 }
 </script>
 <style lang="scss" scoped>
 .address {
 	min-height: calc(100vh - var(--window-top));
 	background-color: #ECECEC;
+	padding: 1rpx 0 40rpx;
+	box-sizing: border-box;
+	.u-radio-group {
+		display: block;
+		.address-item {
+			background-color: #ffffff;
+			margin-bottom: 20rpx;
+			padding: 30rpx;
+		}
+	}
+	.address-btn {
+		margin: 322rpx auto 0;
+		width: 690rpx;
+		height: 98rpx;
+		background: rgba(255,119,15,1);
+		border-radius: 49rpx;
+		font-size: 36rpx;
+		color: rgba(255,255,255,1);
+		line-height: 98rpx;
+		text-align: center;
+	}
 }
 </style>