diff --git a/LibManagementSystem/returnbook.cpp b/LibManagementSystem/returnbook.cpp
index cc2e0c48a6a2406ea0fc46815990213a6bffc3a5..608b2ca107d9f9fd5c25d58a84843472aa898a0a 100644
--- a/LibManagementSystem/returnbook.cpp
+++ b/LibManagementSystem/returnbook.cpp
@@ -3,9 +3,9 @@
 #include<QStandardItem>
 #include <QTableView>
 #include<QMessageBox>
+#include<QDebug>
 QStandardItemModel *mo = new QStandardItemModel();
-returnBook::returnBook(User *u,  QWidget *parent) :
-    QWidget(parent),
+returnBook::returnBook(User *u,  QWidget *parent) :QMainWindow(parent),
     ui(new Ui::returnBook),
     user(u)
 {
@@ -25,17 +25,11 @@ returnBook::returnBook(User *u,  QWidget *parent) :
     ui->ownlist->setColumnWidth(1,300);
     ui->ownlist->setEditTriggers(QAbstractItemView::NoEditTriggers);
     connect(ui->ownlist, &QTableView::clicked, this, &returnBook::temp);
-    for(int y=0;y<5;y++)
-    {
-        QString w=(*user).borbook[y];
-        mo->setItem(y,0,new QStandardItem(borbookcut(w,1)));
-        mo->setItem(y,1,new QStandardItem((*user).returnddl[y]));
-    }
 }
 
-void returnBook::temp(const QModelIndex &u)
+void returnBook::temp(const QModelIndex &p)
 {
-    selected=u.row();
+    selected=p.row();
 }
 returnBook::~returnBook()
 {
@@ -52,6 +46,42 @@ void returnBook::fillInfo()
         QString t = QString::fromLocal8Bit(user->nickname.toLocal8Bit().mid(0,8));
         ui->to_userInfo->setText("· " + t + "··");
     }
