From cebc13c52d4889151a5af95b02649f1799da042d Mon Sep 17 00:00:00 2001
From: chenlong <vip_chenlong@163.com>
Date: Wed, 13 Sep 2023 18:12:30 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A1=B5=E9=9D=A2=E8=81=94?=
 =?UTF-8?q?=E5=8A=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/other.js                               |  14 ++
 components/FooterNav/index.vue             |   5 +-
 pages.json                                 |  20 ++
 pages/AboutUs/AboutUs.vue                  |  27 +++
 pages/Index/components/OrderPage/index.vue |  31 ++-
 pages/Index/components/UserPage/index.vue  |  20 +-
 pages/Index/index.vue                      |   7 +-
 pages/PrivacyPolicy/PrivacyPolicy.vue      |  29 +++
 pages/UserCoupons/index.vue                |  85 ++++---
 pages/UserDetail/index.vue                 |  21 +-
 pages/UserOrderPage/components/index.scss  | 224 +++++++++++++++++++
 pages/UserOrderPage/index.vue              | 245 +++++++++++++++++++++
 utils/functions.js                         |   2 +-
 13 files changed, 665 insertions(+), 65 deletions(-)
 create mode 100644 pages/AboutUs/AboutUs.vue
 create mode 100644 pages/PrivacyPolicy/PrivacyPolicy.vue
 create mode 100644 pages/UserOrderPage/components/index.scss
 create mode 100644 pages/UserOrderPage/index.vue

diff --git a/api/other.js b/api/other.js
index a904552..dd4211f 100644
--- a/api/other.js
+++ b/api/other.js
@@ -12,4 +12,18 @@ export function getSTS(data) {
         method: "get",
         data
     });
+}
+
+/**
+ * 获取配置
+ * @param sign
+ * @returns {Promise | Promise<unknown>}
+ */
+export function getConfig(sign){
+    return request({
+        url:`/get-config`,
+        data:{
+            sign:sign
+        }
+    })
 }
\ No newline at end of file
diff --git a/components/FooterNav/index.vue b/components/FooterNav/index.vue
index 2078f1b..6de9e1c 100644
--- a/components/FooterNav/index.vue
+++ b/components/FooterNav/index.vue
@@ -7,7 +7,8 @@
 		</view>
 		<view class="foot-nav-button-group row">
 			<view class="col-3 foot-nav-button" v-for="(item,index) in footGroup"
-            :class="{active:(item.name === footCheck)}" :style="{
+            :class="{active:(item.name === footCheck)}"
+						:style="{
 					backgroundImage:'url('+item.image+ ((index === footCheck)?'-active':'')+'.png)',
 					backgroundSize:'auto '+((index === footCheck)?'81':'54')+'rpx'
 				}" @click="selectItem(index)">
