diff --git a/src/views/project/projectDetail.vue b/src/views/project/projectDetail.vue index 45d4a162..e961ab43 100644 --- a/src/views/project/projectDetail.vue +++ b/src/views/project/projectDetail.vue @@ -383,6 +383,7 @@ export default { let data= { projectId:this.id, memberId:res.data.id, + depositStatus:'1' }; getSignup(data).then(r =>{ if(r.data=="1"){ @@ -405,6 +406,7 @@ export default { let data= { projectId:this.id, memberId:res.data.id, + depositStatus:'1' }; getSignup(data).then(r =>{ if(r.data=="1"){ @@ -434,6 +436,7 @@ export default { let data= { projectId:this.id, memberId:res.data.id, + depositStatus:'1' }; getSignup(data).then(r =>{ if(r.data=="1"){ diff --git a/src/views/sunVillage_info/list_signature.vue b/src/views/sunVillage_info/list_signature.vue index 4430fa36..4fb3bd00 100644 --- a/src/views/sunVillage_info/list_signature.vue +++ b/src/views/sunVillage_info/list_signature.vue @@ -46,10 +46,12 @@

预览

+

电子合同

+
-
+

线下合同

@@ -58,14 +60,16 @@
- - + + + +
+ + + + +
@@ -94,6 +103,7 @@ loading: false, finished: false, show: false, + showFile: false, fileList:[], listLength:'0', queryParams:{ @@ -113,12 +123,14 @@ isCrop: false, // 是否裁剪,在画布设定尺寸基础上裁掉四周空白部分 }, signaId:'', + height:null }; }, created() { if (this.$route.query.type == 'code'){ this.showBtn = false; } + this.height = window.screen.height*1.28-20; }, methods: { getList(){ @@ -142,6 +154,18 @@ this.show = true; this.signaId = id; }, + openPopupFile(file){ + this.showFile = true; + console.log(file) + if (!file) return; + let fileArray = file.split(','); + fileArray.map(res=>{ + this.fileList.push({ + url: '/api'+res, + isImage: true + }) + }) + }, signaImgFun(url){ this.signatureImg = url; // console.log(url) @@ -440,10 +464,17 @@ .signature-box{ border:1px dashed #666; margin:2px 20px; + height: 100%; + /*canvas{*/ + /* height: 100%!important;*/ + /*}*/ } .signature-footer{ - margin:15px 20px 0; - display: flex; + transform: rotate(90deg); + width: auto; + position: absolute; + top: 50%; + left: 0PX; .clearBtn{ margin-left: 15px; } diff --git a/src/views/user/signature/signatureList.vue b/src/views/user/signature/signatureList.vue index c9a6719e..6d54b821 100644 --- a/src/views/user/signature/signatureList.vue +++ b/src/views/user/signature/signatureList.vue @@ -35,7 +35,7 @@