From 996d2ea94cca4c664af0a3b4b029808c283de8bf Mon Sep 17 00:00:00 2001 From: cun-nan <19819293608@163.com> Date: Tue, 28 Nov 2023 15:42:35 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=94=B6=E9=93=B6=E5=8F=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/fuint/business/userManager/entity/LJUser.java | 3 +++ .../main/java/com/fuint/business/userManager/vo/LJUserVo.java | 2 ++ 2 files changed, 5 insertions(+) diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/entity/LJUser.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/entity/LJUser.java index 20dd37ee8..3a101638c 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/entity/LJUser.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/entity/LJUser.java @@ -92,4 +92,7 @@ public class LJUser extends BaseEntity implements Serializable { @ApiModelProperty("固定等级") private String fixingLevel; + + @ApiModelProperty("邀请员工id") + private Integer staffId; } diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/vo/LJUserVo.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/vo/LJUserVo.java index f23331771..a2494da67 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/vo/LJUserVo.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/vo/LJUserVo.java @@ -94,4 +94,6 @@ public class LJUserVo extends BaseEntity { // 固定等级 private String fixingLevel; +// 邀请员工id + private Integer staffId; } From 37fa476a0f2747db13baf0687f6ea8e2fa5d105b Mon Sep 17 00:00:00 2001 From: cun-nan <19819293608@163.com> Date: Tue, 28 Nov 2023 16:40:05 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=94=B6=E9=93=B6=E5=8F=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fuint/business/member/entity/LJStaff.java | 6 +++++ gasStation-uni/pages/index/index.vue | 25 +++++++++++++++++-- 2 files changed, 29 insertions(+), 2 deletions(-) diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/member/entity/LJStaff.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/member/entity/LJStaff.java index b3477cd50..e98f0eba0 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/member/entity/LJStaff.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/member/entity/LJStaff.java @@ -115,4 +115,10 @@ public class LJStaff extends BaseEntity implements Serializable { @ApiModelProperty("退款密码") private String refundPassword; + + @ApiModelProperty("核销码") + private String writeOffCode; + + @ApiModelProperty("员工码") + private String staffCode; } diff --git a/gasStation-uni/pages/index/index.vue b/gasStation-uni/pages/index/index.vue index dbab47c15..667005ef9 100644 --- a/gasStation-uni/pages/index/index.vue +++ b/gasStation-uni/pages/index/index.vue @@ -136,10 +136,27 @@ // 店铺福利信息 welfare: [], distance: "", + storeId: "", + staffId: "", } }, - onLoad() { - + onLoad(query) { + const q = decodeURIComponent(query.q) // 获取到二维码原始链接内容 + let str = q.split("?")[1]; + let arr = str.split("&"); + let storeId = ""; + let staffId = ""; + arr.forEach(item => { + if (item.includes("storeId")){ + storeId = item.split("=")[1] + }else{ + staffId = item.split("=")[1] + } + }) + uni.setStorageSync("inviteStoreId",storeId) + uni.setStorageSync("inviteStaffId",staffId) + this.storeId = uni.getStorageInfoSync("inviteStoreId") + this.staffId = uni.getStorageInfoSync("inviteStaffId") }, onShow() { // this.getAddress(); @@ -148,6 +165,10 @@ tabbar }, methods: { + // 获取门店信息 + getStore(){ + + }, // 获取当前位置 getAddress() { let _this = this;