From e8c74df8a09cc084152c720f2c5a30b17d0c0bd4 Mon Sep 17 00:00:00 2001
From: ghusermoon <2673031505@qq.com>
Date: Thu, 4 Jun 2020 08:21:34 +0800
Subject: [PATCH] 6.4

---
 components/mine/address-active/index.vue      |   3 +-
 .../mine/address-block/address-item.vue       | 132 +++++------
 components/mine/article-list/index.vue        |  47 ++++
 pageE/mine/AddAddress.vue                     |   2 +-
 pageE/mine/Address.vue                        |   2 +-
 pageE/mine/AfterSalesHelp.vue                 |  26 +++
 .../{HelpDetails.vue => ArticleDetails.vue}   |  18 +-
 pageE/mine/Complaints.vue                     | 100 ++++++++
 pageE/mine/EditAddress.vue                    |  45 +++-
 pageE/mine/Manicure.vue                       | 111 +++++++++
 pageE/mine/ManicureOrder.vue                  |  94 ++++++++
 pageE/mine/MemberServe.vue                    | 217 ++++++++++++++++++
 pageE/mine/MineHelp.vue                       |  37 +--
 pageE/mine/MineHistory.vue                    |   2 +-
 pageE/mine/MineIndex.vue                      |  17 +-
 pageE/mine/SendWash.vue                       | 132 +++++++++++
 pageE/mine/WriteComments.vue                  |  74 ++++++
 pageE/static/mine/26.png                      | Bin 0 -> 3591 bytes
 pageE/static/mine/27.png                      | Bin 0 -> 3250 bytes
 pages.json                                    | 137 +++++++++--
 20 files changed, 1065 insertions(+), 131 deletions(-)
 create mode 100644 components/mine/article-list/index.vue
 create mode 100644 pageE/mine/AfterSalesHelp.vue
 rename pageE/mine/{HelpDetails.vue => ArticleDetails.vue} (57%)
 create mode 100644 pageE/mine/Complaints.vue
 create mode 100644 pageE/mine/Manicure.vue
 create mode 100644 pageE/mine/ManicureOrder.vue
 create mode 100644 pageE/mine/MemberServe.vue
 create mode 100644 pageE/mine/SendWash.vue
 create mode 100644 pageE/mine/WriteComments.vue
 create mode 100644 pageE/static/mine/26.png
 create mode 100644 pageE/static/mine/27.png

diff --git a/components/mine/address-active/index.vue b/components/mine/address-active/index.vue
index 5fc217a..1e5b869 100644
--- a/components/mine/address-active/index.vue
+++ b/components/mine/address-active/index.vue
@@ -16,7 +16,7 @@
 			<view class="set-default">
 				<view>设为默认地址</view>
 				<view>
-					<u-switch v-model="checked" active-color="#FF770F" inactive-color="##A9A7A7" size="35"></u-switch>
+					<u-switch v-model="checked" active-color="#FF770F" inactive-color="#A9A7A7" size="35"></u-switch>
 				</view>
 			</view>
 		</view>
