Merge remote-tracking branch 'origin/master'

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;
 }

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;
 }

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;
 }

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;