From ee27f6bf7914cd57ffde1a592dd3d80c053888df Mon Sep 17 00:00:00 2001
From: xyc <3422692813@qq.com>
Date: Wed, 16 Apr 2025 16:15:01 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/index/contract.vue                      | 335 ++++++++++--------
 .../jushi-signature/jushi-signature.vue       |  39 +-
 2 files changed, 197 insertions(+), 177 deletions(-)

diff --git a/pages/index/contract.vue b/pages/index/contract.vue
index a46e9ba..011b0d4 100644
--- a/pages/index/contract.vue
+++ b/pages/index/contract.vue
@@ -1,178 +1,199 @@
 <template>
-  <view class="content">
-    <view class="container">
-      <headers :titles="titles">
-        <uni-icons type="arrow-left" color="#000000" size="22px"></uni-icons>
-      </headers>
-      <view class="f-box">
-        <u-parse :content="content"></u-parse>
-      </view>
+	<view class="content">
+		<view class="container">
+			<headers :titles="titles">
+				<uni-icons type="arrow-left" color="#000000" size="22px"></uni-icons>
+			</headers>
+			<view class="f-box">
+				<u-parse :content="content"></u-parse>
+			</view>
 
-      <jushi-signature :settings="settings" base64 @cancel="signatureCancel"
-                       @change="signatureChange"></jushi-signature>
-    </view>
+			<jushi-signature :settings="settings" base64 @cancel="signatureCancel"
+				@change="signatureChange"></jushi-signature>
+		</view>
 
-  </view>
+	</view>
 </template>
 
 <script>
-import headers from '../../components/header/headers.vue'
-import request from '@/utils/request.js'
+	import headers from '../../components/header/headers.vue'
+	import upload from '../../utils/upload';
+	import request from '@/utils/request.js'
 
