From 616df4a7db17e9e4ac56a4b66d9448d80fe9c24c Mon Sep 17 00:00:00 2001
From: yujialong <479214531@qq.com>
Date: Thu, 9 Jan 2025 13:51:26 +0800
Subject: [PATCH] fix

---
 src/components/case/index.vue                 |   6 +-
 src/components/selectBusiness/index.vue       | 526 +++++++++---------
 src/layouts/header/index.vue                  |   6 +-
 src/libs/util.js                              |   8 +
 src/pages/index/list/index.vue                |   3 +-
 .../list/corporateLoans/application.vue       |   2 +-
 .../manage/list/personalLoans/detail.vue      |   2 +-
 src/store/modules/user.js                     |   7 +-
 8 files changed, 294 insertions(+), 266 deletions(-)

diff --git a/src/components/case/index.vue b/src/components/case/index.vue
index 61ff818..2cb7bd0 100644
--- a/src/components/case/index.vue
+++ b/src/components/case/index.vue
@@ -137,7 +137,7 @@
 
 <script>
 import Cookie from 'js-cookie'
-import util from '@/libs/util'
+import Util from '@/libs/util'
 import Setting from '@/setting'
 // 引入封装好的接口
 import { getProjectBySystemId, getProjectDetail, submit, getQueryCache, deleteCache, checkTest, checkTest2 } from "@/api/http.js";
