From bf5691b68a34c2093063d6acd154659907333693 Mon Sep 17 00:00:00 2001
From: ghusermoon <2673031505@qq.com>
Date: Tue, 23 Jun 2020 09:00:04 +0800
Subject: [PATCH] 6.22

---
 common/api/user.js                       | 15 ++++++++-
 components/mine/address-active/index.vue |  2 +-
 pageE/tool/Manicure.vue                  | 41 +++++++++++++++++++-----
 pageE/tool/ManicureOrder.vue             |  8 +++++
 4 files changed, 56 insertions(+), 10 deletions(-)

diff --git a/common/api/user.js b/common/api/user.js
index f2f9ecc..79ed564 100644
--- a/common/api/user.js
+++ b/common/api/user.js
@@ -77,7 +77,20 @@ export default {
 			// 用户收货地址列表
 			getAddressList() {
 				return vm.$u.post('MemberAddress/addressList');
-			}
+			},
+			// 美甲
+			getManicureList({ page }) {
+				return vm.$u.post('MemberManicure/getManicureList', {
+					page: page
+				});
+			},
+			// 美甲-提交订单
+			addManicure({ name, time }) {
+				return vm.$u.post('MemberManicure/addManicure', {
+					name: name,
+					time: time
+				});
+			},
         }
     }
 }
\ No newline at end of file
diff --git a/components/mine/address-active/index.vue b/components/mine/address-active/index.vue
index df3052b..ca8983d 100644
--- a/components/mine/address-active/index.vue
+++ b/components/mine/address-active/index.vue
@@ -22,7 +22,7 @@
 		</view>
 		<view class="edit-btn">保存地址</view>
 		<!-- <u-picker mode="region" v-model="show" @confirm="setArea"></u-picker> -->
-		<u-select v-model="show" mode="mutil-column-auto" :list="areaList" @confirm="setArea"></u-select>
+		<!-- <u-select v-model="show" mode="mutil-column-auto" :list="areaList" @confirm="setArea"></u-select> -->
 	</view>
 </template>
 <script>
diff --git a/pageE/tool/Manicure.vue b/pageE/tool/Manicure.vue
index 6d616d5..5100701 100644
--- a/pageE/tool/Manicure.vue
+++ b/pageE/tool/Manicure.vue
@@ -5,14 +5,17 @@
 		</view>
 		<swiper :current="swiperCurrent" @animationfinish="animationfinish">
 			<swiper-item class="swiper-item">
-				<scroll-view scroll-y class="order-list">
-					<view v-for="(item, index) in 6" :key="index" class="order-item">
-						<view class="order-title">
-							<view class="order-text">订单</view>
-							<view class="order-status">已预约</view>
+				<scroll-view scroll-y class="order-list" @scrolltolower="reachBottom">
+					<view>
+						<view v-for="(item, index) in orderList" :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>
-						<view class="order-name">美甲人姓名：xxx</view>
-						<view class="order-date">时间：2020-04-12</view>
+						<u-loadmore :status="loadStatus" bgColor="#ECECEC" margin-bottom="20"></u-loadmore>
 					</view>
 				</scroll-view>
 			</swiper-item>
@@ -34,7 +37,10 @@ export default {
 				name: '申请表'
 			}],
 			current: 0,
-			swiperCurrent: 0
+			swiperCurrent: 0,
+			page: 1,
+			orderList: 5,
+			loadStatus: 'loadmore',
 		}
 	},
 	onShow() {
@@ -42,6 +48,25 @@ export default {
 		this.swiperCurrent = 0;
 	},
 	methods: {
+		getManicureList() {
+			this.$u.api.getManicureList({
+				page: this.page
+			}).then((res)=>{
+				if (res.errCode == 0) {}
+			})
+		},
+		reachBottom() {
+			// console.log(this.page);
+			if(this.page >= 3) return;
+			// 修改当前的 loadStatus
+			console.log(this.loadStatus);
+			this.loadStatus.splice(this.current, 1, "loading");
+			this.page++;
+			setTimeout(() => {
+				this.orderList += 5;
+				this.loadStatus.splice(this.current, 1, "nomore");
+			}, 1200);
+		},
 		tabsChange(index) {
 			this.swiperCurrent = index;
 			this.toApplyPage(index);
diff --git a/pageE/tool/ManicureOrder.vue b/pageE/tool/ManicureOrder.vue
index 4e00368..50471cc 100644
--- a/pageE/tool/ManicureOrder.vue
+++ b/pageE/tool/ManicureOrder.vue
@@ -33,6 +33,14 @@ export default {
 		}
 	},
 	methods: {
+		addManicureOrder() {
+			this.$u.api.addManicure({
+				name: this.name,
+				time: this.time
+			}).then((res)=>{
+				if (res.errCode == 0) {}
+			})
+		},
 		chooseDate(e) {
 			let time = e.year + '年' + e.month + '月' + e.day + '日' + e.hour + '时' + e.minute + '分'
 			this.time = time