dianliang/oil-station
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
齐天大圣 2024-03-12 15:57:34 +08:00
commit ad4194bfd6
8 changed files with 65 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fuintAdmin_zt/src/main.js
View File

@ -48,7 +48,7 @@ Vue.prototype.getName = getName
Vue.prototype.download = download Vue.prototype.download = download
Vue.prototype.handleTree = handleTree 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.0.121:82/' Vue.prototype.pcUrl = 'http://192.168.31.96:82/'
// Vue.prototype.pcUrl = 'http://47.95.206.185:85/' // Vue.prototype.pcUrl = 'http://47.95.206.185:85/'
// 全局组件挂载 // 全局组件挂载

8
fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/service/impl/CardValueRecordServiceImpl.java
View File

@ -944,9 +944,11 @@ public class CardValueRecordServiceImpl extends ServiceImpl<CardValueRecordMappe
cardExchangeRecord.setName(ljUserVo.getName()); cardExchangeRecord.setName(ljUserVo.getName());
cardExchangeRecord.setMobile(ljUserVo.getMobile()); cardExchangeRecord.setMobile(ljUserVo.getMobile());
cardExchangeRecord.setPhoto(ljUserVo.getAvatar()); cardExchangeRecord.setPhoto(ljUserVo.getAvatar());
cardExchangeRecord.setMtStaffId(ljStaff.getId()); if (ObjectUtil.isNotEmpty(ljStaff)) {
cardExchangeRecord.setRealName(ljStaff.getRealName()); cardExchangeRecord.setMtStaffId(ljStaff.getId());
cardExchangeRecord.setStaffMobile(ljStaff.getMobile()); cardExchangeRecord.setRealName(ljStaff.getRealName());
cardExchangeRecord.setStaffMobile(ljStaff.getMobile());
}
cardExchangeRecord.setStatus("0"); cardExchangeRecord.setStatus("0");
cardExchangeRecord.setExchangeFrom("充值送券"); cardExchangeRecord.setExchangeFrom("充值送券");
cardExchangeRecordService.addCardExchangeRecord(cardExchangeRecord); cardExchangeRecordService.addCardExchangeRecord(cardExchangeRecord);

16
gasStation-uni/App.vue
View File

@ -51,13 +51,19 @@
let storeId = ""; let storeId = "";
let staffId = ""; let staffId = "";
let userId = "";
let type = "";
if (str.includes("&")){ if (str.includes("&")){
let arr = str.split("&"); let arr = str.split("&");
arr.forEach(item => { arr.forEach(item => {
if (item.includes("storeId")) { if (item.includes("storeId")) {
storeId = item.split("=")[1] storeId = item.split("=")[1]
}else { } else if (item.includes("staffId")) {
staffId = item.split("=")[1] staffId = item.split("=")[1]
} else if (item.includes("userId")) {
userId = item.split("=")[1]
} else if (item.includes("type")) {
type = item.split("=")[1]
} }
}) })
}else{ }else{
@ -66,10 +72,12 @@
} }
} }
uni.setStorageSync("storeId", storeId) uni.setStorageSync("storeId", storeId)
uni.setStorageSync("y_type", type)
uni.setStorageSync("y_userId", userId)
uni.setStorageSync("inviteStaffId", staffId) uni.setStorageSync("inviteStaffId", staffId)
uni.showLoading({ // uni.showLoading({
title:uni.getStorageSync("storeId") + "staffId" + uni.getStorageSync("inviteStaffId") // title:uni.getStorageSync("storeId") + "staffId" + uni.getStorageSync("inviteStaffId")
}) // })
} }
} }
// #endif // #endif

7
gasStation-uni/pages.json
View File