@@ -210,7 +210,7 @@ export default {
       stageId: '',
       teamId: '',
       isSubmit: false,
-      entryTime: util.formatDate('yyyy-MM-dd hh:mm:ss'),
+      entryTime: Util.formatDate('yyyy-MM-dd hh:mm:ss'),
       startTime: '',
       stopTime: '',
       isSelected: false,
@@ -365,7 +365,7 @@ export default {
       let startTime = sessionStorage.getItem('startTime')
 
       const storeProjectId = sessionStorage.getItem('storeProjectId')
-      sessionStorage.clear()
+      Util.clearSession()
       sessionStorage.setItem('token', token)
       sessionStorage.setItem('cid', cid)
       sessionStorage.setItem('systemId', systemId)
diff --git a/src/components/selectBusiness/index.vue b/src/components/selectBusiness/index.vue
index c0e0169..1940ede 100644
--- a/src/components/selectBusiness/index.vue
+++ b/src/components/selectBusiness/index.vue
@@ -1,38 +1,24 @@
 <template>
   <!-- 业务选择列表 -->
-  <el-dialog :visible="true"
-             class=""
-             :modal="false"
-             @close="closeData"
-             :close-on-click-modal="false"
-             :show-close="false"
-             custom-class="data-dia 2xl:w-7/12 xl:w-9/12 lg:w-full h-9/12">
-    <div slot="title"
-         class="dia-header2">
+  <el-dialog :visible="true" class="" :modal="false" @close="closeData" :close-on-click-modal="false"
+    :show-close="false" custom-class="data-dia 2xl:w-7/12 xl:w-9/12 lg:w-full h-9/12">
+    <div slot="title" class="dia-header2">
       <div class="data-title2">业务选择</div>
-      <div class="close"><img v-lazy="closeImg"
-             alt=""
-             @click="showBusinessSelect(false)" /></div>
+      <div class="close"><img v-lazy="closeImg" alt="" @click="showBusinessSelect(false)" /></div>
     </div>
     <p class="tips2">请选择您要办理的业务:</p>
     <ul class="take-list2">
-      <li v-for="(item) in getBusinessSelectList"
-          :class="{checked: takeCheck == item.myKey}"
-          :key="item.myKey"
-          @click="checkTake(item.myKey)">
-        <img v-lazy="businessImg"
-             alt="">
-        <p>{{ item.myKey + item.text}}</p>
+      <li v-for="(item) in getBusinessSelectList" :class="{ checked: takeCheck == item.myKey }" :key="item.myKey"
+        @click="checkTake(item.myKey)">
+        <img v-lazy="businessImg" alt="">
+        <p>{{ item.myKey + item.text }}</p>
       </li>
-      <li v-for="(item) in (3 - getBusinessSelectList.length%3)"
-          class="sitting"
-          :key="item"></li>
+      <li v-for="(item) in (3 - getBusinessSelectList.length % 3)" class="sitting" :key="item"></li>
     </ul>
     <div class="dia-footer2">
       <div class='busyButtonBox'>
         <el-button @click="showBusinessSelect(false)">取消</el-button>
-        <el-button type="primary"
-                   @click="selectBusiness()">确定</el-button>
+        <el-button type="primary" @click="selectBusiness()">确定</el-button>
       </div>
     </div>
   </el-dialog>
@@ -40,6 +26,7 @@
 
 <script>
 import { mapState, mapMutations, mapGetters } from 'vuex';
+import Util from '@/libs/util'
 
 export default {
   props: {
@@ -141,7 +128,7 @@ export default {
       let timestamp = sessionStorage.getItem('timestamp')
       let startTime = sessionStorage.getItem('startTime')
       const storeProjectId = sessionStorage.getItem('storeProjectId')
-      sessionStorage.clear()
+      Util.clearSession()
       sessionStorage.setItem('token', token)
       sessionStorage.setItem('cid', cid)
       sessionStorage.setItem('systemId', systemId)
@@ -193,249 +180,284 @@ export default {
 
 <style lang="scss" scoped>
 .data-dia {
-    border-radius: 16px;
-    margin-top: 4vh !important;
-    background: #fff;
-    position: fixed;
-    top: 7%;
-    left: 50%;
-    transform: translate(-50%, 0);
-    padding: 0 15px 15px;
-    z-index: 997;
-    border: 1px solid #e6e6e6;
-    max-height: 600px;
+  border-radius: 16px;
+  margin-top: 4vh !important;
+  background: #fff;
+  position: fixed;
+  top: 7%;
+  left: 50%;
+  transform: translate(-50%, 0);
+  padding: 0 15px 15px;
+  z-index: 997;
+  border: 1px solid #e6e6e6;
+  max-height: 600px;
+  overflow: auto;
+
+  // 业务选择中的
+  .take-list2 {
+    width: 100%;
+    display: flex;
+    justify-content: space-around;
+    flex-direction: row;
+    flex-wrap: wrap;
+    height: 40vh;
     overflow: auto;
-    // 业务选择中的
-    .take-list2 {
-        width: 100%;
-        display: flex;
-        justify-content: space-around;
-        flex-direction: row;
-        flex-wrap: wrap;
-        height: 40vh;
-        overflow: auto;
-        li {
-            display: inline-flex;
-            align-items: center;
-            width: 30%;
-            height: 10vh;
-            font-size: 16px;
-            margin: 1vh 0;
-            border: 4px solid #dbdbdb;
-            border-radius: 20px;
-            cursor: pointer;
-            background-color: rgba(216, 216, 216, 0.1);
-            // &:first-child{
-            //     margin: 0 0px 50px 0;
-            // }
-            // &:last-child{
-            //     margin-left: 50px;
-            // }
-            img {
-                width: 15%;
-                margin: 0;
-                //height: 154px;
-                //margin: 0 45px;
-            }
-            p {
-                font-size: 16px;
-                color: #000;
-                text-align: left;
-                padding: 0 20px;
-                // white-space: wrap;
-                // overflow: hidden;
-                // text-overflow: ellipsis;
-                text-overflow: -o-ellipsis-lastline;
-                overflow: hidden;
-                text-overflow: ellipsis;
-                display: -webkit-box;
-                -webkit-line-clamp: 2;
-                -webkit-box-orient: vertical;
-            }
-            &.checked {
-                background: rgba(97, 145, 255, 0.1) url('../../assets/svg/checked.svg') 96% 7% / auto no-repeat;
-                border-color: #6191ff;
-            }
-        }
+
+    li {
+      display: inline-flex;
+      align-items: center;
+      width: 30%;
+      height: 10vh;
+      font-size: 16px;
+      margin: 1vh 0;
+      border: 4px solid #dbdbdb;
+      border-radius: 20px;
+      cursor: pointer;
+      background-color: rgba(216, 216, 216, 0.1);
+
+      // &:first-child{
+      //     margin: 0 0px 50px 0;
+      // }
+      // &:last-child{
+      //     margin-left: 50px;
+      // }
+      img {
+        width: 15%;
+        margin: 0;
+        //height: 154px;
+        //margin: 0 45px;
+      }
+
+      p {
+        font-size: 16px;
+        color: #000;
+        text-align: left;
+        padding: 0 20px;
+        // white-space: wrap;
+        // overflow: hidden;
+        // text-overflow: ellipsis;
+        text-overflow: -o-ellipsis-lastline;
+        overflow: hidden;
+        text-overflow: ellipsis;
+        display: -webkit-box;
+        -webkit-line-clamp: 2;
+        -webkit-box-orient: vertical;
+      }
+
+      &.checked {
+        background: rgba(97, 145, 255, 0.1) url('../../assets/svg/checked.svg') 96% 7% / auto no-repeat;
+        border-color: #6191ff;
+      }
+    }
+  }
+
+  .dia-header2 {
+    position: relative;
+    height: 50px;
+    line-height: 50px;
+    background-color: rgb(98, 149, 243);
+    border-top-left-radius: 14px;
+    border-top-right-radius: 14px;
+
+    .data-title2 {
+      position: absolute;
+      left: 15px;
+      height: 50px;
+      font-size: 16px;
+      line-height: 50px;
+      color: #fff;
+    }
+
+    .close {
+      height: 50px;
+      position: absolute;
+      right: 15px;
+      cursor: pointer;
+      display: flex;
+      flex-direction: column;
+      justify-content: center;
+
+      img {
+        vertical-align: center;
+      }
     }
-    .dia-header2 {
+  }
+
+  .tips2 {
+    margin: 1vh 0 2vh 0;
+    text-align: left;
+    font-size: 16px;
+    color: #000;
+  }
+
+  .list {
+    width: 940px;
+    min-height: 204px;
+    max-height: 360px;
+    overflow: auto;
+    margin: 0 auto;
+    display: flex;
+    align-items: center;
+
+    .img-wrap {
+      background: url('../../assets/img/data-frame.png') 0 0 / cover no-repeat;
+      width: 180px;
+      height: 180px;
+      display: flex;
+      justify-content: center;
+      margin: 5px 10px;
+      position: relative;
+      cursor: pointer;
+
+      .file {
         position: relative;
-        height: 50px;
-        line-height: 50px;
-        background-color: rgb(98, 149, 243);
-        border-top-left-radius: 14px;
-        border-top-right-radius: 14px;
-        .data-title2 {
-            position: absolute;
-            left: 15px;
-            height: 50px;
-            font-size: 16px;
-            line-height: 50px;
-            color: #fff;
+        max-width: 180px;
+        max-height: 130px;
+        text-align: center;
+        margin: 10px 10px;
+
+        img {
+          margin-top: 45px;
         }
-        .close {
-            height: 50px;
-            position: absolute;
-            right: 15px;
-            cursor: pointer;
-            display: flex;
-            flex-direction: column;
-            justify-content: center;
-            img {
-                vertical-align: center;
-            }
+
+        p {
+          position: absolute;
+          bottom: 0;
+          width: 100%;
+          line-height: 54px;
+          text-align: center;
+          font-size: 18px;
+          color: #000;
+        }
+      }
+
+      .text {
+        font-size: 18px;
+        white-space: nowrap;
+        position: absolute;
+        bottom: 15px;
+        left: 50%;
+        transform: translate(-50%, 0);
+      }
+
+      &.checked {
+        background: url('../../assets/img/data-frame-checked.png') 0 0 / cover no-repeat,
+          url('../../assets/svg/checked.svg') 165px 7% / auto no-repeat;
+
+        p {
+          color: #fff;
         }
+      }
     }
-    .tips2 {
-        margin: 1vh 0 2vh 0;
-        text-align: left;
-        font-size: 16px;
-        color: #000;
+  }
+
+  .seal {
+    width: 1100px;
+    padding: 0 5%;
+    display: flex;
+    justify-content: space-between;
+
+    .box {
+      border: 2px solid #e6e6e6;
+      width: 45%;
+      min-height: 300px;
+      border-radius: 10px;
+      padding: 10px;
     }
-    .list {
-        width: 940px;
-        min-height: 204px;
-        max-height: 360px;
-        overflow: auto;
-        margin: 0 auto;
-        display: flex;
-        align-items: center;
-        .img-wrap {
-            background: url('../../assets/img/data-frame.png') 0 0 / cover no-repeat;
-            width: 180px;
-            height: 180px;
-            display: flex;
-            justify-content: center;
-            margin: 5px 10px;
-            position: relative;
-            cursor: pointer;
-            .file {
-                position: relative;
-                max-width: 180px;
-                max-height: 130px;
-                text-align: center;
-                margin: 10px 10px;
-                img {
-                    margin-top: 45px;
-                }
-                p {
-                    position: absolute;
-                    bottom: 0;
-                    width: 100%;
-                    line-height: 54px;
-                    text-align: center;
-                    font-size: 18px;
-                    color: #000;
-                }
-            }
-            .text {
-                font-size: 18px;
-                white-space: nowrap;
-                position: absolute;
-                bottom: 15px;
-                left: 50%;
-                transform: translate(-50%, 0);
-            }
-            &.checked {
-                background: url('../../assets/img/data-frame-checked.png') 0 0 / cover no-repeat,
-                    url('../../assets/svg/checked.svg') 165px 7% / auto no-repeat;
-                p {
-                    color: #fff;
-                }
-            }
+
+    .left {
+      display: flex;
+      width: 50%;
+      flex-wrap: wrap;
+
+      .file {
+        position: relative;
+        width: 140px;
+        height: 140px;
+        text-align: center;
+        background: url('../../assets/img/data-frame.png') 0 0 / cover no-repeat;
+        cursor: pointer;
+        margin: 5px 7px;
+
+        img {
+          width: 130px;
+          max-height: 90px;
         }
-    }
-    .seal {
-        width: 1100px;
-        padding: 0 5%;
-        display: flex;
-        justify-content: space-between;
-        .box {
-            border: 2px solid #e6e6e6;
-            width: 45%;
-            min-height: 300px;
-            border-radius: 10px;
-            padding: 10px;
+
+        &:last-child {
+          margin-right: 0;
         }
-        .left {
-            display: flex;
-            width: 50%;
-            flex-wrap: wrap;
-            .file {
-                position: relative;
-                width: 140px;
-                height: 140px;
-                text-align: center;
-                background: url('../../assets/img/data-frame.png') 0 0 / cover no-repeat;
-                cursor: pointer;
-                margin: 5px 7px;
-                img {
-                    width: 130px;
-                    max-height: 90px;
-                }
-                &:last-child {
-                    margin-right: 0;
-                }
-                &:nth-child(n > 1) {
-                    margin-top: 0;
-                }
-                img {
-                    width: 130px;
-                    max-height: 108px;
-                    margin: 10px auto 0;
-                    z-index: 9;
-                }
-                p {
-                    position: absolute;
-                    bottom: 0;
-                    width: 100%;
-                    line-height: 54px;
-                    text-align: center;
-                    font-size: 18px;
-                    color: #000;
-                }
-                &.checked {
-                    background: url('../../assets/img/data-frame-checked.png') 0 0 / cover no-repeat,
-                        url('../../assets/svg/checked.svg') 163px 7% / auto no-repeat;
-
-                    p {
-                        color: #fff;
-                    }
-                }
-            }
-            &.active {
-                left: 0;
-                z-index: 9999;
-            }
-            img {
-                cursor: pointer;
-                &:last-child {
-                    margin-right: 0;
-                }
-            }
+
+        &:nth-child(n > 1) {
+          margin-top: 0;
         }
-        .right {
-            margin-left: 5%;
+
+        img {
+          width: 130px;
+          max-height: 108px;
+          margin: 10px auto 0;
+          z-index: 9;
         }
-        .else {
-            width: 100%;
+
+        p {
+          position: absolute;
+          bottom: 0;
+          width: 100%;
+          line-height: 54px;
+          text-align: center;
+          font-size: 18px;
+          color: #000;
         }
-    }
-    .dia-footer2 {
-        height: 70px;
-        line-height: 70px;
-        display: flex;
-        justify-content: flex-end;
-        align-items: center;
-        .busyButtonBox {
-            display: flex;
-            justify-content: space-between;
+
+        &.checked {
+          background: url('../../assets/img/data-frame-checked.png') 0 0 / cover no-repeat,
+            url('../../assets/svg/checked.svg') 163px 7% / auto no-repeat;
+
+          p {
+            color: #fff;
+          }
         }
+      }
+
+      &.active {
+        left: 0;
+        z-index: 9999;
+      }
+
+      img {
+        cursor: pointer;
+
+        &:last-child {
+          margin-right: 0;
+        }
+      }
     }
+
+    .right {
+      margin-left: 5%;
+    }
+
+    .else {
+      width: 100%;
+    }
+  }
+
+  .dia-footer2 {
+    height: 70px;
+    line-height: 70px;
+    display: flex;
+    justify-content: flex-end;
+    align-items: center;
+
+    .busyButtonBox {
+      display: flex;
+      justify-content: space-between;
+    }
+  }
 }
 
 .sitting {
-    opacity: 0;
-    cursor: default !important;
+  opacity: 0;
+  cursor: default !important;
 }
 </style>
\ No newline at end of file
diff --git a/src/layouts/header/index.vue b/src/layouts/header/index.vue
index e0e5663..bab2238 100644
--- a/src/layouts/header/index.vue
+++ b/src/layouts/header/index.vue
@@ -20,13 +20,13 @@
 <script>
 import { mapMutations } from 'vuex'
 import Setting from '@/setting'
-import util from '@/libs/util'
+import Util from '@/libs/util'
 import Cookie from 'js-cookie'
 export default {
   data () {
     return {
       isDev: Setting.isDev,
-      token: util.local.get(Setting.tokenKey),
+      token: Util.local.get(Setting.tokenKey),
       ip: localStorage.getItem('localIp') ? +localStorage.getItem('localIp') : 0,
     };
   },
@@ -59,7 +59,7 @@ export default {
         const cid = sessionStorage.getItem('cid')
         href += `station/preview?courseId=${cid}&curriculumName=银行项目&mallId=${this.$route.query.mallId}`
       }
-      sessionStorage.clear()
+      Util.clearSession()
       location.href = href
     },
 
diff --git a/src/libs/util.js b/src/libs/util.js
index e8f9aaf..aeb2ee8 100644
--- a/src/libs/util.js
+++ b/src/libs/util.js
@@ -1,6 +1,8 @@
 import cookies from './util.cookies'
 import { _local, _session } from './util.db'
 import { Message } from 'element-ui'
+import Cookie from 'js-cookie'
+import router from '@/router'
 
 const util = {
   cookies,
@@ -133,6 +135,12 @@ const util = {
   errorMsg (message, duration = 3000) {
     return Message.error({ message, showClose: true, offset: (document.documentElement.clientHeight - 40) / 2, duration })
   },
+  // 清除sessionStorage后补上职站的token
+  clearSession () {
+    const token = sessionStorage.getItem('token')
+    sessionStorage.clear()
+    sessionStorage.setItem(Cookie.get('manager') ? 'oc_server_token' : 'oc_client_token', token)
+  },
   // 授信年限
   creditTerms: [
     {
diff --git a/src/pages/index/list/index.vue b/src/pages/index/list/index.vue
index 88b186b..b69ac6c 100644
--- a/src/pages/index/list/index.vue
+++ b/src/pages/index/list/index.vue
@@ -41,6 +41,7 @@
 import { mapMutations, mapState } from 'vuex';
 import saveSystemModule from '@/mixins/saveSystemModule'
 import Bus from '@/libs/bus'
+import Util from '@/libs/util'
 export default {
   name: 'index',
   mixins: [saveSystemModule],
@@ -60,7 +61,7 @@ export default {
   },
   created () {
     if (!sessionStorage.getItem('firstLoad2')) {
-      sessionStorage.clear()
+      Util.clearSession()
       // sessionStorage.removeItem('submited')
       // sessionStorage.removeItem('businessKey')
       this.setBusinessKey('')
diff --git a/src/pages/manage/list/corporateLoans/application.vue b/src/pages/manage/list/corporateLoans/application.vue
index 13844d4..a5911b4 100644
--- a/src/pages/manage/list/corporateLoans/application.vue
+++ b/src/pages/manage/list/corporateLoans/application.vue
@@ -14,7 +14,7 @@
     <el-table :data="list" stripe :header-cell-style="headerCellStyle">
       <el-table-column prop="customerName" label="客户姓名" align="center" />
       <el-table-column prop="applicationNumber" label="申请编号" align="center" />
-      <el-table-column prop="createTime" label="申请日期" align="center" />
+      <el-table-column prop="loanApplicationDate" label="申请日期" align="center" />
       <el-table-column prop="loanApplicationAmount" label="申请金额" align="center">
         <template slot-scope="scope">{{ scope.row.loanApplicationAmount || '-' }}</template>
       </el-table-column>
diff --git a/src/pages/manage/list/personalLoans/detail.vue b/src/pages/manage/list/personalLoans/detail.vue
index 91ec9a3..aa74f35 100644
--- a/src/pages/manage/list/personalLoans/detail.vue
+++ b/src/pages/manage/list/personalLoans/detail.vue
@@ -531,7 +531,7 @@ export default {
             { answerId: 860, emptyOne: 125, emptyTwo: form.contractAmount, operationIds: preId + ',860', type: 3 },
             { answerId: 861, emptyOne: 141, emptyTwo: this.loanTerms.find(e => e.id === form.loanTerm).pointId, operationIds: preId + ',861', type: 1 },
             { answerId: 862, emptyOne: 125, emptyTwo: form.interestStartDate, operationIds: preId + ',862', type: 3 },
-            { answerId: 863, emptyOne: 125, emptyTwo: form.repaymentMethod, operationIds: preId + ',863', type: 1 },
+            { answerId: 863, emptyOne: 135, emptyTwo: form.repaymentMethod, operationIds: preId + ',863', type: 1 },
             { answerId: 864, emptyOne: 125, emptyTwo: form.repaymentAccount, operationIds: preId + ',864', type: 3 },
           ]
           await addOperation({
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index c97bedd..4127bfe 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -1,6 +1,6 @@
 
 import Setting from '@/setting'
-import util from '@/libs/util'
+import Util from '@/libs/util'
 import { Message } from 'element-ui'
 import { post, get, del, put } from '@/plugins/requests/index.js'
 import api from '@/api'
@@ -27,9 +27,6 @@ export default {
       let href = process.env.NODE_ENV === 'development' ?
         `http://${location.hostname}:8082/#/` :
         `${location.origin}${isAdmin ? '/admin' : ''}/#/`
-      if (location.origin === 'http://118.31.167.228') {
-        href = `http://118.31.167.228/${isAdmin ? 'admin' : 'student'}/#/`
-      }
       const { query } = router.app._route
       let assessmentId = sessionStorage.getItem('assessmentId') || query.assessmentId
       let competitionId = sessionStorage.getItem('competitionId') || query.competitionId
@@ -41,7 +38,7 @@ export default {
         const cid = sessionStorage.getItem('cid')
         href += `station/preview?courseId=${cid}&curriculumName=银行项目&mallId=${router.currentRoute.query.mallId}`
       }
-      sessionStorage.clear()
+      Util.clearSession()
       location.href = href
     },
   },