From 8ee1a513247b9f034e5c3cd8b2d68f3a2a75835c Mon Sep 17 00:00:00 2001
From: jscyl_mac <13849007907@163.com>
Date: Wed, 2 Jul 2025 17:24:34 +0800
Subject: [PATCH 1/7] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=B7=A5=E5=8D=95?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 root/detail/apply.vue  |  67 ++++++++---
 root/detail/myMain.vue | 293 +++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 346 insertions(+), 14 deletions(-)
 create mode 100644 root/detail/myMain.vue

diff --git a/root/detail/apply.vue b/root/detail/apply.vue
index 6ac9567..e8a3929 100644
--- a/root/detail/apply.vue
+++ b/root/detail/apply.vue
@@ -157,7 +157,7 @@
 			<view class="g_h_10 g_bg_f_5"></view>
 			<!-- 跟进记录 -->
 			<view class="m-reord">
-				<view class="g_bg_f" style="padding-bottom: 10px; margin-bottom: 60px; padding-top: 32rpx">
+				<view class="g_bg_f" style="padding-bottom: 10px; margin-bottom: 0px; padding-top: 32rpx">
 					<view class="g_flex_row_between" style="padding-top: 0; padding-bottom: 0; padding-right: 32rpx; position: relative; margin-left: 20px; margin-bottom: 36rpx">
 						<view class="g_fs_16 g_c_3 g_flex_column_center">跟进记录</view>
 						<view @click="handleOpenRemarkModal">
@@ -353,25 +353,34 @@
 		</u-popup>
 		
 		<view class="g_h_104" style="background-color: #ededed;"></view>
-				<g-panel-fixed style="box-shadow: 0 -4px 12px #ededed;">
-					<slot>
-						<view class="g_pl_20 g_pr_20 g_flex_row_center flex_center flex_nw" style="width: 100%">
-							<view class="g_flex_1 g_flex_column_center">
-								<view class="">
-									<button open-type="share" 
-													class="g_flex_c"
-													style="background-color: #00b666;color: #fff;width: 250px;height: 42px;font-size: 18px;border-radius: 60px;"
-									>分享</button>
-								</view>
-							</view>
+		<g-panel-fixed style="box-shadow: 0 -4px 12px #ededed;">
+			<slot>
+				<view class="g_pl_20 g_pr_20 g_flex_row_center flex_center flex_nw" style="width: 100%">
+					<view class="g_flex_1 g_flex_column_center">
+						<view class="">
+							<button 
+							    @click="createImage"
+								class="g_flex_c"
+								style="background-color: #00b666;color: #fff;width: 250px;height: 42px;font-size: 18px;border-radius: 60px;"
+							>分享</button>
 						</view>
-					</slot>
-				</g-panel-fixed>
+					</view>
+				</view>
+			</slot>
+		</g-panel-fixed>
+
+		<u-popup v-model="shareModal.isShow" mode="bottom" border-radius="16" height='600px' :mask-close-able="true">
+			<mainPanel :showBg="true" :active="1" :recommendList="recommendList[0]" />
+		</u-popup>
 	</view>
 </template>
 
 <script>
