diff --git a/dist.zip b/dist.zip
new file mode 100644
index 0000000..e8d457c
Binary files /dev/null and b/dist.zip differ
diff --git a/src/router/axios.js b/src/router/axios.js
index 64b38fe..4f3374c 100644
--- a/src/router/axios.js
+++ b/src/router/axios.js
@@ -16,6 +16,8 @@ import {Base64} from 'js-base64';
 import NProgress from 'nprogress';
 import 'nprogress/nprogress.css';
 
+//默认baseurl
+// axios.defaults.baseURL = "http://www.qdscgs.com"
 //默认超时时间
 axios.defaults.timeout = 10000;
 //返回其他状态码
diff --git a/src/util/util.js b/src/util/util.js
index 9df90d0..9232d52 100644
--- a/src/util/util.js
+++ b/src/util/util.js
@@ -389,3 +389,17 @@ export const downloadXls = (fileArrayBuffer, filename) => {
     window.open(URL.createObjectURL(file));
   }
 }
+
+/**
+ * 根据身份证号判断那女
+*/
+export const calcSex = (cardNo) => {
+  let result = '';
+  if(validatenull(cardNo)) return result;
+  if(cardNo.length == 18) {
+    result = cardNo.charAt(16)%2 === 0 ? '女' : '男';
+  }else if(cardNo.length == 15) {
+    result = cardNo.charAt(14)%2 === 0 ? '女' : '男';
+  }
+  return result;
+}
\ No newline at end of file
diff --git a/src/views/booklist/index.vue b/src/views/booklist/index.vue
index 46a4880..89c5e85 100644
--- a/src/views/booklist/index.vue
+++ b/src/views/booklist/index.vue
@@ -5,19 +5,17 @@
       @search-reset="searchReset" @current-change="currentChange" @size-change="sizeChange"
       @refresh-change="refreshChange" @on-load="onLoad">
       <template slot-scope="{row}" slot="examDate">
-        <div v-for="item1 in row.details.map(item => item.period + item.timeFrame)" :key="item1">{{item1}}</div>
+        <div v-for="item1 in row.details.map(item => item.period + item.timeFrame)" :key="item1">{{ item1 }}</div>
       </template>
       <template slot-scope="{row}" slot="examPro">
-        <div v-for="item1 in row.details.map(item => item.project)" :key="item1">{{item1}}</div>
+        <div v-for="item1 in row.details.map(item => item.project)" :key="item1">{{ item1 }}</div>
       </template>
       <template slot-scope="{row}" slot="apmStatus">
         <div v-for="item1 in row.details.map(item => item.apmStatus)" :key="item1">
-        <el-tag size="small" 
-          :type="item1 == 3 ? 'success' : item1 == 2 ? 'warning' : item1 == 3 ? 'danger' : 'info'"
-          >
-          {{
-            item1 == 3 ? '已报道' : item1 == 2 ? '未报道' : item1 == 1 ? '已取消' : '未报到'
-          }}
+          <el-tag size="small" :type="item1 == 3 ? 'success' : item1 == 2 ? 'warning' : item1 == 3 ? 'danger' : 'info'">
+            {{
+  item1 == 3 ? '已报道' : item1 == 2 ? '未报道' : item1 == 1 ? '已取消' : '未报到'
+            }}
           </el-tag>
         </div>
       </template>
@@ -26,11 +24,7 @@
           :disabled="(row.details.find(item => item.apmStatus == 2) && row.apmDay > systemTime) ? false : true">预约报道</el-button>
       </template>
     </avue-crud>
-    <el-drawer 
-      :visible.sync="isRegister"
-      :append-to-body="true"
-      :direction="direction"
-      class="my-info-dialog"
+    <el-drawer :visible.sync="isRegister" :append-to-body="true" :direction="direction" class="my-info-dialog"
       custom-class="register_box" @close="closeDraw">
       <div slot="title" class="title_box">
         <div class="title_txt">
@@ -43,19 +37,18 @@
           <img v-show="regData.resStatus == 1" src="~@/assets/image/succ.png" alt="">
           <img v-show="regData.resStatus == 0" src="~@/assets/image/fail.png" alt="">
           <!-- <img v-show="regData.resStatus == 3" src="~@/assets/image/warn.png" alt=""> -->
