Browse Source

fix:修改引导、静默户模块新增字段、修改倒计时样式

lazy 2 months ago
parent
commit
59fb9af861

+ 7 - 0
src/router/moudules/accountCenter.js

@@ -46,6 +46,13 @@ export default {
           hidden: true,
           hidden: true,
           meta: { title: '修改账户信息', activeMenu: '/cyAccountManage/index' }
           meta: { title: '修改账户信息', activeMenu: '/cyAccountManage/index' }
         },
         },
+        {
+          path: '/cyAccountManage/accountSee',
+          name: 'CyAccountaccountSee',
+          component: () => import('@/views/accountCenter/cyAccountManage/updateDefault.vue'),
+          hidden: true,
+          meta: { title: '查看账户信息', activeMenu: '/cyAccountManage/index' }
+        },
         {
         {
           path: '/cyAccountManage/accountBind',
           path: '/cyAccountManage/accountBind',
           name: 'CyAccountaccountBind',
           name: 'CyAccountaccountBind',

+ 2 - 1
src/views/accountCenter/cyAccountManage/components/Activation.vue

@@ -207,7 +207,8 @@ export default {
   color: #fff;
   color: #fff;
   text-align: center;
   text-align: center;
   font-size: 12px;
   font-size: 12px;
-  max-width: 300px;
+  max-width: 360px;
+  height: 46px;
   margin: 0 auto;
   margin: 0 auto;
   margin-top: 50px;
   margin-top: 50px;
   cursor: pointer;
   cursor: pointer;

+ 2 - 1
src/views/accountCenter/cyAccountManage/components/Authorization.vue

@@ -173,7 +173,8 @@ export default {
       color: #fff;
       color: #fff;
       text-align: center;
       text-align: center;
       font-size: 12px;
       font-size: 12px;
-      width: 300px;
+      width: 360px;
+      height: 46px;
       margin: 0 auto;
       margin: 0 auto;
       margin-top: 30px;
       margin-top: 30px;
       cursor: pointer;
       cursor: pointer;

+ 12 - 1
src/views/accountCenter/cyAccountManage/components/PaymentAccount.vue

@@ -9,6 +9,13 @@
     <div class="table-box">
     <div class="table-box">
       <el-table :data="tableData" style="width: 100%">
       <el-table :data="tableData" style="width: 100%">
         <el-table-column type="index" label="序号" width="200" />
         <el-table-column type="index" label="序号" width="200" />
+        <el-table-column v-if="$route.query.type === 'see'" prop="silentAccountNumber" label="账户编号" />
+        <el-table-column v-if="$route.query.type === 'see'" prop="accountName" label="账户名称" />
+        <el-table-column v-if="$route.query.type === 'see'" prop="accountNumber" label="金额 ">
+          <template slot-scope="scope">
+            <cy-amount-input v-model="scope.row.balance" :disabled="disabled" />
+          </template>
+        </el-table-column>
         <el-table-column prop="name" label="付款方银行账户名称">
         <el-table-column prop="name" label="付款方银行账户名称">
           <template slot-scope="scope">
           <template slot-scope="scope">
             <custom-select
             <custom-select
@@ -29,7 +36,7 @@
             </custom-select>
             </custom-select>
           </template>
           </template>
         </el-table-column>
         </el-table-column>
-        <el-table-column prop="address" label="操作" width="200" v-if="$route.query.type !== 'see'">
+        <el-table-column v-if="$route.query.type !== 'see'" prop="address" label="操作" width="200">
           <template slot-scope="scope">
           <template slot-scope="scope">
             <!-- <el-button v-if="scope.$index === tableData.length - 1" type="text" @click="tableOptionsClick('add')">新增</el-button> -->
             <!-- <el-button v-if="scope.$index === tableData.length - 1" type="text" @click="tableOptionsClick('add')">新增</el-button> -->
             <!-- v-if="tableData.length > 1" -->
             <!-- v-if="tableData.length > 1" -->
@@ -106,6 +113,10 @@ export default {
       if (type === 'add') {
       if (type === 'add') {
         this.tableData.push({ payerAccountName: '' })
         this.tableData.push({ payerAccountName: '' })
       } else if (type === 'delete') {
       } else if (type === 'delete') {
+        if ('balance' in row && row.balance > 0) {
+          this.$message.warning('付款方余额不为空,不能删除')
+          return
+        }
         if (row.id) {
         if (row.id) {
           this.deleteSilentIds.push(row.id)
           this.deleteSilentIds.push(row.id)
           this.tableData.splice(index, 1)
           this.tableData.splice(index, 1)

+ 27 - 1
src/views/accountCenter/cyAccountManage/mainContent.vue

@@ -1,7 +1,7 @@
 <template>
 <template>
   <div class="main-content">
   <div class="main-content">
     <div v-for="(item, index) in companyList" :key="index">
     <div v-for="(item, index) in companyList" :key="index">
-      <div class="company-box-cont" v-if="['生效', '失效'].includes(item.customerStatus)">
+      <div v-if="['生效', '失效'].includes(item.customerStatus)" class="company-box-cont">
         <template v-if="item.vipAccountBasicInfoList && item.vipAccountBasicInfoList.length === 0">
         <template v-if="item.vipAccountBasicInfoList && item.vipAccountBasicInfoList.length === 0">
           <div class="company-box">
           <div class="company-box">
             <div class="company-title">
             <div class="company-title">
@@ -250,6 +250,18 @@ export default {
                 icon: 'iconfont icon-orange icon-a-Group8131',
                 icon: 'iconfont icon-orange icon-a-Group8131',
                 power: '',
                 power: '',
                 category: 'refreshRegister'
                 category: 'refreshRegister'
+              },
+              {
+                msg: '修改绑卡信息',
+                icon: 'iconfont icon-orange icon-a-Group8151',
+                power: '',
+                category: 'number'
+              },
+              {
+                msg: '查看绑卡信息',
+                icon: 'iconfont icon-orange icon-a-Group8141',
+                power: '',
+                category: 'seeBindCard'
               }
               }
               // {
               // {
               //   msg: '账单流水',
               //   msg: '账单流水',
@@ -313,6 +325,12 @@ export default {
           }
           }
           return false
           return false
         }
         }
+        if (item.category === 'seeBindCard' || item.category === 'number') {
+          if (row.silentAccountNum > 0) {
+            return true
+          }
+          return false
+        }
         return true
         return true
       }
       }
     }
     }
@@ -426,6 +444,14 @@ export default {
         }
         }
       } else if (type === 'refreshRegister') {
       } else if (type === 'refreshRegister') {
         this.refreshRegister(row)
         this.refreshRegister(row)
+      } else if (type === 'seeBindCard') {
+        this.$router.push({
+          name: 'CyAccountaccountSee',
+          query: {
+            type: 'see',
+            id: row.id
+          }
+        })
       }
       }
     },
     },
     // 开通长银账户
     // 开通长银账户