+import mainPanel from "./myMain.vue";
 export default {
+	components:{
+		mainPanel
+	},
 	onReady() {
 		this.G.setNavStyle();
 	},
@@ -380,6 +389,10 @@ export default {
 	},
 	data() {
 		return {
+			recommendList:[],
+			shareModal:{
+				isShow:false,
+			},
 			cdnBaseImg: this.G.store().cdnBaseImg,
 			agencyId: uni.getStorageSync("apply-agencyId"),
 			isCreator: false, //管理人员判断
@@ -466,15 +479,41 @@ export default {
 		this.type = options.type;
 	},
 	onShow() {
+		let that = this;
 		this.isCreator = uni.getStorageSync("IS_CREATOR") == 1 ? true : false;
 		this.getResident();
 		this.getPeople();
 		this.getDetail();
+		that.G.Get(
+			that.api.bind_enterpriseDetail + "/" + uni.getStorageSync("apply-agencyId"),
+			{
+				agencyId: uni.getStorageSync("apply-agencyId"),
+				type: 1,
+			},
+			(res) => {
+				console.log("recommendList", res);
+				that.recommendList = [res];
+				console.log("--", that.recommendList);
+			}
+		);
 		uni.$on("infoUpdate", () => {
 			this.getDetail();
 		});
 	},
 	methods: {
+		setShareImg(e) {
+			console.log(e);
+			this.shareImg = e;
+		},
+		getCode(e) {
+			console.log("获取返回数据：", e);
+			this.wxCode = e.code;
+			this.agencyName = e.agencyName;
+		},
+		createImage(){
+			let that = this;
+			that.shareModal.isShow = true;
+		},
 		handleClickLabelBtn($data) {
 			var that = this;
 			var text = "";
diff --git a/root/detail/myMain.vue b/root/detail/myMain.vue
new file mode 100644
index 0000000..4cabe58
--- /dev/null
+++ b/root/detail/myMain.vue
@@ -0,0 +1,293 @@
+<template>
+	<view class="p-root-bind-my-main g_w_all g_h_all g_bg_f_5 g_kuaishou" 
+	      :class="showBg ? 'g_pt_32' : ''"
+	>
+		<image :src="shareJobImg" show-menu-by-longpress style="width: 343px; height: 555px; margin: 0 auto; display: block" mode=""></image>
+		<view class="g_text_c g_fs_16 g_mt_12 g_fw_600" style="background-color: #ededed;">长按图片转发给微信好友</view>
+		<view v-if="allowClick">
+			<view class="g_h_100" style="background-color: #ededed;"></view>
+			<g-panel-fixed>
+				<slot>
+					<view class="g_flex_row_center">
+						<g-button btnText="保存图片" size="small" type="default" @clickBtn="saveWXImageToAlbum"></g-button>
+						<g-button btnText="直接转发" class="g_ml_16" size="small" openType="share" type="primary"></g-button>
+					</view>
+				</slot>
+			</g-panel-fixed>
+		</view>
+		<canvas type="2d" style="position: absolute; left: -2000px; width: 425px; height: 350px; " id="canvasId" ref="canvasId"></canvas>
+	</view>
+</template>
+<script>
+export default {
+	onReady() {
+		this.G.setNavStyle();
+	},
+	onShareAppMessage() {
+		return this.G.shareFun();
+	},
+	data() {
+		return {
+			localBaseImg: this.G.store().localBaseImg,
+			cdnBaseImg: this.G.store().cdnBaseImg,
+			wxCode: "",
+			appCodeSize: 0,
+			appLogoSize: 0,
+			appCodeTop: 0,
+			appLogoTop: 0,
+			appLogoLeft: 0,
+			agencyName: "",
+			shareJobImg: "",
+			allowClick: false,
+			appInfo: {},
+			appfile: null,
+			canvasWidth: 0,
+			canvasHeight: 0,
+		};
+	},
+	props: {
+		showBg: {
+			type: Boolean,
+			default: () => {
+				return true;
+			},
+		},
+		active: {
+			default: 0,
+		},
+		recommendList: {
+			type: Object,
+			default: () => {
+				return {
+					logo: "",
+					jobNum: 0,
+					jobUpdateNum: 0,
+					recruitmentJobNum: 0,
+					downNum: 0,
+				};
+			},
+		},
+	},
+	created() {
+		let that = this;
+		uni.getImageInfo({
+			src: "https://matripe-cms.oss-cn-beijing.aliyuncs.com/dailibaoming/canvasBg.png", // 网络图片
+			success(res) {
+				that.canvasWidth = res.width;
+				that.canvasHeight = res.height;
+			},
+		});
+		this.init();
+		// uni.showLoading({
+		// 	title: "生成中...",
+		// });
+	},
+	watch: {
+		shareJobImg(newValue, oldValue) {
+			if (newValue) {
+				uni.hideLoading();
+			}
+		},
+		recommendList(val) {
+			let that = this;
+			console.log("watch:", val);
+			// uni.showLoading({
+			// 	title: "生成中...",
+			// });
+			that.appInfo = val;
+			this.init();
+		},
+	},
+	methods: {
+		init() {
+			let that = this;
+			that.appInfo = that.recommendList;
+			console.log("that.appInfo", that.appInfo);
+			let _env = uni.getAccountInfoSync().miniProgram.envVersion;
+			that.G.Get(
+				that.api.bind_getCode,
+				{
+					env: _env,
+				},
+				(res) => {
+					console.log("获取邀请码：", res);
+					that.wxCode = "https://daotian.matripe.com.cn" + res.qrcode;
+					that.agencyName = res.agencyName;
+					// #ifdef MP-WEIXIN
+					console.log("canvasRes1");
+
+					that.getWXCanvas("https://matripe-cms.oss-cn-beijing.aliyuncs.com/dailibaoming/canvasBg.png").then((canvasRes) => {
+						console.log("canvasRes", canvasRes);
+						that.shareJobImg = canvasRes.tempFilePath;
+						that.allowClick = true;
+						that.$emit("setImg", that.shareJobImg);
+					});
+					that.$emit("exportCode", {
+						code: res.code,
+						agencyName: res.agencyName,
+					});
+					// #endif
+				}
+			);
+		},
+		// 微信端绘制
+		getWXCanvas(sharelImg, type) {
+			const that = this;
+			return new Promise((resolve) => {
+				var mycenter = 0; //文字左右居中显示
+				var myheight = 0; //文字高度
+				const query = uni.createSelectorQuery().in(this);
+				query
+					.select("#canvasId")
+					.fields({
+						node: true,
+						size: true,
+					})
+					.exec((res) => {
+						console.log("uni 获取节点信息：", res);
+						// console.log("sharelImg", sharelImg);
+						const canvas = res[0].node;
+						const ctx = canvas.getContext("2d");
+						new Promise(function (resolve) {
+							// 绘制背景图片
+							uni.getImageInfo({
+								src: sharelImg, // 网络图片
+								success(res) {
+									console.log("res111", res);
+									canvas.width = res.width;
+									canvas.height = res.height;
+									mycenter = canvas.width;
+									myheight = canvas.height;
+									const img = canvas.createImage();
+									img.src = res.path;
+									console.log("img111", img);
+									img.onload = (info) => {
+										ctx.drawImage(img, 0, 0, canvas.width, canvas.height);
+										console.log("info111", info);
+										resolve(true);
+									};
+								},
+								fail(err) {},
+							});
+						}).then(() => {
+							//使用：
+							this.setShareJobImg(ctx, canvas, mycenter)
+								.then(function (canvas1) {
+									console.log("canvas1", canvas1);
+									uni.canvasToTempFilePath({
+										canvas: canvas1,
+										success(res) {
+											console.log("res222", res);
+											resolve(res);
+										},
+										fail(res) {
+											uni.hideLoading();
+											uni.showToast({
+												title: res.errMsg,
+												icon: "error",
+											});
+										},
+									});
+								})
+								.catch((err) => {
+									uni.hideLoading();
+									uni.showToast({
+										title: "生成失败,请重试",
+									});
+								});
+						});
+					});
+			});
+		},
+
+		// 微信端下载
+		saveWXImageToAlbum() {
+			let that = this;
+			uni.saveImageToPhotosAlbum({
+				filePath: that.shareJobImg,
+				success() {
+					uni.showToast({
+						title: "保存成功",
+					});
+				},
+				fail(err) {
+					uni.showToast({
+						title: "保存失败, 请重试",
+					});
+				},
+			});
+		},
+		// 设置分享布局
+		setShareJobImg(ctx, canvas, mycenter, funObj) {
+			let that = this;
+			return new Promise((imgres) => {
+				uni.getImageInfo({
+					src: that.wxCode,
+					success(res) {
+						const img = canvas.createImage();
+						console.log("res333", res);
+						img.src = res.path;
+						img.onload = () => {
+							that.G.roundRect(ctx, img, (mycenter - 488) / 2, 1160, 488, 488, 0);
+							let info = that.recommendList;
+							console.log("info", info);
+							if (!info.logo) {
+								info.logo = "https://matripe-cms.oss-cn-beijing.aliyuncs.com/ibocai/defaultAvatar.png";
+							}
+							console.log("that.recommendList333", that.recommendList);
+							uni.getImageInfo({
+								src: info.logo,
+								success(res) {
+									console.log("res444", res);
+									const img = canvas.createImage();
+									img.src = res.path;
+									img.onload = () => {
+										that.G.roundRect(ctx, img, 915, 218, 272, 272, 136); // logo
+										that.G.fillTextLineBreak(ctx, info.fullName, 140, 300, info.fullName.length * 80, 80, "#333", 80, 600, "left"); // 企业名称
+										that.G.fillTextLineBreak(ctx, "今日更新职位" + info.jobUpdateNum, 140, 400, ("今日更新职位" + info.jobUpdateNum).length * 56, 56, "#999", 56, 500, "left"); // 今日更新职位
+
+										that.G.fillTextLineBreak(ctx, info.jobNum.toString(), 230, 620, info.jobNum.toString().length * 88, 88, "#333", 88, 600); // 总职位
+										that.G.fillTextLineBreak(ctx, info.recruitmentJobNum.toString(), 480, 620, info.recruitmentJobNum.toString().length * 88, 88, "#333", 88, 600); // 在招数
+										that.G.fillTextLineBreak(ctx, info.downNum.toString(), 730, 620, info.downNum.toString().length * 88, 88, "#333", 88, 600); // 粉丝数
+
+										that.G.fillTextLineBreak(ctx, "总职位", 230, 700, "总职位".length * 56, 56, "#999", 56, 500); // 总职位
+										that.G.fillTextLineBreak(ctx, "在招数", 480, 700, "在招数".length * 56, 56, "#999", 56, 500); // 在招数
+										that.G.fillTextLineBreak(ctx, "粉丝数", 730, 700, "粉丝数".length * 56, 56, "#999", 56, 500); // 粉丝数
+										imgres(canvas);
+									};
+								},
+								fail(err) {},
+							});
+						};
+					},
+					fail(err) {},
+				});
+			});
+		},
+		// 扫一扫
+		handleOpenCamera() {
+			let that = this;
+			that.G.handleScanCode();
+		},
+	},
+};
+</script>
+
+<style lang="scss">
+.p-root-bind-my-main {
+	background-size: 100% 100%;
+	background-repeat: no-repeat;
+	.canvas-card {
+		background-size: 100% 100%;
+		background-repeat: no-repeat;
+		width: calc(100vw - 32px);
+		height: calc(calc(100vw - 32px) * 2248 / 1372);
+	}
+	.m-card {
+		top: calc(calc(calc(100vw - 32px) * 2248 / 1372) * (36 / 562));
+		border-radius: 15px;
+		width: calc(100vw - 74px);
+		height: calc(calc(calc(100vw - 32px) * 2248 / 1372) * (198 / 562));
+	}
+}
+</style>

From aa0dd0ee6463d910d6ba2499504f37a5554b7676 Mon Sep 17 00:00:00 2001
From: jscyl_mac <13849007907@163.com>
Date: Wed, 2 Jul 2025 17:48:16 +0800
Subject: [PATCH 2/7] no message

---
 root/detail/apply.vue  |  2 +-
 root/detail/myMain.vue | 32 ++++++++++++++++++++++++--------
 2 files changed, 25 insertions(+), 9 deletions(-)

diff --git a/root/detail/apply.vue b/root/detail/apply.vue
index e8a3929..5ce2871 100644
--- a/root/detail/apply.vue
+++ b/root/detail/apply.vue
@@ -370,7 +370,7 @@
 		</g-panel-fixed>
 
 		<u-popup v-model="shareModal.isShow" mode="bottom" border-radius="16" height='600px' :mask-close-able="true">
-			<mainPanel :showBg="true" :active="1" :recommendList="recommendList[0]" />
+			<mainPanel :showBg="true" :active="1" :name='orderDetail.userName' :job="orderDetail.storeJobName" :recommendList="recommendList[0]" />
 		</u-popup>
 	</view>
 </template>
diff --git a/root/detail/myMain.vue b/root/detail/myMain.vue
index 4cabe58..07c440a 100644
--- a/root/detail/myMain.vue
+++ b/root/detail/myMain.vue
@@ -43,6 +43,8 @@ export default {
 			appfile: null,
 			canvasWidth: 0,
 			canvasHeight: 0,
+			_name:'',
+			_job:'',
 		};
 	},
 	props: {
@@ -67,6 +69,12 @@ export default {
 				};
 			},
 		},
+		name:{
+			default:'',
+		},
+		job:{
+			default:'',
+		}
 	},
 	created() {
 		let that = this;
@@ -97,10 +105,18 @@ export default {
 			that.appInfo = val;
 			this.init();
 		},
+		name(val){
+			this._name = val;
+		},
+		job(val){
+			this._job = val;
+		}
 	},
 	methods: {
 		init() {
 			let that = this;
+			that._name = that.name;
+			that._job = that.job;
 			that.appInfo = that.recommendList;
 			console.log("that.appInfo", that.appInfo);
 			let _env = uni.getAccountInfoSync().miniProgram.envVersion;
@@ -243,16 +259,16 @@ export default {
 									img.src = res.path;
 									img.onload = () => {
 										that.G.roundRect(ctx, img, 915, 218, 272, 272, 136); // logo
-										that.G.fillTextLineBreak(ctx, info.fullName, 140, 300, info.fullName.length * 80, 80, "#333", 80, 600, "left"); // 企业名称
-										that.G.fillTextLineBreak(ctx, "今日更新职位" + info.jobUpdateNum, 140, 400, ("今日更新职位" + info.jobUpdateNum).length * 56, 56, "#999", 56, 500, "left"); // 今日更新职位
+										that.G.fillTextLineBreak(ctx, that._name, 140, 300, that._name.length * 80, 80, "#333", 80, 600, "left"); // 企业名称
+										that.G.fillTextLineBreak(ctx, that._job, 140, 400, that._job.length * 56, 56, "#999", 56, 500, "left"); // 今日更新职位
 
-										that.G.fillTextLineBreak(ctx, info.jobNum.toString(), 230, 620, info.jobNum.toString().length * 88, 88, "#333", 88, 600); // 总职位
-										that.G.fillTextLineBreak(ctx, info.recruitmentJobNum.toString(), 480, 620, info.recruitmentJobNum.toString().length * 88, 88, "#333", 88, 600); // 在招数
-										that.G.fillTextLineBreak(ctx, info.downNum.toString(), 730, 620, info.downNum.toString().length * 88, 88, "#333", 88, 600); // 粉丝数
+										// that.G.fillTextLineBreak(ctx, info.jobNum.toString(), 230, 620, info.jobNum.toString().length * 88, 88, "#333", 88, 600); // 总职位
+										// that.G.fillTextLineBreak(ctx, info.recruitmentJobNum.toString(), 480, 620, info.recruitmentJobNum.toString().length * 88, 88, "#333", 88, 600); // 在招数
+										// that.G.fillTextLineBreak(ctx, info.downNum.toString(), 730, 620, info.downNum.toString().length * 88, 88, "#333", 88, 600); // 粉丝数
 
-										that.G.fillTextLineBreak(ctx, "总职位", 230, 700, "总职位".length * 56, 56, "#999", 56, 500); // 总职位
-										that.G.fillTextLineBreak(ctx, "在招数", 480, 700, "在招数".length * 56, 56, "#999", 56, 500); // 在招数
-										that.G.fillTextLineBreak(ctx, "粉丝数", 730, 700, "粉丝数".length * 56, 56, "#999", 56, 500); // 粉丝数
+										// that.G.fillTextLineBreak(ctx, "总职位", 230, 700, "总职位".length * 56, 56, "#999", 56, 500); // 总职位
+										// that.G.fillTextLineBreak(ctx, "在招数", 480, 700, "在招数".length * 56, 56, "#999", 56, 500); // 在招数
+										// that.G.fillTextLineBreak(ctx, "粉丝数", 730, 700, "粉丝数".length * 56, 56, "#999", 56, 500); // 粉丝数
 										imgres(canvas);
 									};
 								},

From 59d840e84b68d4b6424e6e94c1bcebe2fe01243e Mon Sep 17 00:00:00 2001
From: jscyl_mac <13849007907@163.com>
Date: Wed, 2 Jul 2025 18:00:16 +0800
Subject: [PATCH 3/7] no message

---
 api/bind.js            |  1 +
 root/detail/apply.vue  |  2 +-
 root/detail/myMain.vue | 16 ++++++++++++++--
 3 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/api/bind.js b/api/bind.js
index 94ce9df..5ee9576 100644
--- a/api/bind.js
+++ b/api/bind.js
@@ -1,5 +1,6 @@
 let bindInfo = {
 	bind_getCode:"/assistant/circle/agency/apply/inviteCode",// 获取邀请码
+	bind_getOrderCode:"/yishoudan/user/apply/order/orderDetailsQrCodeImage",// 获取邀请码
 	bind_getSubscribeDetail :"/assistant/circle/agency/search/code",// 根据搜索code获取对应关注详情
 	bind_subscribeSubmit:"/assistant/circle/agency/apply/subscribe",// 提交关注
 	bind_recordList:"/assistant/circle/agency/apply/list",// 申请记录
diff --git a/root/detail/apply.vue b/root/detail/apply.vue
index 5ce2871..7e1f89a 100644
--- a/root/detail/apply.vue
+++ b/root/detail/apply.vue
@@ -370,7 +370,7 @@
 		</g-panel-fixed>
 
 		<u-popup v-model="shareModal.isShow" mode="bottom" border-radius="16" height='600px' :mask-close-able="true">
-			<mainPanel :showBg="true" :active="1" :name='orderDetail.userName' :job="orderDetail.storeJobName" :recommendList="recommendList[0]" />
+			<mainPanel :showBg="true" :oid='oid' :active="1" :name='orderDetail.userName' :job="orderDetail.storeJobName" :recommendList="recommendList[0]" />
 		</u-popup>
 	</view>
 </template>
diff --git a/root/detail/myMain.vue b/root/detail/myMain.vue
index 07c440a..d20a188 100644
--- a/root/detail/myMain.vue
+++ b/root/detail/myMain.vue
@@ -45,6 +45,7 @@ export default {
 			canvasHeight: 0,
 			_name:'',
 			_job:'',
+			_oid:'',
 		};
 	},
 	props: {
@@ -74,6 +75,9 @@ export default {
 		},
 		job:{
 			default:'',
+		},
+		oid:{
+			default:'',
 		}
 	},
 	created() {
@@ -110,20 +114,28 @@ export default {
 		},
 		job(val){
 			this._job = val;
+		},
+		oid(val){
+			this._oid = val;
 		}
 	},
 	methods: {
 		init() {
-			let that = this;
+			let that = this;	
 			that._name = that.name;
 			that._job = that.job;
+			that._oid = that.oid;
 			that.appInfo = that.recommendList;
 			console.log("that.appInfo", that.appInfo);
 			let _env = uni.getAccountInfoSync().miniProgram.envVersion;
+			if(!that._oid || that._oid == 0){
+				return false;
+			}
 			that.G.Get(
-				that.api.bind_getCode,
+				that.api.bind_getOrderCode,
 				{
 					env: _env,
+					orderId:that._oid,
 				},
 				(res) => {
 					console.log("获取邀请码：", res);

From 3553fa4566d337eeeba6b5fd3a9235b75b172a20 Mon Sep 17 00:00:00 2001
From: jscyl_mac <13849007907@163.com>
Date: Wed, 2 Jul 2025 18:27:14 +0800
Subject: [PATCH 4/7] no message

---
 root/detail/apply.vue | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/root/detail/apply.vue b/root/detail/apply.vue
index 7e1f89a..007aee9 100644
--- a/root/detail/apply.vue
+++ b/root/detail/apply.vue
@@ -474,9 +474,21 @@ export default {
 		};
 	},
 	onLoad(options) {
-		this.oid = options.id;
-		this.relationId = options.relationId;
-		this.type = options.type;
+		console.log('工单详情页：',options)
+
+		if (options.scene) {
+			let _str = decodeURIComponent(options.scene);
+			console.log('邀请 codeRes 1',_str)
+			let codeRes = _str.split("=");
+			console.log('邀请 codeRes 2',codeRes)
+			this.oid = codeRes[1].split('_')[1];
+			this.relationId = codeRes[1].split('_')[0];
+			this.type = 1;
+		} else {
+			this.oid = options.id;
+			this.relationId = options.relationId;
+			this.type = options.type;
+		}
 	},
 	onShow() {
 		let that = this;

From 2e2aa8457a7f95efa92f7c62dc868a395540f087 Mon Sep 17 00:00:00 2001
From: jscyl_mac <13849007907@163.com>
Date: Wed, 2 Jul 2025 18:32:17 +0800
Subject: [PATCH 5/7] no message

---
 root/detail/apply.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/root/detail/apply.vue b/root/detail/apply.vue
index 007aee9..4f3ef12 100644
--- a/root/detail/apply.vue
+++ b/root/detail/apply.vue
@@ -483,7 +483,8 @@ export default {
 			console.log('邀请 codeRes 2',codeRes)
 			this.oid = codeRes[1].split('_')[1];
 			this.relationId = codeRes[1].split('_')[0];
-			this.type = 1;
+			this.type = '1';
+			console.log('邀请 codeRes 3 oid:',this.oid,' rid:',this.relationId)
 		} else {
 			this.oid = options.id;
 			this.relationId = options.relationId;

From 52a6225c9b901e86e598d406ad7e01dc9acabca8 Mon Sep 17 00:00:00 2001
From: jscyl_mac <13849007907@163.com>
Date: Wed, 2 Jul 2025 18:54:44 +0800
Subject: [PATCH 6/7] no message

---
 root/detail/apply.vue  | 4 ++--
 root/detail/myMain.vue | 9 +++++++++
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/root/detail/apply.vue b/root/detail/apply.vue
index 4f3ef12..885590b 100644
--- a/root/detail/apply.vue
+++ b/root/detail/apply.vue
@@ -370,7 +370,7 @@
 		</g-panel-fixed>
 
 		<u-popup v-model="shareModal.isShow" mode="bottom" border-radius="16" height='600px' :mask-close-able="true">
-			<mainPanel :showBg="true" :oid='oid' :active="1" :name='orderDetail.userName' :job="orderDetail.storeJobName" :recommendList="recommendList[0]" />
+			<mainPanel :showBg="true" :rid='relationId' :oid='oid' :active="1" :name='orderDetail.userName' :job="orderDetail.storeJobName" :recommendList="recommendList[0]" />
 		</u-popup>
 	</view>
 </template>
@@ -482,7 +482,7 @@ export default {
 			let codeRes = _str.split("=");
 			console.log('邀请 codeRes 2',codeRes)
 			this.oid = codeRes[1].split('_')[1];
-			this.relationId = codeRes[1].split('_')[0];
+			this.relationId = codeRes[1].split('_')[2];
 			this.type = '1';
 			console.log('邀请 codeRes 3 oid:',this.oid,' rid:',this.relationId)
 		} else {
diff --git a/root/detail/myMain.vue b/root/detail/myMain.vue
index d20a188..e775f62 100644
--- a/root/detail/myMain.vue
+++ b/root/detail/myMain.vue
@@ -46,6 +46,7 @@ export default {
 			_name:'',
 			_job:'',
 			_oid:'',
+			_rid:''
 		};
 	},
 	props: {
@@ -78,6 +79,9 @@ export default {
 		},
 		oid:{
 			default:'',
+		},
+		rid:{
+			default:''
 		}
 	},
 	created() {
@@ -117,6 +121,9 @@ export default {
 		},
 		oid(val){
 			this._oid = val;
+		},
+		rid(val){
+			this._rid = val;
 		}
 	},
 	methods: {
@@ -125,6 +132,7 @@ export default {
 			that._name = that.name;
 			that._job = that.job;
 			that._oid = that.oid;
+			that._rid = that.rid;
 			that.appInfo = that.recommendList;
 			console.log("that.appInfo", that.appInfo);
 			let _env = uni.getAccountInfoSync().miniProgram.envVersion;
@@ -136,6 +144,7 @@ export default {
 				{
 					env: _env,
 					orderId:that._oid,
+					relationId:that._rid
 				},
 				(res) => {
 					console.log("获取邀请码：", res);

From 331dc84d3177fbc7ac4f5f7120bcadd6ad17122a Mon Sep 17 00:00:00 2001
From: jscyl_mac <13849007907@163.com>
Date: Wed, 2 Jul 2025 19:12:30 +0800
Subject: [PATCH 7/7] no message

---
 root/detail/apply.vue | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/root/detail/apply.vue b/root/detail/apply.vue
index 885590b..1d9e439 100644
--- a/root/detail/apply.vue
+++ b/root/detail/apply.vue
@@ -483,12 +483,21 @@ export default {
 			console.log('邀请 codeRes 2',codeRes)
 			this.oid = codeRes[1].split('_')[1];
 			this.relationId = codeRes[1].split('_')[2];
+			uni.setStorageSync('order_oid',this.oid)
+			uni.setStorageSync('order_relationId',this.relationId)
 			this.type = '1';
 			console.log('邀请 codeRes 3 oid:',this.oid,' rid:',this.relationId)
 		} else {
-			this.oid = options.id;
-			this.relationId = options.relationId;
-			this.type = options.type;
+			if(options.id){
+				this.oid = options.id;
+				this.relationId = options.relationId;
+				this.type = options.type;
+			}else if(uni.getStorageSync('order_oid')){
+				this.oid = uni.getStorageSync('order_oid');
+				this.relationId = uni.getStorageSync('order_relationId');
+				this.type = options.type;
+			}
+			
 		}
 	},
 	onShow() {
@@ -599,6 +608,8 @@ export default {
 					relationId: that.relationId,
 				},
 				(res) => {
+					uni.removeStorageSync('order_oid')
+					uni.removeStorageSync('order_relationId')
 					console.log("工单详情：", res);
 					// return;
 					console.log("res", res);