-          <div class="tip_txt" :class="regData.resStatus == 0 ? 'fail_txt'  : ''">
+          <div class="tip_txt" :class="regData.resStatus == 0 ? 'fail_txt' : ''">
             {{ regData.resStatus == 1 ? '报道成功' : '报道失败' }}</div>
         </div>
-        <div class="tips_txt">{{regData.resMsg}}</div>
+        <div class="tips_txt">{{ regData.resMsg }}</div>
         <div class="account_mess">
           <div class="mess_tit">账号信息</div>
           <div class="mess_box">
-            <div class="left_box" :class="regData.resStatus == 0 ? 'fail_box' :  ''">
+            <div class="left_box" :class="regData.resStatus == 0 ? 'fail_box' : ''">
               <div class="acc_text">姓名</div>
-              <div class="acc_txt">{{regData.resData ? regData.resData.cupName : '' }}</div>
+              <div class="acc_txt">{{ regData.resData ? regData.resData.cupName : '' }}</div>
             </div>
-            <div class="right_box"
-              :class="regData.resStatus == 0 ? 'fail_right' :  ''">
+            <div class="right_box" :class="regData.resStatus == 0 ? 'fail_right' : ''">
               <div class="acc_box">
                 <div class="acc_text">身份证号</div>
                 <div class="acc_txt">{{ regData.resData ? regData.resData.cupCardNo : '' }}</div>
@@ -77,13 +70,17 @@
           <div class="mess_box reg_box">
             <div class="left_box">
               <div class="acc_text">体检项目</div>
-              <div class="acc_txt"  v-for="item in regData.resData ? regData.resData.details : []" :key="item">{{ item.project }}</div>
+              <div class="acc_txt" v-for="item in regData.resData ? regData.resData.details : []" :key="item">{{
+                item.project
+              }}</div>
               <!-- <div class="acc_txt">{{ regData.resData.details.map(item => item.project) }}</div> -->
             </div>
             <div class="right_box">
               <div class="acc_box">
                 <div class="acc_text">预约时间</div>
-                <div class="acc_txt" v-for="item in regData.resData ? regData.resData.details : []" :key="item">{{regData.resData ? regData.resData.apmDay.substring(0,10) : ''}} {{item.period}}{{item.timeFrame}}</div>
+                <div class="acc_txt" v-for="item in regData.resData ? regData.resData.details : []" :key="item">
+                  {{ regData.resData ? regData.resData.apmDay.substring(0, 10) : '' }} {{ item.period }}{{ item.timeFrame }}
+                </div>
               </div>
             </div>
           </div>
@@ -91,13 +88,13 @@
         <div class="btn" v-print="printObj" v-show="regData.resStatus == 1">
           签到并打印
         </div>
-        <div class="btn"  v-show="regData.resStatus == 0" @click="closeDraw">
+        <div class="btn" v-show="regData.resStatus == 0" @click="closeDraw">
           关闭
         </div>
       </div>
     </el-drawer>
     <!-- 打印 -->
-    <!-- <div style="margin-left:-9999px;">
+    <div style="margin-left:-9999px;height:1000pt;">
       <div id="pintHtml" class="prin_table"
         style="font-family: SimSun;font-size:12px;letter-spacing: 2px;line-height:16px;display: inline-block;overflow: hidden;">
         <div style="line-height:40px;font-size:22pt;text-align:center;">机动车驾驶人身体条件证明</div>
@@ -106,11 +103,13 @@
             <td rowspan="6" style="text-align:center;width:26px;">申<br />请<br />人<br />填<br />报<br />事<br />项</td>
             <td rowspan="4" style="text-align:center;width:26px;">申<br />请<br />人<br />信<br />息</td>
             <td style="width:60px;text-align:center;">姓 名</td>
-            <td colspan="3" style="text-align:center;">{{ regData.name }}</td>
+            <td colspan="3" style="text-align:center;">{{ regData.resData ? regData.resData.cupName : '' }}</td>
             <td style="text-align:center;">性别</td>
-            <td style="text-align:center;">{{ regData.sex }}</td>
+            <td style="text-align:center;">{{ calcSex(regData.resData.cupCardNo) }}</td>
             <td colspan="4" style="text-align:center;">出生日期</td>
