diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..a4434cb --- /dev/null +++ b/Dockerfile @@ -0,0 +1,18 @@ +FROM nginx:latest + +RUN mkdir -p /zlpt-front + +WORKDIR /zlpt-front + + +COPY zrpt_front-sit/assets /zlpt-front/assets +COPY zrpt_front-sit/favicon.ico /zlpt-front/favicon.ico +COPY zrpt_front-sit/index.html /zlpt-front/index.html + +RUN rm /usr/share/nginx/html/* + +RUN cp -r /zlpt-front/* /usr/share/nginx/html/ + +EXPOSE 80 + +CMD ["nginx", "-g", "daemon off;"] \ No newline at end of file diff --git a/components.d.ts b/components.d.ts index a408692..8265dc8 100644 --- a/components.d.ts +++ b/components.d.ts @@ -8,6 +8,8 @@ export {} declare module 'vue' { export interface GlobalComponents { ElButton: typeof import('element-plus/es')['ElButton'] + ElCarousel: typeof import('element-plus/es')['ElCarousel'] + ElCarouselItem: typeof import('element-plus/es')['ElCarouselItem'] ElCheckbox: typeof import('element-plus/es')['ElCheckbox'] ElCol: typeof import('element-plus/es')['ElCol'] ElConfigProvider: typeof import('element-plus/es')['ElConfigProvider'] diff --git a/env/.env.dev b/env/.env.dev index a47f396..cae1be7 100644 --- a/env/.env.dev +++ b/env/.env.dev @@ -13,7 +13,7 @@ VITE_proxyTarget = 'http://10.40.92.74:8080' #盛旭 # VITE_proxyTarget = 'http://10.40.92.253:8080' # 牛 (个人中心 基础信息企业申请认证) - +VITE_UPLOAD_URL='apiUpload diff --git a/src/components/uploadComponent/index.vue b/src/components/uploadComponent/index.vue index 68102f6..bf30694 100644 --- a/src/components/uploadComponent/index.vue +++ b/src/components/uploadComponent/index.vue @@ -31,12 +31,12 @@ import { ref, nextTick } from 'vue' import { ElMessage } from 'element-plus' import { Base64 } from 'js-base64' - + import {apiUpload} from "http/api/myInfo" const props = defineProps({ actionUrl: { //上传的地址 type: String, - default: '' + default: "" }, width: { //上传的地址 diff --git a/src/views/user/orderManagementCz/index.vue b/src/views/user/orderManagementCz/index.vue index 2c9f110..82a3355 100644 --- a/src/views/user/orderManagementCz/index.vue +++ b/src/views/user/orderManagementCz/index.vue @@ -83,6 +83,7 @@