diff --git a/.beagle.yml b/.beagle.yml index 1798e667b4e42d6811e4c900ed60f954e2799bca..6ce83b0baa00a821dcf02d8d8fe51531e88aa0fe 100644 --- a/.beagle.yml +++ b/.beagle.yml @@ -50,7 +50,7 @@ pipeline: base: hub.wodcloud.com/wod/ui-base:2.0-apaasv3 dockerfile: .beagle/dockerfile repo: wod/apaas-ui - version: v3.0.4 + version: v3.0.5 channel: alpha args: "TARGETOS=linux,TARGETARCH=amd64" ## 不同架构的构建参数 registry: registry.cn-qingdao.aliyuncs.com @@ -69,8 +69,8 @@ pipeline: dns: 223.5.5.5 volumes: - /var/run/docker.sock:/var/run/docker.sock - source: registry.cn-qingdao.aliyuncs.com/wod/apaas-ui:v3.0.4-alpha - target: registry.cn-qingdao.aliyuncs.com/wod/apaas-ui:v3.0.4 + source: registry.cn-qingdao.aliyuncs.com/wod/apaas-ui:v3.0.5-alpha + target: registry.cn-qingdao.aliyuncs.com/wod/apaas-ui:v3.0.5 registry: registry.cn-qingdao.aliyuncs.com secrets: - source: REGISTRY_USER_ALIYUN @@ -87,7 +87,7 @@ pipeline: dns: 223.5.5.5 volumes: - /var/run/docker.sock:/var/run/docker.sock - source: registry.cn-qingdao.aliyuncs.com/wod/apaas-ui:v3.0.4 + source: registry.cn-qingdao.aliyuncs.com/wod/apaas-ui:v3.0.5 target: registry.cn-qingdao.aliyuncs.com/wod/apaas-ui:v3.0 registry: registry.cn-qingdao.aliyuncs.com secrets: @@ -107,7 +107,7 @@ pipeline: base: hub.wodcloud.com/wod/ui-base:2.0-apaasv3-arm64 dockerfile: .beagle/dockerfile repo: wod/apaas-ui - version: v3.0.4 + version: v3.0.5 channel: alpha-arm64 args: "TARGETOS=linux,TARGETARCH=arm64" registry: registry.cn-qingdao.aliyuncs.com @@ -126,8 +126,8 @@ pipeline: dns: 223.5.5.5 volumes: - /var/run/docker.sock:/var/run/docker.sock - source: registry.cn-qingdao.aliyuncs.com/wod/apaas-ui:v3.0.4-alpha-arm64 - target: registry.cn-qingdao.aliyuncs.com/wod/apaas-ui:v3.0.4-arm64 + source: registry.cn-qingdao.aliyuncs.com/wod/apaas-ui:v3.0.5-alpha-arm64 + target: registry.cn-qingdao.aliyuncs.com/wod/apaas-ui:v3.0.5-arm64 registry: registry.cn-qingdao.aliyuncs.com secrets: - source: REGISTRY_USER_ALIYUN @@ -144,7 +144,7 @@ pipeline: dns: 223.5.5.5 volumes: - /var/run/docker.sock:/var/run/docker.sock - source: registry.cn-qingdao.aliyuncs.com/wod/apaas-ui:v3.0.4-arm64 + source: registry.cn-qingdao.aliyuncs.com/wod/apaas-ui:v3.0.5-arm64 target: registry.cn-qingdao.aliyuncs.com/wod/apaas-ui:v3.0-arm64 registry: registry.cn-qingdao.aliyuncs.com secrets: @@ -163,7 +163,7 @@ pipeline: base: hub.wodcloud.com/wod/ui-base:2.0-apaasv3-ppc64le dockerfile: .beagle/dockerfile repo: wod/apaas-ui - version: v3.0.4 + version: v3.0.5 channel: alpha-ppc64le args: "TARGETOS=linux,TARGETARCH=ppc64le" registry: registry.cn-qingdao.aliyuncs.com @@ -181,8 +181,8 @@ pipeline: dns: 223.5.5.5 volumes: - /var/run/docker.sock:/var/run/docker.sock - source: registry.cn-qingdao.aliyuncs.com/wod/apaas-ui:v3.0.4-alpha-ppc64le - target: registry.cn-qingdao.aliyuncs.com/wod/apaas-ui:v3.0.4-ppc64le + source: registry.cn-qingdao.aliyuncs.com/wod/apaas-ui:v3.0.5-alpha-ppc64le + target: registry.cn-qingdao.aliyuncs.com/wod/apaas-ui:v3.0.5-ppc64le registry: registry.cn-qingdao.aliyuncs.com secrets: - source: REGISTRY_USER_ALIYUN @@ -198,7 +198,7 @@ pipeline: dns: 223.5.5.5 volumes: - /var/run/docker.sock:/var/run/docker.sock - source: registry.cn-qingdao.aliyuncs.com/wod/apaas-ui:v3.0.4-ppc64le + source: registry.cn-qingdao.aliyuncs.com/wod/apaas-ui:v3.0.5-ppc64le target: registry.cn-qingdao.aliyuncs.com/wod/apaas-ui:v3.0-ppc64le registry: registry.cn-qingdao.aliyuncs.com secrets: @@ -217,7 +217,7 @@ pipeline: base: hub.wodcloud.com/wod/ui-base:2.0-apaasv3-mips64le dockerfile: .beagle/dockerfile repo: wod/apaas-ui - version: v3.0.4 + version: v3.0.5 channel: alpha-mips64le args: "TARGETOS=linux,TARGETARCH=mips64le" registry: registry.cn-qingdao.aliyuncs.com @@ -235,8 +235,8 @@ pipeline: dns: 223.5.5.5 volumes: - /var/run/docker.sock:/var/run/docker.sock - source: registry.cn-qingdao.aliyuncs.com/wod/apaas-ui:v3.0.4-alpha-mips64le - target: registry.cn-qingdao.aliyuncs.com/wod/apaas-ui:v3.0.4-mips64le + source: registry.cn-qingdao.aliyuncs.com/wod/apaas-ui:v3.0.5-alpha-mips64le + target: registry.cn-qingdao.aliyuncs.com/wod/apaas-ui:v3.0.5-mips64le registry: registry.cn-qingdao.aliyuncs.com secrets: - source: REGISTRY_USER_ALIYUN @@ -252,7 +252,7 @@ pipeline: dns: 223.5.5.5 volumes: - /var/run/docker.sock:/var/run/docker.sock - source: registry.cn-qingdao.aliyuncs.com/wod/apaas-ui:v3.0.4-mips64le + source: registry.cn-qingdao.aliyuncs.com/wod/apaas-ui:v3.0.5-mips64le target: registry.cn-qingdao.aliyuncs.com/wod/apaas-ui:v3.0-mips64le registry: registry.cn-qingdao.aliyuncs.com secrets: @@ -269,7 +269,7 @@ pipeline: namespace: apaas-v3 deployment: apaas-ui container: apaas-ui - registry: registry.cn-qingdao.aliyuncs.com/wod/apaas-ui:v3.0.4-alpha + registry: registry.cn-qingdao.aliyuncs.com/wod/apaas-ui:v3.0.5-alpha when: branch: - dev diff --git a/src/components/service-list/commodity-list-new.vue b/src/components/service-list/commodity-list-new.vue index 53dc45fc0a49dbe95ebff903bd7867df1aa4a759..b9f867e9f161b6fc9e1adaf8c08a7d6f84d60ab5 100644 --- a/src/components/service-list/commodity-list-new.vue +++ b/src/components/service-list/commodity-list-new.vue @@ -119,6 +119,7 @@ export default { methods: { handleSizeChange(val) { this.pagination.rowsPerPage = val; + this.pagination.page = 1 this.refreshData(); }, handleCurrentChange(val) { diff --git a/src/components/service-list/service_list-new.vue b/src/components/service-list/service_list-new.vue index 93b1137cb008bbfd263b946604a61a0d94fd73f7..07508a86623076c2fb3b987fe913f137c20d94e4 100644 --- a/src/components/service-list/service_list-new.vue +++ b/src/components/service-list/service_list-new.vue @@ -182,6 +182,7 @@ > {{ item.name }} +
服务规格:
+