From ef9a2dd15cecc58756e274aa874e1daae5e4e077 Mon Sep 17 00:00:00 2001
From: "851673013@qq.com" <851673013@qq.com>
Date: Mon, 25 Jul 2022 11:09:59 +0800
Subject: [PATCH] bug703

---
 front/src/views/detailsAll/ApplicationDetails.vue         | 1 +
 .../components/Application/ApplicationAbilityTrial.vue    | 8 ++++----
 .../components/Application/ApplicationNavigation.vue      | 2 --
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/front/src/views/detailsAll/ApplicationDetails.vue b/front/src/views/detailsAll/ApplicationDetails.vue
index a0d1596e..8e68c6c5 100644
--- a/front/src/views/detailsAll/ApplicationDetails.vue
+++ b/front/src/views/detailsAll/ApplicationDetails.vue
@@ -88,6 +88,7 @@
   import ApplicationNavigation from '@/views/detailsAll/components/Application/ApplicationNavigation.vue'
   import ApplicationPresentation from '@/views/detailsAll/components/Application/ApplicationPresentation.vue'
   import ApplicationCommonProblem from '@/views/detailsAll/components/Application/ApplicationCommonProblem.vue'
+  import ApplicationAbilityTrial from '@/views/detailsAll/components/Application/ApplicationAbilityTrial.vue'
   import { ref, onMounted, onBeforeUnmount, reactive } from 'vue'
   import {
     updateVisits,
diff --git a/front/src/views/detailsAll/components/Application/ApplicationAbilityTrial.vue b/front/src/views/detailsAll/components/Application/ApplicationAbilityTrial.vue
index 2c9cc96d..df6cd215 100644
--- a/front/src/views/detailsAll/components/Application/ApplicationAbilityTrial.vue
+++ b/front/src/views/detailsAll/components/Application/ApplicationAbilityTrial.vue
@@ -6,7 +6,7 @@
  * @Description: 应用详情
 -->
 <template>
-  <div class="algorithm-on-trial" v-if="flag && whoShow1.itShowQingDao">
+  <div class="algorithm-on-trial" v-if="flag">
     <detals-title title="应用详情" type="PROBATION"></detals-title>
     <div class="main">
       <div class="main-left">
@@ -61,12 +61,12 @@
   })
   if (props.dataList.infoList) {
     let obj = props.dataList.approveStatus
-    if (obj !== '通过') {
+    if (obj !== '通过' && whoShow1.value.itShowQingDao) {
       flag.value = false
     } else {
       dataFrom.value.link = props.dataList.link
       props.dataList.infoList.map((item) => {
-        if (item.attrType == '试用用户名') {
+        if (item.attrType == '试用用户名' || item.attrType == '试用账号') {
           dataFrom.value.number = item.attrValue
         } else if (item.attrType == '试用密码') {
           dataFrom.value.password2 = item.attrValue
@@ -116,7 +116,7 @@
         } else {
           dataFrom.value.link = props.dataList.link
           props.dataList.infoList.map((item) => {
-            if (item.attrType == '试用用户名') {
+            if (item.attrType == '试用用户名' || item.attrType == '试用账号') {
               dataFrom.value.number = item.attrValue
             } else if (item.attrType == '试用密码') {
               dataFrom.value.password2 = item.attrValue
diff --git a/front/src/views/detailsAll/components/Application/ApplicationNavigation.vue b/front/src/views/detailsAll/components/Application/ApplicationNavigation.vue
index 55894f62..0503a752 100644
--- a/front/src/views/detailsAll/components/Application/ApplicationNavigation.vue
+++ b/front/src/views/detailsAll/components/Application/ApplicationNavigation.vue
@@ -104,7 +104,6 @@
       }
     })
     if (
-      props.dataList.link &&
       whoShow1.value.itShowQingDao &&
       props.dataList.approveStatus === '通过'
     ) {
@@ -152,7 +151,6 @@
           }
         })
         if (
-          props.dataList.link &&
           whoShow1.value.itShowQingDao &&
           props.dataList.approveStatus === '通过'
         ) {