-            <td colspan="7" style="text-align:center;">{{ regData.cardId.substring(6, 15) }}</td>
+            <td colspan="7" style="text-align:center;">{{
+              regData.resData.cupCardNo ? regData.resData.cupCardNo.substring(6, 15) : ''
+            }}</td>
             <td colspan="3" style="text-align:center;">国 籍</td>
             <td colspan="5" style="text-align:center;"></td>
           </tr>
@@ -118,26 +117,65 @@
             <td style="text-align:center;">身份证<br />明名称</td>
             <td colspan="4"></td>
             <td style="text-align:center;">号 码</td>
-            <td style="width:20px;text-align:center;">{{ regData.cardId.charAt(0) }}</td>
-            <td colspan="2" style="width:36px;text-align:center;">{{ regData.cardId.charAt(1) }}</td>
-            <td style="width:20px;text-align:center;">{{ regData.cardId.charAt(2) }}</td>
-            <td style="width:20px;text-align:center;">{{ regData.cardId.charAt(3) }}</td>
-            <td style="width:20px;text-align:center;">{{ regData.cardId.charAt(4) }}</td>
-            <td style="width:20px;text-align:center;">{{ regData.cardId.charAt(5) }}</td>
-            <td style="width:20px;text-align:center;">{{ regData.cardId.charAt(6) }}</td>
-            <td style="width:20px;text-align:center;">{{ regData.cardId.charAt(7) }}</td>
-            <td style="width:20px;text-align:center;">{{ regData.cardId.charAt(8) }}</td>
-            <td style="width:20px;text-align:center;">{{ regData.cardId.charAt(9) }}</td>
-            <td style="width:20px;text-align:center;">{{ regData.cardId.charAt(10) }}</td>
-            <td style="width:20px;text-align:center;">{{ regData.cardId.charAt(11) }}</td>
-            <td style="width:20px;text-align:center;">{{ regData.cardId.charAt(12) }}</td>
-            <td style="width:20px;text-align:center;">{{ regData.cardId.charAt(13) }}</td>
-            <td style="width:20px;text-align:center;">{{ regData.cardId.charAt(14) }}</td>
-            <td style="width:20px;text-align:center;">{{ regData.cardId.length > 15 ? regData.cardId.charAt(15) : '' }}
+            <td style="width:20px;text-align:center;">{{
+              regData.resData.cupCardNo ? regData.resData.cupCardNo.charAt(0) : ''
+            }}</td>
+            <td colspan="2" style="width:36px;text-align:center;">{{
+              regData.resData.cupCardNo ? regData.resData.cupCardNo.charAt(1) : ''
+            }}</td>
+            <td style="width:20px;text-align:center;">{{
+              regData.resData.cupCardNo ? regData.resData.cupCardNo.charAt(2) : ''
+            }}</td>
+            <td style="width:20px;text-align:center;">{{
+              regData.resData.cupCardNo ? regData.resData.cupCardNo.charAt(3) : ''
+            }}</td>
+            <td style="width:20px;text-align:center;">{{
+              regData.resData.cupCardNo ? regData.resData.cupCardNo.charAt(4) : ''
+            }}</td>
+            <td style="width:20px;text-align:center;">{{
+              regData.resData.cupCardNo ? regData.resData.cupCardNo.charAt(5) : ''
+            }}</td>
+            <td style="width:20px;text-align:center;">{{
+              regData.resData.cupCardNo ? regData.resData.cupCardNo.charAt(6) : ''
+            }}</td>
+            <td style="width:20px;text-align:center;">{{
+              regData.resData.cupCardNo ? regData.resData.cupCardNo.charAt(7) : ''
+            }}</td>
+            <td style="width:20px;text-align:center;">{{
+              regData.resData.cupCardNo ? regData.resData.cupCardNo.charAt(8) : ''
+            }}</td>
+            <td style="width:20px;text-align:center;">{{
+              regData.resData.cupCardNo ? regData.resData.cupCardNo.charAt(9) : ''
+            }}</td>
+            <td style="width:20px;text-align:center;">{{
+              regData.resData.cupCardNo ? regData.resData.cupCardNo.charAt(10) : ''
+            }}</td>
+            <td style="width:20px;text-align:center;">{{
+              regData.resData.cupCardNo ? regData.resData.cupCardNo.charAt(11) : ''
+            }}</td>
+            <td style="width:20px;text-align:center;">{{
+              regData.resData.cupCardNo ? regData.resData.cupCardNo.charAt(12) : ''
+            }}</td>
+            <td style="width:20px;text-align:center;">{{
+              regData.resData.cupCardNo ? regData.resData.cupCardNo.charAt(13) : ''
+            }}</td>
+            <td style="width:20px;text-align:center;">{{
+              regData.resData.cupCardNo ? regData.resData.cupCardNo.charAt(14) : ''
+            }}</td>
+            <td style="width:20px;text-align:center;">{{
+              regData.resData.cupCardNo && regData.resData.cupCardNo.length >
+                15 ? regData.resData.cupCardNo.charAt(15) : ''
+            }}
             </td>