@@ -38,7 +39,7 @@
 			}
 		},
 		onLoad() {
-
+			console.log(this.footGroup)
 		},
 		methods: {
       selectItem(index){
diff --git a/pages.json b/pages.json
index 5af8c8e..cb583b0 100644
--- a/pages.json
+++ b/pages.json
@@ -90,6 +90,26 @@
             "style": {
                 "navigationBarTitleText": "创建修改萌宠"
             }
+        },
+        {
+            "path": "pages/UserOrderPage/index",
+            "style": {
+                "navigationBarTitleText": "我的订单"
+            }
+        },
+        {
+            "path": "pages/PrivacyPolicy/PrivacyPolicy",
+            "style": {
+                "navigationBarTitleText": "",
+                "enablePullDownRefresh": true
+            }
+        },
+        {
+            "path": "pages/AboutUs/AboutUs",
+            "style": {
+                "navigationBarTitleText": "",
+                "enablePullDownRefresh": true
+            }
         }
     ],
     "globalStyle": {
diff --git a/pages/AboutUs/AboutUs.vue b/pages/AboutUs/AboutUs.vue
new file mode 100644
index 0000000..953d5fe
--- /dev/null
+++ b/pages/AboutUs/AboutUs.vue
@@ -0,0 +1,27 @@
+<template>
+    <view v-html="aboutUs"></view>
+</template>
+
+<script>
+import {getConfig} from "@/api/other";
+
+export default {
+    data() {
+        return {aboutUs:''};
+    },
+    onLoad() {
+        this.getAboutUs();
+    },
+    methods:{
+        getAboutUs(){
+            getConfig('aboutUs').then(res =>{
+                this.aboutUs = res.data.aboutUs;
+            })
+        }
+    }
+}
+</script>
+
+<style lang="scss">
+
+</style>
diff --git a/pages/Index/components/OrderPage/index.vue b/pages/Index/components/OrderPage/index.vue
index 3c1c03b..0b20f13 100644
--- a/pages/Index/components/OrderPage/index.vue
+++ b/pages/Index/components/OrderPage/index.vue
@@ -155,7 +155,9 @@
 				orderList:[],
 				dayActive: 0,
 				statusActive: 1,
-				page:1
+				page:1,
+				start_time:'',
+				end_time:'',
 			}
 		},
 		onLoad() {
@@ -176,12 +178,12 @@
       },
 			getOrderList(filter = {
 				status: "",
-				start_time: "",
-				end_time: ""
+				start_time:  this.start_time,
+				end_time: this.end_time,
 			}){
-				filter.is_worker = this.$store.state.userInfo.store_id ? 1 : 0;
+				filter.is_worker = 1;
 				filter.page = this.page++;
-				filter.limit = 1;
+				filter.limit = 5;
 				if (this.screenCheck !== '') {
 					filter.status = this.screenCheck;
 				}
@@ -191,13 +193,13 @@
 				}
 				this.status = 'loading';
 				getOrderList(filter).then(data => {
-					this.orderList.push.apply(this.orderList,data.data);
-					this.orderList.push.apply(this.orderList,data.data);
-					if (data.data.length < filter.limit) {
-						this.status = 'nomore';
+					if (filter.page === 1){
+						this.orderList = data.data;
 					}else{
-						this.status = 'loadmore';
+						this.orderList.push(...data.data);
 					}
+
+					this.status = data.data.length < filter.limit ? 'nomore' : 'loadmore';
 				});
 			},
 			dayActiveToggle(date){
@@ -205,6 +207,15 @@
 				this.page = 1;
 				this.orderList = [];
 				this.status = "loadmore";
+
+				let currentTime = new Date().getTime();
+				let unitDay = 86400000;
+				let today = uni.$u.timeFormat(currentTime, 'yyyy-mm-dd');
+				let tomorrow = uni.$u.timeFormat(currentTime + unitDay, 'yyyy-mm-dd');
+				let acquired = uni.$u.timeFormat(currentTime + unitDay * 2, 'yyyy-mm-dd');
+				this.start_time = ['', today, tomorrow][date.value];
+				this.end_time = ['', tomorrow, acquired][date.value];
+				this.getOrderList();
 			},
 
 		},
diff --git a/pages/Index/components/UserPage/index.vue b/pages/Index/components/UserPage/index.vue
index 5d52a18..2f0ff4b 100644
--- a/pages/Index/components/UserPage/index.vue
+++ b/pages/Index/components/UserPage/index.vue
@@ -1,6 +1,6 @@
 <template>
 	<view class="user-background"  :style="{
-		backgroundImage:'url('+staticImage.bodyBackground+')'
+		backgroundImage:'url('+(userInfo.background_image ? userInfo.background_image :  staticImage.bodyBackground)+')'
 		}">
 		
 	</view>
@@ -73,11 +73,11 @@
 					</view>
 				</view>
 				<view class="user-button-group row">
-					<view class="user-button col-6" @click="orderPage()">
+					<view class="user-button col-6" @click="orderPage(0, 1)">
 						<image class="img" :src="staticImage.baby.wait" mode="aspectFit"/>
 						<view class="user-title">待服务</view>
 					</view>
-					<view class="user-button col-6" @click="orderPage()">
+					<view class="user-button col-6" @click="orderPage(2, 1)">
 						<image class="img" :src="staticImage.baby.end" mode="aspectFit"/>
 						<view class="user-title">已完成</view>
 					</view>
@@ -95,11 +95,11 @@
 					<image class="img" :src="staticImage.bigTitle" mode="heightFix"/>
 				</view>
 				<view class="user-button-group row">
