Merge branch 'V0.0.2' of http://10.87.10.227:4000/jzyd_yyds/soc_app into V0.0.2

src/components/upload/index.vue

@@ -1,5 +1,5 @@
 <template>
-  <div>
+<!--  <div>
     <van-uploader
       accept=""
       ref="uploader"
@@ -10,10 +10,28 @@
       @click-upload="useCamera(2)"
       @delete="deleteHandler"
       :max-size="maxSize * 1024 * 1024"
-      
+
     />
-    <!-- :after-read="afterRead" -->
-    <!-- :before-read="beforeRead" -->
+    &lt;!&ndash; :after-read="afterRead" &ndash;&gt;
+    &lt;!&ndash; :before-read="beforeRead" &ndash;&gt;
+  </div>-->
+  <div>
+    <div  style="float: left">
+      <van-uploader
+        ref="uploader"
+        v-bind="$attrs"
+        v-model="fileList"
+        :before-read="beforeRead"
+        :after-read="afterRead"
+        :max-count="maxCount"
+        @delete="deleteHandler"
+        :show-upload="false"
+        :max-size="maxSize * 1024*1024"/>
+    </div>
+    <div  class="van-uploader__upload" @click="useCamera(2)">
+      <i class="van-icon van-icon-photograph van-uploader__upload-icon">
+      </i>
+    </div>
   </div>
 </template>
 <script>
@@ -58,7 +76,7 @@ export default {
       handler(val) {
         this.imageList = this.fileList = val.map(v => {
           let imgUrl = process.env.NODE_ENV === 'development' ? '/dev' + v.path : window.origin + v.path
-          
+
           return {
             name: v.name,
             url: imgUrl,
@@ -74,9 +92,10 @@ export default {
     useCamera(actionType) {
       window.openCameraCallBack = null
       window.openCameraCallBack = this.openCameraCallBack
-      let parms = {}
+      let parms = {};
       if (actionType) {
-        parms.actionType = actionType
+        parms.actionType = actionType;
+        parms.compressKb = "500";
       }
       let system = this.isAndroidOrIos()
       if (system === 1) {
@@ -103,11 +122,18 @@ export default {
     },
 
     openCameraCallBack(data) {
-      let img = JSON.parse(data)
-      this.content = data
-      let params = {
-        extension: img.extension,
-        content: img.content
+      let params = {};
+      try{
+        let img = JSON.parse(data);
+        params = {
+          extension: img.extension,
+          content: img.content,
+        }
+      }catch (e) {
+        params = {
+          extension: data.extension,
+          content: data.content,
+        }
       }
       uploadBase64(params)
         .then(res => {
@@ -122,7 +148,7 @@ export default {
           this.fileList.splice(this.fileList.length - 1, 1)
         })
     },
-    
+
     //删除
     deleteHandler() {
       let imageList = JSON.parse(JSON.stringify(this.fileList))
@@ -140,7 +166,7 @@ export default {
   },
   destroyed(){
     window.openCameraCallBack = null;
-   
+
   }
 }
 </script>