commit

src/main/resources/static/components/sign/mobileSign.vue

@@ -1,6 +1,6 @@
 <template>
-  <div>
-    <van-image :src="'/signature/getSignData?path='+value" v-if="!signDrawingBoardShow"
+  <div style="width: 100%">
+    <van-image :src="imageUrl" v-if="!signDrawingBoardShow"
                style="width: 100%;height: 150px;border: 1px dashed"></van-image>
     <div style="text-align: right">
       <van-button plain type="danger" hairline size="small" @click="openSignDrawingBoard">
@@ -26,12 +26,31 @@ module.exports = {
     },
     value: {
       type: String
-    }
+    },
+    is_value_base64: {
+      type: Boolean,
+      default: true
+    },
+    prefix: {
+      type: String,
+      default: ''
+    },
   },
   data() {
     return {
       signDrawingBoardShow: false,
-      signData: null
+      signData: null,
+      imageUrl: "",
+    }
+  },
+  watch: {
+    value:{
+      handler:function (val){
+        if(val){
+          this.getImageUrl(val)
+        }
+      },
+      immediate:true
     }
   },
   methods: {
@@ -64,16 +83,31 @@ module.exports = {
     },
 
     async uploadSignData() {
-      const {data, code, msg} = await $.post('/signature/uploadSignData', {data: this.signData})
-      if (code === 0) {
-        console.log(data)
-        this.$emit('input', data)
+      if (this.is_value_base64) {
+        this.$emit('input', this.signData)
+        this.$emit("update:my_sign", this.signData)
+        this.getImageUrl(this.signData)
       } else {
-        this.$modal.msgError(msg)
+        const {data, code, msg} = await $.post('/signature/uploadSignData', {data: this.signData})
+        if (code === 0) {
+          console.log(data)
+          this.getImageUrl(data)
+          this.$emit('input', data)
+          this.$emit("update:my_sign", data)
+        } else {
+          this.$modal.msgError(msg)
+        }
+      }
+
+
+    },
+    getImageUrl(value) {
+      if (this.is_value_base64) {
+        this.imageUrl = value
+      } else {
+        this.imageUrl = '/signature/getSignData?path=' + value
       }
     },
-
-
     checkNull() {
       return $('#canvas').jSignature('getData', 'native').length === 0
     },
@@ -81,17 +115,15 @@ module.exports = {
       this.$emit("update:my_sign", $('#canvas').jSignature('getData'))
     },
     async updateSign() {
-      const data = await $.post("/mobile/common/signing/update", {sign: $('#canvas').jSignature('getData')})
+      const data = await $.post("/mobile/common/signing/update", {
+        sign: $('#canvas').jSignature('getData'),
+        prefix: this.prefix
+      })
     },
     async getMySign() {
-      const data = await $.get("/mobile/common/signing/getMySign")
+      const data = await $.get("/mobile/common/signing/getMySign", {prefix: this.prefix})
       if (data) {
-        console.log(this.my_sign)
-
-        $('#canvas').jSignature("importData", data)
-        this.$nextTick(() => {
-
-        })
+        this.getImageUrl(data)
       }
     }
   },