From 5b36365a76ea64af2d6717c4f759453d75c195ba Mon Sep 17 00:00:00 2001
From: ghusermoon <2673031505@qq.com>
Date: Tue, 2 Jun 2020 15:35:19 +0800
Subject: [PATCH] 6.2

---
 .../mine/address-block/address-item.vue       | 107 +++++++++++++++---
 pageE/mine/Address.vue                        |   5 +-
 pageE/mine/EditAddress.vue                    |  70 ++++++++++++
 pageE/mine/MineHelp.vue                       |  11 +-
 pageE/mine/MineIndex.vue                      |  16 ++-
 pages.json                                    |  21 ++++
 6 files changed, 207 insertions(+), 23 deletions(-)
 create mode 100644 pageE/mine/EditAddress.vue

diff --git a/components/mine/address-block/address-item.vue b/components/mine/address-block/address-item.vue
index 4b209f3..6a8fa5c 100644
--- a/components/mine/address-block/address-item.vue
+++ b/components/mine/address-block/address-item.vue
@@ -1,6 +1,6 @@
 <template>
 	<view class="address">
-		<radio-group>
+		<radio-group @change="changeDefault">
 			<view v-for="(item, index) in addressList" :key="index" class="address-item">
 				<view class="item-top">
 					<view class="user-info">
@@ -11,18 +11,18 @@
 				</view>
 				<view class="item-bottom">
 					<view class="item-default">
-						<radio :value="item.value" :checked="index === current" />
-						<view :class="[item.value ? 'radio-default' : 'radio-others']">
-							{{ item.value ? '已设为默认' : '设为默认' }}
+						<radio :value="item" :checked="index === current" color="#FF770F" class="radio-class" />
+						<view :class="[item == current ? 'radio-default' : 'radio-others']">
+							{{ item == current ? '已设为默认' : '设为默认' }}
 						</view>
 					</view>
 					<view class="address-operate">
 						<view>
-							<!-- <img src="../static/mine/24.png" /> -->
+							<img src="@/pageE/static/mine/24.png" />
 							<view>编辑</view>
 						</view>
 						<view>
-							<!-- <img src="../static/mine/25.png" /> -->
+							<img src="@/pageE/static/mine/25.png" />
 							<view>删除</view>
 						</view>
 					</view>
