diff --git a/pages/index/index.vue b/pages/index/index.vue index f9962b0..fe04d68 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -191,7 +191,7 @@ }); }, toVisitors(hospital){ - uni.setStorageSync('hospital_id', hospital.id) + uni.setStorageSync('hospital_id', hospital.depart_id) uni.setStorageSync('hospital', JSON.stringify(hospital)) uni.setStorageSync('doctor_info', JSON.stringify(this.doctorInfo)) uni.navigateTo({ diff --git a/pages/visitors/visitors.vue b/pages/visitors/visitors.vue index 78d8bbc..3c6f3f1 100644 --- a/pages/visitors/visitors.vue +++ b/pages/visitors/visitors.vue @@ -157,10 +157,10 @@ var param = new Object() param.page = 1 param.limit = 10000 - this.$http.req('client/user/visit_user/', param, 'GET').then(data=>{ + this.$http.req('get_visitors', param, 'GET').then(data=>{ if(data == -1) return - var server_time = data.server_time - this.visitUsers = data.data + this.visitUsers = data + console.log(this.visitUsers) this.popMsgs = [] var popmsgIndex = 0 for (var i = 0; i < this.visitUsers.length; i++) { @@ -186,24 +186,9 @@ // ] try{ - var dateService = new Date(server_time.replaceAll('-', "/")); - var timestampService = Math.floor(dateService)/1000; var hospitalInfo = this.visitUsers[i].hospital_info for (var j = 0; j < hospitalInfo.length; j++) { - var datestr = new Date(hospitalInfo[j].last_visit_time.replaceAll('-', "/")); - var timestamp = Math.floor(datestr)/1000; - var visitTimeDayTotal = Math.floor((timestampService-timestamp)/3600/24) - if(visitTimeDayTotal>0 && visitTimeDayTotal < 7) hospitalInfo[j].expire_day = visitTimeDayTotal+'天' - if(visitTimeDayTotal>=7) hospitalInfo[j].expire_day = Math.floor(visitTimeDayTotal/7)+'周' - if(visitTimeDayTotal>=365) hospitalInfo[j].expire_day = Math.floor(visitTimeDayTotal/365)+'年' - if(!hospitalInfo[j].expire_day) { - var visitTimeMinute = Math.floor((timestampService-timestamp)/60) - if(visitTimeMinute <= 0) hospitalInfo[j].expire_day = (timestampService-timestamp)+'秒' - if(visitTimeMinute >= 1 && visitTimeMinute<60) hospitalInfo[j].expire_day = Math.floor((timestampService-timestamp)/60)+'分' - if(visitTimeMinute>=60) hospitalInfo[j].expire_day = Math.floor((visitTimeMinute)/60)+'小时' - } - - if(!hospitalInfo[j].hospital_state) continue + if(!hospitalInfo[j].hospital_state || this.type == 1) continue var popobj = new Object() popobj.popShowCancel = false