From e765c2a6ba2d14fd748f5dae70db9bc1d4b996bc Mon Sep 17 00:00:00 2001
From: e <2432808546@qq.com>
Date: Fri, 29 Oct 2021 18:13:46 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=99=E9=A1=B6=E9=83=A8=E5=8A=A0=E4=B8=8A?=
 =?UTF-8?q?=E9=80=80=E5=87=BA=E6=8C=89=E9=92=AE=E4=BB=A5=E5=8F=8A=E8=B7=B3?=
 =?UTF-8?q?=E8=BD=AC=E5=9B=9E=E8=81=8C=E7=AB=99=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/api.js                                |  4 +-
 src/layouts/header/index.vue                  | 13 +++-
 src/pages/counter/list/index.vue              | 68 ++++++++++---------
 .../personal/currentAccount/openAccount.vue   |  2 +-
 4 files changed, 50 insertions(+), 37 deletions(-)

diff --git a/src/api/api.js b/src/api/api.js
index 95597c7..ccda07c 100644
--- a/src/api/api.js
+++ b/src/api/api.js
@@ -2,10 +2,10 @@ import axios from 'axios';
 import router from '../router';
 // 创建axios实例
 const service = axios.create({
-    // baseURL: "http://39.108.250.202:9000/", // 中台测试服
+    baseURL: "http://39.108.250.202:9000/", // 中台测试服
     // baseURL: "http://192.168.31.137:9000/", // 赓
     // baseURL: "http://192.168.31.151:9000/", // 榕
-    baseURL: "http://192.168.31.125:9000/", // 坤
+    // baseURL: "http://192.168.31.125:9000/", // 坤
     // baseURL: 'http://39.108.250.202:9000',
     timeout: 30000 // 请求超时时间
 })
diff --git a/src/layouts/header/index.vue b/src/layouts/header/index.vue
index b549352..2bbc502 100644
--- a/src/layouts/header/index.vue
+++ b/src/layouts/header/index.vue
@@ -1,9 +1,14 @@
 <template>
     <div class="header">
-        <div class="inner">
-            <div class="logo" @click="toIndex">
+        <div class="inner" style="width: 100%">
+            <div class="logo" @click="toIndex" style="float: left">
                 <img src="../../assets/img/logo.png" alt="">
             </div>
+          <div style="float: right;margin:0 60px;font-size: 18px">
+            <span style="cursor:pointer" @click="exit">
+              退出<i class="icon el-icon-s-unfold"></i>
+            </span>
+          </div>
         </div>
     </div>
 </template>
@@ -27,11 +32,15 @@ export default {
                 title: '首页'
             })
         },
