diff --git a/.beagle.yml b/.beagle.yml index 8cb4b493b9b3281c65a3c7eb58b630676a2f0ce3..85a0696aaa5ba818086f5ddc7671b7caa8776df1 100644 --- a/.beagle.yml +++ b/.beagle.yml @@ -265,7 +265,7 @@ pipeline: - master deploy: - image: registry.cn-qingdao.aliyuncs.com/wod-devops/kubernetes:1.0 + image: registry.cn-qingdao.aliyuncs.com/wod/devops-kubernetes:1.0 namespace: apaas-v3 deployment: apaas-ui container: apaas-ui diff --git a/src/components/shopping-cart/shopping-cart-cell.vue b/src/components/shopping-cart/shopping-cart-cell.vue index 0588b5e5861ff04682e205433aed7a99af46856f..dbd62719252afda3eef36fbb48e71bbaa5bf6b89 100644 --- a/src/components/shopping-cart/shopping-cart-cell.vue +++ b/src/components/shopping-cart/shopping-cart-cell.vue @@ -128,14 +128,22 @@ {{ item.money }}金币/{{ item.spcs_count }}次 {{ cellItems.service.request_spcs_info.spcs_type_2[0] .money @@ -301,10 +309,14 @@ export default { !this.cellItems.service.spcs_info.id ) { this.$message({ - message: "该服务暂不支持购买", + message: + (this.cellItems.service_id == 0 + ? this.cellItems.application.app_name + : this.cellItems.service.name) + "暂不支持购买", type: "error", }); this.checkedItem = false; + this.$emit("changeState", { state: false, index: this.cellIndex }); } else { this.$emit("changeState", { state: val, index: this.cellIndex }); } @@ -322,7 +334,7 @@ export default { }, setSpecificationPop() { this.specificationPop = this.cellItems.service.spcs_info; - console.log(this.specificationPop) + console.log(this.specificationPop); // this.specificationApplicationPop = this.cellItems.duration_method; }, changeSubscription(val) { diff --git a/src/components/shopping-cart/shopping-cart-list.vue b/src/components/shopping-cart/shopping-cart-list.vue index 3af70db9185a81ec2e86275d80175d6d91910120..9206adcb1c31a7499b35bf41e3a01a790339b368 100644 --- a/src/components/shopping-cart/shopping-cart-list.vue +++ b/src/components/shopping-cart/shopping-cart-list.vue @@ -2,6 +2,7 @@