-					<view class="user-button col-6" @click="orderPage()">
+					<view class="user-button col-6" @click="orderPage(0, 2)">
 						<image class="img" :src="staticImage.big.wait" mode="aspectFit"/>
 						<view class="user-title">待服务</view>
 					</view>
-					<view class="user-button col-6" @click="orderPage()">
+					<view class="user-button col-6" @click="orderPage(2, 2)">
 						<image class="img" :src="staticImage.big.end" mode="aspectFit"/>
 						<view class="user-title">已完成</view>
 					</view>
@@ -122,7 +122,7 @@
 						<view class="user-title">在线沟通</view>
 					</view>
 					<view class="user-button col-3">
-						<image class="img" :src="staticImage.more.privacy" mode="aspectFit"/>
+						<image class="img" :src="staticImage.more.privacy" @click="navTo('/pages/PrivacyPolicy/PrivacyPolicy')" mode="aspectFit"/>
 						<view class="user-title">隐私协议</view>
 					</view>
 					<view class="user-button col-3">
@@ -130,7 +130,7 @@
 						<view class="user-title">意见反馈</view>
 					</view>
 					<view class="user-button col-3">
-						<image class="img" :src="staticImage.more.about" mode="aspectFit"/>
+						<image class="img" :src="staticImage.more.about" @click="navTo('/pages/AboutUs/AboutUs')" mode="aspectFit"/>
 						<view class="user-title">关于我们</view>
 					</view>
 				</view>
@@ -219,8 +219,10 @@
 					url:'/pages/UserDetail/index'
 				})
 			},
-			orderPage(){
-				this.$emit('tabNavTo',1)
+			orderPage(type, is_buy){
+				uni.navigateTo({
+					url:`/pages/UserOrderPage/index?type=${type}&is_bay=${is_buy}`
+				})
 			},
 			showNumber(){
 				userExtends().then(data => {
diff --git a/pages/Index/index.vue b/pages/Index/index.vue
index 541dbff..475a3fd 100644
--- a/pages/Index/index.vue
+++ b/pages/Index/index.vue
@@ -3,7 +3,7 @@
 	<view :class="{show:(footCheck === 'home')}">
 		<HomePage v-if="(footCheck === 'home')"></HomePage>
 	</view>
-	<view :class="{show:(footCheck === 'order')}">
+	<view :class="{show:(footCheck === 'order')}" v-if="$store.state.userInfo.store_id > 0">
 		<OrderPage ref="orderList" v-if="(footCheck === 'order')"></OrderPage>
 	</view>
 	<view :class="{show:(footCheck === 'chat')}">
@@ -49,27 +49,32 @@
           image: imghost + "/static/image/foot-nav-button-one",
           name: 'home',
           title:'汪汪行天下',
+					is_show:true
         },
           {
             image: imghost + "/static/image/foot-nav-button-two",
             name: 'order',
             title:'订单',
+						is_show: this.$store.state.userInfo.store_id > 0
           },
           {
             image: imghost + "/static/image/foot-nav-button-three",
             name: 'chat',
             title:'在线沟通',
+						is_show:true
           },
           {
             image: imghost + "/static/image/foot-nav-button-four",
             name: 'user',
             title:'',
+						is_show:true
           },
         ],
         rightShow:false,
 			}
 		},
 		onLoad(option) {
+			this.footGroup = this.footGroup.filter(v => v.is_show );
       if(option?.foot_check){
         this.footSelect(option.foot_check)
       }
diff --git a/pages/PrivacyPolicy/PrivacyPolicy.vue b/pages/PrivacyPolicy/PrivacyPolicy.vue
new file mode 100644
index 0000000..dba41ea
--- /dev/null
+++ b/pages/PrivacyPolicy/PrivacyPolicy.vue
@@ -0,0 +1,29 @@
+<template>
+    <view v-html="privacyPolicy"></view>
+</template>
+
+<script>
+import {getConfig} from "@/api/other";
+
+export default {
+    data() {
+        return {
+            privacyPolicy:''
+        };
+    },
+    onLoad() {
+        this.getPrivacyPolicy();
+    },
+    methods:{
+        getPrivacyPolicy(){
+            getConfig('privacyPolicy').then(res => {
+                this.privacyPolicy = res.data;
+            })
+        }
+    }
+}
+</script>
+
+<style lang="scss">
+
+</style>
diff --git a/pages/UserCoupons/index.vue b/pages/UserCoupons/index.vue
index 75dfece..452e351 100644
--- a/pages/UserCoupons/index.vue
+++ b/pages/UserCoupons/index.vue
@@ -5,11 +5,8 @@
 		}">
 
 		<view class="capsule-container row" v-if="type === 'lists'">
