diff --git a/common/http.api.js b/common/http.api.js
index 7c56209..92f03f8 100644
--- a/common/http.api.js
+++ b/common/http.api.js
@@ -26,35 +26,38 @@ const install = (Vue, vm) => {
 		getorderlist(){
 			return vm.$u.get("/Order/orderList")
 		},
+		// 获取试穿订单列表
+		getshiftlist(){
+			return vm.$u.get("/order/goodsTryOrderList")
+		},
 		// 获取轮播图列表
 		getswiper(){
 			return vm.$u.get("/Order/orderList")
 		},
 		// 商家登陆
-		shoplogin(obj){
-		    return vm.$u.get("/Login/storeLogin",obj)
+		shoplogin({member_name,member_password}){
+		    return vm.$u.get("/Login/storeLogin",{member_name,member_password})
 		},
 		// 获取个人信息
-		getshopinfo(obj){
-		    return vm.$u.post("/member/memberInfo",obj)
+		getshopinfo(){
+		    return vm.$u.post("/member/memberInfo")
 		},
 		// 获取粉丝列表
-		myfanlist(obj){
-		    return vm.$u.post("/member/myFansList",obj)
-		},
-		// 商家登陆
-		getshopinfo(obj){
-		    return vm.$u.post("/member/memberInfo",obj)
+		myfanlist(){
+		    return vm.$u.post("/member/myFansList")
 		},
 		// 修改个人信息
-		changeinfo(obj){
-		    return vm.$u.post("/Member/changeMemberInfo",obj)
+		changeinfo({nickname,avatar,signature}){
+		    return vm.$u.post("/Member/changeMemberInfo",{nickname,avatar,signature})
 		},
 		// 获取内容列表
-		articlelist(obj){
-		    return vm.$u.post("/Article/articleList",obj)
+		articlelist({type,page}){
+		    return vm.$u.post("/Article/articleList",{type,page})
+		},
+		// 骑手列表
+		takeawayerlist(){
+		    return vm.$u.get("/Order/getTakeawayerList")
 		},
-		
     }
 	// 将各个定义的接口名称，统一放进对象挂载到vm.$u.api(因为vm就是this，也即this.$u.api)下
 	vm.$u.api = api;
diff --git a/components/order-item/index.vue b/components/order-item/index.vue
index eedfb24..1b57ef1 100644
--- a/components/order-item/index.vue
+++ b/components/order-item/index.vue
@@ -1,6 +1,6 @@
 <template>
 	<view class="item" @click="toDetailsPage">
-		<image></image>
+		<image :src="info.extend_order_goods[0].goods_image"></image>
 		<view class="goods">
 			<view class="">
 				<view class="">
@@ -28,9 +28,8 @@ export default {
 	},
 	methods: {
 		toDetailsPage() {
-			console.log(this.info)
 			uni.navigateTo({
-				url: '/pages/index/details?current=' + this.cur
+				url: '/pages/index/details?id=' + this.info.order_id
 			});
 		},
 	},
diff --git a/components/order-item/testlist.vue b/components/order-item/testlist.vue
new file mode 100644
index 0000000..0318e96
--- /dev/null
+++ b/components/order-item/testlist.vue
@@ -0,0 +1,84 @@
+<template>
+	<view class="item" @click="toDetailsPage">
+		<image :src="info.goods_pic"></image>
+		<view class="goods">
+			<view class="">
+				<view class="status" v-if="cur==4">待处理订单</view>
+			</view>
+			
+			<view class="name u-line-1">{{info.extend_order_goods[0].goods_name}}</view>
+			<view class="info">
+				<view class="num">共{{info.extend_order_goods[0].goods_num}}件商品</view>
+				<view class="price">实付<span>￥{{info.extend_order_goods[0].goods_pay_price}}</span></view>
+			</view>
+		</view>
+	</view>
+</template>
+<script>
+export default {
+	data() {
+		return {}
+	},
+	props: {
+		cur: [Number, String],
+		info: Object
+	},
+	methods: {
+		toDetailsPage() {
+			uni.navigateTo({
+				url: '/pages/index/details?id=' + this.info.order_id
+			});
+		},
+	},
+};
+</script>
+<style lang="scss" scoped>
+.item {
+	margin: 0 auto 20rpx;
+	width: 690rpx;
+	height: 220rpx;
+	background: rgba(255,255,255,1);
+	border-radius: 10rpx;
+	padding: 30rpx;
+	display: flex; 
+	align-items: center;
+	> image {
+		width: 160rpx;
+		height: 160rpx;
+		flex-shrink: 0;
+		margin-right: 25rpx;
+		background-color: aqua;
+	}
+	.goods {
+		display: flex;
+		flex-direction: column;
+		align-items: flex-start;
+		justify-content: center;
+		.status {
+			align-self: flex-end;
+			font-size: 26rpx;
+			color: rgba(255,49,49,1);
+			margin-bottom: 30rpx;
+		}
+		.name {
+			width: 439rpx;
+			font-size: 28rpx;
+			color: rgba(51,51,51,1);
+			margin-bottom: 30rpx;
+		}
+		.info {
+			width: 100%;
+			display: flex;
+			align-items: center;
+			font-size: 26rpx;
+			color: rgba(102,102,102,1);
+			.price {
+				margin-left: 10rpx;
+				> span {
+					color: #FF780F;
+				}
+			}
+		}
+	}
+}
+</style>
\ No newline at end of file
diff --git a/pages/index/index.vue b/pages/index/index.vue
index c253bef..1f3300d 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -26,7 +26,9 @@
 			</swiper-item>
 			<swiper-item class="swiper-item">
 				<scroll-view scroll-y style="height: 100%;width: 100%;">
-					<view v-for="(item, index) in 5" :key="index"><OrderItem :cur="current"></OrderItem></view>
+					<view v-for="(item, index) in testlist" :key="index">
+						<testList :info="item"></testList>
+					</view>
 				</scroll-view>
 			</swiper-item>
 			<swiper-item class="swiper-item">
@@ -105,8 +107,13 @@
 </template>
 
 <script>
-import OrderItem from '@/components/order-item/index';
-export default {
+import OrderItem from '@/components/order-item/index';
+import testList from '@/components/order-item/testlist.vue';
+export default {
+	components: {
+		OrderItem,
+		testList
+	},
 	data() {
 		return {
 			list: [
@@ -166,16 +173,15 @@ export default {
 			],
 			publishstate: false,
 			num: 0,
-			allorder:[],//所有订单
+			allorder:[],//所有订单
+			testlist:[],//试穿列表
 		};
 	},
-	components: {
-		OrderItem
-	},
 	onLoad() {
 		this.getswiper();
-		this.getallorder();
-		// 订单状态：0:已取消 10:未付款 20:已付款 30:已发货 40:已收货
+		this.getallorder(0);
+		this.getshiftlist()
+		// 订单状态： 0:全部 1已付款未发货 2已发货 3已完成 4申请退款/退货 5已退款/退货
 	},
 	onReachBottom() {
 		this.num++
@@ -184,11 +190,30 @@ export default {
 		// 关闭发布弹窗
 		close() {
 			this.publishstate = false;
+		},
+		// 获取试穿列表
+		getshiftlist(){
+			let that = this;
+			this.$u.api.getshiftlist({
+				type:type,
+				page: that.num
+			}).then(res => {
+				console.log(res);
+				if (res.errCode != 0) {
+					this.$refs.uToast.show({
+						title: res.message,
+						type: 'error'
+					});
+				} else {
+					this.testlist = res.data.orderList
+				}
+			});
 		},
-		// 获取全部订单
-		getallorder() {
+		// 获取订单列表
+		getallorder(type) {
 			let that = this;
-			this.$u.api.getorderlist({
+			this.$u.api.getorderlist({
+				type:type,
 				page: that.num
 			}).then(res => {
 				console.log(res);
diff --git a/pages/user/content.vue b/pages/user/content.vue
index 0fbcf61..7aa78fa 100644
--- a/pages/user/content.vue
+++ b/pages/user/content.vue
@@ -1,21 +1,30 @@
 <template>
 	<view class="content">
 		<view class="tab-swiper">
-			<u-tabs-swiper ref="uTabs" :list="list" :current="current" @change="tabsChange" active-color="#FF780F" inactive-color="#333333" font-size="30" gutter="317" height="98" :show-bar="false" swiperWidth="750" :is-scroll="false"></u-tabs-swiper>
+			<u-tabs-swiper
+				ref="uTabs"
+				:list="list"
+				:current="current"
+				@change="tabsChange"
+				active-color="#FF780F"
+				inactive-color="#333333"
+				font-size="30"
+				gutter="317"
+				height="98"
+				:show-bar="false"
+				swiperWidth="750"
+				:is-scroll="false"
+			></u-tabs-swiper>
 		</view>
-		<swiper :current="swiperCurrent" >
+		<swiper :current="swiperCurrent">
 			<swiper-item class="swiper-item">
 				<scroll-view scroll-y style="height: 100%;width: 100%;" class="list">
-					<view v-for="(item, index) in newlist" :key="index">
-						<ContentItem :info="item" :type="type" del="del"></ContentItem>
-					</view>
+					<view v-for="(item, index) in newlist" :key="index"><ContentItem :info="item" :type="type" del="del"></ContentItem></view>
 				</scroll-view>
 			</swiper-item>
 			<swiper-item class="swiper-item">
 				<scroll-view scroll-y style="height: 100%;width: 100%;" class="video-list">
-					<view v-for="(item, index) in newlist" :key="index">
-						<ContentItem :info="item" :type="type" @del="del"></ContentItem>
-					</view>
+					<view v-for="(item, index) in newlist" :key="index"><ContentItem :info="item" :type="type" @del="del"></ContentItem></view>
 				</scroll-view>
 			</swiper-item>
 		</swiper>
@@ -23,7 +32,7 @@
 			<view class="close-popup">
 				<view class="tips">确定要删除该视频吗</view>
 				<view class="btn">
-					<view class="cancel" @click="show=false">取消</view>
+					<view class="cancel" @click="show = false">取消</view>
 					<view class="confirm">确定</view>
 				</view>
 			</view>
@@ -31,102 +40,109 @@
 	</view>
 </template>
 <script>
-import ContentItem from '@/components/content-item/index'
+import ContentItem from '@/components/content-item/index';
 export default {
 	data() {
 		return {
 			show: false,
 			current: 0,
 			swiperCurrent: 0,
-			list: [{
-				name: '图文'
-			}, {
-				name: '视频'
-			}],
-			type:1,
-			num:1,
-			newlist:[]
-		}
+			list: [
+				{
+					name: '图文'
+				},
+				{
+					name: '视频'
+				}
+			],
+			type: 1,
+			num: 1,
+			newlist: []
+		};
 	},
 	components: {
 		ContentItem
 	},
 	onLoad() {
-		this.getlist()
+		this.getlist();
 	},
 	onReachBottom() {
-		this.num++
-		this.getlist()
+		this.num++;
+		this.getlist();
 	},
 	methods: {
-		getlist(){
+		getlist() {
 			let that = this;
-			this.$u.api.articlelist({
-				type:that.type,
-				page:that.num
-			}).then(res => {
-				console.log(res);
-				if (res.errCode != 0) {
-					this.$refs.uToast.show({
-						title: res.message,
-						type: 'error'
-					});
-				} else {
-					let arr = res.data.articleList
-					for(let index in arr){
-						that.newlist.push(arr[index])
+			this.$u.api
+				.articlelist({
+					type: that.type,
+					page: that.num
+				})
+				.then(res => {
+					console.log(res);
+					if (res.errCode != 0) {
+						this.$refs.uToast.show({
+							title: res.message,
+							type: 'error'
+						});
+					} else {
+						let arr = res.data.articleList;
+						for (let index in arr) {
+							that.newlist.push(arr[index]);
+						}
 					}
-				}
-			});
-			
+				});
 		},
 		del(e) {
 			// 删除元素
-			this.show=true
-			console.log(e)
+			this.show = true;
+			console.log(e);
 		},
 		tabsChange(index) {
 			this.swiperCurrent = index;
-			this.type=index+1;
-			this.num=0
-			this.newlist=[]
-			this.getlist()
+			this.type = index + 1;
+			this.num = 0;
+			this.newlist = [];
+			this.getlist();
 		},
 		animationfinish(e) {
-			console.log(12345666)
+			console.log(12345666);
 			let current = e.detail.current;
 			this.swiperCurrent = current;
 			this.current = current;
-			this.type=current+1;
-		},
-	},
+			this.type = current + 1;
+		}
+	}
 };
 </script>
 <style lang="scss" scoped>
+.tab-swiper {
+	width: 100%;
+	position: fixed;
+	top: 0;
+	margin-bottom: 2rpx 0 20rpx 0;
+}
 .content {
 	min-height: calc(100vh - var(--window-top));
-	background-color: #ECECEC;
+	background-color: #ececec;
 	display: flex;
 	flex-direction: column;
 	> uni-swiper {
 		flex: 1;
 	}
-	.tab-swiper {
-		margin: 2rpx 0 20rpx 0;
-	}
 	.close-popup {
-		background:rgba(255,255,255,1);
+		background: rgba(255, 255, 255, 1);
 		border-radius: 10rpx;
 		.tips {
 			width: 420rpx;
 			font-size: 28rpx;
-			color: rgba(102,102,102,1);
+			color: rgba(102, 102, 102, 1);
 			text-align: center;
 			padding: 38rpx 0;
 		}
 		.btn {
 			width: 420rpx;
-			border-top: 2rpx #ECECEC solid;
+			border-top: 2rpx #ececec solid;
 			display: flex;
 			> view {
 				font-size: 26rpx;
@@ -136,12 +152,12 @@ export default {
 			}
 			.cancel {
 				color: #333333;
-				border-right: 2rpx #ECECEC solid;
+				border-right: 2rpx #ececec solid;
 			}
 			.confirm {
-				color: #FF780F;
+				color: #ff780f;
 			}
 		}
 	}
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/pages/user/fans.vue b/pages/user/fans.vue
index c14f4fd..a87fbfb 100644
--- a/pages/user/fans.vue
+++ b/pages/user/fans.vue
@@ -3,7 +3,7 @@
 		<view class="lately">
 			<view class="title">最新</view>
 			<view class="items">
-				<view v-for="(item, index) in myfans" :key="index">
+				<view v-for="(item, index) in newfans" :key="index">
 					<FansItem :info="item"></FansItem>
 				</view>
 			</view>
@@ -11,7 +11,7 @@
 		<view class="before">
 			<view class="title">早前</view>
 			<view class="items">
-				<view v-for="(item, index) in newfans" :key="index">
+				<view v-for="(item, index) in myfans" :key="index">
 					<FansItem :info="item"></FansItem>
 				</view>
 			</view>
diff --git a/pages/user/info.vue b/pages/user/info.vue
index a9c8eb7..4a9f6c2 100644
--- a/pages/user/info.vue
+++ b/pages/user/info.vue
@@ -6,11 +6,11 @@
 		</view>
 		<view class="item">
 			<text class="title">用户名</text>
-			<input type="text" :value="info.member_nickname==null?'新用户':info.member_nickname" />
+			<input type="text" value="" v-model="info.member_nickname" placeholder="请输入用户名"/>
 		</view>
 		<view class="item">
 			<text class="title">个性签名</text>
-			<input type="text" :value="info.signature==''?'该用户很懒没有签名！':info.signature" />
+			<input type="text" value="" v-model="info.signature" placeholder="请输入个性签名"/>
 		</view>
 		<view class="password" @click="updatePwd">
 			<text>修改密码</text>