diff --git a/.beagle-arm.yml b/.beagle-arm.yml deleted file mode 100644 index e2bd9245b817a1f3e3efb193169b6a964fbb841c..0000000000000000000000000000000000000000 --- a/.beagle-arm.yml +++ /dev/null @@ -1,77 +0,0 @@ - -clone: - git: - image: registry.cn-qingdao.aliyuncs.com/wod/devops-git-arm64:1.0 -pipeline: - read-cache: - image: registry.cn-qingdao.aliyuncs.com/wod/devops-cache-arm64:1.0 - restore: true - check: yarn.lock - mount: - - ./node_modules - - ./yarn.lock - volumes: - - /data/cache:/cache - build: - image: registry.cn-qingdao.aliyuncs.com/wod/devops-node-arm64:12.18.2-buster - volumes: - - /data/cache/yarn:/usr/local/share/.cache/yarn - commands: - - yarn install - - yarn run build - store-cache: - image: registry.cn-qingdao.aliyuncs.com/wod/devops-cache-arm64:1.0 - rebuild: true - mount: - - ./node_modules - - ./yarn.lock - volumes: - - /data/cache:/cache - docker: - image: registry.cn-qingdao.aliyuncs.com/wod/devops-docker-arm64:1.0 - volumes: - - /var/run/docker.sock:/var/run/docker.sock - base: registry.cn-qingdao.aliyuncs.com/wod-devops/ui-base-arm64:2.0 - repo: wod/apaas-ui-arm64 - version: "v3.0.2" - channel: alpha - registry: registry.cn-qingdao.aliyuncs.com - secrets: - - source: REGISTRY_USER_ALIYUN - target: REGISTRY_USER - - source: REGISTRY_PASSWORD_ALIYUN - target: REGISTRY_PASSWORD - when: - branch: dev - harbor: - image: registry.cn-qingdao.aliyuncs.com/wod/devops-docker-arm64:1.0 - volumes: - - /var/run/docker.sock:/var/run/docker.sock - base: registry.cn-qingdao.aliyuncs.com/wod-devops/ui-base-arm64:2.0 - repo: wod/apaas-ui-arm64 - version: "v3.0.2" - registry: registry.cn-qingdao.aliyuncs.com - secrets: - - source: REGISTRY_USER_ALIYUN - target: REGISTRY_USER - - source: REGISTRY_PASSWORD_ALIYUN - target: REGISTRY_PASSWORD - when: - branch: master - latest: - image: registry.cn-qingdao.aliyuncs.com/wod/devops-docker-arm64:1.0 - volumes: - - /var/run/docker.sock:/var/run/docker.sock - base: registry.cn-qingdao.aliyuncs.com/wod-devops/ui-base-arm64:2.0 - repo: wod/apaas-ui-arm64 - version: "v3.1" - registry: registry.cn-qingdao.aliyuncs.com - secrets: - - source: REGISTRY_USER_ALIYUN - target: REGISTRY_USER - - source: REGISTRY_PASSWORD_ALIYUN - target: REGISTRY_PASSWORD - when: - branch: master - -branches: [master,dev] diff --git a/.beagle.yml b/.beagle.yml index 7302e9b7a24c242e3d87bf2f423ebd1b5868f688..1be526ac3762aa5602e2390bdbf024138123009b 100644 --- a/.beagle.yml +++ b/.beagle.yml @@ -1,43 +1,49 @@ -platform: 10.11.92.33 +platform: 10.11.92.34 + clone: git: - image: registry.cn-qingdao.aliyuncs.com/wod-devops/git:1.4.0 + image: registry.cn-qingdao.aliyuncs.com/wod/devops-git:1.0 pull: true dns: 223.5.5.5 + pipeline: + ## 读缓存 read-cache: - image: registry.cn-qingdao.aliyuncs.com/wod/devops-cache:1.0.0-alpha + image: registry.cn-qingdao.aliyuncs.com/wod/devops-cache:1.0 restore: true - check: yarn.lock mount: - ./node_modules - - ./yarn.lock volumes: - /data/cache:/cache + ## 构建 build: image: registry.cn-qingdao.aliyuncs.com/wod/devops-node:12.18.0-stretch dns: 223.5.5.5 volumes: - /data/cache/yarn:/usr/local/share/.cache/yarn commands: - - yarn install - - yarn run build + - yarn + - yarn build + store-cache: - image: registry.cn-qingdao.aliyuncs.com/wod/devops-cache:1.0.0-alpha + image: registry.cn-qingdao.aliyuncs.com/wod/devops-cache:1.0 rebuild: true mount: - ./node_modules - - ./yarn.lock volumes: - /data/cache:/cache + + ## 编译成静态文件 docker: - image: registry.cn-qingdao.aliyuncs.com/wod-devops/docker:1.0 + image: registry.cn-qingdao.aliyuncs.com/wod/devops-docker:1.0 volumes: - - /var/run/docker.sock:/var/run/docker.sock - base: registry.cn-qingdao.aliyuncs.com/wod-devops/ui-base:2.0.0 + - /var/run/docker.sock:/var/run/docker.sock + base: registry.cn-qingdao.aliyuncs.com/wod-devops/ui-base:2.0 + dockerfile: .beagle/dockerfile repo: wod/apaas-ui - version: "v3.0" + version: v3.0.2 channel: alpha + args: "TARGETOS=linux,TARGETARCH=amd64" ## 不同架构的构建参数 registry: registry.cn-qingdao.aliyuncs.com secrets: - source: REGISTRY_USER_ALIYUN @@ -45,14 +51,56 @@ pipeline: - source: REGISTRY_PASSWORD_ALIYUN target: REGISTRY_PASSWORD when: - branch: dev + branch: + - dev + + ## 更换dev生成镜像的名称 harbor: - image: registry.cn-qingdao.aliyuncs.com/wod-devops/docker:1.0 + image: registry.cn-qingdao.aliyuncs.com/wod/devops-docker-tag:1.0 + dns: 223.5.5.5 volumes: - - /var/run/docker.sock:/var/run/docker.sock - base: registry.cn-qingdao.aliyuncs.com/wod-devops/ui-base:2.0.0 + - /var/run/docker.sock:/var/run/docker.sock + source: registry.cn-qingdao.aliyuncs.com/wod/apaas-ui:v3.0.2-alpha + target: registry.cn-qingdao.aliyuncs.com/wod/apaas-ui:v3.0.2 + registry: registry.cn-qingdao.aliyuncs.com + secrets: + - source: REGISTRY_USER_ALIYUN + target: REGISTRY_USER + - source: REGISTRY_PASSWORD_ALIYUN + target: REGISTRY_PASSWORD + when: + branch: + - master + + # 生成最终amd版本 + latest: + image: registry.cn-qingdao.aliyuncs.com/wod/devops-docker-tag:1.0 + 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.2 + target: registry.cn-qingdao.aliyuncs.com/wod/apaas-ui:v3.0 + registry: registry.cn-qingdao.aliyuncs.com + secrets: + - source: REGISTRY_USER_ALIYUN + target: REGISTRY_USER + - source: REGISTRY_PASSWORD_ALIYUN + target: REGISTRY_PASSWORD + when: + branch: + - master + + # 构建arm64位镜像 + docker-arm64: + image: registry.cn-qingdao.aliyuncs.com/wod/devops-docker:1.0 + volumes: + - /var/run/docker.sock:/var/run/docker.sock + base: registry.cn-qingdao.aliyuncs.com/wod-devops/ui-base:2.0-arm64 + dockerfile: .beagle/dockerfile repo: wod/apaas-ui - version: "v3.0" + version: v3.0.2 + channel: alpha-arm64 + args: "TARGETOS=linux,TARGETARCH=arm64" registry: registry.cn-qingdao.aliyuncs.com secrets: - source: REGISTRY_USER_ALIYUN @@ -60,14 +108,55 @@ pipeline: - source: REGISTRY_PASSWORD_ALIYUN target: REGISTRY_PASSWORD when: - branch: master - latest: - image: registry.cn-qingdao.aliyuncs.com/wod-devops/docker:1.0 + branch: + - dev + + ## 更换dev生成arm64镜像的名称 + harbor-arm64: + image: registry.cn-qingdao.aliyuncs.com/wod/devops-docker-tag:1.0 + dns: 223.5.5.5 volumes: - - /var/run/docker.sock:/var/run/docker.sock - base: registry.cn-qingdao.aliyuncs.com/wod-devops/ui-base:2.0.0 + - /var/run/docker.sock:/var/run/docker.sock + source: registry.cn-qingdao.aliyuncs.com/wod/apaas-ui:v3.0.2-alpha-arm64 + target: registry.cn-qingdao.aliyuncs.com/wod/apaas-ui:v3.0.2-arm64 + registry: registry.cn-qingdao.aliyuncs.com + secrets: + - source: REGISTRY_USER_ALIYUN + target: REGISTRY_USER + - source: REGISTRY_PASSWORD_ALIYUN + target: REGISTRY_PASSWORD + when: + branch: + - master + + # 生成最终arm版本 + latest-arm64: + image: registry.cn-qingdao.aliyuncs.com/wod/devops-docker-tag:1.0 + 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.2-arm64 + target: registry.cn-qingdao.aliyuncs.com/wod/apaas-ui:v3.0-arm64 + registry: registry.cn-qingdao.aliyuncs.com + secrets: + - source: REGISTRY_USER_ALIYUN + target: REGISTRY_USER + - source: REGISTRY_PASSWORD_ALIYUN + target: REGISTRY_PASSWORD + when: + branch: + - master + + docker-ppc64le: + image: registry.cn-qingdao.aliyuncs.com/wod/devops-docker:1.0 + volumes: + - /var/run/docker.sock:/var/run/docker.sock + base: registry.cn-qingdao.aliyuncs.com/wod-devops/ui-base:2.0-ppc64le + dockerfile: .beagle/dockerfile repo: wod/apaas-ui - version: "v3.0" + version: v3.0.2 + channel: alpha-ppc64le + args: "TARGETOS=linux,TARGETARCH=ppc64le" registry: registry.cn-qingdao.aliyuncs.com secrets: - source: REGISTRY_USER_ALIYUN @@ -75,15 +164,103 @@ pipeline: - source: REGISTRY_PASSWORD_ALIYUN target: REGISTRY_PASSWORD when: - branch: master - deploy: - image: registry.cn-qingdao.aliyuncs.com/wod-devops/kubernetes:1.0 - namespace: apaas-v3 - deployment: apaas-ui - container: apaas-ui + branch: + - dev + + harbor-ppc64le: + image: registry.cn-qingdao.aliyuncs.com/wod/devops-docker-tag:1.0 + 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.2-alpha-ppc64le + target: registry.cn-qingdao.aliyuncs.com/wod/apaas-ui:v3.0.2-ppc64le + registry: registry.cn-qingdao.aliyuncs.com + secrets: + - source: REGISTRY_USER_ALIYUN + target: REGISTRY_USER + - source: REGISTRY_PASSWORD_ALIYUN + target: REGISTRY_PASSWORD + when: + branch: + - master + + latest-ppc64le: + image: registry.cn-qingdao.aliyuncs.com/wod/devops-docker-tag:1.0 + 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.2-ppc64le + target: registry.cn-qingdao.aliyuncs.com/wod/apaas-ui:v3.0-ppc64le + registry: registry.cn-qingdao.aliyuncs.com + secrets: + - source: REGISTRY_USER_ALIYUN + target: REGISTRY_USER + - source: REGISTRY_PASSWORD_ALIYUN + target: REGISTRY_PASSWORD + when: + branch: + - master + + docker-mips64le: + image: registry.cn-qingdao.aliyuncs.com/wod/devops-docker:1.0 + volumes: + - /var/run/docker.sock:/var/run/docker.sock + base: registry.cn-qingdao.aliyuncs.com/wod-devops/ui-base:2.0-mips64le + dockerfile: .beagle/dockerfile + repo: wod/apaas-ui + version: v3.0.2 + channel: alpha-mips64le + args: "TARGETOS=linux,TARGETARCH=mips64le" + registry: registry.cn-qingdao.aliyuncs.com secrets: - source: REGISTRY_USER_ALIYUN target: REGISTRY_USER - source: REGISTRY_PASSWORD_ALIYUN target: REGISTRY_PASSWORD -branches: [master,dev] + when: + branch: + - dev + + harbor-mips64le: + image: registry.cn-qingdao.aliyuncs.com/wod/devops-docker-tag:1.0 + 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.2-alpha-mips64le + target: registry.cn-qingdao.aliyuncs.com/wod/apaas-ui:v3.0.2-mips64le + registry: registry.cn-qingdao.aliyuncs.com + secrets: + - source: REGISTRY_USER_ALIYUN + target: REGISTRY_USER + - source: REGISTRY_PASSWORD_ALIYUN + target: REGISTRY_PASSWORD + when: + branch: + - master + + latest-mips64le: + image: registry.cn-qingdao.aliyuncs.com/wod/devops-docker-tag:1.0 + 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.2-mips64le + target: registry.cn-qingdao.aliyuncs.com/wod/apaas-ui:v3.0-mips64le + registry: registry.cn-qingdao.aliyuncs.com + secrets: + - source: REGISTRY_USER_ALIYUN + target: REGISTRY_USER + - source: REGISTRY_PASSWORD_ALIYUN + target: REGISTRY_PASSWORD + when: + branch: + - master + + deploy: + image: registry.cn-qingdao.aliyuncs.com/wod-devops/kubernetes:1.0 + namespace: apaas-v3 + deployment: apaas-ui + container: apaas-ui + registry: registry.cn-qingdao.aliyuncs.com/wod/apaas-ui:v3.0.2-alpha + when: + branch: + - dev diff --git a/.beagle/dockerfile b/.beagle/dockerfile new file mode 100644 index 0000000000000000000000000000000000000000..798acf38a81161effca1ff0b7cbf6f30ab73164f --- /dev/null +++ b/.beagle/dockerfile @@ -0,0 +1,13 @@ +ARG BASE + +FROM $BASE + +ARG AUTHOR +ARG VERSION +LABEL maintainer=${AUTHOR} version=${VERSION} + +ARG TARGETOS +ARG TARGETARCH + +ADD ./dist /www +ADD ./build/conf.yaml /www/conf.yaml \ No newline at end of file diff --git a/package.json b/package.json index 3c90effd7c9493c4a1d02d8bcddaa22816e071a9..c78b29c34d7b870892042ca3f2a51356285fb23d 100644 --- a/package.json +++ b/package.json @@ -22,6 +22,7 @@ "element-ui": "^2.11.1", "js-yaml": "^3.13.1", "json2yaml": "^1.1.0", + "markdown-loader": "^6.0.0", "material-design-icons-iconfont": "^4.0.5", "mavon-editor": "^2.9.0", "qs": "^6.9.4", diff --git a/src/assets/css/index.css b/src/assets/css/index.css index 2ec7406153bf7d34ab89a334ffc457892e40a71c..cc336983ed992ed7e091b5864fde7c689802cb9d 100644 --- a/src/assets/css/index.css +++ b/src/assets/css/index.css @@ -228,13 +228,14 @@ div { .el-dialog__header { border-bottom: 1px solid #edf0ff; + padding: 20px 16px; } .el-dialog__title { - font-size: 16px; + font-size: 18px; font-weight: 700; color: #1d1e20; - padding-left: 8px; + padding-left: 12px; position: relative; } @@ -246,7 +247,19 @@ div { border-radius: 2px; background-color: #515fe7; left: 0; - top: 2px; + top: 5px; +} + +.el-dialog__headerbtn { + top: 24px; +} + +.el-dialog__headerbtn .el-dialog__close { + color: #8890a7; +} + +.el-dialog__headerbtn:focus .el-dialog__close, .el-dialog__headerbtn:hover .el-dialog__close { + color: #515fe7; } .el-dialog__body { @@ -1071,6 +1084,10 @@ border-radius:8px; background-color: #242c43 !important; } +.el-picker-panel__icon-btn { + color: #0c3ff7; +} + .el-date-table th { border-bottom: 1px solid #3f4864 !important; color: #e3e5ef !important; @@ -1197,4 +1214,43 @@ border-radius:8px; } .el-date-editor .el-range-input { width: 36%; +} + + +.el-input__inner:focus { + border-color: #515fe7; +} +.el-textarea__inner:focus { + border-color: #515fe7; +} +.el-select .el-input .el-select__caret { + color: #515fe7; +} +.el-input-number__decrease, .el-input-number__increase { + color: #515fe7; +} +.el-input__inner::-webkit-input-placeholder, +.el-textarea__inner::-webkit-input-placeholder { + color: #a9aec0; +} +.el-input__inner:-moz-placeholder, +.el-textarea__inner:-moz-placeholder {/* Firefox 18- */ + color: #a9aec0; +} +.el-input__inner::-moz-placeholder, +.el-textarea__inner::-moz-placeholder {/* Firefox 19+ */ + color: #a9aec0; +} +.el-input__inner:-ms-input-placeholder, +.el-textarea__inner:-ms-input-placeholder { + color: #a9aec0; +} + +[class*=" el-icon-"], [class^=el-icon-] { + font-weight: 700; +} + +.el-rate__item .el-rate__icon { + font-size: 18px; + margin-right: 0; } \ No newline at end of file diff --git a/src/assets/imgs/nav_ic_chanpinzy.png b/src/assets/imgs/nav_ic_chanpinzy.png new file mode 100644 index 0000000000000000000000000000000000000000..1f84bf9401433b18da1a184e19675d589853e0bb Binary files /dev/null and b/src/assets/imgs/nav_ic_chanpinzy.png differ diff --git a/src/assets/imgs/nav_ic_chanpinzy_sel.png b/src/assets/imgs/nav_ic_chanpinzy_sel.png new file mode 100644 index 0000000000000000000000000000000000000000..7d78436c5cac10f3af561ae95bc7f85cfd72e868 Binary files /dev/null and b/src/assets/imgs/nav_ic_chanpinzy_sel.png differ diff --git a/src/assets/imgs/shop_img_hqlc_chanpin.png b/src/assets/imgs/shop_img_hqlc_chanpin.png new file mode 100644 index 0000000000000000000000000000000000000000..5f0aeb9ef00790e5cf78bdb4483171f8ab02ab72 Binary files /dev/null and b/src/assets/imgs/shop_img_hqlc_chanpin.png differ diff --git a/src/assets/imgs/shop_nav_iv_chanpinzy.png b/src/assets/imgs/shop_nav_iv_chanpinzy.png new file mode 100644 index 0000000000000000000000000000000000000000..f2def2735882beb3a746029040aa4ed0ba24c85e Binary files /dev/null and b/src/assets/imgs/shop_nav_iv_chanpinzy.png differ diff --git a/src/assets/imgs/shop_nav_iv_chanpinzy_pre.png b/src/assets/imgs/shop_nav_iv_chanpinzy_pre.png new file mode 100644 index 0000000000000000000000000000000000000000..2f4e29f9e4c47eddc89628f7341224f1793206b0 Binary files /dev/null and b/src/assets/imgs/shop_nav_iv_chanpinzy_pre.png differ diff --git a/src/components/apass-table.vue b/src/components/apass-table.vue index 7e289fa1d5452d31d605a52417bf0a280b28add2..1c61fe13ce03477f7cd9a7640ac25263ab30a936 100644 --- a/src/components/apass-table.vue +++ b/src/components/apass-table.vue @@ -75,6 +75,13 @@ @click.stop="item.callback && item.callback(scope.row)" > +
满分5分
填写评价:
@@ -310,6 +311,7 @@ v-model="message.score" disabled :colors="colors" + disabled-void-color="#d9dce5" >