Merge branch 'dev-songyang'

components.d.ts

@@ -22,6 +22,7 @@ declare module 'vue' {
     ElMenuItem: typeof import('element-plus/es')['ElMenuItem']
     ElOption: typeof import('element-plus/es')['ElOption']
     ElPagination: typeof import('element-plus/es')['ElPagination']
+    ElProgress: typeof import('element-plus/es')['ElProgress']
     ElRadio: typeof import('element-plus/es')['ElRadio']
     ElRow: typeof import('element-plus/es')['ElRow']
     ElSelect: typeof import('element-plus/es')['ElSelect']
@@ -37,7 +38,6 @@ declare module 'vue' {
     RouterLink: typeof import('vue-router')['RouterLink']
     RouterView: typeof import('vue-router')['RouterView']
     TableComponent: typeof import('./src/components/TableComponent/index.vue')['default']
-    UploadCom: typeof import('./src/components/uploadComponent/uploadCom.vue')['default']
     UploadComponent: typeof import('./src/components/uploadComponent/index.vue')['default']
     UploadImg: typeof import('./src/components/uploadImg.vue')['default']
   }

package.json

@@ -17,6 +17,7 @@
     "@vueuse/core": "^10.6.1",
     "axios": "^1.6.2",
     "element-plus": "^2.4.3",
+    "js-base64": "^3.7.5",
     "mitt": "^3.0.1",
     "moment": "^2.29.4",
     "nprogress": "^0.2.0",

pnpm-lock.yaml

@@ -17,6 +17,9 @@ dependencies:
   element-plus:
     specifier: ^2.4.3
     version: 2.4.3(vue@3.3.4)
+  js-base64:
+    specifier: ^3.7.5
+    version: 3.7.5
   mitt:
     specifier: ^3.0.1
     version: 3.0.1
@@ -1552,6 +1555,10 @@ packages:
       minimatch: 3.1.2
     dev: false
 
+  /js-base64@3.7.5:
+    resolution: {integrity: sha512-3MEt5DTINKqfScXKfJFrRbxkrnk2AxPWGBL/ycjz4dK8iqiSJ06UxD8jh8xuh6p10TX4t2+7FsBYVxxQbMg+qA==}
+    dev: false
+
   /js-tokens@4.0.0:
     resolution: {integrity: sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==}
     dev: true

src/views/EnterpriseCertification.vue

@@ -186,7 +186,8 @@
 
                     <el-col :span="4">
                         <el-form-item class="" label="营业执照">
-                            <upload-img width="80" @onClick="test" />
+                            <!-- <upload-img width="80" @onClick="test" /> -->
+                            <uploadComponent />
                             <div class="previewExample">
                                 <span>预览</span>
                                 <span>查看示例</span>
@@ -196,7 +197,8 @@
 
                     <el-col :span="4">
                         <el-form-item class="" label="身份证国徽面">
-                            <upload-img width="80" @onClick="test" />
+                            <!-- <upload-img width="80" @onClick="test" /> -->
+                            <uploadComponent />
                             <div class="previewExample">
                                 <span>预览</span>
                                 <span>查看示例</span>
@@ -206,7 +208,8 @@
 
                     <el-col :span="4">
                         <el-form-item class="" label="身份证肖像面">
-                            <upload-img width="80" @onClick="test" />
+                            <!-- <upload-img width="80" @onClick="test" /> -->
+                            <uploadComponent />
                             <div class="previewExample">
                                 <span>预览</span>
                                 <span>查看示例</span>
@@ -303,7 +306,15 @@
                 <el-row :gutter="20">
                     <el-col :span="5">
                         <el-form-item label="法人授权书">
-                            <upload-img width="80" @onClick="test" />
+                            <div style="width: 72px; height: 72px">
+                                <uploadComponent
+                                    :maxLimit="1"
+                                    :acceptTypeList="['.jpg', '.jpeg', '.png']">
+                                    <template v-slot:uploadBtn>
+                                        <el-icon size="48" color="#aaa"><Plus /></el-icon>
+                                    </template>
+                                </uploadComponent>
+                            </div>
                             <div class="previewExample">
                                 <span>预览</span>
                                 <span>查看示例</span>
@@ -312,7 +323,8 @@
                     </el-col>
                     <el-col :span="5">
                         <el-form-item label="被授权人身份证国徽面">
-                            <upload-img width="80" @onClick="test" />
+                            <!-- <upload-img width="80" @onClick="test" /> -->
+                            <uploadComponent />
                             <div class="previewExample">
                                 <span>预览</span>
                                 <span>查看示例</span>
@@ -321,7 +333,8 @@
                     </el-col>
                     <el-col :span="5">
                         <el-form-item label="被授权人身份证肖像面">
-                            <upload-img width="80" @onClick="test" />
+                            <!-- <upload-img width="80" @onClick="test" /> -->
+                            <uploadComponent />
                             <div class="previewExample">
                                 <span>预览</span>
                                 <span>查看示例</span>
@@ -389,6 +402,7 @@
 </template>
 <script lang="ts" setup>
     import uploadImg from 'components/uploadImg.vue'
+    import uploadComponent from 'components/uploadComponent/index.vue'
     import { ElMessage } from 'element-plus'
     import { reactive, ref } from 'vue'
     import { useStore } from 'store/user'