-            <td style="width:20px;text-align:center;">{{ regData.cardId.length > 15 ? regData.cardId.charAt(16) : '' }}
+            <td style="width:20px;text-align:center;">{{
+              regData.resData.cupCardNo && regData.resData.cupCardNo.length >
+                15 ? regData.resData.cupCardNo.charAt(16) : ''
+            }}
             </td>
-            <td style="width:20px;text-align:center;">{{ regData.cardId.length > 15 ? regData.cardId.charAt(17) : '' }}
+            <td style="width:20px;text-align:center;">{{
+              regData.resData.cupCardNo && regData.resData.cupCardNo.length >
+                15 ? regData.resData.cupCardNo.charAt(17) : ''
+            }}
             </td>
           </tr>
           <tr>
@@ -305,7 +343,7 @@
           </tr>
         </table>
       </div>
-    </div> -->
+    </div>
   </basic-container>
 </template>
 
@@ -318,6 +356,7 @@ import {
 } from "@/api/booklist/booklist";
 import { mapGetters } from "vuex";
 import print from "vue-print-nb";
+import { calcSex } from "../../util/util";
 
 export default {
   data() {
@@ -386,12 +425,12 @@ export default {
           {
             label: "预约时间",
             prop: "examDate",
-            slot:true
+            slot: true
           },
           {
             label: "预约项目",
             prop: "examPro",
-            slot:true
+            slot: true
           },
           {
             label: "状态",
@@ -401,8 +440,10 @@ export default {
         ]
       },
       data: [],
-      regData: {},
-      systemTime:''
+      regData: {
+        resData: {}
+      },
+      systemTime: ''
     };
   },
   directives: {
@@ -410,7 +451,7 @@ export default {
   },
 
   computed: {
-    ...mapGetters(["userInfo", "permission","systemTime"]),
+    ...mapGetters(["userInfo", "permission", "systemTime"]),
     permissionList() {
       return {
         addBtn: this.vaildData(this.permission.notice_add, false),
@@ -424,24 +465,29 @@ export default {
     // this.getCard()
   },
   mounted() {
-    getSystemTime().then(res =>{
+    getSystemTime().then(res => {
       this.systemTime = res.data.data
     })
   },
   methods: {
+    //计算性别
+    calcSex(cardNo) {
+      // console.log('sex', calcSex(cardNo));
+      return calcSex(cardNo);
+    },
     // 获取身份证后打开弹窗
-    getCard(number){
+    getCard(number) {
       number = '3702120000618034X';
       this.option.column.find(item => item.label == '身份证号码').searchValue = number
     },
     handleRegister(row) {
       console.log(row)
       let ids = []
-      row.details.map(item =>{
+      row.details.map(item => {
         ids.push(item.id)
       })
       let val = ids.join(',');
-      getStatus(val).then(res =>{
+      getStatus(val).then(res => {
         console.log(res)
         this.regData = res.data.data;
         this.isRegister = true
@@ -477,7 +523,7 @@ export default {
       this.onLoad(this.page, this.query);
     },
     onLoad(page, params = {}) {
-    console.log(this.systemTime)
+      console.log(this.systemTime)
 
       this.loading = true;
       const { releaseTimeRange, cupCardNo } = this.query;
@@ -530,7 +576,7 @@ export default {
         justify-content: space-between;
 
         .txt {
-          color: rgba(0,0,0,.85);
+          color: rgba(0, 0, 0, .85);
           font-weight: 500;
           line-height: 24px;
 
@@ -729,7 +775,7 @@ export default {
       color: #FFFFFF;
       cursor: pointer;
       margin-top: 50px;
-      
+
     }
   }