Skip to content

fix(SubscriptionModelDialog): Add judgment when click submit #102

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jiuyetx merged 1 commit into from
Jun 25, 2023
Merged

fix(SubscriptionModelDialog): Add judgment when click submit #102

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions apps/dfs/src/views/Layout.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -337,8 +337,8 @@ export default {
},
// 检查是否有安装过agent
checkAgentInstall() {
this.$axios.get('api/tcm/orders/checkAgent').then(data => {
if (data === 0) {
this.$axios.get('api/tcm/agent').then(data => {
if (data?.total === 0) {
this.subscriptionModelVisible = true
}
})
Expand Down
25 changes: 18 additions & 7 deletions apps/dfs/src/views/agent-download/SubscriptionModelDialog.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -344,9 +344,15 @@
<div class="is-active-triangle"></div>
<VIcon size="16" class="is-active-icon">check-bold</VIcon>
</div>
<div class="spec-li-title mt-1 lh-base fw-bold font-color-dark">
<div class="spec-li-title mt-1 lh-base fw-bold font-color-dark flex align-items-center">
<span>{{ item.name }}: </span>
<span>{{ item.desc }}</span>
<ElTag
v-if="item.chargeProvider === 'FreeTier'"
size="small"
class="bg-color-warning text-white border-0 ml-2"
>{{ $t('dfs_instance_createagent_mianfeitiyan') }}</ElTag
>
</div>
<div
v-if="agentDeploy === 'selfHost'"
Expand Down Expand Up @@ -1075,7 +1081,7 @@ export default {
},
//格式化价格
formatPrice(item, isOriginalPrice) {
if (!item || item?.chargeProvider === 'FreeTier') return 0
if (!item || item?.chargeProvider === 'FreeTier') return '0'

let amount = this.getAmount(item, isOriginalPrice) + this.mdbPrices
return (
Expand Down Expand Up @@ -1188,10 +1194,7 @@ export default {
if (this.agentCount > 0) {
this.specificationItems = this.specificationItems.filter(it => it.chargeProvider !== 'FreeTier')
}
this.specification =
this.agentCount > 0 || this.agentDeploy !== 'selfHost'
? this.specificationItems[1]?.value
: this.specificationItems[0]?.value
this.specification = this.specificationItems[0]?.value
// 价格套餐
this.allPackages = paidPrice.map(t => {
return Object.assign(t, {
Expand Down Expand Up @@ -1478,7 +1481,15 @@ export default {
this.$axios
.post('api/tcm/orders', params)
.then(data => {
if (data.chargeProvider === 'FreeTier' || (data.chargeProvider === 'Aliyun' && row.agentType === 'Local')) {
if (data.chargeProvider === 'FreeTier' && this.agentDeploy === 'fullManagement') {
this.finish()
this.$router.push({
name: 'Instance'
})
} else if (
data.chargeProvider === 'FreeTier' ||
(data.chargeProvider === 'Aliyun' && row.agentType === 'Local')
) {
//免费实例（授权码）-半托管-直接部署页面
this.finish()
let downloadUrl = window.App.$router.resolve({
Expand Down