+    if(user->borbook[0] != ""){
+
+        mo->setItem(0,0,new QStandardItem(borbookcut(user->borbook[0],1)));
+        mo->setItem(0,1,new QStandardItem(user->returnddl[0]));
+        mo->item(0,0)->setToolTip(user->borbook[0]);
+        mo->item(0,0)->setTextAlignment(Qt::AlignCenter);
+        mo->item(0,1)->setTextAlignment(Qt::AlignCenter);
+    }
+    if(user->borbook[1] != ""){
+        mo->setItem(1,0,new QStandardItem(borbookcut(user->borbook[1],1)));
+        mo->setItem(1,1,new QStandardItem(user->returnddl[1]));
+        mo->item(1,0)->setToolTip(user->borbook[1]);
+        mo->item(1,0)->setTextAlignment(Qt::AlignCenter);
+        mo->item(1,1)->setTextAlignment(Qt::AlignCenter);
+    }
+    if(user->borbook[2] != ""){
+        mo->setItem(2,0,new QStandardItem(borbookcut(user->borbook[2],1)));
+        mo->setItem(2,1,new QStandardItem(user->returnddl[2]));
+        mo->item(2,0)->setToolTip(user->borbook[2]);
+        mo->item(2,0)->setTextAlignment(Qt::AlignCenter);
+        mo->item(2,1)->setTextAlignment(Qt::AlignCenter);
+    }
+    if(user->borbook[3] != ""){
+        mo->setItem(3,0,new QStandardItem(borbookcut(user->borbook[3],1)));
+        mo->setItem(3,1,new QStandardItem(user->returnddl[3]));
+        mo->item(3,0)->setToolTip(user->borbook[3]);
+        mo->item(3,0)->setTextAlignment(Qt::AlignCenter);
+        mo->item(3,1)->setTextAlignment(Qt::AlignCenter);
+    }
+    if(user->borbook[4] != ""){
+        mo->setItem(4,0,new QStandardItem(borbookcut(user->borbook[4],1)));
+        mo->setItem(4,1,new QStandardItem(user->returnddl[4]));
+        mo->item(4,0)->setToolTip(user->borbook[4]);
+        mo->item(4,0)->setTextAlignment(Qt::AlignCenter);
+        mo->item(4,1)->setTextAlignment(Qt::AlignCenter);
+    }
 }
 void returnBook::on_return_btn_clicked()
 {
@@ -63,8 +93,8 @@ void returnBook::on_re_clicked()
 {
     QByteArray t;
     char g = stopChar;
-    QString o=(*user).borbook[selected];
-    QString y=(*user).account;
+    QString o=user->borbook[selected];
+    QString y=user->account;
     t+="REVERT"+borbookcut(o,0).toStdString()+g+y.toStdString();
     emit send_return(t);
 }
@@ -83,10 +113,39 @@ void returnBook::receive_return()
     box->setText("还书成功");
     box->show();
     mo->setRowCount(0);
-    for(int y=0;y<5;y++)
-    {
-
-        QString w=(*user).borbook[y];
-        mo->setItem(y,0,new QStandardItem(borbookcut(w,1)));
+    if(user->borbook[0] != ""){
+        mo->setItem(0,0,new QStandardItem(borbookcut(user->borbook[0],1)));
+        mo->setItem(0,1,new QStandardItem(user->returnddl[0]));
+        mo->item(0,0)->setToolTip(user->borbook[0]);
+        mo->item(0,0)->setTextAlignment(Qt::AlignCenter);
+        mo->item(0,1)->setTextAlignment(Qt::AlignCenter);
+    }
+    if(user->borbook[1] != ""){
+        mo->setItem(1,0,new QStandardItem(borbookcut(user->borbook[1],1)));
+        mo->setItem(1,1,new QStandardItem(user->returnddl[1]));
+        mo->item(1,0)->setToolTip(user->borbook[1]);
+        mo->item(1,0)->setTextAlignment(Qt::AlignCenter);
+        mo->item(1,1)->setTextAlignment(Qt::AlignCenter);
+    }
+    if(user->borbook[2] != ""){
+        mo->setItem(2,0,new QStandardItem(borbookcut(user->borbook[2],1)));
+        mo->setItem(2,1,new QStandardItem(user->returnddl[2]));
+        mo->item(2,0)->setToolTip(user->borbook[2]);
+        mo->item(2,0)->setTextAlignment(Qt::AlignCenter);
+        mo->item(2,1)->setTextAlignment(Qt::AlignCenter);
+    }
+    if(user->borbook[3] != ""){
+        mo->setItem(3,0,new QStandardItem(borbookcut(user->borbook[3],1)));
+        mo->setItem(3,1,new QStandardItem(user->returnddl[3]));
+        mo->item(3,0)->setToolTip(user->borbook[3]);
+        mo->item(3,0)->setTextAlignment(Qt::AlignCenter);
+        mo->item(3,1)->setTextAlignment(Qt::AlignCenter);
+    }
+    if(user->borbook[4] != ""){
+        mo->setItem(4,0,new QStandardItem(borbookcut(user->borbook[4],1)));
+        mo->setItem(4,1,new QStandardItem(user->returnddl[4]));
+        mo->item(4,0)->setToolTip(user->borbook[4]);
+        mo->item(4,0)->setTextAlignment(Qt::AlignCenter);
+        mo->item(4,1)->setTextAlignment(Qt::AlignCenter);
     }
 }
diff --git a/LibManagementSystem/returnbook.h b/LibManagementSystem/returnbook.h
index cd76ed1b404db706d2e5a50e2fd2ab1fcfa5d9d7..abe6704986fa776171e551c42736b3edb9ce7901 100644
--- a/LibManagementSystem/returnbook.h
+++ b/LibManagementSystem/returnbook.h
@@ -1,13 +1,13 @@
 #ifndef RETURNBOOK_H
 #define RETURNBOOK_H
 
-#include <QWidget>
+#include <QMainWindow>
 #include"universal.h"
 namespace Ui {
 class returnBook;
 }
 
-class returnBook : public QWidget
+class returnBook : public QMainWindow
 {
     Q_OBJECT
 
diff --git a/LibManagementSystem/universal.cpp b/LibManagementSystem/universal.cpp
index 35b0417aea8cb16654f4c6659e2d891c875a8f83..1b5aee79a25407ed5dfbfed98bcb3f6cdb3f6b3a 100644
--- a/LibManagementSystem/universal.cpp
+++ b/LibManagementSystem/universal.cpp
@@ -72,6 +72,6 @@ QString borbookcut(QString Origin,int pos)
     if(pos == 1)
         Origin = Origin.mid(index+1,-1);
     if(pos == 0)
-        Origin = Origin.mid(0,index+1);
+        Origin = Origin.mid(0,index);
     return Origin;
 }