+ 7 - 2
src/views/accountCenter/cyAccountManage/updateDefault.vue

@@ -10,7 +10,12 @@
     />
     />
 
 
     <!-- 付款方账户信息 | 静默户账户信息 -->
     <!-- 付款方账户信息 | 静默户账户信息 -->
-    <payment-account ref="paymentRef" :details-info="silentAccountInfoList" client-type="C" />
+    <payment-account
+      ref="paymentRef"
+      :disabled="$route.query.type==='see' ? true : false"
+      :details-info="silentAccountInfoList"
+      client-type="C"
+    />
 
 
     <div class="submit-btn">
     <div class="submit-btn">
       <el-button
       <el-button
@@ -20,7 +25,7 @@
           }
           }
         "
         "
       >取消</el-button>
       >取消</el-button>
-      <el-button type="primary" @click="submitClick('submit')">保存</el-button>
+      <el-button v-if="$route.query.type !== 'see'" type="primary" @click="submitClick('submit')">保存</el-button>
     </div>
     </div>
   </div>
   </div>
 </template>
 </template>

+ 23 - 3
src/views/accountCenter/mixins/driver.js

@@ -31,8 +31,14 @@ export default {
   },
   },
   methods: {
   methods: {
     initDriver(outerIndex, innerIndex) {
     initDriver(outerIndex, innerIndex) {
+      console.log(this.companyList)
       const stepList = []
       const stepList = []
-      if (document.querySelectorAll(`.authorization-${outerIndex}-${innerIndex}:nth-child(1)`).length) {
+      // 去授权引导 -- 客户状态生效且登记薄状态为未失效
+      const tipDom = document.querySelectorAll(`.authorization-${outerIndex}-${innerIndex}:nth-child(1)`).length
+      const tipCondition = this.companyList[outerIndex].customerStatus === '生效' &&
+      this.companyList[outerIndex].vipAccountBasicInfoList[innerIndex].accountStatus === 1 &&
+      this.companyList[outerIndex].vipAccountBasicInfoList[innerIndex].authorizationStatus !== 4
+      if (tipDom && tipCondition) {
         stepList.push({
         stepList.push({
           element: `.authorization-${outerIndex}-${innerIndex}:nth-child(1)`,
           element: `.authorization-${outerIndex}-${innerIndex}:nth-child(1)`,
           popover: {
           popover: {
@@ -45,7 +51,14 @@ export default {
           }
           }
         })
         })
       }
       }
-      if (document.querySelectorAll(`.binding-account-${outerIndex}-${innerIndex}:nth-child(1)`).length) {
+
+      // 客户状态&登记簿状态非失效,授权成功,未绑定任何实体账户
+      const tipBind = document.querySelectorAll(`.binding-account-${outerIndex}-${innerIndex}:nth-child(1)`).length
+      const tipBindCondition = this.companyList[outerIndex].customerStatus === '生效' &&
+      this.companyList[outerIndex].vipAccountBasicInfoList[innerIndex].accountStatus === 1 &&
+      this.companyList[outerIndex].vipAccountBasicInfoList[innerIndex].authorizationStatus === 4 && this.companyList[outerIndex].vipAccountBasicInfoList[innerIndex].bindAccountInfoList.length === 0
+
+      if (tipBind && tipBindCondition) {
         stepList.push({
         stepList.push({
           element: `.binding-account-${outerIndex}-${innerIndex}:nth-child(1)`,
           element: `.binding-account-${outerIndex}-${innerIndex}:nth-child(1)`,
           popover: {
           popover: {
@@ -55,7 +68,14 @@ export default {
           }
           }
         })
         })
       }
       }
-      if (document.querySelectorAll('.activation:nth-child(1)').length) {
+
+      // 客户状态&登记簿状态未失效,登记簿创建后,且入金激活状态未成功
+      const tipActive = document.querySelectorAll('.activation:nth-child(1)').length
+      const tipActiveCondition = this.companyList[outerIndex].customerStatus === '生效' &&
+      this.companyList[outerIndex].vipAccountBasicInfoList[innerIndex].accountStatus === 1 &&
+      this.companyList[outerIndex].vipAccountBasicInfoList[innerIndex].bindAccountInfoList[0].bindSts === 2
+
+      if (tipActive && tipActiveCondition) {
         stepList.push({
         stepList.push({
           element: '.activation:nth-child(1)',
           element: '.activation:nth-child(1)',
           popover: {
           popover: {