Merge pull request '6.4' (#13) from zhy into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/13
This commit is contained in:
		
						commit
						0dd0f55245
					
				@ -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 {
 | 
			
		||||
 | 
			
		||||
@ -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);
 | 
			
		||||
 | 
			
		||||
							
								
								
									
										47
									
								
								components/mine/article-list/index.vue
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										47
									
								
								components/mine/article-list/index.vue
									
									
									
									
									
										Normal file
									
								
							@ -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>
 | 
			
		||||
@ -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>
 | 
			
		||||
@ -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>
 | 
			
		||||
							
								
								
									
										26
									
								
								pageE/mine/AfterSalesHelp.vue
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										26
									
								
								pageE/mine/AfterSalesHelp.vue
									
									
									
									
									
										Normal file
									
								
							@ -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>
 | 
			
		||||
@ -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>
 | 
			
		||||
							
								
								
									
										100
									
								
								pageE/mine/Complaints.vue
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										100
									
								
								pageE/mine/Complaints.vue
									
									
									
									
									
										Normal file
									
								
							@ -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>
 | 
			
		||||
@ -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>
 | 
			
		||||
							
								
								
									
										111
									
								
								pageE/mine/Manicure.vue
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										111
									
								
								pageE/mine/Manicure.vue
									
									
									
									
									
										Normal file
									
								
							@ -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>
 | 
			
		||||
							
								
								
									
										94
									
								
								pageE/mine/ManicureOrder.vue
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										94
									
								
								pageE/mine/ManicureOrder.vue
									
									
									
									
									
										Normal file
									
								
							@ -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>
 | 
			
		||||
							
								
								
									
										217
									
								
								pageE/mine/MemberServe.vue
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										217
									
								
								pageE/mine/MemberServe.vue
									
									
									
									
									
										Normal file
									
								
							@ -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>
 | 
			
		||||
@ -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>
 | 
			
		||||
@ -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;
 | 
			
		||||
 | 
			
		||||
@ -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;
 | 
			
		||||
				};
 | 
			
		||||
			}
 | 
			
		||||
		} 
 | 
			
		||||
 | 
			
		||||
							
								
								
									
										132
									
								
								pageE/mine/SendWash.vue
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										132
									
								
								pageE/mine/SendWash.vue
									
									
									
									
									
										Normal file
									
								
							@ -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>
 | 
			
		||||
							
								
								
									
										74
									
								
								pageE/mine/WriteComments.vue
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										74
									
								
								pageE/mine/WriteComments.vue
									
									
									
									
									
										Normal file
									
								
							@ -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>
 | 
			
		||||
							
								
								
									
										
											BIN
										
									
								
								pageE/static/mine/26.png
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										
											BIN
										
									
								
								pageE/static/mine/26.png
									
									
									
									
									
										Normal file
									
								
							
										
											Binary file not shown.
										
									
								
							| 
		 After Width: | Height: | Size: 3.5 KiB  | 
							
								
								
									
										
											BIN
										
									
								
								pageE/static/mine/27.png
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										
											BIN
										
									
								
								pageE/static/mine/27.png
									
									
									
									
									
										Normal file
									
								
							
										
											Binary file not shown.
										
									
								
							| 
		 After Width: | Height: | Size: 3.2 KiB  | 
							
								
								
									
										137
									
								
								pages.json
									
									
									
									
									
								
							
							
						
						
									
										137
									
								
								pages.json
									
									
									
									
									
								
							@ -77,6 +77,19 @@
 | 
			
		||||
		{
 | 
			
		||||
			"root": "pageE",
 | 
			
		||||
			"pages":[
 | 
			
		||||
				{
 | 
			
		||||
					"path": "mine/MineIndex",
 | 
			
		||||
					"style": {
 | 
			
		||||
						"navigationBarTitleText": "我的",
 | 
			
		||||
						"app-plus": {
 | 
			
		||||
							"titleSize": "36px",
 | 
			
		||||
							"titleColor": "#333333",
 | 
			
		||||
							"titleNView": {
 | 
			
		||||
								"backgroundColor": "#FFFFFF"
 | 
			
		||||
							}
 | 
			
		||||
						}
 | 
			
		||||
					}
 | 
			
		||||
				},
 | 
			
		||||
				{
 | 
			
		||||
					"path": "mine/MineHistory",
 | 
			
		||||
					"style": {
 | 
			
		||||
@ -104,9 +117,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",
 | 
			
		||||
@ -137,19 +162,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",
 | 
			
		||||
@ -163,7 +187,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"
 | 
			
		||||
							}
 | 
			
		||||
						}
 | 
			
		||||
					}
 | 
			
		||||
				}
 | 
			
		||||
			]
 | 
			
		||||
		}	
 | 
			
		||||
 | 
			
		||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user