gaoxiong 2 жил өмнө
parent
commit
87c8b335f5

+ 13 - 5
src/components/nfcPopup/gxmore.vue

@@ -76,11 +76,18 @@ export default {
   },
   methods:{
     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,
+        }
       }
       this.$toast.loading({
         duration: 0, // 持续展示 toast
@@ -116,6 +123,7 @@ export default {
       let parms = {};
       if(actionType){
         parms.actionType = actionType;
+        parms.compressKb = "500";
       }
       let system = this.isAndroidOrIos();
       if(system === 1){

+ 14 - 5
src/components/upload/gxuploader.vue

@@ -70,13 +70,21 @@ export default {
   },
   methods: {
     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 => {
         /*上传成功*/
         this.$toast.success('上传成功')
@@ -94,6 +102,7 @@ export default {
       let parms = {};
       if (actionType) {
         parms.actionType = actionType;
+        parms.compressKb = "500";
       }
       let system = this.isAndroidOrIos();
       if (system === 1) {

+ 7 - 2
src/views/menu/resumption/detail.vue

@@ -343,8 +343,13 @@ export default {
     },
     openNFCScanCallBack(nfcStr){
       clearInterval(this.timer);
-      let nfc = JSON.parse(nfcStr);
-      let nfcCode =  nfc.content;
+      let nfcCode = '';
+      try{
+        let nfc = JSON.parse(nfcStr);
+        nfcCode =  nfc.content;
+      }catch (e) {
+        nfcCode = nfcStr.content;
+      }
       this.checkNfcFilter(nfcCode);
     },
     checkNfcFilter(nfcCode){