diff --git a/pages/order/reservationlist.vue b/pages/order/reservationlist.vue index 63ed7c4..082a866 100644 --- a/pages/order/reservationlist.vue +++ b/pages/order/reservationlist.vue @@ -125,7 +125,12 @@ params: data }) if(res.code == 200){ - this.goodsList = this.goodsList.concat(res.rows) + if (this.pageNum == 1) { + this.goodsList = res.rows + }else { + + this.goodsList = this.goodsList.concat(res.rows) + } let total = res.total this.totalPages = Math.ceil(total / this.pageSize); } diff --git a/pages/staff/staff-my.vue b/pages/staff/staff-my.vue index f4c561c..d14eb2a 100644 --- a/pages/staff/staff-my.vue +++ b/pages/staff/staff-my.vue @@ -70,6 +70,17 @@ + + + + + + 预约信息 + + + + + @@ -147,7 +158,8 @@ export default { user: {}, baseUrl: '', partnerId: '', - myindex: {} + myindex: {}, + lookAppointment: false } }, onLoad() { @@ -158,6 +170,7 @@ export default { console.log(this.user); this.partnerId = uni.getStorageSync('partnerId') this.getindexmy() + this.ifAppointment() }, components: { tabBar, @@ -176,6 +189,14 @@ export default { this.tui() this.$refs.alertDialog.close() }, + ifAppointment(){ + request({ + url: '/partnerOwn/partner/ifAppointment', + method: 'get', + }).then((res) => { + this.lookAppointment = res.data + }) + }, // 点击编辑信息按钮时调用此方法 editUserInfo() { // 这里可以跳转到编辑页面并传递参数 @@ -227,6 +248,11 @@ export default { url: "/pages/manage/deviceManage" }) }, + goAppointment() { + uni.navigateTo({ + url: "/pages/order/reservationlist" + }) + }, goWord() { request({ url: '/system/info/exportWord',