-export default {
-  data() {
-    return {
-      titles: "合同",
-      settings: { //签名设置
-        width: '750', //签名区域的宽
-        height: '500', //签名区域的高
-        lineWidth: 4, //签名时线宽
-        textColor: '#000' //签名文字颜色
-      },
-      contentTemp: '',
-      content: '',
-      List: [],
-      show: false,
-      status: 'loading',
-      name: '',
-      Address: '',
-      tenantId: '',
-      contractData: {},
-      userData: {},
-	  callback: null,
-    }
-  },
-  onLoad(options) {
-    /*this.name = option.name
-    this.Address = option.Address
-    this.tenantId = option.tenantId
-    console.log('name',this.name)
-    console.log('Address',this.Address)
-    console.log('tenantId',this.tenantId)*/
-    if (options.data) {
-      this.contractData = JSON.parse(decodeURIComponent(options.data));
-      this.callback = options.callback;
-    }
-	this.callback = options.callback;
-    this.userData = uni.getStorageSync('userInfo');
-  },
-  onShow() {
-    this.getdriveSchool()
-    // this.actList = ["1", "1", "1", "1", "1", ]
-    // this.status = "nomore" 底部刷新结束
-  },
-  onPullDownRefresh() {
-    console.log("刷新");
-    uni.stopPullDownRefresh()
-  },
-  onReachBottom() {
-    // this.show = true
-    setTimeout(() => {
-      console.log("加载执行");
-    }, 2000)
-  },
-  components: {
-    headers
-  },
-  methods: {
-    async getdriveSchool() {
-      let res = await request({
-        url: `/app-api/small/driveSchool/obtainContract/tenantId/${this.contractData.tenantId}`,
-        method: 'get',
-      })
-      this.content = res.data.content
+	export default {
+		data() {
+			return {
+				titles: "合同",
+				settings: { //签名设置
+					width: '750', //签名区域的宽
+					height: '500', //签名区域的高
+					lineWidth: 4, //签名时线宽
+					textColor: '#000' //签名文字颜色
+				},
+				contentTemp: '',
+				content: '',
+				userUrl: '',
+				List: [],
+				show: false,
+				status: 'loading',
+				name: '',
+				Address: '',
+				tenantId: '',
+				contractData: {},
+				userData: {},
+				callback: null,
+			}
+		},
+		onLoad(options) {
+			/*this.name = option.name
+			this.Address = option.Address
+			this.tenantId = option.tenantId
+			console.log('name',this.name)
+			console.log('Address',this.Address)
+			console.log('tenantId',this.tenantId)*/
+			if (options.data) {
+				this.contractData = JSON.parse(decodeURIComponent(options.data));
+				this.callback = options.callback;
+			}
+			this.callback = options.callback;
+			this.userData = uni.getStorageSync('userInfo');
+			// 监听 tempFilePath 事件
+			uni.$off('tempFilePath');
+			uni.$on('tempFilePath', (data) => {
+				console.log('Received tempFilePath:', data);
+				//上传图片
+				upload({
+					url: '/app-api/small-upload/common/upload',
+					filePath: data,
+				}).then((res) => {
+					this.userUrl = res.data.url
+					console.log(this.userUrl, 'userUrl');
+					this.signatureChange()
+				})
+			});
 
-      // 执行替换
-      for (const [key, value] of Object.entries(this.contractData)) {
-        this.content = this.content.replace(
-            new RegExp(`&nbsp;${key}&nbsp;|${key}`, 'g'),
-            value
-        );
-      }
+		},
+		onShow() {
+			this.getdriveSchool()
+			// this.actList = ["1", "1", "1", "1", "1", ]
+			// this.status = "nomore" 底部刷新结束
+		},
+		onPullDownRefresh() {
+			console.log("刷新");
+			uni.stopPullDownRefresh()
+		},
+		onReachBottom() {
+			// this.show = true
+			setTimeout(() => {
+				console.log("加载执行");
+			}, 2000)
+		},
+		components: {
+			headers
+		},
+		methods: {
+			async getdriveSchool() {
+				let res = await request({
+					url: `/app-api/small/driveSchool/obtainContract/tenantId/${this.contractData.tenantId}`,
+					method: 'get',
+				})
+				this.content = res.data.content
 
-      // 处理特殊格式的占位符（如下划线格式）
-      this.content = this.content.replace(/<u[^>]*>([^<]*)name([^<]*)<\/u>/g, `<u>$1${this.contractData.name}$2</u>`);
-      this.content = this.content.replace(/<u[^>]*>([^<]*)type([^<]*)<\/u>/g, `<u>$1${this.contractData.type}$2</u>`);
+				// 执行替换
+				for (const [key, value] of Object.entries(this.contractData)) {
+					this.content = this.content.replace(
+						new RegExp(`&nbsp;${key}&nbsp;|${key}`, 'g'),
+						value
+					);
+				}
+
+				// 处理特殊格式的占位符（如下划线格式）
+				this.content = this.content.replace(/<u[^>]*>([^<]*)name([^<]*)<\/u>/g,
+					`<u>$1${this.contractData.name}$2</u>`);
+				this.content = this.content.replace(/<u[^>]*>([^<]*)type([^<]*)<\/u>/g,
+					`<u>$1${this.contractData.type}$2</u>`);
 
 
-    },
+			},
 
-    signatureCancel() {
-      uni.navigateBack()
-    },
-    async signatureChange(e) {
-      this.imgUrl = e
-      let res = await request({
-        url: '/app-api/small/driveSchool/obtainContract',
-        method: 'post',
-        data: {
-          userName: this.contractData.name,
-          tenantId: this.tenantId,
-          userId: this.userData.id,
-          content: this.content,
-        }
-      })
-      console.log(res);
-      uni.showToast({
-        title: '报名成功',
-        duration: 3000
-		
-      });
-	  
-	  const pages = getCurrentPages();
-	    const prevPage = pages[pages.length - 2];
-	    
-	    if (prevPage && (prevPage.route === 'pagesA/register/index' || prevPage.route === '/pagesA/register/index')) {
-	      if (this.callback) { // 从onLoad中获取的callback
-	        try {
-	          const callback = decodeURIComponent(this.callback);
-	          if (prevPage.$vm && typeof prevPage.$vm[callback] === 'function') {
-	            prevPage.$vm[callback]();
-	          }
-	        } catch (e) {
-	          console.error('回调执行失败:', e);
-	        }
-	      }
-	    }
-		
-      setTimeout(function () {
-        // 在这里写需要延迟执行的代码
-        uni.navigateTo({
-          url: '/newPages/newIndex/index'
-        })
-      }, 2600); // 3000毫秒即为3秒
+			signatureCancel() {
+				uni.navigateBack()
+			},
+			async signatureChange(e) {
+				this.imgUrl = e
+				let res = await request({
+					url: '/app-api/small/driveSchool/obtainContract',
+					method: 'post',
+					data: {
+						userName: this.contractData.name,
+						tenantId: this.tenantId,
+						userId: this.userData.id,
+						content: this.content,
+						userUrl: this.userUrl,
+					}
+				})
+				console.log(res);
+				uni.showToast({
+					title: '报名成功',
+					duration: 3000
 
-      // const index = e.lastIndexOf("/")
-      // let fileName = e.substring(index + 1, e.length)
-      // this.uploadFile(this.imgUrl, fileName)
+				});
 
-    },
-	
-    goback() {
-      uni.navigateBack()
-    },
+				const pages = getCurrentPages();
+				const prevPage = pages[pages.length - 2];
 
-  }
-}
+				if (prevPage && (prevPage.route === 'pagesA/register/index' || prevPage.route ===
+						'/pagesA/register/index')) {
+					if (this.callback) { // 从onLoad中获取的callback
+						try {
+							const callback = decodeURIComponent(this.callback);
+							if (prevPage.$vm && typeof prevPage.$vm[callback] === 'function') {
+								prevPage.$vm[callback]();
+							}
+						} catch (e) {
+							console.error('回调执行失败:', e);
+						}
+					}
+				}
+
+				setTimeout(function() {
+					// 在这里写需要延迟执行的代码
+					uni.navigateTo({
+						url: '/newPages/newIndex/index'
+					})
+				}, 2600); // 3000毫秒即为3秒
+
+				// const index = e.lastIndexOf("/")
+				// let fileName = e.substring(index + 1, e.length)
+				// this.uploadFile(this.imgUrl, fileName)
+
+			},
+
+			goback() {
+				uni.navigateBack()
+			},
+
+		}
+	}
 </script>
 
 <style scoped lang="scss">