-			<view class="capsule col-6 active">
-				省点银子
-			</view>
-			<view class="capsule col-6" @click="navTo('/pages/Card/index')">
-				豪门大户卡
+			<view class="capsule col-6" :class="{active:item.value === couponType}" @click="couponTypeToggle(item)" v-for="item in types">
+				{{ item.title }}
 			</view>
 		</view>
 		<view class="coupons-list">
@@ -55,7 +52,11 @@
 				</view>
 			</view>
 		</view>
-
+		<u-loadmore :status="status" fontSize="28"
+								color="#ACB4B6"
+								line
+								line-color="#ACB4B6"
+								marginBottom="30" marginTop="30" @loadmore="getCouponsList(++this.page)"/>
 	</view>
 
 	<!-- <RightNav></RightNav> -->
@@ -102,26 +103,15 @@
 				isTop: false,
 				pagePadding: 100,
 				petImage: imghost + '/static/image/pet_avatar1.jpeg',
-				couponsList: [{
-					price: '57',
-					title: '满0.11减57元优惠券',
-					cause: '满0.11使用',
-					time: '有效期至2023.08.09',
-					is_timeout: false,
-				}, {
-					price: '58',
-					title: '满0.02减58元优惠券',
-					cause: '满0.02使用',
-					time: '有效期至2023.08.01',
-					is_timeout: true,
-				}, {
-					price: '580',
-					title: '满0.01减580元优惠券',
-					cause: '满0.01使用',
-					time: '有效期至2023.08.02',
-					is_timeout: false,
-				}, ],
+				couponsList: [ ],
         type:'lists',
+				couponType:2,
+        types:[
+					{title:'省点银子', value: 2},
+					{title:'豪门大户卡', value: 1},
+				],
+				page:1,
+				status:'loadmore',
 			}
 		},
 		onLoad(option) {
@@ -142,20 +132,40 @@
         })
       },
       getCouponsList(page = 1){
+				if (this.status === 'nomore'){
+					return;
+				}else{
+					this.status = 'loading';
+				}
         userCoupons({
-          page:page
+          page:page,
+					limit:10,
+					is_buy:this.couponType
         }).then((res) => {
-          this.couponsList = res.data.map((row) => {
-            return {
-              price:parseFloat(row.deduction),
-              title:row.title,
-              time: '有效期至 '+row.end_time,
-              cause:'满'+parseFloat(row.min_price)+'使用',
-              is_timeout: (row.status === 2),
-            }
-          })
+					let couponsList = res.data.map((row) => {
+						return {
+							price:parseFloat(row.deduction),
+							title:row.title,
+							time: '有效期至 '+row.end_time,
+							cause:'满'+parseFloat(row.min_price)+'使用',
+							is_timeout: (row.status === 2),
+						}
+					});
+					this.status = couponsList.length < 10 ? 'nomore' : 'loadmore';
+
+					if (page === 1) {
+						this.couponsList = couponsList;
+						return;
+					}
+          this.couponsList.push(...couponsList);
         })
-      }
+      },
+			couponTypeToggle(item){
+				this.couponType = item.value;
+				this.page = 1;
+				this.status = 'loadmore';
+				this.getCouponsList();
+			}
 		},
 		onPageScroll(res) {
 			if (res.scrollTop <= 20) {
@@ -164,6 +174,9 @@
 				uni.$emit('isTop', false);
 			}
 		},