@@ -35,7 +35,6 @@ export default {
 </script>
 <style lang="scss" scoped>
 .address-active {
-	// min-height: 100vh;
 	.user-info {
 		border-top: 1rpx solid rgba(235,235,235,1);
 		> view {
diff --git a/components/mine/address-block/address-item.vue b/components/mine/address-block/address-item.vue
index 7387ce0..8d6b9e7 100644
--- a/components/mine/address-block/address-item.vue
+++ b/components/mine/address-block/address-item.vue
@@ -22,7 +22,7 @@
 						</u-radio>
 					</view>
 					<view class="address-operate">
-						<view>
+						<view @click="editAddress">
 							<img src="@/pageE/static/mine/24.png" />
 							<view>编辑</view>
 						</view>
@@ -71,82 +71,82 @@ export default {
 </script>
 <style lang="scss" scoped>
 .address {
-	padding-top: 1rpx;
+	padding: 1rpx 0 40rpx;
 	.u-radio-group {
 		display: block;
-	}
-	.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;
+		.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-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;
-			align-items: center;
-			justify-content: space-between;
-			.item-default {
-				display: flex;
-				align-items: center;
-				font-size: 22rpx;
-				.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 {
+				.user-info {
 					display: flex;
-					&:not(:last-child) {
-						margin-right: 30rpx;
+					align-items: center;
+					margin-bottom: 30rpx;
+					.user-name {
+						font-size: 32rpx;
+						font-weight: 500;
+						color: rgba(51,51,51,1);
+						margin-right: 13rpx;
 					}
-					> img {
-						height: 23rpx;
-						margin-right: 15rpx;
+					.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;
+				align-items: center;
+				justify-content: space-between;
+				.item-default {
+					display: flex;
+					align-items: center;
+					font-size: 22rpx;
+					.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 {
-		margin: 322rpx auto 40rpx;
+		margin: 322rpx auto 0;
 		width: 690rpx;
 		height: 98rpx;
 		background: rgba(255,119,15,1);
diff --git a/components/mine/article-list/index.vue b/components/mine/article-list/index.vue
new file mode 100644
index 0000000..94564d4
--- /dev/null
+++ b/components/mine/article-list/index.vue
@@ -0,0 +1,47 @@
+<template>
+	<view class="article-list">
+		<view v-for="(item, index) in articleList" :key="index" class="list-item" @click="toDetailsPage()">
+			<view>{{ type }}</view>
+			<img src="@/pageE/static/mine/21.png" />
+		</view>
+	</view>
+</template>
+<script>
+export default {
+	data() {
+		return {}
+	},
+	props: {
+		articleList: Array,
+		type: String
+	},
+	methods: {
+		toDetailsPage() {
+			uni.navigateTo({
+				url: '/pageE/mine/ArticleDetails?title=' + this.type
+			});
+		}
+	},
+}
+</script>
+<style lang="scss" scoped>
+.article-list {
+	min-height: calc(100vh-var(--custom-bar-height));
+	background-color: #ECECEC;
+	.list-item {
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		height: 98rpx;
+		border-top: 2rpx solid #EBEBEB;
+		background-color: #ffffff;
+		padding: 0 30rpx;
+		font-size: 30rpx;
+		color: rgba(51,51,51,1);
+		> img {
+			width: 14rpx;
+			height: 24rpx;
+		}
+	}
+}
+</style>
\ No newline at end of file
diff --git a/pageE/mine/AddAddress.vue b/pageE/mine/AddAddress.vue
index c45fbc0..f73c371 100644
--- a/pageE/mine/AddAddress.vue
+++ b/pageE/mine/AddAddress.vue
@@ -19,6 +19,6 @@ export default {
 </script>
 <style lang="scss" scoped>
 .add-address {
-	min-height: calc(100vh-var(--custom-bar-height));
+	min-height: calc(100vh - var(--window-top));
 }
 </style>
\ No newline at end of file
diff --git a/pageE/mine/Address.vue b/pageE/mine/Address.vue
index 3c459f5..f881369 100644
--- a/pageE/mine/Address.vue
+++ b/pageE/mine/Address.vue
@@ -19,7 +19,7 @@ export default {
 </script>
 <style lang="scss" scoped>
 .address {
-	min-height: 100vh;
+	min-height: calc(100vh - var(--window-top));
 	background-color: #ECECEC;
 }
 </style>
\ No newline at end of file
diff --git a/pageE/mine/AfterSalesHelp.vue b/pageE/mine/AfterSalesHelp.vue
new file mode 100644
index 0000000..0f0ab42
--- /dev/null
+++ b/pageE/mine/AfterSalesHelp.vue
@@ -0,0 +1,26 @@
+<template>
+	<view class="after-sale">
+		<ArticleList :articleList="policyList" :type="type"></ArticleList>
+	</view>
+</template>
+<script>
+import ArticleList from '@/components/mine/article-list/index'
+export default {
+	data() {
+		return {
+			type: '售后政策',
+			policyList: [1,1,1,1, 1, 1, 1]
+		}
+	},
+	components: {
+		ArticleList
+	},
+	methods: {},
+}
+</script>
+<style lang="scss" scoped>
+.after-sale {
+	min-height: calc(100vh - var(--window-top));
+	background-color: #ECECEC;
+}
+</style>
\ No newline at end of file
diff --git a/pageE/mine/HelpDetails.vue b/pageE/mine/ArticleDetails.vue
similarity index 57%
rename from pageE/mine/HelpDetails.vue
rename to pageE/mine/ArticleDetails.vue
index 0791259..59825a5 100644
--- a/pageE/mine/HelpDetails.vue
+++ b/pageE/mine/ArticleDetails.vue
@@ -1,5 +1,5 @@
 <template>
-	<view class="help-details">
+	<view class="article-details">
 		<rich-text :nodes="nodes"></rich-text>
 	</view>
 </template>
@@ -9,13 +9,23 @@ export default {
 		return {
 			nodes: `<p>13268748568645634nfdhf dfvjdfjgdfl vdufhnh1</p>123346<h1>das</h1><h1>das</h1><h1>das1</h1><h2>das2</h2><h3>das3</h3>`
 		}
-	}
+	},
+	onLoad(option) {
+		this.setTitle(option.title);
+	},
+	methods: {
+		setTitle(title){
+			uni.setNavigationBarTitle({
+				title: title + "详情"
+			});
+		},
+	},
 }
 </script>
 <style lang="scss" scoped>
-.help-details {
+.article-details {
+	min-height: calc(100vh - var(--window-top));
 	background: #ECECEC;
 	padding: 20rpx 35rpx 0;
-	min-height: 100vh;
 }
 </style>
\ No newline at end of file
diff --git a/pageE/mine/Complaints.vue b/pageE/mine/Complaints.vue
new file mode 100644
index 0000000..7cfc6dc
--- /dev/null
+++ b/pageE/mine/Complaints.vue
@@ -0,0 +1,100 @@
+<template>
+	<view class="complaints">
+		<view class="complaints-box">
+			<view class="suggestions">
+				<view class="text">您的满意是对我们最大的支持，茫茫德铭阳光之中能够遇到亲也是我们的荣幸</view>
+				<view class="image">
+					<img v-for="(url, index) in imgList" :key="index" :src="url" />
+				</view>
+			</view>
+			<view class="reply">
+				<view class="reply-title">后台回复：</view>
+				<view class="reply-content u-line-4">您的满意是对我们最大的支持，茫茫德铭阳光之中能够遇到亲也是我们的荣幸，您的评价是对我们付出最好的认可，我们会不断前行，不忘初衷，给亲们提供更好的服务和产品!我把对您的谢意写在纸上，被风吹走了;我把对您的谢意写在沙滩上，被海浪卷走了;我只好把对您的谢意写在解释里，这样才会永驻心间!感谢您对的支持!加油!加油!， 祝您生活愉快，工作顺利，期待我们下次合作愉快! ! !</view>
+			</view>
+			<view class="date">
+				<img src="../static/mine/26.png" />
+				<view>2020-05-14</view>
+			</view>
+		</view>
+	</view>
+</template>
+<script>
+export default {
+	data() {
+		return {
+			imgList: [
+				require('../static/mine/23.png'),
+				require('../static/mine/23.png'),
+				require('../static/mine/23.png'),
+				require('../static/mine/23.png')
+			]
+		}
+	},
+	onNavigationBarButtonTap() {
+		uni.navigateTo({
+			url: '/pageE/mine/WriteComments'
+		});
+	},
+}
+</script>
+<style lang="scss" scoped>
+.complaints {
+	min-height: calc(100vh - var(--window-top));
+	background-color: #ECECEC;
+	padding-top: 1rpx;
+	.complaints-box {
+		padding: 30rpx;
+		background-color: #ffffff;
+		.suggestions {
+			.text {
+				font-size: 26rpx;
+				color: rgba(51,51,51,1);
+				margin-bottom: 25rpx;
+				line-height: 36rpx;
+			}
+			.image {
+				display: flex;
+				flex-wrap: wrap;
+				> img {
+					width: 210rpx;
+					height: 210rpx;
+					border-radius: 10rpx;
+					margin-bottom: 10rpx;
+					&:not(:nth-child(3n)) {
+						margin-right: 30rpx;
+					}
+				}
+			}
+		}
+		.reply {
+			width: 690rpx;
+			height: 224rpx;
+			background: rgba(240,238,238,1);
+			border-radius: 10rpx;
+			padding: 20rpx;
+			font-size: 24rpx;
+			color: rgba(102,102,102,1);
+			margin: 20rpx 0;
+			.reply-title {
+				margin-bottom: 16rpx;
+			}
+			.reply-content {
+				line-height: 36rpx;
+			}
+		}
+		.date {
+			display: flex;
+			align-items: center;
+			> img {
+				width: 28rpx;
+				height: 28rpx;
+				margin-right: 12rpx;
+			}
+			> view {
+				font-size: 24rpx;
+				color: rgba(153,153,153,1);
+			}
+		}
+	}
+}
+</style>
\ No newline at end of file
diff --git a/pageE/mine/EditAddress.vue b/pageE/mine/EditAddress.vue
index feeae4b..6ea8293 100644
--- a/pageE/mine/EditAddress.vue
+++ b/pageE/mine/EditAddress.vue
@@ -1,6 +1,13 @@
 <template>
 	<view class="edit-address">
 		<AddressActive></AddressActive>
+		<u-popup v-model="popupShow" mode="center" border-radius="10">
+			<view class="popup-tips">确定要删除该地址吗</view>
+			<view class="popup-btn">
+				<view class="cancel" @click="popupShow=false">取消</view>
+				<view class="determine" @click="delAddress">确定</view>
+			</view>
+		</u-popup>
 	</view>
 </template>
 <script>
@@ -8,17 +15,49 @@ import AddressActive from '@/components/mine/address-active/index'
 export default {
 	data() {
 		return {
-			checked: false
+			popupShow: false
 		}
 	},
 	components: {
 		AddressActive
 	},
-	onLoad() {}
+	onLoad() {},
+	onNavigationBarButtonTap() {
+		this.popupShow = true
+	},
+	methods: {
+		delAddress() {
+			this.popupShow = false
+		}
+	},
 }
 </script>
 <style lang="scss" scoped>
 .edit-address {
-	min-height: calc(100vh-var(--custom-bar-height));
+	min-height: calc(100vh - var(--window-top));
+	.popup-tips {
+		width: 420rpx;
+		text-align: center;
+		line-height: 104rpx;
+		font-size: 28rpx;
+		color: rgba(102,102,102,1);
+	}
+	.popup-btn {
+		width: 420rpx;
+		display: flex;
+		border-top: 2rpx solid #ECECEC;
+		> view {
+			flex: 1;
+			height: 98rpx;
+			text-align: center;
+			line-height: 98rpx;
+			&:first-child {
+				border-right: 2rpx solid #ECECEC;
+			}
+		}
+		.determine {
+			color: #FF780F;
+		}
+	}
 }
 </style>
\ No newline at end of file
diff --git a/pageE/mine/Manicure.vue b/pageE/mine/Manicure.vue
new file mode 100644
index 0000000..37cdddd
--- /dev/null
+++ b/pageE/mine/Manicure.vue
@@ -0,0 +1,111 @@
+<template>
+	<view class="manicure">
+		<view>
+			<u-tabs-swiper ref="tabs" :list="list" :is-scroll="false" active-color="#FF780F" :current="current" font-size="32" :show-bar="false" @change="tabsChange" height="88" ></u-tabs-swiper>
+		</view>
+		<swiper :current="swiperCurrent" @animationfinish="animationfinish">
+			<swiper-item class="swiper-item">
+				<scroll-view scroll-y class="order-list">
+					<view v-for="(item, index) in 3" :key="index" class="order-item">
+						<view class="order-title">
+							<view class="order-text">订单</view>
+							<view class="order-status">已预约</view>
+						</view>
+						<view class="order-name">美甲人姓名：xxx</view>
+						<view class="order-date">时间：2020-04-12</view>
+					</view>
+				</scroll-view>
+			</swiper-item>
+			<swiper-item class="swiper-item">
+				<scroll-view scroll-y class="none-page">
+					<view></view>
+				</scroll-view>
+			</swiper-item>
+		</swiper>
+	</view>
+</template>
+<script>
+export default {
+	data() {
+		return {
+			list: [{
+				name: '我的订单'
+			}, {
+				name: '申请表'
+			}],
+			current: 0,
+			swiperCurrent: 0
+		}
+	},
+	onShow() {
+		this.current = 0;
+		this.swiperCurrent = 0;
+	},
+	methods: {
+		tabsChange(index) {
+			this.swiperCurrent = index;
+			this.toApplyPage(index);
+		},
+		animationfinish(e) {
+			let current = e.detail.current;
+			this.swiperCurrent = current;
+			this.current = current;
+			this.toApplyPage(current);
+		},
+		toApplyPage(index) {
+			if(index == 1) {
+				uni.navigateTo({
+					url: '/pageE/mine/ManicureOrder'
+				});
+			}
+		}
+	},
+};
+</script>
+<style lang="scss" scoped>
+.manicure {
+	min-height: calc(100vh - var(--window-top));
+	background-color: #ECECEC;
+	display: flex;
+	flex-direction: column;
+	> uni-swiper {
+		flex: 1;
+	}
+	.swiper-item {
+		padding: 20rpx 30rpx 0;
+		.order-list {
+			.order-item {
+				padding: 30rpx;
+				width:690rpx;
+				height: 229rpx;
+				background: rgba(255,255,255,1);
+				border-radius: 10rpx;
+				margin-bottom: 20rpx;
+				.order-title {
+					display: flex;
+					align-items: center;
+					justify-content: space-between;
+					.order-text {
+						font-size: 30rpx;
+						color: rgba(51,51,51,1);
+					}
+					.order-status {
+						font-size: 28rpx;
+						color: rgba(255,120,15,1);
+					}
+				}
+				.order-name {
+					font-size: 32rpx;
+					font-weight: 500;
+					color: rgba(51,51,51,1);
+					margin: 43rpx 0 45rpx;
+				}
+				.order-date {
+					font-size: 24rpx;
+					color: rgba(153,153,153,1);
+				}
+			}
+		}
+	}
+}
+</style>
\ No newline at end of file
diff --git a/pageE/mine/ManicureOrder.vue b/pageE/mine/ManicureOrder.vue
new file mode 100644
index 0000000..4e00368
--- /dev/null
+++ b/pageE/mine/ManicureOrder.vue
@@ -0,0 +1,94 @@
+<template>
+	<view class="manicure-order">
+		<view class="order-form">
+			<view class="order-name">
+				<view>美甲人：</view>
+				<input type="text" v-model="name" />
+			</view>
+			<view class="order-date" @click="show=true">
+				<view>美甲时间：</view>
+				<img src="../static/mine/21.png" v-if="!time" />
+				<view v-else>{{ time }}</view>
+			</view>
+		</view>
+		<view class="order-btn">确认订单</view>
+		<u-picker mode="time" v-model="show" :params="params" @confirm="chooseDate"></u-picker>
+	</view>
+</template>
+<script>
+export default {
+	data() {
+		return {
+			name: '',
+			time: '',
+			params: {
+				year: true,
+				month: true,
+				day: true,
+				hour: true,
+				minute: true,
+				second: false
+			},
+			show: false
+		}
+	},
+	methods: {
+		chooseDate(e) {
+			let time = e.year + '年' + e.month + '月' + e.day + '日' + e.hour + '时' + e.minute + '分'
+			this.time = time
+		}
+	},
+};
+</script>
+<style lang="scss" scoped>
+.manicure-order {
+	min-height: calc(100vh - var(--window-top));
+	background-color: #ECECEC;
+	padding-top: 1rpx;
+	.order-form {
+		> view {
+			height: 98rpx;
+			background-color: #ffffff;
+			padding: 35rpx 30rpx;
+			&:not(:last-child) {
+				margin-bottom: 2rpx;
+			}
+		}
+		.order-name {
+			display: flex;
+			align-items: center;
+			> view {
+				font-size: 30rpx;
+				color: rgba(51,51,51,1);
+			}
+			> input {
+				flex: 1;
+				text-align: right;
+			}
+		}
+		.order-date {
+			display: flex;
+			align-items: center;
+			justify-content: space-between;
+			> img {
+				width: 14rpx;
+				height :24rpx;
+			}
+		}
+	}
+	.order-btn {
+		width: 690rpx;
+		height: 98rpx;
+		background: rgba(255,120,15,1);
+		border-radius: 49rpx;
+		font-size: 36rpx;
+		color: rgba(255,255,255,1);
+		line-height: 98rpx;
+		text-align: center;
+		position: absolute;
+		bottom: 40rpx;
+		left: 50%;
+		transform: translate(-50%, 0);
+	}
+}
+</style>
\ No newline at end of file
diff --git a/pageE/mine/MemberServe.vue b/pageE/mine/MemberServe.vue
new file mode 100644
index 0000000..e2a3b4c
--- /dev/null
+++ b/pageE/mine/MemberServe.vue
@@ -0,0 +1,217 @@
+<template>
+	<view class="member">
+		<view>
+			<u-tabs-swiper ref="tabs" :list="list" :is-scroll="false" active-color="#FF780F" :current="current" font-size="32" :show-bar="false" @change="tabsChange" height="88" ></u-tabs-swiper>
+		</view>
+		<swiper :current="swiperCurrent" @animationfinish="animationfinish">
+			<swiper-item class="swiper-item">
+				<scroll-view scroll-y class="integral">
+					<view class="integral-top">
+						<view>
+							<view class="title">总积分</view>
+							<view class="value">999</view>
+						</view>
+						<view>
+							<view class="title">经验值</view>
+							<view class="value">999</view>
+						</view>
+						<view>
+							<view class="title">预计进度</view>
+							<view class="value">999</view>
+						</view>
+					</view>
+					<view class="integral-botom">
+						<rich-text :nodes="nodes"></rich-text>
+					</view>
+				</scroll-view>
+			</swiper-item>
+			<swiper-item class="swiper-item">
+				<scroll-view scroll-y class="coupon">
+					<view v-for="(item, index) in 3" :key="index" class="coupon-item">
+						<img src="../static/mine/23.png" />
+						<view class="coupon-main">
+							<view class="coupon-title">萌店十元优惠券</view>
+							<view class="coupon-date">
+								<img src="../static/mine/26.png" />
+								<view>2020.05.17-2020.06.17</view>
+							</view>
+							<view class="coupon-integral">299积分</view>
+						</view>
+						<view class="coupon-btn">兑换</view>
+					</view>
+				</scroll-view>
+			</swiper-item>
+			<swiper-item class="swiper-item">
+				<scroll-view scroll-y class="details">
+					<view v-for="(item, index) in 6" :key="index" class="details-item">
+						<view class="item-left">
+							<view class="item-title">积分商城兑换礼品</view>
+							<view class="item-date">2020-03-11</view>
+						</view>
+						<view class="item-right" :class="[index&1 ? 'negative' : 'positive']">
+							{{ index&1 ? '-' + 10.00 : '+' + 10.00 }}
+						</view>
+					</view>
+				</scroll-view>
+			</swiper-item>
+		</swiper>
+	</view>
+</template>
+<script>
+export default {
+	data() {
+		return {
+			list: [{
+				name: '积分数'
+			}, {
+				name: '兑换优惠券'
+			}, {
+				name: '积分明细'
+			}],
+			current: 0,
+			swiperCurrent: 0,
+			nodes: '<h1>2</h1><h1>2</h1><h1>2</h1><h1>2</h1><h1>2</h1><h1>2</h1><h1>2</h1><h1>2</h1><h1>2</h1><h1>2</h1><h1>2</h1><h1>2</h1><h1>2</h1><h1>2</h1><h1>2</h1><h1>2</h1><h1>2</h1><h1>2</h1>'
+		}
+	},
+	methods: {
+		tabsChange(index) {
+			this.swiperCurrent = index;
+		},
+		animationfinish(e) {
+			let current = e.detail.current;
+			this.swiperCurrent = current;
+			this.current = current;
+		}
+	},
+}
+</script>
+<style lang="scss" scpoed>
+.member {
+	min-height: calc(100vh - var(--window-top));
+	background-color: #ECECEC;
+	display: flex;
+	flex-direction: column;
+	> uni-swiper {
+		flex: 1;
+	}
+	.swiper-item {
+		padding-top: 10rpx;
+		.integral {
+			height: 100%;
+			position: relative;
+			.integral-top {
+				padding: 79rpx 88rpx;
+				width: 750rpx;
+				height: 271rpx;
+				background: linear-gradient(0deg,rgba(246,211,119,1) 1%,rgba(240,154,105,1) 100%);
+				display: flex;
+				justify-content: space-between;
+				> view {
+					flex: 1;
+					text-align: center;
+					.title {
+						font-size: 28rpx;
+						color: rgba(255,255,255, 0.6);
+						margin-bottom: 29rpx;
+					}
+					.value {
+						font-size: 48rpx;
+						font-weight: 500;
+						color: rgba(255,255,255,1);
+					}
+				}
+			}
+			.integral-botom {
+				position: absolute;
+				width: 750rpx;
+				// height: 856rpx;
+				background: rgba(255,255,255,1);
+				border-radius: 20rpx 20rpx 0rpx 0rpx;
+				top: 251rpx;
+				z-index: 9;
+			}
+		}
+		.coupon {
+			.coupon-item {
+				padding: 30rpx;
+				background-color: #ffffff;
+				display: flex;
+				align-items: flex-end;
+				margin-bottom: 2rpx;
+				> img {
+					width: 180rpx;
+					height: 160rpx;
+					border-radius: 10rpx;
+					margin-right: 30rpx;
+				}
+				.coupon-main {
+					.coupon-title {
+						font-size: 30rpx;
+						color: rgba(51,51,51,1);
+					}
+					.coupon-date {
+						display: flex;
+						align-items: center;
+						margin: 29rpx 0 20rpx;
+						> img {
+							width: 24rpx;
+							height: 24rpx;
+							margin-right: 15rpx;
+						}
+						> view {
+							font-size: 24rpx;
+							color: rgba(153,153,153,1);
+						}
+					}
+					.coupon-integral {
+						font-size: 30rpx;
+						font-weight: 500;
+						color: rgba(255,120,15,1);
+					}
+				}
+				.coupon-btn {
+					margin-left: auto;
+					width: 85rpx;
+					height: 42rpx;
+					border: 2rpx solid rgba(255,120,15,1);
+					border-radius: 10rpx;
+					font-size: 26rpx;
+					color: rgba(255,120,15,1);
+					line-height: 42rpx;
+					text-align: center;
+				}
+			}
+		}
+		.details {
+			.details-item {
+				background-color: #ffffff;
+				padding: 23rpx 30rpx;
+				margin-bottom: 2rpx;
+				display: flex;
+				align-items: center;
+				justify-content: space-between;
+				.item-left {
+					.item-title {
+						font-size: 32rpx;
+						color: rgba(51,51,51,1);
+						margin-bottom: 23rpx;
+					}
+					.item-date {
+						font-size: 24rpx;
+						color: rgba(153,153,153,1);
+					}
+				}
+				.item-right {
+					font-size: 32rpx;
+				}
+				.positive {
+					color: rgba(56,199,70,1);
+				}
+				.negative {
+					color: rgba(255,49,49,1);
+				}
+			}
+		}
+	}
+}
+</style>
\ No newline at end of file
diff --git a/pageE/mine/MineHelp.vue b/pageE/mine/MineHelp.vue
index 7384585..34d041b 100644
--- a/pageE/mine/MineHelp.vue
+++ b/pageE/mine/MineHelp.vue
@@ -1,49 +1,26 @@
 <template>
 	<view class="mine-help">
-		<view class="help-box">
-			<view v-for="(item, index) in helpList" :key="index" class="help-item" @click="toDetailsPage()">
-				<view>使用帮助</view>
-				<img src="../static/mine/21.png" />
-			</view>
-		</view>
+		<ArticleList :articleList="helpList" :type="type"></ArticleList>
 	</view>
 </template>
 <script>
+import ArticleList from '@/components/mine/article-list/index'
 export default {
 	data() {
 		return {
+			type: '使用帮助',
 			helpList: [1,1,1,1, 1, 1, 1]
 		}
 	},
-	methods: {
-		toDetailsPage() {
-			uni.navigateTo({
-				url: '/pageE/mine/HelpDetails'
-			});
-		}
+	components: {
+		ArticleList
 	},
+	methods: {},
 }
 </script>
 <style lang="scss" scoped>
 .mine-help {
-	min-height: 100vh;
+	min-height: calc(100vh - var(--window-top));
 	background-color: #ECECEC;
-	.help-box {
-		.help-item {
-			display: flex;
-			align-items: center;
-			justify-content: space-between;
-			height: 98rpx;
-			border-top: 2rpx solid #EBEBEB;
-			background-color: #ffffff;
-			padding: 0 30rpx;
-			font-size: 30rpx;
-			color: rgba(51,51,51,1);
-			> img {
-				width: 14rpx;
-				height: 24rpx;
-			}
-		}
-	}
 }
 </style>
\ No newline at end of file
diff --git a/pageE/mine/MineHistory.vue b/pageE/mine/MineHistory.vue
index 6315177..98ec682 100644
--- a/pageE/mine/MineHistory.vue
+++ b/pageE/mine/MineHistory.vue
@@ -32,7 +32,7 @@ export default {
 </script>
 <style lang="scss" scoped>
 .mine-history {
-	min-height: 100vh;
+	min-height: calc(100vh - var(--window-top));
 	background: #ECECEC;
 	.history-box {
 		padding: 20rpx 30rpx 0;
diff --git a/pageE/mine/MineIndex.vue b/pageE/mine/MineIndex.vue
index b7c0245..1d18eff 100644
--- a/pageE/mine/MineIndex.vue
+++ b/pageE/mine/MineIndex.vue
@@ -3,7 +3,6 @@
         <view class="mine-top">
             <view class="top">
 				<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>
@@ -17,7 +16,7 @@
 						<view class="user-rank">等级:34级</view>
 					</view>
 				</view>
-				<view class="member-service">会员服务</view>
+				<view class="member-service" @click="toOtherPage('MemberServe')">会员服务</view>
 			</view>
 			<view class="bottom">
 				<view>
@@ -81,11 +80,11 @@
 			<view class="tool">
 				<view class="title">我的工具</view>
 				<view class="content">
-					<view>
+					<view @click="toOtherPage('SendWash')">
 						<img src="../static/mine/20.png" />
 						<view>送洗</view>
 					</view>
-					<view>
+					<view @click="toOtherPage('Manicure')">
 						<img src="../static/mine/19.png" />
 						<view>美甲</view>
 					</view>
@@ -98,11 +97,11 @@
 			<view class="more-tool">
 				<view class="title">更多工具</view>
 				<view class="content">
-					<view>
+					<view @click="toOtherPage('Address')">
 						<img src="../static/mine/17.png" />
 						<view>收货地址</view>
 					</view>
-					<view>
+					<view @click="toOtherPage('AfterSalesHelp')">
 						<img src="../static/mine/9.png" />
 						<view>售后政策</view>
 					</view>
@@ -110,7 +109,7 @@
 						<img src="../static/mine/16.png" />
 						<view>使用帮助</view>
 					</view>
-					<view>
+					<view @click="toOtherPage('Complaints')">
 						<img src="../static/mine/15.png" />
 						<view>投诉意见</view>
 					</view>
@@ -139,7 +138,8 @@ export default {
 </script>
 <style lang="scss" scoped>
 .mine {
-	min-height: 100vh;
+	min-height: calc(100vh - var(--window-top));
+	// min-height: calc(100vh-var(--custom-bar-height));
 	background: #ECECEC;
     .mine-top {
 		width: 750rpx;
@@ -285,7 +285,6 @@ export default {
 				justify-content: space-between;
 				> view {
 					text-align: center;
-					flex: 1;
 				};
 			}
 		} 
diff --git a/pageE/mine/SendWash.vue b/pageE/mine/SendWash.vue
new file mode 100644
index 0000000..4df0bdd
--- /dev/null
+++ b/pageE/mine/SendWash.vue
@@ -0,0 +1,132 @@
+<template>
+	<view class="wash">
+		<view>
+			<u-tabs-swiper ref="tabs" :list="list" :is-scroll="false" active-color="#FF780F" :current="current" font-size="32" :show-bar="false" @change="tabsChange" height="88" ></u-tabs-swiper>
+		</view>
+		<swiper :current="swiperCurrent" @animationfinish="animationfinish">
+			<swiper-item class="swiper-item">
+				<scroll-view scroll-y class="order-list">
+					<view v-for="(item, index) in 3" :key="index" class="order-item">
+						<view class="order-title">
+							<view class="order-text">订单状态</view>
+							<view class="order-status">已预约</view>
+						</view>
+						<view class="order-info">
+							<image src="../static/mine/23.png"></image>
+							<view>
+								<view>骑手名字：xxx</view>
+								<view>联系方式：123456789</view>
+								<view>所属公司：xx公司</view>
+							</view>
+						</view>
+					</view>
+				</scroll-view>
+			</swiper-item>
+			<swiper-item class="swiper-item">
+				<scroll-view scroll-y class="none-page">
+					<view></view>
+				</scroll-view>
+			</swiper-item>
+			<swiper-item class="swiper-item">
+				<scroll-view scroll-y class="none-page">
+					<view></view>
+				</scroll-view>
+			</swiper-item>
+		</swiper>
+	</view>
+</template>
+<script>
+export default {
+	data() {
+		return {
+			list: [{
+				name: '我的订单'
+			}, {
+				name: '申请表'
+			}, {
+				name: '评价'
+			}],
+			current: 0,
+			swiperCurrent: 0
+		}
+	},
+	onShow() {
+		this.current = 0;
+		this.swiperCurrent = 0;
+	},
+	methods: {
+		tabsChange(index) {
+			this.swiperCurrent = index;
+			this.toApplyPage(index);
+		},
+		animationfinish(e) {
+			let current = e.detail.current;
+			this.swiperCurrent = current;
+			this.current = current;
+			this.toApplyPage(current);
+		},
+		toApplyPage(index) {
+			// if(index == 2) {
+			// 	uni.navigateTo({
+			// 		url: '/pageE/mine/ManicureOrder'
+			// 	});
+			// }
+		}
+	},
+};
+</script>
+<style lang="scss" scoped>
+.wash {
+	min-height: calc(100vh - var(--window-top));
+	background-color: #ECECEC;
+	display: flex;
+	flex-direction: column;
+	> uni-swiper {
+		flex: 1;
+	}
+	.swiper-item {
+		padding: 20rpx 30rpx 0;
+		.order-list {
+			.order-item {
+				padding: 30rpx;
+				width:690rpx;
+				height: 308rpx;
+				background: rgba(255,255,255,1);
+				border-radius: 10rpx;
+				margin-bottom: 20rpx;
+				.order-title {
+					display: flex;
+					align-items: center;
+					justify-content: space-between;
+					margin-bottom: 30rpx;
+					.order-text {
+						font-size: 30rpx;
+						color: rgba(51,51,51,1);
+					}
+					.order-status {
+						font-size: 28rpx;
+						color: rgba(255,120,15,1);
+					}
+				}
+				.order-info {
+					display: flex;
+					align-items: center;
+					> image {
+						width: 180rpx;
+						height: 160rpx;
+						border-radius: 10rpx;
+						margin-right: 30rpx;
+					}
+					> view {
+						font-size:　26rpx;
+						color:　rgba(51,51,51,1);
+						> view:not(:last-child) {
+							margin-bottom: 19rpx;
+						}
+					}
+				}
+			}
+		}
+	}
+}
+</style>
\ No newline at end of file
diff --git a/pageE/mine/WriteComments.vue b/pageE/mine/WriteComments.vue
new file mode 100644
index 0000000..5cadce5
--- /dev/null
+++ b/pageE/mine/WriteComments.vue
@@ -0,0 +1,74 @@
+<template>
+	<view class="write-complaints">
+		<view class="main-container">
+			<textarea @blur="bindTextAreaBlur" auto-height placeholder="发表您的意见吧，我们会做得更好." maxlength="200" />
+			<u-upload 
+				ref="uUpload" 
+				@on-uploaded="onUploaded" 
+				:custom-btn="true" 
+				:max-count="count" 
+				:auto-upload="false"
+			>
+				<view slot="addBtn" class="slot-btn" hover-class="slot-btn__hover" hover-stay-time="150">
+					<img src="../static/mine/27.png" />
+				</view>
+			</u-upload>
+		</view>
+		<view class="write-btn" @click="submit">发表意见</view>
+	</view>
+</template>
+<script>
+export default {
+	data() {
+		return {
+			count: 4, // 最大图片数量
+			imageList: []
+		}
+	},
+	methods: {
+		submit() {
+			this.$refs.uUpload.upload();
+		},
+		onUploaded(list) {
+			console.log(list)
+		}
+	},
+}
+</script>
+<style lang="scss" scoped>
+.write-complaints {
+	min-height: calc(100vh - var(--window-top));
+	background-color: #ECECEC;
+	.main-container {
+		background-color: #ffffff;
+		padding: 30rpx;
+		textarea {
+			width: 100% !important;
+			margin-bottom: 60rpx;
+		}
+		.slot-btn {
+			width: 140rpx;
+			height: 140rpx;
+			background: rgba(236,236,236,1);
+			border-radius: 10rpx;
+			text-align: center;
+			> img {
+				margin-top: 48rpx;
+				width: 54rpx;
+				height: 49rpx;
+			}
+		}
+	}
+	.write-btn {
+		margin: 120rpx auto 0;
+		width: 690rpx;
+		height: 98rpx;
+		background: rgba(255,120,15,1);
+		border-radius: 46rpx;
+		font-size: 36rpx;
+		color: rgba(255,255,255,1);
+		text-align: center;
+		line-height: 98rpx;
+	}
+}
+</style>
\ No newline at end of file
diff --git a/pageE/static/mine/26.png b/pageE/static/mine/26.png
new file mode 100644
index 0000000000000000000000000000000000000000..460a54f567b8422ab7f6f406382f0efc95300686
GIT binary patch
literal 3591
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
N002ovPDHLkV1np})k6RP

literal 0
HcmV?d00001

diff --git a/pageE/static/mine/27.png b/pageE/static/mine/27.png
new file mode 100644
index 0000000000000000000000000000000000000000..4a914398d7c99d66b8c985fdc4768b401456f230
GIT binary patch
literal 3250
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

literal 0
HcmV?d00001

diff --git a/pages.json b/pages.json
index dce346f..af869a8 100644
--- a/pages.json
+++ b/pages.json
@@ -50,6 +50,19 @@
 		{
 			"root": "pageE",
 			"pages":[
+				{
+					"path": "mine/MineIndex",
+					"style": {
+						"navigationBarTitleText": "我的",
+						"app-plus": {
+							"titleSize": "36px",
+							"titleColor": "#333333",
+							"titleNView": {
+								"backgroundColor": "#FFFFFF"
+							}
+						}
+					}
+				},
 				{
 					"path": "mine/MineHistory",
 					"style": {
@@ -77,9 +90,21 @@
 					}
 				},
 				{
-					"path": "mine/HelpDetails",
+					"path": "mine/AfterSalesHelp",
+					"style": {
+						"navigationBarTitleText": "售后政策",
+						"app-plus": {
+							"titleSize": "36px",
+							"titleColor": "#333333",
+							"titleNView": {
+								"backgroundColor": "#FFFFFF"
+							}
+						}
+					}
+				},
+				{
+					"path": "mine/ArticleDetails",
 					"style": {
-						"navigationBarTitleText": "使用帮助详情",
 						"app-plus": {
 							"titleSize": "36px",
 							"titleColor": "#333333",
@@ -110,19 +135,18 @@
 							"titleSize": "36px",
 							"titleColor": "#333333",
 							"titleNView": {
-								"backgroundColor": "#FFFFFF"
-							},
-							"buttons": [
-								{  
-									"type":"none",
-									"text":"删除",
-									"float":"right",
-									"fontSize":"26"
-								}
-							]
+								"backgroundColor": "#FFFFFF",
+								"buttons": [
+									{  
+										"type":"none",
+										"text":"删除",
+										"float":"right",
+										"fontSize":"14"
+									}
+								]
+							}
 						}
 					}
-				
 				},
 				{
 					"path": "mine/AddAddress",
@@ -136,7 +160,92 @@
 							}
 						}
 					}
-				
+				},
+				{
+					"path": "mine/Complaints",
+					"style": {
+						"navigationBarTitleText": "投诉意见",
+						"app-plus": {
+							"titleSize": "36px",
+							"titleColor": "#333333",
+							"titleNView": {
+								"backgroundColor": "#FFFFFF",
+								"buttons": [
+									{  
+										"type":"none",
+										"text":"写意见",
+										"float":"right",
+										"fontSize":"14"
+									}
+								]
+							}
+						}
+					}
+				},
+				{
+					"path": "mine/WriteComments",
+					"style": {
+						"navigationBarTitleText": "写意见",
+						"app-plus": {
+							"titleSize": "36px",
+							"titleColor": "#333333",
+							"titleNView": {
+								"backgroundColor": "#FFFFFF"
+							}
+						}
+					}
+				},
+				{
+					"path": "mine/MemberServe",
+					"style": {
+						"navigationBarTitleText": "会员服务",
+						"app-plus": {
+							"titleSize": "36px",
+							"titleColor": "#333333",
+							"titleNView": {
+								"backgroundColor": "#FFFFFF"
+							}
+						}
+					}
+				},
+				{
+					"path": "mine/Manicure",
+					"style": {
+						"navigationBarTitleText": "美甲",
+						"app-plus": {
+							"titleSize": "36px",
+							"titleColor": "#333333",
+							"titleNView": {
+								"backgroundColor": "#FFFFFF"
+							}
+						}
+					}
+				},
+				{
+					"path": "mine/ManicureOrder",
+					"style": {
+						"navigationBarTitleText": "美甲订单",
+						"app-plus": {
+							"titleSize": "36px",
+							"titleColor": "#333333",
+							"titleNView": {
+								"backgroundColor": "#FFFFFF"
+							}
+						}
+					}
+				},
+				{
+					"path": "mine/SendWash",
+					"style": {
+						"navigationBarTitleText": "送洗",
+						"app-plus": {
+							"titleSize": "36px",
+							"titleColor": "#333333",
+							"titleNView": {
+								"backgroundColor": "#FFFFFF"
+							}
+						}
+					}
 				}
 			]
 		}