-.content {
-  background: #f4f5f6;
+	.content {
+		background: #f4f5f6;
 
-  height: 100vh;
-}
+		height: 100vh;
+	}
 
-.container {
-  width: 100%;
-  background: #f4f5f6;
-  box-sizing: border-box;
-  padding-top: 88px;
-}
+	.container {
+		width: 100%;
+		background: #f4f5f6;
+		box-sizing: border-box;
+		padding-top: 88px;
+	}
 
-.f-box {
-  width: 100%;
-  box-sizing: border-box;
-  padding: 15px;
-}
-</style>
+	.f-box {
+		width: 100%;
+		box-sizing: border-box;
+		padding: 15px;
+	}
+</style>
\ No newline at end of file
diff --git a/uni_modules/jushi-signature/components/jushi-signature/jushi-signature.vue b/uni_modules/jushi-signature/components/jushi-signature/jushi-signature.vue
index ba95409..b0b49e7 100644
--- a/uni_modules/jushi-signature/components/jushi-signature/jushi-signature.vue
+++ b/uni_modules/jushi-signature/components/jushi-signature/jushi-signature.vue
@@ -141,7 +141,7 @@
 					success: function(res) {
 						console.log(res, '签名');
 						//强制返回base64
-						that.emit(res.tempFilePath)
+						uni.$emit('tempFilePath', res.tempFilePath)
 					},
 					fail(e) {
 						console.log(JSON.stringify(e))
@@ -149,20 +149,20 @@
 				}, this)
 			},
 			reset() {
-					let that = this
-					uni.getSystemInfo({
-						success: function(res) {
-							ctx.clearRect(0, 0, res.windowWidth, res.windowHeight)
-							ctx.draw(true)
-							// #ifdef MP-WEIXIN
-							that.setCanvasBg()
-							// #endif
-							that.setPaintStyle()
-						},
-					})
-					tempPoint = []
-					// 注意：这里不触发任何emit事件
-				},
+				let that = this
+				uni.getSystemInfo({
+					success: function(res) {
+						ctx.clearRect(0, 0, res.windowWidth, res.windowHeight)
+						ctx.draw(true)
+						// #ifdef MP-WEIXIN
+						that.setCanvasBg()
+						// #endif
+						that.setPaintStyle()
+					},
+				})
+				tempPoint = []
+				// 注意：这里不触发任何emit事件
+			},
 			emit(tempFilePath) {
 				this.$emit('change', tempFilePath)
 			},
@@ -226,11 +226,11 @@
 	}
 
 	.clear {}
-	
+
 	.reset {
-			background: #FF9900;
-			color: white;
-		}
+		background: #FF9900;
+		color: white;
+	}
 
 	.sign-area {
 		position: absolute;
@@ -240,5 +240,4 @@
 		font-size: 130rpx;
 		transform: rotate(-20deg);
 	}
-	
 </style>
\ No newline at end of file