diff --git a/fuintAdmin_zt/src/main.js b/fuintAdmin_zt/src/main.js index 9f64dc225..f14522b38 100644 --- a/fuintAdmin_zt/src/main.js +++ b/fuintAdmin_zt/src/main.js @@ -48,7 +48,7 @@ Vue.prototype.getName = getName Vue.prototype.download = download Vue.prototype.handleTree = handleTree // Vue.prototype.pcUrl = 'http://192.168.0.121:82/' -Vue.prototype.pcUrl = 'http://192.168.0.121:82/' +Vue.prototype.pcUrl = 'http://192.168.31.96:82/' // Vue.prototype.pcUrl = 'http://47.95.206.185:85/' // 全局组件挂载 diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/service/impl/CardValueRecordServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/service/impl/CardValueRecordServiceImpl.java index dae016eeb..ab6b9185d 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/service/impl/CardValueRecordServiceImpl.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/service/impl/CardValueRecordServiceImpl.java @@ -944,9 +944,11 @@ public class CardValueRecordServiceImpl extends ServiceImpl { if (item.includes("storeId")) { storeId = item.split("=")[1] - }else { + } else if (item.includes("staffId")) { staffId = item.split("=")[1] + } else if (item.includes("userId")) { + userId = item.split("=")[1] + } else if (item.includes("type")) { + type = item.split("=")[1] } }) }else{ @@ -66,10 +72,12 @@ } } uni.setStorageSync("storeId", storeId) + uni.setStorageSync("y_type", type) + uni.setStorageSync("y_userId", userId) uni.setStorageSync("inviteStaffId", staffId) - uni.showLoading({ - title:uni.getStorageSync("storeId") + "staffId" + uni.getStorageSync("inviteStaffId") - }) + // uni.showLoading({ + // title:uni.getStorageSync("storeId") + "staffId" + uni.getStorageSync("inviteStaffId") + // }) } } // #endif diff --git a/gasStation-uni/pages.json b/gasStation-uni/pages.json index 7237cf8b7..c795090a7 100644 --- a/gasStation-uni/pages.json +++ b/gasStation-uni/pages.json @@ -243,6 +243,13 @@ "navigationStyle": "custom" } }, + { + "path": "invite/inviteCode", + "style": { + "navigationBarTitleText": "邀请码", + "navigationStyle": "custom" + } + }, { "path": "feedback/feedback", "style": { diff --git a/gasStation-uni/pages/index/index.vue b/gasStation-uni/pages/index/index.vue index ac5243559..d4bca2aae 100644 --- a/gasStation-uni/pages/index/index.vue +++ b/gasStation-uni/pages/index/index.vue @@ -215,24 +215,27 @@ if (query.userId) { uni.setStorageSync("y_userId", query.userId) } - uni.showToast({ - title:"storeId："+uni.getStorageSync("storeId")+"y_type:"+uni.getStorageSync("y_type")+"y_userId"+uni.getStorageSync("y_userId") - }) if (uni.getStorageSync("appltType") == "WECHAT") { const q = decodeURIComponent(query.q) // 获取到二维码原始链接内容 if (query.q) { let str = q.split("?")[1]; - let storeId = "19"; + let storeId = ""; let staffId = ""; + let userId = ""; + let type = ""; console.log(111); if (str.includes("&")) { let arr = str.split("&"); arr.forEach(item => { if (item.includes("storeId")) { storeId = item.split("=")[1] - } else { + } else if (item.includes("staffId")) { staffId = item.split("=")[1] + } else if (item.includes("userId")) { + userId = item.split("=")[1] + } else if (item.includes("type")) { + type = item.split("=")[1] } }) } else { @@ -241,6 +244,8 @@ uni.setStorageSync("storeId", storeId) + uni.setStorageSync("y_type", type) + uni.setStorageSync("y_userId", userId) uni.setStorageSync("inviteStaffId", staffId) this.storeId = uni.getStorageSync("storeId") this.chainStoreId = uni.getStorageSync("chainStoreId") diff --git a/gasStation-uni/pagesHome/Activity/index.vue b/gasStation-uni/pagesHome/Activity/index.vue index e57141404..5ab0ed82e 100644 --- a/gasStation-uni/pagesHome/Activity/index.vue +++ b/gasStation-uni/pagesHome/Activity/index.vue @@ -53,7 +53,7 @@ data() { return { query: { - storeId: '' + storeId: uni.getStorageSync("storeId") }, title: '', activityList: [], @@ -78,6 +78,7 @@ }); request({ url: 'business/marketingActivity/activeExchange/applet', + // url: 'business/marketingActivity/activeApplet/appletActive', method: 'get', params: this.query }).then(res => { diff --git a/gasStation-uni/pagesLogin/login/login.vue b/gasStation-uni/pagesLogin/login/login.vue index 02d53b176..d27410837 100644 --- a/gasStation-uni/pagesLogin/login/login.vue +++ b/gasStation-uni/pagesLogin/login/login.vue @@ -91,12 +91,12 @@ encryptedData: encryptedData, }, }).then((resp) => { - if (uni.getStorageSync("y_type") == - 'yaoqingyouli') { - this.activeRecommendRecords() - - } if (resp.code == 200) { + if (uni.getStorageSync("y_type") == + 'yaoqingyouli') { + _this.activeRecommendRecords() + + } uni.setStorageSync('App-Token', resp.data.token); uni.setStorageSync('chainStoreId', resp.data @@ -124,7 +124,7 @@ wxlogin() {}, getPhone(e) { let that = this - if (this.privacyPolicyChecked == false) { + if (this.qindex == false) { uni.showToast({ icon: "none", title: "请先阅读并勾选用户协议", @@ -166,11 +166,6 @@ }, success: (rex) => { console.log('请求成功', rex) - if (uni.getStorageSync("y_type") == - 'yaoqingyouli') { - this.activeRecommendRecords() - - } if (rex.data.code == 200) { uni.setStorageSync('App-Token', rex.data.data @@ -179,6 +174,11 @@ .data .chainStoreId); + if (uni.getStorageSync("y_type") == + 'yaoqingyouli') { + that.activeRecommendRecords() + + } uni.navigateTo({ url: '/pages/index/index' }) @@ -207,9 +207,10 @@ } }) }, - async activeRecommendRecords() { - let res = await request({ - url: "clientApi/sign/alipayLogin/getUserid", + activeRecommendRecords() { + request({ + // url: "clientApi/sign/alipayLogin/getUserid", + url: "business/marketingActivity/activeRecommendRecords", method: 'post', data: { storeId: uni.getStorageSync("storeId"), @@ -217,7 +218,7 @@ type: uni.getStorageSync("y_type"), userId: uni.getStorageSync("y_userId"), }, - }) + }).then(res => {}) }, goback() { diff --git a/gasStation-uni/pagesMy/invite/invite.vue b/gasStation-uni/pagesMy/invite/invite.vue index 369e70b63..0b768a44f 100644 --- a/gasStation-uni/pagesMy/invite/invite.vue +++ b/gasStation-uni/pagesMy/invite/invite.vue @@ -23,14 +23,16 @@ - + 面对面邀请 - + @@ -65,6 +67,7 @@ + @@ -90,7 +93,7 @@ .getStorageSync('userId') + '&type=yaoqingyouli', // code: 'https://www.tuofeng.cc/oily?storeId=' + uni.getStorageSync('storeId') + ' &userId=' + uni // .getStorageSync('userId'), // 生成二维码的值 - size: 460, // 460代表生成的二维码的宽高均为460rpx + size: 500, // 460代表生成的二维码的宽高均为460rpx }, } @@ -150,7 +153,8 @@ } return { title: '来个油惠', - path: '/pages/index/index' + path: '/pages/index/index?storeId=' + uni.getStorageSync('storeId') + '&userId=' + uni + .getStorageSync('userId') + '&type=yaoqingyouli' } }, @@ -164,7 +168,10 @@ this.show = false }, open() { - + this.show = true + // uni.navigateTo({ + // url: '/pagesMy/invite/inviteCode' , + // }) }, getAllAmount() { request({