diff --git a/src/page/index/top/index.vue b/src/page/index/top/index.vue
index 1744baf..6e22233 100644
--- a/src/page/index/top/index.vue
+++ b/src/page/index/top/index.vue
@@ -78,7 +78,7 @@
            :src="userInfo.avatar">
       <el-dropdown>
         <span class="el-dropdown-link">
-          {{userInfo.userName}}
+          {{userInfo.user_name}}
           <i class="el-icon-arrow-down el-icon--right"></i>
         </span>
         <el-dropdown-menu slot="dropdown">
diff --git a/src/page/login/userlogin.vue b/src/page/login/userlogin.vue
index 5338090..7370475 100644
--- a/src/page/login/userlogin.vue
+++ b/src/page/login/userlogin.vue
@@ -88,9 +88,9 @@
           //角色ID
           roleId: "",
           //用户名
-          username: "admin",
+          username: "",//"admin",
           //密码
-          password: "admin",
+          password: "",//"admin",
           //账号类型
           type: "account",
           //验证码的值
diff --git a/src/views/blacklist/index.vue b/src/views/blacklist/index.vue
index 2a24ca8..4a1bac7 100644
--- a/src/views/blacklist/index.vue
+++ b/src/views/blacklist/index.vue
@@ -17,6 +17,7 @@
 
 <script>
 import { getList, remove } from "@/api/blacklist/blacklist";
+import { Base64 } from "js-base64";
 import { mapGetters } from "vuex";
 
 export default {
@@ -181,11 +182,16 @@ export default {
         values.startTime = '';
         values.endTime = '';
       }
-      values.cupCardNo = cupCardNo ? cupCardNo : '';
+      values.cupCardNo = cupCardNo ? Base64.encode(cupCardNo) : '';
       // console.log('black', values)
       this.loading = true;
       getList(page.currentPage, page.pageSize, values).then(res => {
-        const data = res.data.data;
+        let data = res.data.data;
+        data.records.map(item => {
+          item.cupCardNo = Base64.decode(item.cupCardNo);
+          item.cupName = Base64.decode(item.cupName);
+          item.cupPhone = Base64.decode(item.cupPhone);
+        })
         this.page.total = data.total;
         this.data = data.records;
         this.loading = false;
diff --git a/src/views/booklist/index.vue b/src/views/booklist/index.vue
index d911fae..9e7cea5 100644
--- a/src/views/booklist/index.vue
+++ b/src/views/booklist/index.vue
@@ -360,6 +360,7 @@ import {
 import { mapGetters } from "vuex";
 import print from "vue-print-nb";
 import { calcSex } from "../../util/util";
+import {Base64} from 'js-base64';
 
 export default {
   data() {
@@ -484,14 +485,17 @@ export default {
       this.option.column.find(item => item.label == '身份证号码').searchValue = number
     },
     handleRegister(row) {
-      console.log(row)
+      // console.log('13',row)
       let ids = []
       row.details.map(item => {
         ids.push(item.id)
       })
       let val = ids.join(',');
       getStatus(val).then(res => {
-        console.log(res)
+        res.data.data.resData.cupCardNo = res.data.data.resData.cupCardNo.length > 18 ? Base64.decode(res.data.data.resData.cupCardNo) : res.data.data.resData.cupCardNo;
+        res.data.data.resData.cupName = res.data.data.resData.cupName.length > 7 ? Base64.decode(res.data.data.resData.cupName) : res.data.data.resData.cupName;
+        res.data.data.resData.cupPhone = res.data.data.resData.cupPhone.length > 11 ? Base64.decode(res.data.data.resData.cupPhone) : res.data.data.resData.cupPhone;
+        // console.log('12',res.data);
         this.regData = res.data.data;
         this.isRegister = true
       })
@@ -551,6 +555,11 @@ export default {
       getList(page.currentPage, page.pageSize, values).then(res => {
         const data = res.data.data;
         this.page.total = data.total;
+        data.records.map(item => {
+          item.cupCardNo = item.cupCardNo.length > 18 ? Base64.decode(item.cupCardNo) : item.cupCardNo;
+          item.cupName = item.cupName.length > 7 ? Base64.decode(item.cupName) : item.cupName;
+          item.cupPhone = item.cupPhone.length > 11 ? Base64.decode(item.cupPhone) : item.cupPhone;
+        })
         this.data = data.records;
         this.loading = false;
       });
@@ -659,7 +668,7 @@ export default {
 
       .mess_box {
         width: 100%;
-        height: 123px;
+        min-height: 123px;
         background: #F5F6FA;
         border-radius: 8px;
         display: flex;
diff --git a/vue.config.js b/vue.config.js
index d50c5a7..2e0fde1 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -26,8 +26,8 @@ module.exports = {
     proxy: {
       "/api": {
         //本地服务接口地址
-        // target: "http://192.168.1.3:8088",
-        target: "http://192.168.1.106:80",
+        target: "http://192.168.1.3:8080",
+        // target: "http://192.168.1.106",
         //远程演示服务地址,可用于直接启动项目
         // target: 'https://saber.bladex.vip/api',
         ws: true,