@@ -34,11 +34,10 @@
 </template>
 <script>
 export default {
-	name: 'address',
+	name: 'address-item',
 	data() {
 		return {
-			current: 0,
-			default: 0
+			current: 0
 		}
 	},
 	props: {
@@ -46,16 +45,98 @@ export default {
 	},
 	onLoad() {
 		console.log(22)
-	}
+	},
+	methods: {
+		editAddress() {
+			uni.navigateTo({
+				url: '/pageE/mine/EditAddress'
+			});
+		},
+		changeDefault(event) {
+			console.log(event)
+			this.current = event.detail.value
+		}
+	},
 }
 </script>
 <style lang="scss" scoped>
 .address {
-	background-color: #ffffff;
+	padding-top: 1rpx;
 	.address-item {
+		background-color: #ffffff;
 		margin-bottom: 20rpx;
+		padding: 30rpx;
 		.item-top {
-
+			position: relative;
+			padding-bottom: 30rpx;
+			&::after {
+				content: "";
+				position: absolute;
+				width: 690rpx;
+				height: 2rpx;
+				background: rgba(241,241,241,1);
+				bottom: 0;
+				left: 50%;
+    			transform: translate(-50%,0);
+			}
+			.user-info {
+				display: flex;
+				align-items: center;
+				margin-bottom: 30rpx;
+				.user-name {
+					font-size: 32rpx;
+					font-weight: 500;
+					color: rgba(51,51,51,1);
+					margin-right: 13rpx;
+				}
+				.user-pnone {
+					font-size: 28rpx;
+					color: rgba(51,51,51,1);
+				}
+			}
+			.user-address {
+				font-size: 26rpx;
+				color: rgba(51,51,51,1);
+			}
+		}
+		.item-bottom {
+			padding-top: 30rpx;
+			display: flex;
+			justify-content: space-between;
+			.item-default {
+				display: flex;
+				align-items: center;
+				font-size: 22rpx;
+				/deep/ .radio-class {
+					.uni-radio-wrapper {
+						.uni-radio-input {
+							width: 29rpx !important;
+							height: 29rpx !important;
+						}
+					}
+				}
+				.radio-default {
+					color: rgba(255,119,15,1);
+				}
+				.radio-others {
+					color:rgba(153,153,153,1);
+				}
+			}
+			.address-operate {
+				display: flex;
+				font-size: 24rpx;
+				color: rgba(152,152,152,1);
+				> view {
+					display: flex;
+					&:not(:last-child) {
+						margin-right: 30rpx;
+					}
+					> img {
+						height: 23rpx;
+						margin-right: 15rpx;
+					}
+				}
+			}
 		}
 	}
 	.address-btn {
@@ -66,7 +147,7 @@ export default {
 		border-radius: 49rpx;
 		font-size: 36rpx;
 		color: rgba(255,255,255,1);
-		line-height: 40rpx;
+		line-height: 98rpx;
 		text-align: center;
 	}
 }
diff --git a/pageE/mine/Address.vue b/pageE/mine/Address.vue
index 01aa059..c22b3e8 100644
--- a/pageE/mine/Address.vue
+++ b/pageE/mine/Address.vue
@@ -1,7 +1,6 @@
 <template>
 	<view class="address">
 		<AddressItem :addressList='addressList'></AddressItem>
-		11
 	</view>
 </template>
 <script>
@@ -9,10 +8,10 @@ import AddressItem from '@/components/mine/address-block/address-item'
 export default {
 	data() {
 		return {
-			addressList: [1, 1, 1]
+			addressList: ['0', '1', '2', '3']
 		}
 	},
-	comments: {
+	components: {
 		AddressItem
 	},
 	onLoad() {
diff --git a/pageE/mine/EditAddress.vue b/pageE/mine/EditAddress.vue
new file mode 100644
index 0000000..3eb3bde
--- /dev/null
+++ b/pageE/mine/EditAddress.vue
@@ -0,0 +1,70 @@
+<template>
+	<view class="edit-address">
+		<view class="user-info">
+			<view>
+				<input type="text" placeholder="收货人" />
+			</view>
+			<view>
+				<input type="text" placeholder="手机号" />
+			</view>
+			<view class="area">
+				<input type="text" placeholder="省市区" />
+			</view>
+			<view>
+				<input type="text" placeholder="详细地址" />
+			</view>
+			<view class="set-default">
+				<view>设为默认地址</view>
+				<view>
+					<u-switch v-model="checked" active-color="#FF770F" inactive-color="##A9A7A7" size="35"></u-switch>
+				</view>
+			</view>
+		</view>
+		<view class="edit-btn">保存地址</view>
+	</view>
+</template>
+<script>
+export default {
+	data() {
+		return {
+			checked: false
+		}
+	},
+	onLoad() {}
+}
+</script>
+<style lang="scss" scoped>
+.edit-address {
+	min-height: 100vh;
+	.user-info {
+		border-top: 1rpx solid rgba(235,235,235,1);
+		> view {
+			height: 98rpx;
+			padding: 30rpx;
+			border-bottom: 2rpx solid rgba(235,235,235,1);
+			> input {
+				font-size: 30rpx;
+				outline: none;
+			}
+		}
+		.set-default {
+			display: flex;
+			align-items: center;
+			justify-content: space-between;
+			font-size: 30rpx;
+			color: rgba(51,51,51,1);
+		}
+	}
+	.edit-btn {
+		margin: 122rpx 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>
\ No newline at end of file
diff --git a/pageE/mine/MineHelp.vue b/pageE/mine/MineHelp.vue
index d6b8edd..7384585 100644
--- a/pageE/mine/MineHelp.vue
+++ b/pageE/mine/MineHelp.vue
@@ -1,7 +1,7 @@
 <template>
 	<view class="mine-help">
 		<view class="help-box">
-			<view v-for="(item, index) in helpList" :key="index" class="help-item">
+			<view v-for="(item, index) in helpList" :key="index" class="help-item" @click="toDetailsPage()">
 				<view>使用帮助</view>
 				<img src="../static/mine/21.png" />
 			</view>
@@ -14,7 +14,14 @@ export default {
 		return {
 			helpList: [1,1,1,1, 1, 1, 1]
 		}
-	}
+	},
+	methods: {
+		toDetailsPage() {
+			uni.navigateTo({
+				url: '/pageE/mine/HelpDetails'
+			});
+		}
+	},
 }
 </script>
 <style lang="scss" scoped>
diff --git a/pageE/mine/MineIndex.vue b/pageE/mine/MineIndex.vue
index 467b0fa..b7c0245 100644
--- a/pageE/mine/MineIndex.vue
+++ b/pageE/mine/MineIndex.vue
@@ -2,8 +2,8 @@
     <view class="mine">
         <view class="mine-top">
             <view class="top">
-				<!-- <img src="" alt="" /> -->
-				<view class="avatar"></view>
+				<img src="../static/mine/23.png" class="avatar" />
+				<!-- <view class="avatar"></view> -->
 				<view class="user-info">
 					<view class="info-left">
 						<view class="user-nickname">小同学</view>
@@ -89,7 +89,7 @@
 						<img src="../static/mine/19.png" />
 						<view>美甲</view>
 					</view>
-					<view>
+					<view @click="toOtherPage('MineHistory')">
 						<img src="../static/mine/18.png" />
 						<view>足迹</view>
 					</view>
@@ -106,7 +106,7 @@
 						<img src="../static/mine/9.png" />
 						<view>售后政策</view>
 					</view>
-					<view>
+					<view @click="toOtherPage('MineHelp')">
 						<img src="../static/mine/16.png" />
 						<view>使用帮助</view>
 					</view>
@@ -128,7 +128,13 @@ export default {
         };
     },
     onLoad() {},
-    methods: {}
+    methods: {
+		toOtherPage(url) {
+			uni.navigateTo({
+				url: '/pageE/mine/' + url
+			});
+		}
+	}
 };
 </script>
 <style lang="scss" scoped>
diff --git a/pages.json b/pages.json
index ec59ecf..a40e0e5 100644
--- a/pages.json
+++ b/pages.json
@@ -82,6 +82,27 @@
 							}
 						}
 					}
+				},
+				{
+					"path": "mine/EditAddress",
+					"style": {
+						"navigationBarTitleText": "编辑地址",
+						"app-plus": {
+							"titleSize": "36px",
+							"titleColor": "#333333",
+							"titleNView": {
+								"backgroundColor": "#FFFFFF"
+							},
+							"buttons": [
+								{  
+									"type":"none",
+									"text":"删除",
+									"float":"right",
+									"fontSize":"26"
+								}
+							 ]
+						}
+					}
 				}
 			]
 		}