Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
7
7-Eleven
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
高淑倩
7-Eleven
Commits
e98463e5
Commit
e98463e5
authored
Apr 23, 2020
by
谢中龙
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
集点活动修改
parent
c53424b8
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
27 additions
and
22 deletions
+27
-22
app.json
src/app.json
+4
-0
index.js
src/config/index.js
+2
-2
project.config.json
src/project.config.json
+2
-2
scratch.js
src/subPackageMarketing/page/pages/scratch/scratch.js
+19
-18
No files found.
src/app.json
View file @
e98463e5
...
...
@@ -141,6 +141,10 @@
"contactPlugin"
:
{
"version"
:
"1.3.0"
,
"provider"
:
"wx104a1a20c3f81ec2"
},
"live-player-plugin"
:
{
"version"
:
"1.0.7"
,
"provider"
:
"wx2b03c6e691cd7370"
}
},
"permission"
:
{
...
...
src/config/index.js
View file @
e98463e5
...
...
@@ -6,7 +6,7 @@
// 修改 BRANCH_ID 为对应的商户id
// 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 有直播
//2006 泰华 , wx40fec8944623c8b3 有直播
...
...
@@ -25,7 +25,7 @@ const PROJECT_ENV = 'test' // 生产 prod, 开发 dev, 测试 test , 测试门
//2992 山东盛联微商城 wx53dedc202ae0d0c2
//2002 巴黎贝甜 wx21968cb3a486d4ab
const
BRANCH_ID
=
1002
const
BRANCH_ID
=
3001
const
isMall
=
true
// const needMock = '' //
...
...
src/project.config.json
View file @
e98463e5
...
...
@@ -13,7 +13,7 @@
},
"compileType"
:
"miniprogram"
,
"libVersion"
:
"2.8.2"
,
"appid"
:
"wx
ac09792264c49b5c
"
,
"appid"
:
"wx
313ec36b710125d4
"
,
"projectname"
:
"%E5%BE%AE%E5%95%86%E5%9F%8E"
,
"debugOptions"
:
{
"hidedInDevtools"
:
[]
...
...
@@ -636,7 +636,7 @@
"id"
:
87
,
"name"
:
"刮刮卡"
,
"pathName"
:
"subPackageMarketing/page/pages/scratch/scratch"
,
"query"
:
"i
d=700043642982764548
"
,
"query"
:
"i
=d0)3YH1100&t=d0)PMHH100&s=share
"
,
"scene"
:
null
},
{
...
...
src/subPackageMarketing/page/pages/scratch/scratch.js
View file @
e98463e5
...
...
@@ -24,6 +24,7 @@ wxService.page({
* 生命周期函数--监听页面加载
*/
onLoad
:
function
(
options
)
{
this
.
data
.
activityId
=
options
.
id
;
if
(
this
.
data
.
activityId
){
this
.
getActivityInfo
();
...
...
@@ -41,24 +42,23 @@ wxService.page({
if
(
res
){
let
data
=
res
.
data
.
data
?
res
.
data
.
data
:
null
;
if
(
data
){
if
(
data
.
type
==
3
){
// //判断打开着是不是自己
let
currentLogginUser
=
wx
.
getStorageSync
(
'_baseUserInfo'
);
data
.
tentacleType
=
data
.
type
;
let
memberId
=
data
.
tentacleId
;
this
.
markShareRecords
(
memberId
,
this
.
data
.
activityId
)
;
// this.markShareRecords(currentLogginUser.memberId,this.data.activityId,data)
;
// return
;
// //判断打开着是不是自己
// let currentLogginUser = wx.getStorageSync('_baseUserInfo');
// if(!currentLogginUser){
// let memberId = data.tentacleId;
// this.markShareRecords(memberId,this.data.activityId);
// }
// else{
// let curLoginMemberId = currentLogginUser.memberId;
// if(curLoginMemberId != memberId){ // 不是自己打开的分享链接时才调用分享成功的接口 防止自己刷次数
// let memberId = data.tentacleId;
// this.markShareRecords(memberId,this.data.activityId);
// }
// }
if
(
!
currentLogginUser
){
let
memberId
=
null
;
this
.
markShareRecords
(
memberId
,
this
.
data
.
activityId
,
data
);
}
else
{
let
curLoginMemberId
=
currentLogginUser
.
memberId
;
let
memberId
=
data
.
tentacleId
;
if
(
curLoginMemberId
!=
memberId
){
// 不是自己打开的分享链接时才调用分享成功的接口 防止自己刷次数
this
.
markShareRecords
(
curLoginMemberId
,
this
.
data
.
activityId
,
data
);
}
}
}
}
...
...
@@ -67,10 +67,11 @@ wxService.page({
},
//记录分享数据
markShareRecords
(
memberId
,
activityId
){
markShareRecords
(
memberId
=
null
,
activityId
,
tentacleContent
){
wxService
.
post
(
`/marketing/lottery/shareRecord`
,{
activityId
:
activityId
,
memberId
:
memberId
memberId
:
memberId
,
tentacleContent
:
tentacleContent
,
}).
then
(
res
=>
{});
},
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment