diff --git a/fuintAdmin/src/views/EventMarketing/openCardGift/invite.vue b/fuintAdmin/src/views/EventMarketing/openCardGift/invite.vue
index 462dd1682..faf8f5464 100644
--- a/fuintAdmin/src/views/EventMarketing/openCardGift/invite.vue
+++ b/fuintAdmin/src/views/EventMarketing/openCardGift/invite.vue
@@ -243,6 +243,11 @@ export default {
},
methods: {
updateMax(item) {
+ this.cardCouponList.forEach(item1 => {
+ if (item.vouchersId==item1.id){
+ item.giftCardName = item1.name
+ }
+ })
//先清空之前的值
item.giftCardTotal = 1;
// 更新最大值
diff --git a/gasStation-uni/pagesMy/invite/details.vue b/gasStation-uni/pagesMy/invite/details.vue
index 82e9bc48e..968e4cbac 100644
--- a/gasStation-uni/pagesMy/invite/details.vue
+++ b/gasStation-uni/pagesMy/invite/details.vue
@@ -4,33 +4,24 @@
活动名称
- {{activeInfo.name}}
+ {{activeInfo.activeName}}
活动时间
- 长期有效
+ {{activeInfo.activeStartTime || '--'}}~{{activeInfo.activeEndTime || ""}}
-
- 推荐人等级
-
- {{activeInfo.userGradeName}}
-
-
-
- 支付方式
-
- 微信、支付宝、云闪付、现金、pos刷卡
-
-
-
- 赠送优惠券
-
- 50元优惠券
+
+
+ 赠送优惠券
+
+ {{item.giftCardName || "--"}}
+
+
赠送积分
@@ -43,6 +34,12 @@
{{activeInfo.growaValue || 0}}成长值
+
+ 活动详情
+
+ {{activeInfo.activityDetails || "--"}}
+
+
diff --git a/gasStation-uni/pagesMy/invite/invite.vue b/gasStation-uni/pagesMy/invite/invite.vue
index 40e6aef41..86f5d3128 100644
--- a/gasStation-uni/pagesMy/invite/invite.vue
+++ b/gasStation-uni/pagesMy/invite/invite.vue
@@ -19,9 +19,9 @@
奖励记录
-
+
+
推荐会员消费有礼
@@ -33,7 +33,7 @@
赠送优惠券
- {{item.giftCardName}}
+ {{item.giftCardName || "--"}}
@@ -44,7 +44,7 @@
特权说明
- {{activeInfo.discountActiveDescribe}}
+ 加油立享优惠
有效期
@@ -74,10 +74,11 @@
扫码领会员
-
+
+
- 百业兴加油站
+ {{store.name}}
油站会员卡
@@ -129,6 +130,7 @@
export default {
data() {
return {
+ titles:"",
query: {
storeId: ''
},
@@ -154,6 +156,8 @@
lon: "",
// 店铺纬度信息
lat: "",
+ // url信息
+ baseUrl: this.$baseUrl,
// 店铺信息
store: {
name: "测试油站",
@@ -168,6 +172,13 @@
// '&userId=' + uni.getStorageSync('userId') + '&type=yaoqingyouli'
// console.log(codes);
// this.query.storeId = uni.getStorageSync("storeId");
+ // #ifdef MP-WEIXIN
+ wx.showShareMenu({
+ withShareTicket: true,
+ //设置下方的Menus菜单，才能够让发送给朋友与分享到朋友圈两个按钮可以点击
+ menus: ["shareAppMessage", "shareTimeline"]
+ })
+ // #endif
},
onShow() {
this.getAllAmount();
@@ -205,7 +216,7 @@
wx.onShareAppMessage(function() {
return {
- title: '来个油惠',
+ title: '矩油惠 百业兴',
path: '/pages/index/index',
imageUrl: 'https://example.com/share.jpg',
success: function(res) {
@@ -219,10 +230,11 @@
},
onShareAppMessage(res) {
if (res.from === 'button') { // 来自页面内分享按钮
- console.log(res.target)
+ console.log(res.target,233)
+
}
return {
- title: '来个油惠',
+ title: '矩油惠 百业兴',
path: '/pages/index/index?storeId=' + uni.getStorageSync('storeId') + '&userId=' + uni
.getStorageSync('userId') + '&type=yaoqingyouli'
}
@@ -252,9 +264,10 @@
// 下载图片
savePicture() {
console.log(230);
+ let url = this.options.code;
// 下载图片
uni.downloadFile({
- url: 'https://www.example.com/file/test', //仅为示例，并非真实的资源
+ url: url,
success: (res) => {
if (res.statusCode === 200) {
console.log('下载成功');
diff --git a/gasStation-uni/pagesMy/invite/list.vue b/gasStation-uni/pagesMy/invite/list.vue
index 9beca08e8..29be710c9 100644
--- a/gasStation-uni/pagesMy/invite/list.vue
+++ b/gasStation-uni/pagesMy/invite/list.vue
@@ -1,7 +1,7 @@
-
+
{{item.name}}
@@ -22,16 +22,24 @@
-
+
- 名字
+ {{item.inviteeUserName || "--"}}
- 2024-8-7
+ {{item.createTime}}
+
+
+
+
+
+
+
+
@@ -51,15 +59,12 @@
}
],
- List: [],
+ list: [],
pageNo: 1,
pageSize: 10,
totalPage: '',
-
+ rewardList: []
}
- },
- onLoad() {
-
},
onPullDownRefresh() {
//下拉刷新
@@ -82,6 +87,12 @@
components: {
+ },
+ onLoad() {
+
+ },
+ onShow() {
+ this.getList()
},
methods: {
setIndex(num) {
@@ -92,30 +103,22 @@
this.pageNo = 1
this.pageSize = 10
this.totalPage = ''
- this.List = []
+ this.list = []
},
- // 分页——网络请求
- async getList() {
- uni.showLoading({
- title: '加载中'
- });
- let res = await request({
- url: '网络请求',
+ // 获取列表信息
+ getList() {
+ request({
+ url: '/business/marketingActivity/activeApplet/getRecommendedRecordsByStoreId',
method: 'get',
- data: {
- pageNo: this.pageNo,
- pageSize: this.pageSize,
+ params: {
+ storeId: uni.getStorageSync("storeId")
+ }
+ }).then(res => {
+ console.log(res, 106)
+ if (res.code == 200) {
+ this.list = res.data
}
})
- if (res.code == 200) {
- uni.hideLoading(); //交互反馈
- if (this.pageNo != 1) {
- this.List = this.ruleList.concat(res.result.records)
- } else {
- this.List = res.result.records
- }
- this.totalPage = res.result.pages
- }
},
goback() {
uni.navigateBack()
@@ -133,7 +136,7 @@
width: 100%;
height: 100vh;
box-sizing: border-box;
-
+ padding-top: 15px;
}
.top_box {
@@ -185,7 +188,7 @@
.whit-box {
width: 95%;
background: #fff;
- margin: 15px;
+ margin: 10px auto;
}