diff --git a/src/assets/imgs/1.jpg b/src/assets/imgs/1.jpg new file mode 100644 index 0000000000000000000000000000000000000000..bf7bdc91115ab99585a79649175a4a8b92d6af8e Binary files /dev/null and b/src/assets/imgs/1.jpg differ diff --git a/src/assets/imgs/2.jpg b/src/assets/imgs/2.jpg new file mode 100644 index 0000000000000000000000000000000000000000..7bcaddd1679074427ada47646c16b53f8b829e27 Binary files /dev/null and b/src/assets/imgs/2.jpg differ diff --git a/src/assets/imgs/3.jpg b/src/assets/imgs/3.jpg new file mode 100644 index 0000000000000000000000000000000000000000..6339ea7d3c21820d8a82c882a588449fde13feac Binary files /dev/null and b/src/assets/imgs/3.jpg differ diff --git a/src/assets/imgs/4.jpg b/src/assets/imgs/4.jpg new file mode 100644 index 0000000000000000000000000000000000000000..185ced1b20a5eb38025e6b2c22ce1b88d48330a0 Binary files /dev/null and b/src/assets/imgs/4.jpg differ 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), }; diff --git a/src/pages/service_shop/services_shop.vue b/src/pages/service_shop/services_shop.vue index f54b30e58b26ded32267e7ce3ec63012fdeb357c..b1fb798d92a3814e17847ef5856169f0c1919c70 100644 --- a/src/pages/service_shop/services_shop.vue +++ b/src/pages/service_shop/services_shop.vue @@ -2,7 +2,10 @@
-
  • +
  • @@ -63,45 +70,50 @@ import helper from "@/services/helper"; export default { components: { - shopList + shopList, }, data: () => ({ - banners: null, + banners: [ + { image_url: require("@/assets/imgs/1.jpg") }, + { image_url: require("@/assets/imgs/2.jpg") }, + { image_url: require("@/assets/imgs/3.jpg") }, + { image_url: require("@/assets/imgs/4.jpg") }, + ], servicesShopInfo: [ { name: "服务总数", value: 0, - icon: require("@/assets/imgs/shop_ic_fuwuzs.png") + icon: require("@/assets/imgs/shop_ic_fuwuzs.png"), }, { name: "用户总数", value: 0, - icon: require("@/assets/imgs/shop_ic_yonghuzs.png") + icon: require("@/assets/imgs/shop_ic_yonghuzs.png"), }, { name: "接入机构", value: 0, - icon: require("@/assets/imgs/shop_ic_jierujg.png") + icon: require("@/assets/imgs/shop_ic_jierujg.png"), }, { name: "应用总数", value: 0, - icon: require("@/assets/imgs/shop_ic_jieruxt.png") + icon: require("@/assets/imgs/shop_ic_jieruxt.png"), }, { name: "服务请求次数", value: 0, - icon: require("@/assets/imgs/shop_ic_fuwuqqcs.png") - } + icon: require("@/assets/imgs/shop_ic_fuwuqqcs.png"), + }, ], hot_datas: [], map_datas: [], comprehensive_datas: [], - helper + helper, }), methods: { init(type) { - this.$api.serviceShop.getFeaturedList({ type }).then(response => { + this.$api.serviceShop.getFeaturedList({ type }).then((response) => { if (type == "hotdata") { this.hot_datas = response.data.data; } else if (type == "hgmap") { @@ -112,12 +124,17 @@ export default { }); }, getBenner() { - this.$api.serviceShop.getBenner().then(response => { - this.banners = response.data.data; + this.$api.serviceShop.getBenner().then((response) => { + if (response.data.success == 1) { + let arr = response.data.data; + if (arr && arr.length != 0) { + this.banners = response.data.data; + } + } }); }, getGeneralOverview() { - this.$api.serviceShop.getGeneralOverview().then(response => { + this.$api.serviceShop.getGeneralOverview().then((response) => { let data = response.data.data; this.servicesShopInfo[0].value = data.service_num; this.servicesShopInfo[1].value = data.person_num; @@ -128,7 +145,7 @@ export default { }, goto(page) { window.location.href = page; - } + }, }, mounted() { this.getBenner(); @@ -136,7 +153,7 @@ export default { this.init("hgmap"); this.init("zhapp"); this.getGeneralOverview(); - } + }, }; diff --git a/src/pages/service_shop/shop_car_apply.vue b/src/pages/service_shop/shop_car_apply.vue index 3f541ba7687b074692f8a138d0bdd7a5f0f5ee7c..3afaa42c966b8f35798fac93200505e352c9aad8 100644 --- a/src/pages/service_shop/shop_car_apply.vue +++ b/src/pages/service_shop/shop_car_apply.vue @@ -173,8 +173,7 @@ export default { this.service_arr[0]["auth"] = data.org_name; this.service_arr[0]["size"] = "应用镜像部署权限:" + data.price + "金币/月"; - this.service_arr[0]["applytype"] = - "申请方式:" + (app_data.duration_unit == 1 ? "月" : "年"); + this.service_arr[0]["applytype"] = "申请方式:" + "月"; this.service_arr[0]["num"] = `${app_data.duration}个月`; this.service_arr[0]["count"] = app_data.duration * parseFloat(data.price) + "金币"; @@ -226,12 +225,8 @@ export default { objs.num = "不限时长"; count = el.money; } else { - size = `${el.money}金币/${ - el.duration_unit == 1 ? "月" : "年" - }`; - objs.num = - service_data.duration + - (el.duration_unit == 1 ? "个月" : "年"); + size = `${el.money}金币/月`; + objs.num = service_data.duration + "个月"; count = service_data.duration * el.money; } objs.size = size; @@ -239,8 +234,7 @@ export default { this.all_cost = count; } }); - objs.applytype = - "申请方式:" + (service_data.duration_unit == 1 ? "月" : "年"); + objs.applytype = "申请方式:" + "月"; objs.isMg = data.openness == 3; if (data.data_service_type1 != 36) { objs.data = JSON.parse(data.res_fields); @@ -400,11 +394,8 @@ export default { this.service_arr[l]["auth"] = e.application.org_name; this.service_arr[l]["size"] = "应用镜像部署权限:" + e.application.price + "金币/月"; - this.service_arr[l]["applytype"] = - "申请方式:" + (e.duration_method == 1 ? "月" : "年"); - this.service_arr[l]["num"] = `${e.duration}${ - e.duration_unit == 1 ? "个月" : "年" - }`; + this.service_arr[l]["applytype"] = "申请方式:月"; + this.service_arr[l]["num"] = `${e.duration}个月`; this.service_arr[l]["count"] = e.duration * parseFloat(e.application.price) + "金币"; this.service_arr[l]["isMg"] = false; @@ -442,19 +433,14 @@ export default { }); spcs_type_2.forEach((el, ind) => { if (e.spec_id == el.id) { - this.service_arr[l]["size"] = `时长收费:${el.money}金币/${ - el.duration_unit == 1 ? "月" : "年" - }`; - this.service_arr[l]["num"] = `${e.duration}${ - el.duration_unit == 1 ? "个月" : "年" - }`; + this.service_arr[l]["size"] = `时长收费:${el.money}金币/月`; + this.service_arr[l]["num"] = `${e.duration}个月`; this.service_arr[l]["count"] = e.duration * el.money + "金币"; temp_cost = this.floatAdd(temp_cost, e.duration * el.money); } }); - this.service_arr[l]["applytype"] = - "申请方式:" + (e.duration_method == 1 ? "月" : "年"); + this.service_arr[l]["applytype"] = "申请方式:月"; this.service_arr[l]["isMg"] = e.service.openness == 3; this.service_arr[l]["data"] = e.service.res_fields ? JSON.parse(e.service.res_fields) diff --git a/src/pages/workbench/workPlace.vue b/src/pages/workbench/workPlace.vue index ae09df262d11c5703d0fb4013b26dfc254e2af28..3087c872fa254b571c2ca82d12b0def745ff5985 100644 --- a/src/pages/workbench/workPlace.vue +++ b/src/pages/workbench/workPlace.vue @@ -1058,7 +1058,10 @@ export default { ...mapState(["userInfo"]) }, created() { - this.manage_arr[this.manage_arr.length - 1].url = cloudServiceRoot; + this.$nextTick(() => { + this.manage_arr[this.manage_arr.length - 1].url = cloudServiceRoot; + console.log(this.manage_arr) + }) }, mounted() { console.log(this.level);