Merge branch 'master' of http://git.cc-lotus.info/pointToNetwork/point-app

pagesHome/order/order.vue

@@ -28,7 +28,8 @@
 								</view>
 								<view class="list_2" v-for="(tag,index) in item.goods" :key="index">
 									<view class="l">
-										<image class="image" :src="tag.file&&tag.file.length>0?tag.file[0].url:''" mode=""></image>
+										<image class="image" :src="tag.file&&tag.file.length>0?tag.file[0].url:''"
+											mode=""></image>
 									</view>
 									<view class="c">
 										<view class="name">
@@ -91,32 +92,35 @@
 			</view>
 		</view>
 		<uni-popup ref="popup" background-color="#fff" type="bottom">
-			<view class="content" v-for="(item,index) in addressList" :key="index">
+			<view class="content">
 				<scroll-view scroll-y="true" class="scroll-view">
-					<view class="one">
-						<view class="one_1">
-							<view class="name">
-								<text>{{item.name}},</text>{{item.phone}}
-							</view>
-							<view class="address">
-								<text>{{item.province}}</text><text>{{item.city}}</text>
-								<text>{{item.area}}</text><text>{{item.address}}</text>
+					<view class="list" v-for="(item,index) in addressList" :key="index">
+						<view class="one">
+							<view class="one_1">
+								<view class="name">
+									<text>{{item.name}},</text>{{item.phone}}
+								</view>
+								<view class="address">
+									<text>{{item.province}}</text><text>{{item.city}}</text>
+									<text>{{item.area}}</text><text>{{item.address}}</text>
+								</view>
 							</view>
+							<text class="iconfont icon-jiantouyou"></text>
 						</view>
-						<text class="iconfont icon-jiantouyou"></text>
-					</view>
-					<view class="two">
-						<view class="two_1">
-							<checkbox-group @change="toCheckbox">
-								<label>
-									<checkbox :value="item._id" :checked="item.checked" style="transform:scale(0.7)" />
-									选择地址
-								</label>
-							</checkbox-group>
-						</view>
-						<view class="two_2">
-							<text class="text" v-if="item.is_default=='1'">默认</text>
-							<text @click="toDel(item)" class="iconfont icon-del"></text>
+						<view class="two">
+							<view class="two_1">
+								<checkbox-group @change="toCheckbox">
+									<label>
+										<checkbox :value="item._id" :checked="item.checked"
+											style="transform:scale(0.7)" />
+										选择地址
+									</label>
+								</checkbox-group>
+							</view>
+							<view class="two_2">
+								<text class="text" v-if="item.is_default=='1'">默认</text>
+								<text @click="toDel(item)" class="iconfont icon-del"></text>
+							</view>
 						</view>
 					</view>
 				</scroll-view>
@@ -619,46 +623,48 @@
 	.content {
 		display: flex;
 		flex-direction: column;
-		height: 50vw;
+		height: 100vw;
 		overflow-x: hidden;
 		background-color: var(--f5Color);
 
-		.one {
-			display: flex;
-			justify-content: space-between;
-			margin: 2vw 0 0 0;
-			padding: 2vw;
-			background-color: var(--mainColor);
+		.list {
+			.one {
+				display: flex;
+				justify-content: space-between;
+				margin: 2vw 0 0 0;
+				padding: 2vw;
+				background-color: var(--mainColor);
 
-			.name {
-				font-size: var(--font16Size);
-			}
+				.name {
+					font-size: var(--font16Size);
+				}
 
-			.address {
-				font-size: var(--font14Size);
-			}
+				.address {
+					font-size: var(--font14Size);
+				}
 
-			.iconfont {
-				line-height: 15vw;
-				font-size: var(--font20Szie);
+				.iconfont {
+					line-height: 15vw;
+					font-size: var(--font20Szie);
+				}
 			}
-		}
 
-		.two {
-			display: flex;
-			justify-content: space-between;
-			border-top: 0.1vw solid var(--fcColor);
-			padding: 2vw;
-			background-color: var(--mainColor);
-			font-size: var(--font14Size);
-
-			.text {
-				margin: 0 2vw 0 0;
-				border: 0.1vw solid var(--fFB1Color);
-				padding: 1vw;
-				font-size: var(--font12Size);
-				border-radius: 2vw;
-				color: var(--fFB1Color);
+			.two {
+				display: flex;
+				justify-content: space-between;
+				border-top: 0.1vw solid var(--fcColor);
+				padding: 2vw;
+				background-color: var(--mainColor);
+				font-size: var(--font14Size);
+
+				.text {
+					margin: 0 2vw 0 0;
+					border: 0.1vw solid var(--fFB1Color);
+					padding: 1vw;
+					font-size: var(--font12Size);
+					border-radius: 2vw;
+					color: var(--fFB1Color);
+				}
 			}
 		}
 	}