zhengnaiwen_citu 4 mesi fa
parent
commit
1fa05baa5b
3 ha cambiato i file con 11 aggiunte e 24 eliminazioni
  1. 1 1
      src/utils/request.js
  2. 6 5
      src/views/Home.vue
  3. 4 18
      src/views/components/MCamera.vue

+ 1 - 1
src/utils/request.js

@@ -66,7 +66,7 @@ service.interceptors.response.use(
   error => {
     // console.error(error)
     // error = error.message || error
-    return Promise.reject(error)
+    return Promise.reject(error.response.data)
   }
 )
 

+ 6 - 5
src/views/Home.vue

@@ -3,14 +3,11 @@
     <section>
       <MCover>
         <template #center="{ active, target }">
-          <MCamera v-if="active && tab === 0" @reject="$event => handleReject($event, target)" @photo="handleGet" @close="target(false)"></MCamera>
+          <MCamera v-if="active && tab === 0" @reject="$event => handleReject($event, target)" @error="handleError" @photo="handleGet" @close="target(false)"></MCamera>
           <MFeature v-if="active && tab === 1" :src="imgBase64" :items="face" @reTake="tab = 0"></MFeature>
         </template>
       </MCover>
     </section>
-    <!-- <section v-if="tab === 1">
-      <MFeature :src="imgBase64" :items="face" @reTake="tab = 0"></MFeature>
-    </section> -->
     <modal name="VueDialog" height="150" width="300">
       <div class="model">
         <div class="model-title">提示</div>
@@ -42,10 +39,14 @@ export default {
     }
   },
   methods: {
+    handleError (error) {
+      this.error = error
+      this.$modal.show('VueDialog')
+    },
     handleReject (error, target) {
       this.tab = 0
+      target && target(false)
       if (error) {
-        target && target(false)
         this.error = error
         this.$modal.show('VueDialog')
       }

+ 4 - 18
src/views/components/MCamera.vue

@@ -169,27 +169,13 @@ export default {
         const file = new File([blob], 'canvasImage.png', { type: 'image/png' })
         const query = new FormData()
         query.append('file', file)
-        const { data, error } = await uploadImg(query)
-        if (error) {
-          console.log('错误')
-          return
-        }
+        const { data } = await uploadImg(query)
         this.$emit('photo', data, img)
       } catch (error) {
-        console.log(132, error)
+        this.loading = false
+        this.showImg = false
+        this.$emit('error', error.message)
       }
-      // setTimeout(async () => {
-      //   const face = await this.detectFaceShape(img)
-      //   this.loading = false
-      //   if (!face) {
-      //     window.alert('请拍摄清晰的人脸照片')
-      //     // return
-      //   }
-      //   // this.showImg = false
-      //   // this.$emit('photo', face, img)
-      //   // this.$modal.show('face')
-      //   // window.alert(face)
-      // }, 3000)
     }
     // handleReTake () {
     //   this.src = ''