diff --git a/src/components/shop-cloud/shop-cloud-new.vue b/src/components/shop-cloud/shop-cloud-new.vue
index fbb1fc8e4762bfde7b22107b6b03bb0c99366505..d7977c95f2efbbc1a620739c2058209d53c6e2ea 100644
--- a/src/components/shop-cloud/shop-cloud-new.vue
+++ b/src/components/shop-cloud/shop-cloud-new.vue
@@ -578,8 +578,8 @@
月
@@ -1361,7 +1361,7 @@ export default {
perCPU: undefined,
perRAMs: undefined,
perRAM: undefined,
- appDuration: 1,
+ appDuration: 0,
durType: 1,
apply_file: "",
apply_file_name: "",
@@ -1530,23 +1530,23 @@ export default {
this.formOld.namespace = paramsOld.namespace;
this.formOld.workplace = paramsOld.workplace;
this.formOld.workplacedesc = paramsOld.workplacedesc;
- this.formOld.cpu = paramsOld.cpu;
- this.formOld.memory = paramsOld.memory;
- this.formOld.containerGroup = paramsOld.containers;
+ // this.formOld.cpu = paramsOld.cpu;
+ // this.formOld.memory = paramsOld.memory;
+ // this.formOld.containerGroup = paramsOld.containers;
this.specArr[0].val = paramsOld.cpu;
this.specArr[1].val = paramsOld.memory;
this.specArr[2].val = paramsOld.containers;
- this.formOld.dataDisk = "";
- this.formOld.perDataDisk = "";
- this.formOld.perCPUs = paramsOld.one_cpu_max;
- this.formOld.perCPU = paramsOld.one_cpu_min;
- this.formOld.perRAMs = paramsOld.one_memory_max;
- this.formOld.perRAM = paramsOld.one_memory_min;
+ // this.formOld.dataDisk = "";
+ // this.formOld.perDataDisk = "";
+ // this.formOld.perCPUs = paramsOld.one_cpu_max;
+ // this.formOld.perCPU = paramsOld.one_cpu_min;
+ // this.formOld.perRAMs = paramsOld.one_memory_max;
+ // this.formOld.perRAM = paramsOld.one_memory_min;
this.rqzArr[0].max = paramsOld.one_cpu_max;
this.rqzArr[0].default = paramsOld.one_cpu_min;
this.rqzArr[1].max = paramsOld.one_memory_max;
this.rqzArr[1].default = paramsOld.one_memory_min;
- this.formOld.store_type = paramsOld.store_type;
+ // this.formOld.store_type = paramsOld.store_type;
this.dataDiskList = paramsOld.disk_list || [];
this.dataDiskList.forEach((item, index) => {
item.name = `磁盘${index + 1}`;
@@ -1588,23 +1588,23 @@ export default {
this.formOld.namespace = paramsOld.namespace;
this.formOld.workplace = paramsOld.workplace;
this.formOld.workplacedesc = paramsOld.workplacedesc;
- this.formOld.cpu = paramsOld.cpu;
- this.formOld.memory = paramsOld.memory;
- this.formOld.containerGroup = paramsOld.containers;
+ // this.formOld.cpu = paramsOld.cpu;
+ // this.formOld.memory = paramsOld.memory;
+ // this.formOld.containerGroup = paramsOld.containers;
this.specArr[0].val = paramsOld.cpu;
this.specArr[1].val = paramsOld.memory;
this.specArr[2].val = paramsOld.containers;
- this.formOld.dataDisk = "";
- this.formOld.perDataDisk = "";
- this.formOld.perCPUs = paramsOld.one_cpu_max;
- this.formOld.perCPU = paramsOld.one_cpu_min;
- this.formOld.perRAMs = paramsOld.one_memory_max;
- this.formOld.perRAM = paramsOld.one_memory_min;
+ // this.formOld.dataDisk = "";
+ // this.formOld.perDataDisk = "";
+ // this.formOld.perCPUs = paramsOld.one_cpu_max;
+ // this.formOld.perCPU = paramsOld.one_cpu_min;
+ // this.formOld.perRAMs = paramsOld.one_memory_max;
+ // this.formOld.perRAM = paramsOld.one_memory_min;
this.rqzArr[0].max = paramsOld.one_cpu_max;
this.rqzArr[0].default = paramsOld.one_cpu_min;
this.rqzArr[1].max = paramsOld.one_memory_max;
this.rqzArr[1].default = paramsOld.one_memory_min;
- this.formOld.store_type = paramsOld.store_type;
+ // this.formOld.store_type = paramsOld.store_type;
this.dataDiskList = paramsOld.disk_list || [];
this.dataDiskList.forEach((item, index) => {
item.name = `磁盘${index + 1}`;
diff --git a/src/components/shopping-cart/shopping-cart-cell.vue b/src/components/shopping-cart/shopping-cart-cell.vue
index dbd62719252afda3eef36fbb48e71bbaa5bf6b89..cc2ccf8eae9d3c524d3bf12e6de502b699253d57 100644
--- a/src/components/shopping-cart/shopping-cart-cell.vue
+++ b/src/components/shopping-cart/shopping-cart-cell.vue
@@ -369,10 +369,12 @@ export default {
});
},
updateShoppingCart() {
+ let spec_id = this.specificationPop && this.specificationPop.id ? this.specificationPop.id : this.cellItems.spec_id;
+ console.log(spec_id)
let query = {
id: this.cellItems.id,
duration: this.cellItems.duration,
- spec_id: this.specificationPop.id,
+ spec_id: spec_id,
duration_method: this.cellItems.duration_method,
is_subscribe: Number(this.cellItems.is_subscribe),
};