diff --git a/src/components/order-list/order-list-cell.vue b/src/components/order-list/order-list-cell.vue index e3296c848810208fa49f3ea0f17ac9249c129cd7..6ede68adfb90525967d83a827d00a9164792a154 100644 --- a/src/components/order-list/order-list-cell.vue +++ b/src/components/order-list/order-list-cell.vue @@ -230,7 +230,7 @@ export default { } }, viewDetail(val) { - this.$router.push("/user/order_detail/" + val); + this.$router.push("/user/order_list/detail/" + val); }, delOrder() { this.$api.user diff --git a/src/components/shop-card.vue b/src/components/shop-card.vue index dbf9cdcb8ba597e5fed6ec6c651f7694e60e8c76..567f3e5605a11dabfe4a1b0b9a24866f36a57723 100644 --- a/src/components/shop-card.vue +++ b/src/components/shop-card.vue @@ -4,17 +4,9 @@
-

+

- + @@ -22,18 +14,12 @@

-

+

- - + +

@@ -79,6 +65,10 @@ export default { type: Boolean, default: false, }, + showSummary: { + type: Boolean, + default: false, + }, }, data() { return { diff --git a/src/components/shop-cloud/shop-cloud.vue b/src/components/shop-cloud/shop-cloud.vue index a94c7cbd54a292b1728d93a5d8037b16ffb8cecd..0e27b0bff83d6908254590a8288f3955453cf31e 100644 --- a/src/components/shop-cloud/shop-cloud.vue +++ b/src/components/shop-cloud/shop-cloud.vue @@ -476,7 +476,7 @@ :max="10" placeholder="请设置内存最高使用量" > -
+
GB
@@ -489,7 +489,7 @@ :max="10" placeholder="请设置内存默认使用量" > -
+
GB
@@ -659,8 +659,8 @@
内存:

- 最高 {{ diaForm.perRAMs }}G - 默认 {{ diaForm.perRAM }}G + 最高 {{ diaForm.perRAMs }}GB + 默认 {{ diaForm.perRAM }}GB

@@ -686,7 +686,7 @@
内存: - {{ paramsOld.memory }}核 + {{ paramsOld.memory }}GB
容器组: @@ -705,8 +705,8 @@
内存:

- 最高 {{ paramsOld.one_memory_max }}核 - 默认 {{ paramsOld.one_memory_min }}核 + 最高 {{ paramsOld.one_memory_max }}GB + 默认 {{ paramsOld.one_memory_min }}GB

@@ -732,7 +732,7 @@
内存: - {{ diaForm.memory }}核 + {{ diaForm.memory }}GB
容器组: @@ -774,8 +774,8 @@
内存:

- 最高 {{ diaForm.perRAMs }}核 - 默认 {{ diaForm.perRAM }}核 + 最高 {{ diaForm.perRAMs }}GB + 默认 {{ diaForm.perRAM }}GB

diff --git a/src/components/shop-list.vue b/src/components/shop-list.vue index d0ce49e6440374441c39e508683a495f6c327ad4..3df773148e55524787d991d7f98375dfba937ed8 100644 --- a/src/components/shop-list.vue +++ b/src/components/shop-list.vue @@ -10,6 +10,7 @@ @@ -45,6 +46,10 @@ export default { type: Boolean, default: false, }, + showSummary: { + type: Boolean, + default: false, + } }, methods: { goto() { diff --git a/src/pages/service_shop/services_shop.vue b/src/pages/service_shop/services_shop.vue index 82f81a136a665ed1c6023c67005151794b5db2bf..4eccee04d19b205cec243f87245363b66c79e603 100644 --- a/src/pages/service_shop/services_shop.vue +++ b/src/pages/service_shop/services_shop.vue @@ -32,6 +32,7 @@ detail-path="/shop/sjfwDetail/" :data="hot_datas" :showImg="false" + :showSummary="true" > @@ -41,6 +42,7 @@ detail-path="/shop/skfwDetail/" :data="map_datas" :showImg="true" + :showSummary="false" > @@ -50,6 +52,7 @@ detail-path="/shop/zhfwDetail/" :data="comprehensive_datas" :showImg="true" + :showSummary="false" > diff --git a/src/router/index.js b/src/router/index.js index 7a33a4460c9e1f060806b50ff218d221ee53d8a4..a5f1f71e27a5209288612705e7d8244d074e8345 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -318,7 +318,7 @@ export default new Router({ component: () => import("@/pages/user/order/order_list"), }, { - path: "/user/order_detail/:id", // 订单管理页 + path: "/user/order_list/detail/:id", // 订单管理页 name: "orderDetail", component: () => import("@/pages/user/order/order_detail"), },