Commit e98463e5 by 谢中龙

集点活动修改

parent c53424b8
...@@ -141,6 +141,10 @@ ...@@ -141,6 +141,10 @@
"contactPlugin": { "contactPlugin": {
"version": "1.3.0", "version": "1.3.0",
"provider": "wx104a1a20c3f81ec2" "provider": "wx104a1a20c3f81ec2"
},
"live-player-plugin": {
"version": "1.0.7",
"provider": "wx2b03c6e691cd7370"
} }
}, },
"permission": { "permission": {
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
// 修改 BRANCH_ID 为对应的商户id // 修改 BRANCH_ID 为对应的商户id
// app.js 中brandId 修改为对应 // app.js 中brandId 修改为对应
const PROJECT_ENV = 'test' // 生产 prod, 开发 dev, 测试 test , 测试门户 test_store, 预生产 pre const PROJECT_ENV = 'prod' // 生产 prod, 开发 dev, 测试 test , 测试门户 test_store, 预生产 pre
//仅生产环境时 配置 : //仅生产环境时 配置 :
//3001 3001 , wx313ec36b710125d4 有直播 //3001 3001 , wx313ec36b710125d4 有直播
//2006 泰华 , wx40fec8944623c8b3 有直播 //2006 泰华 , wx40fec8944623c8b3 有直播
...@@ -25,7 +25,7 @@ const PROJECT_ENV = 'test' // 生产 prod, 开发 dev, 测试 test , 测试门 ...@@ -25,7 +25,7 @@ const PROJECT_ENV = 'test' // 生产 prod, 开发 dev, 测试 test , 测试门
//2992 山东盛联微商城 wx53dedc202ae0d0c2 //2992 山东盛联微商城 wx53dedc202ae0d0c2
//2002 巴黎贝甜 wx21968cb3a486d4ab //2002 巴黎贝甜 wx21968cb3a486d4ab
const BRANCH_ID = 1002 const BRANCH_ID = 3001
const isMall = true const isMall = true
// const needMock = '' // // const needMock = '' //
......
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
}, },
"compileType": "miniprogram", "compileType": "miniprogram",
"libVersion": "2.8.2", "libVersion": "2.8.2",
"appid": "wxac09792264c49b5c", "appid": "wx313ec36b710125d4",
"projectname": "%E5%BE%AE%E5%95%86%E5%9F%8E", "projectname": "%E5%BE%AE%E5%95%86%E5%9F%8E",
"debugOptions": { "debugOptions": {
"hidedInDevtools": [] "hidedInDevtools": []
...@@ -636,7 +636,7 @@ ...@@ -636,7 +636,7 @@
"id": 87, "id": 87,
"name": "刮刮卡", "name": "刮刮卡",
"pathName": "subPackageMarketing/page/pages/scratch/scratch", "pathName": "subPackageMarketing/page/pages/scratch/scratch",
"query": "id=700043642982764548", "query": "i=d0)3YH1100&t=d0)PMHH100&s=share",
"scene": null "scene": null
}, },
{ {
......
...@@ -24,6 +24,7 @@ wxService.page({ ...@@ -24,6 +24,7 @@ wxService.page({
* 生命周期函数--监听页面加载 * 生命周期函数--监听页面加载
*/ */
onLoad: function (options) { onLoad: function (options) {
this.data.activityId = options.id; this.data.activityId = options.id;
if(this.data.activityId){ if(this.data.activityId){
this.getActivityInfo(); this.getActivityInfo();
...@@ -41,24 +42,23 @@ wxService.page({ ...@@ -41,24 +42,23 @@ wxService.page({
if(res){ if(res){
let data = res.data.data ? res.data.data : null; let data = res.data.data ? res.data.data : null;
if(data){ if(data){
if(data.type == 3){ // //判断打开着是不是自己
let currentLogginUser = wx.getStorageSync('_baseUserInfo');
data.tentacleType = data.type;
let memberId = data.tentacleId; // this.markShareRecords(currentLogginUser.memberId,this.data.activityId,data);
this.markShareRecords(memberId,this.data.activityId); // return ;
// //判断打开着是不是自己 if(!currentLogginUser){
// let currentLogginUser = wx.getStorageSync('_baseUserInfo'); let memberId = null;
// if(!currentLogginUser){ this.markShareRecords(memberId,this.data.activityId,data);
// let memberId = data.tentacleId; }
// this.markShareRecords(memberId,this.data.activityId); else{
// } let curLoginMemberId = currentLogginUser.memberId;
// else{ let memberId = data.tentacleId;
// let curLoginMemberId = currentLogginUser.memberId; if(curLoginMemberId != memberId){ // 不是自己打开的分享链接时才调用分享成功的接口 防止自己刷次数
// if(curLoginMemberId != memberId){ // 不是自己打开的分享链接时才调用分享成功的接口 防止自己刷次数 this.markShareRecords(curLoginMemberId,this.data.activityId,data);
// let memberId = data.tentacleId; }
// this.markShareRecords(memberId,this.data.activityId);
// }
// }
} }
} }
} }
...@@ -67,10 +67,11 @@ wxService.page({ ...@@ -67,10 +67,11 @@ wxService.page({
}, },
//记录分享数据 //记录分享数据
markShareRecords(memberId,activityId){ markShareRecords(memberId = null,activityId,tentacleContent){
wxService.post(`/marketing/lottery/shareRecord`,{ wxService.post(`/marketing/lottery/shareRecord`,{
activityId : activityId, activityId : activityId,
memberId : memberId memberId : memberId,
tentacleContent : tentacleContent,
}).then(res => {}); }).then(res => {});
}, },
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment