From 6eabd3a575383fdbb933faa582a0ce20f1f16e47 Mon Sep 17 00:00:00 2001
From: ghusermoon <2673031505@qq.com>
Date: Mon, 27 Jul 2020 17:59:47 +0800
Subject: [PATCH] loadmore 7.27

---
 common/api/shop.js                   |  11 ++
 common/api/user.js                   |   4 +
 components/loadmore/index.vue        |  11 --
 components/mine/order-item/index.vue |   1 +
 components/shop/list/index.vue       |   7 +-
 pageB/comment/index.vue              |  47 +++--
 pageB/sdetails/index.vue             |  18 +-
 pageB/triedDress/index.vue           | 260 +++++++++++++++++++++++++++
 pageC/cart/ConfirmOrder.vue          |   8 +-
 pageC/groupBuy/index.vue             |  33 ++--
 pageE/mine/MedalIntroduction.vue     |  16 +-
 pageE/mine/MemberServeCoupon.vue     |  23 +++
 pageE/mine/MineProgress.vue          |   4 +-
 pageE/order/Index.vue                |  19 ++
 pageE/tool/SendWash.vue              |   4 +-
 pageE/tool/WashOrder.vue             |   2 +-
 pages.json                           |  11 ++
 17 files changed, 421 insertions(+), 58 deletions(-)
 create mode 100644 pageB/triedDress/index.vue

diff --git a/common/api/shop.js b/common/api/shop.js
index 19eb9a8..bda384f 100644
--- a/common/api/shop.js
+++ b/common/api/shop.js
@@ -278,6 +278,17 @@ export default {
 			searchwordlist() {
 				return vm.$u.post('ShopSearch/searchwordlist')
 			},
+			saveGoodsTry({ member_name, member_mobile, area_info, address_detail, goods_id, num, store_id }) {
+				return vm.$u.post('Order/saveGoodsTry', {
+					member_name: member_name,
+					member_mobile: member_mobile,
+					area_info: area_info,
+					address_detail: address_detail,
+					goods_id: goods_id,
+					num: num,
+					store_id: store_id,
+				})
+			},
         }
     }
     
diff --git a/common/api/user.js b/common/api/user.js
index 68fef94..bd1ad4e 100644
--- a/common/api/user.js
+++ b/common/api/user.js
@@ -240,6 +240,10 @@ export default {
 			getAfterSaleList({ page }) {
 				return vm.$u.post('order/afterSaleList', { page: page });
 			},
+			// 试穿列表
+			goodsTryOrderList() {
+				return vm.$u.post('order/goodsTryOrderList');
+			},
 			// 订单详情
 			getOrderInfo({ order_id }) {
 				return vm.$u.post('Order/orderInfo', { order_id: order_id });
diff --git a/components/loadmore/index.vue b/components/loadmore/index.vue
index e52261f..cea80bc 100644
--- a/components/loadmore/index.vue
+++ b/components/loadmore/index.vue
@@ -42,17 +42,6 @@ export default {
 			// 	this.loadStatus = "nomore";
 			// 	this.tpage--;
 			// })
-			// this.$parent.callback({ page: this.tpage }).then(length => {
-			// 	if(length == 0) {
-			// 		this.tpage--;
-			// 		this.status = 'nomore';
-			// 	} else {
-			// 		this.status = 'loading';
-			// 	}
-			// }).catch(() => {
-			// 	this.loadStatus = "nomore";
-			// 	this.tpage--;
-			// })
 		}
 	}
 };
diff --git a/components/mine/order-item/index.vue b/components/mine/order-item/index.vue
index 97800b7..c0c3af9 100644
--- a/components/mine/order-item/index.vue
+++ b/components/mine/order-item/index.vue
@@ -96,6 +96,7 @@ export default {
 				if(res.errCode == 0) {
 					this.$emit("refreshOrderList", { reload: 'again' });
 				}
+				this.$u.toast(res.message);
 			})
 		},
 		toOtherPage(url) {
diff --git a/components/shop/list/index.vue b/components/shop/list/index.vue
index 55d8653..13b6c83 100644
--- a/components/shop/list/index.vue
+++ b/components/shop/list/index.vue
@@ -14,12 +14,10 @@
 		</swiper>
 		<!-- 加载更多 -->
 		<u-loadmore :status="loadStatus" bgColor="#FFF" margin-top="20" margin-bottom="20"></u-loadmore>
-		<!-- <loadmore ref="loadmore" @callback="getGoodsRecommend" bgColor="#FFF" :page="page"></loadmore> -->
     </view>
 </template>
 <script>
 import item from "./item";
-import loadmore from "@/components/loadmore/index";
 export default {
 	name:"list",
 	data() {
@@ -36,10 +34,10 @@ export default {
 	},
     components: {
 		item,
-		loadmore
 	},
 	watch: {
 		current(index) {
+			this.page = 1;
 			const id = this.classifyList[index].gc_id;
 			this.getGoodsRecommend({gc_id: id});
 		}
@@ -68,8 +66,6 @@ export default {
 				this.loadStatus = "nomore";
 				this.page--;
 			})
-			// this.$refs.loadmore.reachBottom();
-			// this.getGoodsRecommend(this.classifyList[this.current].gc_id);
 		},
 		getGoodsClassRecommend(gc_id) {
 			this.$u.api.getGoodsClassRecommend().then(res => {
@@ -77,7 +73,6 @@ export default {
 					// 初始化 current
 					this.current = 0;
 					this.classifyList = res.data.gc_recommend;
-					// this.getGoodsRecommend(this.classifyList[0].gc_id);
 				}
 			})
 		},
diff --git a/pageB/comment/index.vue b/pageB/comment/index.vue
index c70266e..c0bb0a8 100644
--- a/pageB/comment/index.vue
+++ b/pageB/comment/index.vue
@@ -1,5 +1,5 @@
 <template>
-	<view class="comment">
+	<scroll-view scroll-y class="comment" @scrolltolower="loadMore">
 		<view class="label-list">
 			<view v-for="(label, index) in evaluateSpec" :key="index" :class="{'active': current == index}" @click="current=index">{{ index + '(' + label + '}' }}</view>
 		</view>
@@ -9,7 +9,9 @@
 			</view>
 			<u-empty text="暂无评论" mode="list" v-if="!evalueList.length" margin-top="120" color="#333"></u-empty>
 		</view>
-	</view>
+		<!-- 加载更多 -->
+		<u-loadmore :status="loadStatus" bgColor="#EEEBEE" margin-top="20" margin-bottom="20" v-if="evalueList.length >= 12"></u-loadmore>
+	</scroll-view>
 </template>
 <script>
 import comment from "@/components/comment/index";
@@ -21,6 +23,8 @@ export default {
 			page: 0,
 			evalueList: [],
 			evaluateSpec: {},
+			loadStatus: 'loadmore',
+			timer: true,
 		}
 	},
 	components: {
@@ -33,13 +37,31 @@ export default {
 	},
 	watch: {
 		current(value) {
-			this.getAllEvalue(value);
+			this.page = 0;
+			this.getAllEvalue({ type: value });
 		}
 	},
 	methods: {
+		loadMore() {
+			if(this.evalueList.length < 12) return false;
+			if(!this.timer) return false;
+			this.loadStatus = "loading";
+			this.page++;
+			this.getAllEvalue({ type: this.current, load: 'more' }).then(length => {
+				if(length == 0) {
+					this.page--;
+					this.loadStatus = 'nomore';
+				} else {
+					this.loadStatus = 'loading';
+				}
+			}).catch(() => {
+				this.loadStatus = "nomore";
+				this.page--;
+			})
+		},
 		getEvaluateSpec() {
 			this.$u.api.getEvaluateSpec({
-				id: this.id
+				id: this.id,
 			}).then(res => {
 				if(res.errCode == 0) {
 					this.evaluateSpec = res.data;
@@ -47,19 +69,20 @@ export default {
 				}
 			})
 		},
-		getAllEvalue(type) {
+		async getAllEvalue({ type, load } = {}) {
 			let params = {
 				goods_id: this.id, 
 				page: this.page,
 			}
 			if(type) Object.assign(params, { type: type });
-			this.$u.api.getAllEvalue(params).then(res => {
-				if(res.errCode == 0) {
-					this.evalueList = res.data;
-				} else {
-					this.evalueList = [];
-				}
-			})
+			const res = await this.$u.api.getAllEvalue(params);
+			if (res.errCode == 0) {
+				if(load) this.evalueList.push(...res.data);
+				else this.evalueList = res.data;
+			} else {
+				this.evalueList = [];
+			}
+			return res.data.length;
 		}
 	}
 };
diff --git a/pageB/sdetails/index.vue b/pageB/sdetails/index.vue
index 0d82a84..d36acc8 100644
--- a/pageB/sdetails/index.vue
+++ b/pageB/sdetails/index.vue
@@ -9,10 +9,13 @@
 				</view>
 				<view class="num">剩余数量{{ groupbuyInfo.inventory - groupbuyInfo.groupbuy_buy_quantity }}件</view>
 			</view>
-			<view class="right">
+			<view class="right" v-if="!isSpike">
 				<view class="title">秒杀倒计时</view>
 				<view class="time">{{ spikeTime }}</view>
 			</view>
+			<view class="right" v-else>
+				<view class="title">时间已结束</view>
+			</view>
 		</view>
         <view class="info">
             <view class="title u-line-2">
@@ -139,7 +142,7 @@
                 <image src="/static/image/common/19.png"></image>
                 客服
             </view>
-            <view class="button" style="background:rgba(253,211,96,0.6);" v-if="goodsInfo.goods_try == 1">试穿试送</view>
+            <view class="button" style="background:rgba(253,211,96,0.6);" v-if="goodsInfo.goods_try == 1" @click="tryDress">试穿试送</view>
             <view class="button" style="background:rgba(253,211,96,1);" @click="addCart">加入购物车</view>
             <view class="button" style="background:rgba(255,120,15,1);" @click="settlementOrder">立即购买</view>
         </view>
@@ -190,6 +193,7 @@ export default {
 			involvemenGroupInfo: [], // 参团的人
 			groupbuyInfo: {}, // 秒杀详情
 			spikeTime: '',
+			isSpike: false, // 是否超过秒杀时间
 			timer: '', // 秒杀时间定时器
 			spec_id: '', // 规格 id, 下单用的
 			evaluate: {}, // 评价内容
@@ -272,6 +276,7 @@ export default {
 			// const time = this.groupbuyInfo.groupbuy_endtime;
 			this.timer = setInterval(() => {
 				let spikeTime = time * 1000 - new Date().getTime();
+				if(spikeTime <= 0) this.isSpike = true;
 				// 计算天数
 				const days = Math.floor(spikeTime/(24*3600*1000));
 				//计算出小时数
@@ -363,6 +368,15 @@ export default {
 				}
 			})
 		},
+		// 试穿
+		tryDress() {
+			this.$u.route({
+				url: '/pageB/triedDress/index',
+				params: {
+					id: this.id,
+				}
+			})
+		},
 		/*
 		* @description 下单 订单步骤1：展示结算数据
 		* @params {Number} type 拼团或者开团
diff --git a/pageB/triedDress/index.vue b/pageB/triedDress/index.vue
new file mode 100644
index 0000000..1ffea1d
--- /dev/null
+++ b/pageB/triedDress/index.vue
@@ -0,0 +1,260 @@
+<template>
+	<view class="tried">
+		<view class="user-info">
+			<view>
+				<label for="name">试穿人:</label>
+				<input type="text" id="name" placeholder="" v-model="name" />
+			</view>
+			<view>
+				<label for="phone">手机号:</label>
+				<input type="text" id="phone" placeholder="" maxlength="11" v-model="phone" />
+			</view>
+			<view class="area" @click="show=true">
+				<label for="address">省市区:</label>
+				<input type="text" id="address" placeholder="" v-model="address" disabled />
+				<view>
+					<image src="/static/image/mine/24.png"></image>
+					<text>定位</text>
+				</view>
+			</view>
+			<view>
+				<label for="area">详细地址:</label>
+				<input type="text" id="area" placeholder="" v-model="area" />
+			</view>
+			<view>
+				<label for="time">预约时间:</label>
+				<input type="text" id="time" placeholder="" v-model="time" />
+			</view>
+		</view>
+		<view class="goods-container">
+			<view class="store">
+				<image :src="store.store_avatar"></image>
+				<text>{{ store.store_name }}</text>
+			</view>
+			<view class="goods">
+				<image :src="goodsInfo.goods_image"></image>
+				<view class="right">
+					<view class="name u-line-2">{{ goodsInfo.goods_name }}</view>
+					<u-number-box v-model="number" bg-color="#FFFFFF" :min="1" :input-width="38" :input-height="38" color="#FF780F"></u-number-box>
+				</view>
+			</view>
+		</view>
+		<view class="edit-btn" @click="confirmBtn">确认试穿</view>
+		<u-select v-model="show" 
+				mode="mutil-column-auto" 
+				:list="areaList" 
+				value-name="area_id" 
+				label-name="area_name" 
+				child-name="_child" 
+				@confirm="setArea">
+		</u-select>
+		<u-toast ref="uToast" />
+	</view>
+</template>
+<script>
+export default {
+	data() {
+		return {
+			show: false,
+			areaList: [],
+			checked: false, // 是否设为默认地址
+			name: '',
+			phone: '',
+			address: '', // 选择地址
+			area: '', // 详细地址
+			time: '',
+			number: 1, // 商品数量
+			area_id: '', // 地区id 省
+			city_id: '', // 城市id
+			goodsInfo: {},
+			store: {},
+		}
+	},
+	mounted() {
+		this.getAreaData();
+	},
+	onLoad(option) {
+		this.ordinaryDetails(option.id);
+	},
+	methods: {
+		verification() {
+			if(this.$u.test.isEmpty(this.name)) {
+				this.$u.toast('姓名不可为空');
+				return false;
+			}
+			if(this.$u.test.isEmpty(this.phone)) {
+				this.$u.toast('手机号不可为空');
+				return false;
+			}
+			if(!this.$u.test.mobile(this.phone)) {
+				this.$u.toast('请填写正确的新手机号');
+				return false;
+			}
+			if(this.$u.test.isEmpty(this.address)) {
+				this.$u.toast('地址不可为空');
+				return false;
+			}
+			if(this.$u.test.isEmpty(this.area)) {
+				this.$u.toast('详细地址不可为空');
+				return false;
+			}
+			return true;
+		},
+		confirmBtn() {
+			if(!this.verification) return false;
+			this.$u.api.saveGoodsTry({
+				member_name: this.name,
+				member_mobile: this.phone,
+				area_info: this.address,
+				address_detail: this.area,
+				goods_id: this.goodsInfo.goods_id,
+				num: this.number,
+				store_id: this.store.store_id,
+			}).then((res)=>{
+				this.$u.toast(res.message);
+				if (res.errCode == 0) {
+					// this.$u.route({ type: 'navigateBack' });
+				}
+			})
+		},
+		getAreaData() {
+			this.$u.api.getArea().then((res)=>{
+				if (res.errCode == 0) {
+					this.areaList = res.data;
+				}
+			})
+		},
+		setArea(area) {
+			// console.log(area);
+			this.area_id = area[0].value;
+			this.city_id = area[1].value;
+			let temp = '';
+			area.forEach(e => {
+				temp += e.label + ' ';
+			});
+			this.address = temp;
+		},
+		ordinaryDetails(id) {
+			this.$u.api.getGoodsDetails({ id: id }).then((res)=>{
+				if (res.errCode == 0) {
+					this.goodsInfo = res.data.goods;
+					this.store = res.data.store;
+				}
+			})
+		},
+	}
+};
+</script>
+<style lang="scss" scoped>
+.tried {
+	.user-info {
+		border-top: 1rpx solid rgba(235,235,235,1);
+		> view {
+			display: flex;
+			align-items: center;
+			height: 98rpx;
+			padding: 30rpx;
+			border-bottom: 2rpx solid rgba(235,235,235,1);
+			font-size: 30rpx;
+			> label {
+				width: 150rpx;
+				margin-right: 20rpx;
+			}
+			> input {
+				flex: 1;
+				outline: none;
+			}
+		}
+		.area {
+			padding: 0 30rpx;
+			display: flex;
+			> input {
+				padding: 30rpx 0;
+				flex: 1;
+			}
+			> view {
+				margin-left: 30rpx;
+				width: 50rpx;
+				display: flex;
+				flex-direction: column;
+				align-items: center;
+				justify-content: center;
+				font-size: 22rpx;
+				color: rgba(255,120,15,1);
+				> image {
+					width: 26rpx;
+					height: 32rpx;
+					margin-bottom: 10rpx;
+				}
+			}
+		}
+	}
+	.goods-container {
+		padding: 30rpx;
+		.store {
+			display: flex;
+			align-items: center;
+			margin-bottom: 20rpx;
+			> image {
+				width: 60rpx;
+				height: 60rpx;
+				border-radius: 50%;
+				margin-right: 16rpx;
+				background-color: antiquewhite;
+			}
+			> text {
+				font-size: 28rpx;
+				color: rgba(51,51,51,1);
+			}
+		}
+		.goods {
+			display: flex;
+			> image {
+				width: 180rpx;
+				height: 160rpx;
+				border-radius: 10rpx;
+				margin-right: 30rpx;
+				background-color: aquamarine;
+			}
+			.right {
+				flex: 1;
+				.name {
+					font-size: 30rpx;
+					color: rgba(51,51,51,1);
+					line-height: 44rpx;
+					margin-bottom: 30rpx;
+				}
+				/deep/ .u-numberbox {
+					border: 1rpx solid rgba(217,215,215,1);
+					.u-icon-minus, .u-icon-plus {
+						width: 38rpx;
+						.u-icon {
+							.u-icon__icon {
+								font-size: 11rpx;
+							}
+						}
+					}
+					.u-number-input {
+						margin: 0;
+						border: 1rpx solid rgba(229,229,229,1) {
+							top: 0;
+							bottom: 0;
+						};
+					}
+				}
+			}
+		}
+	}
+	.edit-btn {
+		margin: 122rpx auto 0;
+		width: 690rpx;
+		height: 98rpx;
+		background: rgba(255,119,15,1);
+		border-radius: 49rpx;
+		font-size: 36rpx;
+		color:rgba(255,255,255,1);
+		line-height: 98rpx;
+		text-align: center;
+	}
+}
+</style>
\ No newline at end of file
diff --git a/pageC/cart/ConfirmOrder.vue b/pageC/cart/ConfirmOrder.vue
index 91ccfc1..d6f076c 100644
--- a/pageC/cart/ConfirmOrder.vue
+++ b/pageC/cart/ConfirmOrder.vue
@@ -68,13 +68,13 @@
 		<u-popup v-model="couponStatus" mode="bottom">
 			<scroll-view class="coupon-choose" scroll-y style="height: 800rpx;" v-if="this.couponType.type == 1">
 				<view class="title">优惠券详情</view>
-				<view class="text">店铺优惠券</view>
+				<view class="text">平台优惠券</view>
 				<Coupon :couponInfo="coupon" @use="useCoupon($event)" :goodsClass="goodsClass" v-for="(coupon, index) in orderInfo.store_voucher_all_list" :key="index"></Coupon>
 				<u-empty text="无可用优惠券" mode="coupon" v-if="!orderInfo.store_voucher_all_list.length"></u-empty>
 			</scroll-view>
 			<scroll-view class="coupon-choose" scroll-y style="height: 800rpx;" v-if="this.couponType.type == 2">
 				<view class="title">优惠券详情</view>
-				<view class="text">平台优惠券</view>
+				<view class="text">店铺优惠券</view>
 				<Coupon :couponInfo="coupon" @use="useCoupon($event)" :goodsClass="goodsClass" v-for="(coupon, index) in orderInfo.store_voucher_list[this.couponType.store_id]" :key="index"></Coupon>
 				<u-empty text="无可用优惠券" mode="coupon" v-if="!orderInfo.store_voucher_list[this.couponType.store_id].length"></u-empty>
 			</scroll-view>
@@ -121,7 +121,6 @@ export default {
 			choiceCoupon: {}, // 使用的平台优惠券
 			goodsClass: [],
 			orderType: '', // 订单类型 1 普通订单  2 拼团订单 3 秒杀订单 4 优惠券 5 购物车订单
-
 		}
 	},
 	components: {
@@ -152,6 +151,8 @@ export default {
 		this.getGoodsClass();
 	},
 	onShow() {
+		this.storeCoupon = {};
+		this.choiceCoupon = {};
 		// 判断是不是从选择地址页面返回
 		if(JSON.stringify(this.$store.state.orderAddress) == '{}') {
 			this.$store.commit('updateAddress', this.orderInfo.address_info);
@@ -256,6 +257,7 @@ export default {
 			this.$u.api.sendOrder(params).then(res => {
 				if(res.errCode == 0) {
 					this.$u.route({
+						type: 'redirect',
 						url: '/pageC/cart/cashier',
 						params: {
 							pay_sn: res.data.pay_sn,
diff --git a/pageC/groupBuy/index.vue b/pageC/groupBuy/index.vue
index a63ac9b..baa8dca 100644
--- a/pageC/groupBuy/index.vue
+++ b/pageC/groupBuy/index.vue
@@ -7,7 +7,7 @@
 			<swiper-item class="swiper-item" v-for="(_, index) in tabList" :key="index">
 				<scroll-view scroll-y style="height: 800rpx;width: 100%;" @scrolltolower="onreachBottom">
 					<SpecialGoods v-for="(item, index) in pinTuanList" :key="index" :item="item" type='group'></SpecialGoods>
-					<!-- <loadmore ref="loadmore" @callback="getPinTuanList" bgColor="#FFF"></loadmore> -->
+					<loadmore ref="loadmore" @callback="getPinTuanList" bgColor="#FFF"></loadmore>
 					<u-empty text="暂无商品" mode="list" color="#000" v-if="!pinTuanList.length"></u-empty>
 				</scroll-view>
 			</swiper-item>
@@ -39,8 +39,7 @@ export default {
 	},
 	watch: {
 		current(index) {
-			// console.log(this.tabList);
-			this.getPinTuanList({id: this.tabList[index].gc_id });
+			this.getPinTuanList({ id: this.tabList[index].gc_id });
 		}
 	},
 	methods: {
@@ -81,20 +80,20 @@ export default {
 		// scroll-view到底部加载更多
 		onreachBottom() {
 			this.$$refs.loadmore.reachBottom();
-			// if(!this.timer) return false;
-			// this.loadStatus = "loading";
-			// this.page++;
-			// this.getPinTuanList().then(length => {
-			// 	if(length == 0) {
-			// 		this.page--;
-			// 		this.status = 'nomore';
-			// 	} else {
-			// 		this.status = 'loading';
-			// 	}
-			// }).catch(() => {
-			// 	this.loadStatus = "nomore";
-			// 	this.page--;
-			// })
+			if(!this.timer) return false;
+			this.loadStatus = "loading";
+			this.page++;
+			this.getPinTuanList().then(length => {
+				if(length == 0) {
+					this.page--;
+					this.status = 'nomore';
+				} else {
+					this.status = 'loading';
+				}
+			}).catch(() => {
+				this.loadStatus = "nomore";
+				this.page--;
+			})
 		},
 		setViewHeight() {
 			const res = uni.getSystemInfoSync();
diff --git a/pageE/mine/MedalIntroduction.vue b/pageE/mine/MedalIntroduction.vue
index 6025fa5..1265c43 100644
--- a/pageE/mine/MedalIntroduction.vue
+++ b/pageE/mine/MedalIntroduction.vue
@@ -13,11 +13,25 @@
 	</view>
 </template>
 <script>
+import common from '@/static/js/common.js';
 export default {
 	data() {
 		return {
-			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>'
+			nodes: '',
 		}
+	}, 
+	created() {
+		this.getMemberPointsStat();
+	},
+	methods: {
+		getMemberPointsStat() {
+			this.$u.api.getMemberPointsStat().then((res)=>{
+				if (res.errCode == 0) {
+					const nodes = res.data.grade_rule;
+					this.nodes = common.unescapeHTML(nodes);
+				}
+			})
+		},
 	}
 };
 </script>
diff --git a/pageE/mine/MemberServeCoupon.vue b/pageE/mine/MemberServeCoupon.vue
index 4ca97f4..094ab67 100644
--- a/pageE/mine/MemberServeCoupon.vue
+++ b/pageE/mine/MemberServeCoupon.vue
@@ -34,6 +34,8 @@ export default {
 			couponGroupList: [],
 			couponList: [],
 			page: 0,
+			loadStatus: 'loadmore',
+			timer: true,
 		}
 	},
 	components: {
@@ -50,6 +52,27 @@ export default {
 		}
 	},
 	methods: {
+		loadMore(page) {
+			if(!this.timer) return false;
+			this.loadStatus = "loading";
+			this.page++;
+			this.getGoodsRecommend({
+				gc_id: this.classifyList[this.current].gc_id, 
+				page: this.page, 
+				reload: false,
+			}).then(length => {
+				// console.log(length);
+				if(length == 0) {
+					this.page--;
+					this.loadStatus = 'nomore';
+				} else {
+					this.loadStatus = 'loading';
+				}
+			}).catch(() => {
+				this.loadStatus = "nomore";
+				this.page--;
+			})
+		},
 		getGoodsClass() {
 			this.$u.api.getGoodsClass().then(res => {
 				if(res.errCode == 0) {
diff --git a/pageE/mine/MineProgress.vue b/pageE/mine/MineProgress.vue
index 198465d..2b276b6 100644
--- a/pageE/mine/MineProgress.vue
+++ b/pageE/mine/MineProgress.vue
@@ -73,7 +73,7 @@ export default {
 	},
 	filters: {
 		percentExp(value, rank) {
-			console.log(rank);
+			// console.log(rank);
 			let result = '0/0';
 			if(rank) result = value + '/' + rank.max;
 			return result;
@@ -93,7 +93,7 @@ export default {
 				if (res.errCode == 0) {
 					this.memberInfo = res.data;
 					this.percent = (this.memberInfo.member_exppoints / this.rank[this.memberInfo.member_level - 1].max) * 100;
-					console.log(this.percent);
+					// console.log(this.percent);
 				}
 			})
 		},
diff --git a/pageE/order/Index.vue b/pageE/order/Index.vue
index 4ff6db6..3683c9e 100644
--- a/pageE/order/Index.vue
+++ b/pageE/order/Index.vue
@@ -55,6 +55,13 @@ export default {
 			this.page = 0;
 			// again 重新请求列表 不然往列表里添加
 			value == 6 ? this.getAfterSaleList({ reload: 'again' }): this.getOrderList({ reload: 'again' });
+			if(value == 6) {
+				this.getAfterSaleList({ reload: 'again' });
+			} else if(value == 4) {
+				this.goodsTryOrderList({ reload: 'again' });
+			} else {
+				this.getOrderList({ reload: 'again' });
+			}
 		},
 	},
 	onLoad(option) {
@@ -113,6 +120,17 @@ export default {
 			}
 			return res;
 		},
+		async goodsTryOrderList({ reload = '' } = {}) {
+			const res = await this.$u.api.goodsTryOrderList({
+				page: this.page,
+			})
+			this.timer = true;
+			if(res.errCode == 0) {
+				if(reload) this.orderList = res.data;
+				else this.orderList.push(...res.data);
+			}
+			return res;
+		},
 		reachBottom() {
 			// 大于15条才会加载更多
 			if(this.orderList.length < 15) return false;
@@ -122,6 +140,7 @@ export default {
 			this.page++;
 			let promise;
 			if(this.current == 6) promise = this.getAfterSaleList();
+			else if(this.current == 4) promise = this.goodsTryOrderList();
 			else promise = this.getOrderList();
 			promise.then(res => {
 				this.loadStatus.splice(this.current, 1, "nomore");
diff --git a/pageE/tool/SendWash.vue b/pageE/tool/SendWash.vue
index d400fbd..e67d218 100644
--- a/pageE/tool/SendWash.vue
+++ b/pageE/tool/SendWash.vue
@@ -88,7 +88,6 @@ export default {
 			this.toApplyPage(current);
 		},
 		toApplyPage(index) {
-			console.log(index)
 			var that = this;
 			if(index == 1) {
 				this.showPopup = false
@@ -175,7 +174,7 @@ export default {
 						}
 					}
 				}
-				.send-btn{
+				.send-btn {
 					width: 100%;
 					display: flex;
 					justify-content: flex-end;
@@ -183,7 +182,6 @@ export default {
 					.btn{
 						width: 154rpx;
 						height: 54rpx;
-						background: RGBA(255, 254, 255, 1);
 						border-radius: 49rpx;
 						transform: translate(-50%, 0);
 						font-size: 26rpx;
diff --git a/pageE/tool/WashOrder.vue b/pageE/tool/WashOrder.vue
index 0fc9b83..c104247 100644
--- a/pageE/tool/WashOrder.vue
+++ b/pageE/tool/WashOrder.vue
@@ -131,7 +131,7 @@
 				<swiper  style="height: 1000px;"   vertical="true">
 					<swiper-item class="swiper-item">
 						<scroll-view scroll-y class="order-list">
-							<view v-for="(items, index) in 3" :key="items.index">
+							<view v-for="(items, index) in 3" :key="index">
 								<view class="store">
 									<view>
 										<image src="../../static/image/mine/23.png" mode=""></image>胖胖的店
diff --git a/pages.json b/pages.json
index 44c90a6..a7ab21a 100644
--- a/pages.json
+++ b/pages.json
@@ -113,6 +113,17 @@
 						}
 					}
 				},
+				{
+					"path": "triedDress/index",
+					"style": {
+						"navigationBarTitleText": "试穿订单",
+						"app-plus":{
+							"titleNView":{
+								"backgroundColor":"#ffffff"
+							}
+						}
+					}
+				},
 				{
 					"path": "comment/index",
 					"style": {