diff --git a/front/src/views/detailsAll/components/Application/ApplicationAbilityTrial.vue b/front/src/views/detailsAll/components/Application/ApplicationAbilityTrial.vue index 866bccd4..86963e15 100644 --- a/front/src/views/detailsAll/components/Application/ApplicationAbilityTrial.vue +++ b/front/src/views/detailsAll/components/Application/ApplicationAbilityTrial.vue @@ -48,23 +48,20 @@ password2: '', }) if (props.dataList.infoList) { - // let obj = props.dataList.infoList.filter( - // (item) => item.attrType === '是否支持试用' && item.attrValue === '是' - // )[0] - // if (obj) { - // flag.value = false - // } else { - props.dataList.infoList.map((item) => { - if (item.attrType == '访问地址') { - debugger - dataFrom.value.link = item.attrValue - } else if (item.attrType == '试用用户名') { - dataFrom.value.number = item.attrValue - } else if (item.attrType == '试用密码') { - dataFrom.value.password2 = item.attrValue - } - }) - // } + let obj = props.dataList.applyState + if (obj !== '已申请') { + flag.value = false + } else { + props.dataList.infoList.map((item) => { + if (item.attrType == '访问地址') { + dataFrom.value.link = item.attrValue + } else if (item.attrType == '试用用户名') { + dataFrom.value.number = item.attrValue + } else if (item.attrType == '试用密码') { + dataFrom.value.password2 = item.attrValue + } + }) + } } const clickLink = (link) => { window.open(link) @@ -95,22 +92,20 @@ () => props.dataList, (val) => { if (val) { - // let obj = val.infoList.filter( - // (item) => item.attrType === '是否支持试用' && item.attrValue === '是' - // )[0] - // if (!obj) { - // flag.value = false - // } else { - props.dataList.infoList.map((item) => { - if (item.attrType == '访问地址') { - dataFrom.value.link = item.attrValue - } else if (item.attrType == '试用用户名') { - dataFrom.value.number = item.attrValue - } else if (item.attrType == '试用密码') { - dataFrom.value.password2 = item.attrValue - } - }) - // } + let obj = props.dataList.applyState + if (obj !== '已申请') { + flag.value = false + } else { + props.dataList.infoList.map((item) => { + if (item.attrType == '访问地址') { + dataFrom.value.link = item.attrValue + } else if (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 ba4241f8..3fcdc0f4 100644 --- a/front/src/views/detailsAll/components/Application/ApplicationNavigation.vue +++ b/front/src/views/detailsAll/components/Application/ApplicationNavigation.vue @@ -100,6 +100,8 @@ list.value.push(item.attrType) } else if (item.attrType === '应用展示视频') { list.value.push('应用展示') + } else if (item.attrType === '访问地址') { + list.value.push('应用详情') } }) list.value.unshift('关联组件') @@ -141,6 +143,8 @@ list.value.push(item.attrType) } else if (item.attrType === '应用展示视频') { list.value.push('应用展示') + } else if (item.attrType === '访问地址') { + list.value.push('应用详情') } }) list.value.unshift('关联组件')