@ -243,6 +243,13 @@
"navigationStyle": "custom" "navigationStyle": "custom"
} }
}, },
{
"path": "invite/inviteCode",
"style": {
"navigationBarTitleText": "邀请码",
"navigationStyle": "custom"
}
},
{ {
"path": "feedback/feedback", "path": "feedback/feedback",
"style": { "style": {

15
gasStation-uni/pages/index/index.vue
View File

@ -215,24 +215,27 @@
if (query.userId) { if (query.userId) {
uni.setStorageSync("y_userId", 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") { if (uni.getStorageSync("appltType") == "WECHAT") {
const q = decodeURIComponent(query.q) // 获取到二维码原始链接内容 const q = decodeURIComponent(query.q) // 获取到二维码原始链接内容
if (query.q) { if (query.q) {
let str = q.split("?")[1]; let str = q.split("?")[1];
let storeId = "19"; let storeId = "";
let staffId = ""; let staffId = "";
let userId = "";
let type = "";
console.log(111); console.log(111);
if (str.includes("&")) { if (str.includes("&")) {
let arr = str.split("&"); let arr = str.split("&");
arr.forEach(item => { arr.forEach(item => {
if (item.includes("storeId")) { if (item.includes("storeId")) {
storeId = item.split("=")[1] storeId = item.split("=")[1]
} else { } else if (item.includes("staffId")) {
staffId = item.split("=")[1] staffId = item.split("=")[1]
} else if (item.includes("userId")) {
userId = item.split("=")[1]
} else if (item.includes("type")) {
type = item.split("=")[1]
} }
}) })
} else { } else {
@ -241,6 +244,8 @@
uni.setStorageSync("storeId", storeId) uni.setStorageSync("storeId", storeId)
uni.setStorageSync("y_type", type)
uni.setStorageSync("y_userId", userId)
uni.setStorageSync("inviteStaffId", staffId) uni.setStorageSync("inviteStaffId", staffId)
this.storeId = uni.getStorageSync("storeId") this.storeId = uni.getStorageSync("storeId")
this.chainStoreId = uni.getStorageSync("chainStoreId") this.chainStoreId = uni.getStorageSync("chainStoreId")

3
gasStation-uni/pagesHome/Activity/index.vue
View File

@ -53,7 +53,7 @@
data() { data() {
return { return {
query: { query: {
storeId: '' storeId: uni.getStorageSync("storeId")
}, },
title: '', title: '',
activityList: [], activityList: [],
@ -78,6 +78,7 @@
}); });
request({ request({
url: 'business/marketingActivity/activeExchange/applet', url: 'business/marketingActivity/activeExchange/applet',
// url: 'business/marketingActivity/activeApplet/appletActive',
method: 'get', method: 'get',
params: this.query params: this.query
}).then(res => { }).then(res => {

31
gasStation-uni/pagesLogin/login/login.vue
View File

@ -91,12 +91,12 @@
encryptedData: encryptedData, encryptedData: encryptedData,
}, },
}).then((resp) => { }).then((resp) => {
if (uni.getStorageSync("y_type") ==
'yaoqingyouli') {
this.activeRecommendRecords()
}
if (resp.code == 200) { if (resp.code == 200) {
if (uni.getStorageSync("y_type") ==
'yaoqingyouli') {
_this.activeRecommendRecords()
}
uni.setStorageSync('App-Token', resp.data.token); uni.setStorageSync('App-Token', resp.data.token);
uni.setStorageSync('chainStoreId', resp.data uni.setStorageSync('chainStoreId', resp.data
@ -124,7 +124,7 @@
wxlogin() {}, wxlogin() {},
getPhone(e) { getPhone(e) {
let that = this let that = this
if (this.privacyPolicyChecked == false) { if (this.qindex == false) {
uni.showToast({ uni.showToast({
icon: "none", icon: "none",
title: "请先阅读并勾选用户协议", title: "请先阅读并勾选用户协议",
@ -166,11 +166,6 @@
}, },
success: (rex) => { success: (rex) => {
console.log('请求成功', rex) console.log('请求成功', rex)
if (uni.getStorageSync("y_type") ==
'yaoqingyouli') {
this.activeRecommendRecords()
}
if (rex.data.code == 200) { if (rex.data.code == 200) {
uni.setStorageSync('App-Token', rex.data.data uni.setStorageSync('App-Token', rex.data.data
@ -179,6 +174,11 @@
.data .data
.chainStoreId); .chainStoreId);
if (uni.getStorageSync("y_type") ==
'yaoqingyouli') {
that.activeRecommendRecords()
}
uni.navigateTo({ uni.navigateTo({
url: '/pages/index/index' url: '/pages/index/index'
}) })
@ -207,9 +207,10 @@
} }
}) })
}, },
async activeRecommendRecords() { activeRecommendRecords() {
let res = await request({ request({
url: "clientApi/sign/alipayLogin/getUserid", // url: "clientApi/sign/alipayLogin/getUserid",
url: "business/marketingActivity/activeRecommendRecords",
method: 'post', method: 'post',
data: { data: {
storeId: uni.getStorageSync("storeId"), storeId: uni.getStorageSync("storeId"),
@ -217,7 +218,7 @@
type: uni.getStorageSync("y_type"), type: uni.getStorageSync("y_type"),
userId: uni.getStorageSync("y_userId"), userId: uni.getStorageSync("y_userId"),
}, },
}) }).then(res => {})
}, },
goback() { goback() {

17
gasStation-uni/pagesMy/invite/invite.vue
View File

@ -23,14 +23,16 @@
</view> </view>
</view> </view>
<view class="x-box"> <view class="x-box">
<view class="l-naniu" @click="show = true"> <view class="l-naniu" @click="open">
<u-icon name="grid" color="#FCDB5A" size="18"></u-icon> <u-icon name="grid" color="#FCDB5A" size="18"></u-icon>
<text>面对面邀请</text> <text>面对面邀请</text>
</view> </view>
<view class="r-naniu"> <view class="r-naniu">
<u-icon name="share-fill" color="#E9312F" size="18"></u-icon> <u-icon name="share-fill" color="#E9312F" size="18"></u-icon>
<button class="qiangzhi" open-type="share"><text>分享给好友</text></button> <button class="qiangzhi" open-type="share">
<text>分享给好友</text>
</button>
</view> </view>
</view> </view>
@ -65,6 +67,7 @@
<w-qrcode :options="options"></w-qrcode> <w-qrcode :options="options"></w-qrcode>
</view> </view>
</u-popup> </u-popup>
</view> </view>
</view> </view>
@ -90,7 +93,7 @@
.getStorageSync('userId') + '&type=yaoqingyouli', .getStorageSync('userId') + '&type=yaoqingyouli',
// code: 'https://www.tuofeng.cc/oily?storeId=' + uni.getStorageSync('storeId') + ' &userId=' + uni // code: 'https://www.tuofeng.cc/oily?storeId=' + uni.getStorageSync('storeId') + ' &userId=' + uni
// .getStorageSync('userId'), // 生成二维码的值 // .getStorageSync('userId'), // 生成二维码的值
size: 460, // 460代表生成的二维码的宽高均为460rpx size: 500, // 460代表生成的二维码的宽高均为460rpx
}, },
} }
@ -150,7 +153,8 @@
} }
return { return {
title: '来个油惠', 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 this.show = false
}, },
open() { open() {
this.show = true
// uni.navigateTo({
// url: '/pagesMy/invite/inviteCode' ,
// })
}, },
getAllAmount() { getAllAmount() {
request({ request({