+		onReachBottom() {
+			this.getCouponsList(++this.page);
+		},
 		created() {
 			// this.pagePadding = (api.navHeight().navPaddingTop +
 			// api.navHeight().navHeight + (api.navHeight().headerPadding * 2))
diff --git a/pages/UserDetail/index.vue b/pages/UserDetail/index.vue
index 2eed225..84b96af 100644
--- a/pages/UserDetail/index.vue
+++ b/pages/UserDetail/index.vue
@@ -54,13 +54,10 @@
 					<view class="detail-content-item">
 						<view class="detail-item-title">背景</view>
 						<view class="detail-item-content">
-							<image class="img" mode="aspectFill" :src="user.background"/>
-							<view class="detail-item-background"></view>
+							<u-upload :file-list="background" :maxCount="1" @delete="backgroundDel" @afterRead="backgroundRead">
+							</u-upload>
 						</view>
 					</view>
-					<view @click="submit" class="detail-logout-button">
-						修改信息
-					</view>
 					<view class="detail-logout-button">
 						退出登录
 					</view>
@@ -99,7 +96,7 @@
 				user:{
 					avatar:imghost+'/static/image/banner.png',
 					name:'清晨的风',
-					background:imghost+'/static/image/banner.png',
+					background_image:imghost+'/static/image/banner.png',
 					sex:1,
 					phone:'15012345678',
 					coupons:221,
@@ -108,6 +105,7 @@
 				},
 			  writeWaitTime:1000,
 			  writeHandler:null,
+				background:[],
 		},
 		onLoad() {
 			this.setSexTitle();
@@ -130,6 +128,7 @@
 				userDetail().then(({data}) => {
 					this.user = data;
 					this.birthday = this.user.birthday ? this.user.birthday : '2000-01-01'
+					this.background = [{url:this.user.background_image}]
 					this.user.birthday = this.birthday
 					this.user.sex = this.user.sex === 1 ? 1 : 2;
 					this.setSexTitle(this.user.sex);
@@ -161,6 +160,16 @@
 					this.user.avatar = res.show_path;
 				})
 			},
