Merge branch 'dev' of https://gitea.lihaink.cn/mkm/new_shop_app into dev

components/addressWindow/index.vue

@@ -3,12 +3,15 @@
 		<view class="address-window" :class="address.address==true?'on':''">
 			<view class='title'>选择地址<text class='iconfont icon-guanbi' @tap='close'></text></view>
 			<scroll-view scroll-y="true" class='list'>
-				<view class='item acea-row row-between-wrapper' :class='active==index?"t-color":""' v-for="(item,index) in addressList"
+				<view class='item acea-row row-between-wrapper' :class='active==index?"t-color":""'
-				 @tap='tapAddress(index,item.address_id)' :key='index'>
+					v-for="(item,index) in addressList" @tap='tapAddress(index,item.address_id)' :key='index'>
 					<text class='iconfont icon-ditu' :class='active==index?"t-color":""'></text>
 					<view class='address'>
-						<view class='name' :class='active==index?"t-color":""'>{{item.real_name}}<text class='phone'>{{item.phone}}</text></view>
+						<view class='name' :class='active==index?"t-color":""'>{{item.real_name}}<text
-						<view class='line1'>{{item.province}}{{item.city}}{{item.district}}{{item.street || ''}}{{item.detail}}</view>
+								class='phone'>{{item.phone}}</text></view>
+						<view class='line1'>
+							{{item.province}}{{item.city}}{{item.district}}{{item.street || ''}}{{item.detail}}
+						</view>
 					</view>
 					<text class='iconfont icon-complete' :class='active==index?"t-color":""'></text>
 				</view>
@@ -34,9 +37,15 @@
 	// +----------------------------------------------------------------------
 	// | Author: CRMEB Team <admin@crmeb.com>
 	// +----------------------------------------------------------------------
-	import { getAddressList } from '@/api/user.js';
+	import {
-	import { mapGetters } from "vuex";
+		getAddressList
-	import { HTTP_REQUEST_URL } from '@/config/app';
+	} from '@/api/user.js';
+	import {
+		mapGetters
+	} from "vuex";
+	import {
+		HTTP_REQUEST_URL
+	} from '@/config/app';
 	export default {
 		props: {
 			pagesUrl: {
@@ -87,7 +96,7 @@
 				let that = this;
 				getAddressList({
 					page: 1,
-					limit: 5
+					limit: 100
 				}).then(res => {
 					let addressList = res.data.list;
 					//处理默认选中项
@@ -114,9 +123,11 @@
 		transform: translate3d(0, 100%, 0);
 		transition: all .3s cubic-bezier(.25, .5, .5, .9);
 	}
+
 	.address-window.on {
 		transform: translate3d(0, 0, 0);
 	}
+
 	.address-window .title {
 		font-size: 32rpx;
 		font-weight: bold;
@@ -125,15 +136,18 @@
 		line-height: 123rpx;
 		position: relative;
 	}
+
 	.address-window .title .iconfont {
 		position: absolute;
 		right: 30rpx;
 		color: #8a8a8a;
 		font-size: 35rpx;
 	}
-	.address-window .list{
+
+	.address-window .list {
 		max-height: 650rpx;
 	}
+
 	.address-window .list .item {
 		margin-left: 30rpx;
 		padding-right: 30rpx;
@@ -142,26 +156,32 @@
 		font-size: 25rpx;
 		color: #333;
 	}
+
 	.address-window .list .item .iconfont {
 		font-size: 37rpx;
 		color: #2c2c2c;
 	}
+
 	.address-window .list .item .iconfont.icon-complete {
 		font-size: 30rpx;
 		color: #fff;
 	}
+
 	.address-window .list .item .address {
 		width: 560rpx;
 	}
+
 	.address-window .list .item .address .name {
 		font-size: 28rpx;
 		font-weight: bold;
 		color: #282828;
 		margin-bottom: 4rpx;
 	}
+
 	.address-window .list .item .address .name .phone {
 		margin-left: 18rpx;
 	}
+
 	.address-window .addressBnt {
 		font-size: 30rpx;
 		font-weight: bold;
@@ -174,17 +194,22 @@
 		margin: 85rpx auto;
 		background-color: var(--view-theme);
 	}
+
 	.address-window .pictrue {
 		text-align: center;
 	}
-	.address-window .pictrue image,.address-window .pictrue uni-image {
+
+	.address-window .pictrue image,
+	.address-window .pictrue uni-image {
 		width: 414rpx;
 		height: 305rpx;
 	}
-	.address-window .pictrue view{	
+
+	.address-window .pictrue view {
 		color: #999;
 	}
+
 	.t-color {
-		color: var(--view-theme)!important;
+		color: var(--view-theme) !important;
 	}
-</style>
+</style>