+      exit(){
+        window.location = 'http://39.108.250.202/student/#/station/preview?courseId=6&curriculumName=%E9%93%B6%E8%A1%8C%E7%BB%BC%E5%90%88'
+      },
     },
 };
 </script>
 <style lang="scss" scoped>
     .header{
+      width:100%;
         z-index: 1;
         display: flex;
         align-items: center;
diff --git a/src/pages/counter/list/index.vue b/src/pages/counter/list/index.vue
index 90369b1..ec496b7 100644
--- a/src/pages/counter/list/index.vue
+++ b/src/pages/counter/list/index.vue
@@ -95,7 +95,7 @@
 
         <!-- 物品栏 -->
         <div ref="goods" class="goods-dia" :class="{ active: showGoods }">
-            <div :id="item.name" v-for="(item, index) in goods" :key="index" class=" justify-center" :class="{ checked: checkList.includes(item.id),file:true }" @click="dblClickFn(item,'goods')">
+            <div :id="item.name" v-for="(item, index) in goodsShelfTotalData" :key="index" class=" justify-center" :class="{ checked: checkList.includes(item.id),file:true }" @click="dblClickFn(item,'goods')">
                 <img :style="item.name==='开户申请书'?'margin-top:10px;':''" :src="item.src" alt="" />
                 <p>{{item.name}}</p>
             </div>
@@ -225,38 +225,32 @@ export default {
             manageVisible: false, // 显示系统录入
             checkList: [],// 物品栏选中
             elseBoxCheck:[],/* 所有其他可从物品栏拖拽物品进入的弹框 */
-          goodsShelf:[
-            {
-              name:'身份证',
-              src:require('@/assets/img/goods/idcard.png'),
-              id:13
-            },
-            {
-              name:'身份证复印件',
-              src:require('@/assets/img/idCard-copy-sm.png'),
-              id:23
-            },
-            {
-              name:'开户申请书',
-              src:require('@/assets/img/goods/khsqs.png'),
-              id:14
-            },
-            {
-              name:'现金',
-              src:require('@/assets/img/goods/cash-sm.png'),
-              id:15
-            },
-            {
-              name:'存款凭条',
-              src:require('@/assets/img/goods/ckpt.png'),
-              id:17
-            },
-            {
-              name:'银行卡',
-              src:require('@/assets/img/goods/ckpt.png'),
-              id:16
-            },
+          //身份证扫描仪//审核资料//验钞机
+          auditGoodsShelf:[
+            {name:'身份证', src:require('@/assets/img/goods/idcard.png'), id:13},
+            {name:'身份证复印件', src:require('@/assets/img/idCard-copy-sm.png'), id:23},
+            {name:'开户申请书', src:require('@/assets/img/goods/khsqs.png'), id:14},
+            {name:'现金', src:require('@/assets/img/goods/cash-sm.png'), id:15},
+          ],
+          //系统录入//选择重要空白凭证
+          systemInputGoodsShelf:[
+            {name:'身份证', src:require('@/assets/img/goods/idcard.png'), id:13},
+            {name:'身份证复印件', src:require('@/assets/img/idCard-copy-sm.png'), id:23},
+            {name:'开户申请书', src:require('@/assets/img/goods/khsqs.png'), id:14},
+            {name:'现金', src:require('@/assets/img/goods/cash-sm.png'), id:15},
+            {name:'银行卡', src:require('@/assets/img/goods/ckpt.png'), id:16},
+          ],
+          //打印资料 //选择普通空白凭证 //客户签字
+          printoutGoodsShelf:[
+            {name:'身份证', src:require('@/assets/img/goods/idcard.png'), id:13},
+            {name:'身份证复印件', src:require('@/assets/img/idCard-copy-sm.png'), id:23},
+            {name:'开户申请书', src:require('@/assets/img/goods/khsqs.png'), id:14},
+            {name:'现金', src:require('@/assets/img/goods/cash-sm.png'), id:15},
+            {name:'银行卡', src:require('@/assets/img/goods/ckpt.png'), id:16},
+            {name:'存款凭条', src:require('@/assets/img/goods/ckpt.png'), id:17},
           ],
+          // 总盒子里面的东西
+          goodsShelfTotalData:[],
             // goods:[/* 物品栏物品 */
             // ],
             popArr:[/* 弹窗展示的物品 */
@@ -472,6 +466,16 @@ export default {
           this.showGoods = !this.showGoods;
         },
         showData(type) {/* 展示弹窗-type为弹窗标题文字 */
+        if(type == '重要空白凭证箱'){
+          this.goodsShelfTotalData = this.systemInputGoodsShelf
+        }else if(type == '身份证扫描仪' || type == '验钞机' || type == '资料'){
+          this.goodsShelfTotalData = this.auditGoodsShelf
+        }else if(type == '普通凭证箱' || type == '打印机'){
+          this.goodsShelfTotalData = this.printoutGoodsShelf
+        }else if(type == '普通凭证箱'){
+          this.goodsShelfTotalData = this.printoutGoodsShelf
+        }
+
             this.$store.commit('system/changePop',{show:true,text:type})
         },
         checkData(item) {/* 选中物品 */
diff --git a/src/pages/manage/list/personal/currentAccount/openAccount.vue b/src/pages/manage/list/personal/currentAccount/openAccount.vue
index 0ea207f..5141abd 100644
--- a/src/pages/manage/list/personal/currentAccount/openAccount.vue
+++ b/src/pages/manage/list/personal/currentAccount/openAccount.vue
@@ -292,7 +292,7 @@ export default {
             formList.push({"emptyOne": "", "emptyTwo": "", "operationIds": "0,5,26,57,62,75,"+voucherNumber[i].id,"type": ""})
           }
           formList.push(
-              {"emptyOne": "", "emptyTwo": paymentCode, "operationIds": "0,5,26,57,62,77", "type": ""},//支取密码
+              {"emptyOne": "17", "emptyTwo": paymentCode, "operationIds": "0,5,26,57,62,77", "type": "3"},//支取密码
           )
           if (this.form.userNumber){formList.push({"emptyOne": "6", "emptyTwo": this.form.userNumber, "operationIds": "0,5,26,57,62,68","type": "3"})}//客户号
           if (this.form.accountQuality){formList.push({"emptyOne": "10", "emptyTwo": this.form.accountQuality, "operationIds": "0,5,26,57,62,72", "type": "1"})}//账户性质1