+			backgroundRead(file, lists, name){
+				api.uploadOssFile(file.file.url).then((res) => {
+					this.background = [{url:res.show_path}];
+					this.user.background_image = res.show_path;
+				})
+			},
+			backgroundDel(index, file, name){
+				this.background = [];
+				this.user.background = '';
+			}
 		},
 		onPageScroll(res) {
 
diff --git a/pages/UserOrderPage/components/index.scss b/pages/UserOrderPage/components/index.scss
new file mode 100644
index 0000000..cd8b990
--- /dev/null
+++ b/pages/UserOrderPage/components/index.scss
@@ -0,0 +1,224 @@
+.order-capsule-container{
+	position: sticky;
+
+	box-sizing: border-box;
+	width:100%;
+	padding:10rpx;
+	border:2rpx solid #262626;
+	border-radius: 45rpx;
+	box-shadow: 1rpx 4rpx 12rpx 0rpx rgba(90,104,103,0.24);
+	background-color: #F8FAFA;
+	.order-capsule{
+		box-sizing: border-box;
+		padding:20rpx;
+		text-align: center;
+		font: {
+			size:30rpx;
+			weight:500;
+		}
+		line-height:30rpx;
+		border:2rpx solid rgba(0,0,0,0);
+		&.active{
+			background:{
+				color:#4DC3B8;
+			}
+			color:#FFFFFF;
+			border:2rpx solid #262626;
+			border-radius:35rpx;
+		}
+	}
+}
+.order-screen-container{
+	.order-screen{
+		padding:40rpx 0 20rpx 0;
+		padding-right: 66rpx;
+		font-size: 28rpx;
+		line-height: 53rpx;
+		color:#646464;
+		font-weight: 400;
+		position: relative;
+		&.active{
+			color:#000000;
+			font-size: 32rpx;
+			font-weight: 500;
+			.order-screen-active{
+				display:flex;
+			}
+		}
+		.order-screen-active{
+			display: none;
+			align-items: center;
+			justify-content: center;
+			position: absolute;
+			top: 90rpx;
+			left: 12rpx;
+			.img{
+				width:37rpx;
+			}
+		}
+
+	}
+	.order-screen-time-container{
+		flex:1;
+		margin-left:auto;
+		justify-content: flex-end;
+		.order-screen{
+			// padding-right:0;
+		}
+	}
+	.order-screen-time-title{
+		color:#B5B5B5;
+		font-size:26rpx;
+		font-weight: 400;
+		line-height:53rpx;
+		padding-right: 16rpx;
+	}
+	.order-screen-time-buttton-container{
+		padding-right: 0;
+	}
+	.order-screen-time-buttton{
+		padding:8rpx 19rpx;
+		color:#4EC2B7;
+		font-size: 28rpx;
+		font-weight: 400;
+		background-color:#ffffff;
+		border:1px solid #4EC2B7;
+		border-radius: 10rpx;
+		line-height: 28rpx;
+		box-shadow: 0rpx 4rpx 5rpx 0rpx rgba(82,84,84,0.1), 2rpx -4rpx 0rpx 0rpx rgba(78,194,183,0.2);
+	}
+}
+.order-screen-top{
+	position: sticky;
+	left:0;
+	z-index: 9999;
+	background-color:#fff;
+	padding:25rpx;
+}
+.app-wallpaper{
+	position: relative;
+	background:{
+		size: 100% 100%;
+		repeat: no-repeat;
+	};
+	.order-list-container{
+		width:100%;
+		//max-height: 1000rpx;
+		height: 100%;
+		//overflow: auto;
+		box-sizing: border-box;
+		
+		.order-list-item{
+			margin-bottom:30rpx;
+			width:100%;
+			box-sizing: border-box;
+			.order-card-container{
+				width:100%;
+				box-sizing: border-box;
+				padding:10rpx 10rpx;
+				position: relative;
+				box-sizing: border-box;
+				.order-card-container-background{
+					
+					width:100%;
+					height:90%;
+					position: absolute;
+					left:0rpx;
+					z-index: -1;
+					bottom:0rpx;
+					border: 3rpx solid #262626;
+					box-shadow: 2rpx 6rpx 11rpx 0rpx rgba(159,167,185,0.3);
+					border-radius: 26rpx;
+					background: {
+						color:#EED9AD;
+					};
+				}
+				.order-card-container-background-main{
+					
+					width:100%;
+					background:{
+						color:#FFFFFF;
+					}
+					border-radius: 26rpx;
+					border: 3rpx solid #262626;
+					padding:7rpx;
+					box-sizing:border-box;
+					.order-card-col{
+						width:100%;
+						box-sizing: border-box;
+						padding:15rpx;
+						background:{
+							size:100% 100%;
+							position: center center;
+							repeat:no-repeat;
+						}
+					}
+				}
+				
+				
+				.order-card-left{
+					.img{
+						width:200rpx;
+						height:200rpx;
+						border-radius: 30rpx;
+					}
+				}
+				.order-card-right{
+					padding-left:20rpx;
+					.order-card-title{
+						padding-top:5px;
+						font-size:32rpx;
+						font-weight: 500;
+						line-height: 30rpx;
+						color:#131313;
+					}
+					.order-card-tag-container{
+						padding-top:18rpx;
+						.order-card-tag{
+							padding:9rpx 20rpx;
+							background:{
+								color:#E9FBF7;
+							}
+							color:#4DC3B8;
+							font-size:26rpx;
+							font-weight:400;
+							line-height:1;
+							border-radius:6rpx;
+							&+.order-card-tag{
+								margin-left:9rpx;
+							}
+						}
+					}
+					.order-card-day{
+						
+					}
+					.order-card-pay-time{
+						
+					}
+					.order-card-day,.order-card-pay-time{
+						padding-top:20rpx;
+						font-size:28rpx;
+						font-weight:400;
+						line-height:30rpx;
+						color:#767676;
+						.card-label{
+							color:#1B1B1B;
+						}
+					}
+				}
+				.order-card-bottom{
+					padding-top:30rpx;
+					justify-content: center;
+				}
+				.card-button{
+					&:nth-child(1){
+						padding-right:23rpx;
+					}
+					&:nth-child(2){
+						padding-left:23rpx;
+					}
+				}
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/pages/UserOrderPage/index.vue b/pages/UserOrderPage/index.vue
new file mode 100644
index 0000000..77e5019
--- /dev/null
+++ b/pages/UserOrderPage/index.vue
@@ -0,0 +1,245 @@
+<template>
+  <view class="order-screen-top" :style="{
+			top:topStyle
+		}">
+    <view class="order-capsule-container row">
+      <view class="order-capsule col-4"
+            v-for="(item,index) in screenMenu"
+            :class="{active:(item.value === screenCheck)}"
+            @click="selectScreen(item)"
+      >
+        {{ item.name }}
+      </view>
+
+    </view>
+    <view class="order-screen-container row">
+      <view class="order-screen" v-for="(date, index) in dateSelectData" @click="dayActiveToggle(date)" :class="{active:dayActive === date.value}">
+        {{ date.title }}
+        <view class="order-screen-active">
+          <image mode="widthFix" class="img" :src="staticImage.screenActiveImg" />
+        </view>
+      </view>
+
+      <view class="order-screen-time-container row">
+        <view class="order-screen order-screen-time-title">
+          05/06-08-03
+        </view>
+        <view class="order-screen order-screen-time-buttton-container">
+          <view class="order-screen-time-buttton">
+            时间
+          </view>
+        </view>
+      </view>
+
+    </view>
+  </view>
+	<view class="app-wallpaper" :style="{
+		backgroundImage:'url('+staticImage.wallpaperBgImage+')'
+		}">
+
+
+		<view class="order-list-container">
+			<view class="order-list-item" v-for="(item,index) in orderList">
+				<view class="order-card-container row">
+					<view class="order-card-container-background col-12"></view>
+					<view class="order-card-container-background-main row">
+						<view class="order-card-col row" :style="{backgroundImage:'url('+staticImage.orderCardBackground+')'}">
+							<view class="order-card-left">
+								<image class="img" :src="petImage" mode="aspectFill" />
+							</view>
+							<view class="order-card-right">
+								<view class="order-card-title">{{item.addr}}</view>
+								<view class="order-card-tag-container row">
+									<view class="order-card-tag" v-for="(server, i) in item.services" wx:key="i">{{ server }}</view>
+								</view>
+								<view class="order-card-day"><text class="card-label">上门：</text>{{item.do_date}} {{ item.do_time }}
+								</view>
+								<view class="order-card-pay-time"><text class="card-label">下单时间：</text>{{item.create_time}}
+								</view>
+							</view>
+							<view class="order-card-bottom col-12 row">
+								<view class="card-button" @click="navTo('/pages/ChatDetail/index?id=' + item.id)">
+									<MzButton
+											title="立即沟通"
+											font-color="#3E3221"
+											button-color="#F7E1C3"
+											button-width="255rpx"></MzButton>
+								</view>
+								<view class="card-button" @click="navTo('/pages/FeedLog/index?pet_id=' + item.pet_id)">
+									<MzButton
+											title="喂养档案"
+											font-color="#FFFFFF"
+											button-color="#4DC3B8"
+											button-width="255rpx"></MzButton>
+								</view>
+							</view>
+						</view>
+					</view>
+				</view>
+			</view>
+		</view>
+		<u-loadmore :status="status" fontSize="28"
+								color="#ACB4B6"
+								line
+								line-color="#ACB4B6"
+								marginBottom="30" marginTop="30" @loadmore="getOrderList()"/>
+	</view>
+
+	<!-- <RightNav></RightNav> -->
+</template>
+
+<script>
+	import {
+		imghost
+	} from '@/config/host.js'
+	import HeaderNav from '@/components/HeaderNav/Index.vue';
+	import FooterNav from '@/components/FooterNav/Index.vue';
+	import RightNav from '@/components/RightNav/Index.vue';
+	import MzButton from '@/components/MzButton/Index.vue';
+	import api from '@/utils/functions.js';
+	import {getOrderList} from "@/api/order";
+	import log from "@/utils/log";
+	export default {
+		components: {
+			HeaderNav,
+			FooterNav,
+			RightNav,
+			MzButton
+		},
+    computed:{
+      topStyle(){
+        return (uni.getStorageSync('sysInfo').sysAndMenuHeight)+'px'
+      },
+    },
+		data() {
+			return {
+				title: 'Hello',
+				loading: true,
+				status: 'loadmore',
+        screenCheck:'',
+        screenMenu:[
+          {
+            name:'全部',
+            value:'',
+          },{
+            name:'待服务',
+            value:'0',
+          },{
+            name:'已完成',
+            value:'2',
+          },
+        ],
+				dateSelectData:[
+					{title:"全部", value: 0},
+					{title:"今天", value: 1},
+					{title:"明天", value: 2},
+				],
+				staticImage: {
+					screenActiveImg: imghost + '/static/image/order-screen-active.png',
+					orderCardBackground: imghost + '/static/image/order-card-background.png',
+					wallpaperBgImage:imghost +'/static/image/background.png'
+				},
+				indexBanner: [{
+					image: imghost + '/static/image/banner.png',
+					url: '',
+				}],
+				user: {
+					avatar: imghost + '/static/image/banner.png',
+					nickname: '清晨的风',
+					coupons: 221,
+					id: 88685
+				},
+				isTop: false,
+				pagePadding: 100,
+				petImage: imghost + '/static/image/pet_avatar1.jpeg',
+				orderList:[],
+				dayActive: 0,
+				statusActive: 1,
+				page:1,
+				is_buy:'',
+				start_time:'',
+				end_time:'',
+			}
+		},
+		onLoad(options) {
+			this.screenCheck = options.type;
+			this.is_buy = options.is_buy;
+		},
+		methods: {
+      selectScreen(item){
+        this.screenCheck = item.value;
+				this.page = 1;
+				this.status = "loadmore";
+				this.orderList = [];
+				this.getOrderList();
+      },
+      navTo(url){
+        uni.navigateTo({
+          url:url
+        })
+      },
+			getOrderList(filter = {
+				status: "",
+				start_time:  this.start_time,
+				end_time: this.end_time,
+			}){
+				filter.is_worker = 0;
+				filter.page = this.page++;
+				filter.limit = 5;
+				filter.is_buy = this.is_buy;
+				if (this.screenCheck !== '') {
+					filter.status = this.screenCheck;
+				}
+
+				if (this.status === 'nomore') {
+					return;
+				}
+				this.status = 'loading';
+				getOrderList(filter).then(data => {
+					if (filter.page === 1){
+						this.orderList = data.data;
+					}else{
+						this.orderList.push(...data.data);
+					}
+
+					this.status = data.data.length < filter.limit ? 'nomore' : 'loadmore';
+				});
+			},
+			dayActiveToggle(date){
+				this.dayActive = date.value;
+				this.page = 1;
+				this.orderList = [];
+				this.status = "loadmore";
+
+				let currentTime = new Date().getTime();
+				let unitDay = 86400000;
+				let today = uni.$u.timeFormat(currentTime, 'yyyy-mm-dd');
+				let tomorrow = uni.$u.timeFormat(currentTime + unitDay, 'yyyy-mm-dd');
+				let acquired = uni.$u.timeFormat(currentTime + unitDay * 2, 'yyyy-mm-dd');
+				this.start_time = ['', today, tomorrow][date.value];
+				this.end_time = ['', tomorrow, acquired][date.value];
+				this.getOrderList();
+			},
+
+		},
+		onPageScroll(res) {
+			if(res.scrollTop <= 20){
+				uni.$emit('isTop', true);
+			}else{
+				uni.$emit('isTop', false);
+			}
+		},
+
+		mounted() {
+			this.getOrderList();
+		},
+		created() {
+			this.pagePadding = (api.navHeight().navPaddingTop +
+				api.navHeight().navHeight + (api.navHeight().headerPadding * 2))
+		}
+	}
+</script>
+
+<style lang="scss">
+	@import './components/index.scss';
+</style>
\ No newline at end of file
diff --git a/utils/functions.js b/utils/functions.js
index 74a044e..46c590c 100644
--- a/utils/functions.js
+++ b/utils/functions.js
@@ -7,7 +7,7 @@ const QQMapWX=require('./qqmap-wx-jssdk.min.js')
 import * as QQMapwx from '@/utils/qqmap-wx-jssdk.min.js'
 import {getSTS} from "@/api/other";
 var qqmapsdk; 
-import { imghost,host,oss } from '@/config/host.js'
+import {imghost, host, oss } from '@/config/host.js'
 const api = {
 	
 	loginModalState: true,