diff --git a/api/order.js b/api/order.js
index fdbb95b..bc59297 100644
--- a/api/order.js
+++ b/api/order.js
@@ -24,7 +24,7 @@ export function cardOrder(card_id)
*/
export function getOrderList(data = {
"page": 1,
- "limit": 10,
+ "limit": 110,
"is_worker": 0,
"status": 0,
"start_time": "",
diff --git a/pages/Addr/components/index.scss b/pages/Addr/components/index.scss
index 9c7edd4..e063e39 100644
--- a/pages/Addr/components/index.scss
+++ b/pages/Addr/components/index.scss
@@ -138,6 +138,7 @@
position: fixed;
bottom:0;
left:0;
+ z-index: 9999;
width: 100%;
background: #FFFFFF;
border: 2rpx solid #262626;
diff --git a/pages/Addr/index.vue b/pages/Addr/index.vue
index 8be2b25..5a86786 100644
--- a/pages/Addr/index.vue
+++ b/pages/Addr/index.vue
@@ -7,7 +7,7 @@
-
+
@@ -48,7 +48,11 @@
-
+
@@ -131,7 +135,7 @@
type:'',
pages:{
page:1,
- limit:10,
+ limit:6,
},
status:'loadmore',
}
@@ -235,7 +239,8 @@
if(this.status === 'nomore'){
return false;
}
- getAdressList(this.pages).then(res => {
+ this.status = 'loading';
+ getAddressList(this.pages).then(res => {
this.addrList.push.apply(this.addrList,res.data)
this.pages.page++;
if(res.data.length === 0){
diff --git a/pages/Card/index.vue b/pages/Card/index.vue
index 7a35d20..1b4f7cf 100644
--- a/pages/Card/index.vue
+++ b/pages/Card/index.vue
@@ -99,6 +99,8 @@
},
onLoad() {
+
+
},
methods: {
navTo(url){
@@ -107,7 +109,7 @@
})
},
getCardList(){
- if(this.status === 'nomre'){
+ if(this.status === 'nomore'){
return false;
}
this.status = 'loading';
diff --git a/pages/Index/components/HomePage/index.vue b/pages/Index/components/HomePage/index.vue
index d8a9e80..d634adb 100644
--- a/pages/Index/components/HomePage/index.vue
+++ b/pages/Index/components/HomePage/index.vue
@@ -4,7 +4,7 @@
}">
-
+
@@ -38,7 +38,7 @@
-
+
diff --git a/pages/Index/components/OrderPage/components/index.scss b/pages/Index/components/OrderPage/components/index.scss
index 0b209a7..bb01f7d 100644
--- a/pages/Index/components/OrderPage/components/index.scss
+++ b/pages/Index/components/OrderPage/components/index.scss
@@ -96,9 +96,9 @@
}
.order-list-container{
width:100%;
- max-height: 1000rpx;
+ //max-height: 1000rpx;
height: 100%;
- overflow: auto;
+ //overflow: auto;
box-sizing: border-box;
.order-list-item{
diff --git a/pages/Index/components/OrderPage/index.vue b/pages/Index/components/OrderPage/index.vue
index 0a53c4a..3505a11 100644
--- a/pages/Index/components/OrderPage/index.vue
+++ b/pages/Index/components/OrderPage/index.vue
@@ -3,80 +3,73 @@
backgroundImage:'url('+staticImage.wallpaperBgImage+')'
}">
-
-
- {{ item.name }}
-
-
-
-
-
- 全部
-
-
-
-
-
- 明天
-
-
+
+
+
+ {{ item.name }}
+
-
- 后天
-
-
+
+
+ {{ date.title }}
+
+
+
-
-
-
- 05/06-08-03
-
-
-
- 时间
+
+
+ 05/06-08-03
+
+
+
+ 时间
+
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+ {{item.addr}}
+
+ {{ server }}
-
- {{item.addr}}
-
- {{ server }}
-
- 上门：{{item.do_date}} {{ item.do_time }}
-
- 下单时间：{{item.create_time}}
-
+ 上门：{{item.do_date}} {{ item.do_time }}
-
-
-
-
-
-
-
+ 下单时间：{{item.create_time}}
+
+
+
+
+
+
+
+
@@ -84,6 +77,11 @@
+
@@ -111,19 +109,25 @@
return {
title: 'Hello',
loading: true,
- screenCheck:0,
+ status: 'loadmore',
+ screenCheck:'',
screenMenu:[
{
name:'全部',
value:'',
},{
name:'待服务',
- value:'1',
+ 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',
@@ -143,40 +147,58 @@
pagePadding: 100,
petImage: imghost + '/static/image/pet_avatar1.jpeg',
orderList:[],
- dayActive: 1,
+ dayActive: 0,
statusActive: 1,
+ page:1
}
},
onLoad() {
},
methods: {
- selectScreen(index){
- this.screenCheck = index;
+ selectScreen(item){
+ this.screenCheck = item.value;
+ this.page = 1;
+ this.status = "loadmore";
+ this.orderList = [];
+ this.getOrderList();
},
navTo(url){
uni.navigateTo({
url:url
})
},
- getOrderList(page = 1, filter = {
+ getOrderList(filter = {
status: "",
start_time: "",
end_time: ""
}){
filter.is_worker = this.$store.state.userInfo.store_id ? 1 : 0;
- filter.page = page;
- filter.limit = 10;
+ filter.page = this.page++;
+ filter.limit = 1;
+ if (this.screenCheck !== '') {
+ filter.status = this.screenCheck;
+ }
+ if (this.status === 'nomore') {
+ return;
+ }
+ this.status = 'loading';
getOrderList(filter).then(data => {
- this.orderList = data.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';
+ }else{
+ this.status = 'loadmore';
+ }
+ });
},
- dayActiveToggle(daySign){
- this.dayActive = daySign;
- },
- statusActiveToggle(statusSign){
- this.statusActive = statusSign;
+ dayActiveToggle(date){
+ this.dayActive = date.value;
+ this.page = 1;
+ this.orderList = [];
+ this.status = "loadmore";
},
},
@@ -187,6 +209,7 @@
uni.$emit('isTop', false);
}
},
+
mounted() {
this.getOrderList();
},
diff --git a/pages/Index/index.vue b/pages/Index/index.vue
index a712a07..541dbff 100644
--- a/pages/Index/index.vue
+++ b/pages/Index/index.vue
@@ -4,7 +4,7 @@
-
+
@@ -27,6 +27,7 @@
import ChatPage from '@/pages/Index/components/ChatPage/Index.vue';
import UserPage from '@/pages/Index/components/UserPage/Index.vue';
import {imghost} from "@/config/host";
+ import log from "@/utils/log";
export default {
components: {
FooterNav,
@@ -88,6 +89,13 @@
},
// store.
},
+ onReachBottom() {
+ log(this.footCheck);
+ if(this.footCheck === 'order'){
+ this.$refs.orderList.getOrderList();
+ }
+
+ },
onPageScroll(res) {
if (res.scrollTop <= 20) {
uni.$emit('isTop', true);
diff --git a/pages/Pet/index.vue b/pages/Pet/index.vue
index b476d63..5b52086 100644
--- a/pages/Pet/index.vue
+++ b/pages/Pet/index.vue
@@ -6,7 +6,7 @@
-
+
@@ -36,7 +36,13 @@
+
+
@@ -85,7 +91,8 @@
pagePadding: 100,
currentPage:1,
petImage: imghost + '/static/image/pet_avatar1.jpeg',
- petList:[]
+ petList:[],
+ status:"loadmore"
}
},
onLoad() {
@@ -98,13 +105,20 @@
})
},
getMyPets(page = 1){
+ if (this.status === 'nomore') {
+ return;
+ }
+ this.status = 'loading';
getMyPets(page).then(data => {
if (page === 1){
this.petList = data.data;
}else{
this.petList.push.apply(this.petList,data.data);
}
- })
+ if (data.data.length < 10) {
+ this.status = 'nomore';
+ }
+ });
}
},
onReachBottom() {