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
53f18953
Commit
53f18953
authored
Aug 31, 2019
by
赵雅纹
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
推广商品分享
parent
bce8644d
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
93 additions
and
58 deletions
+93
-58
extendProduct.js
src/pages/extendProduct/extendProduct.js
+17
-21
extendProduct.wxml
src/pages/extendProduct/extendProduct.wxml
+28
-20
extendProduct.wxss
src/pages/extendProduct/extendProduct.wxss
+12
-2
myInvite.js
src/subPackage/page/pages/myInvite/myInvite.js
+2
-2
plus.js
src/subPackage/page/pages/plus/plus.js
+19
-1
share.js
src/subPackage/page/pages/share/share.js
+6
-6
const.js
src/utils/const.js
+9
-6
No files found.
src/pages/extendProduct/extendProduct.js
View file @
53f18953
...
@@ -52,7 +52,7 @@ wxService.page({
...
@@ -52,7 +52,7 @@ wxService.page({
this
.
getExtendProList
(
1
,
10
)
this
.
getExtendProList
(
1
,
10
)
}
else
if
(
current
==
1
)
{
}
else
if
(
current
==
1
)
{
// 我的推广
// 我的推广
wx
.
hideShareMenu
();
//
wx.hideShareMenu();
this
.
getMyShareCount
()
this
.
getMyShareCount
()
this
.
getMyExtendOrderList
(
1
,
10
)
this
.
getMyExtendOrderList
(
1
,
10
)
}
}
...
@@ -126,7 +126,7 @@ wxService.page({
...
@@ -126,7 +126,7 @@ wxService.page({
}
}
let
tentacleInfo
=
{
let
tentacleInfo
=
{
content
:
JSON
.
stringify
(
this
.
data
.
proData
),
content
:
JSON
.
stringify
(
this
.
data
.
proData
),
contentType
:
2
,
//内容类型 1.文章 2.商品 3.页面
contentType
:
app
.
globalData
.
contants
.
SHARE_TYPE
.
GOODS
,
//内容类型 1.文章 2.商品 3.页面
title
:
this
.
data
.
proData
[
0
].
productName
,
title
:
this
.
data
.
proData
[
0
].
productName
,
type
:
3
// 1:门店,2:员工(暂时不做),3:会员,4:第三方外部渠道,5:智能营销
type
:
3
// 1:门店,2:员工(暂时不做),3:会员,4:第三方外部渠道,5:智能营销
}
}
...
@@ -142,7 +142,7 @@ wxService.page({
...
@@ -142,7 +142,7 @@ wxService.page({
this
.
setData
({
this
.
setData
({
showCardModal
:
true
,
showCardModal
:
true
,
cardTitle
:
this
.
data
.
proData
[
0
].
productName
,
cardTitle
:
this
.
data
.
proData
[
0
].
productName
,
cardUrl
:
this
.
data
.
proData
[
0
].
u
rl
,
cardUrl
:
this
.
data
.
proData
[
0
].
productImgU
rl
,
pagePath
:
path
pagePath
:
path
});
});
}
}
...
@@ -184,26 +184,22 @@ wxService.page({
...
@@ -184,26 +184,22 @@ wxService.page({
const
{
result
,
data
}
=
res
.
data
const
{
result
,
data
}
=
res
.
data
if
(
result
==
0
)
{
if
(
result
==
0
)
{
wx
.
hideLoading
()
wx
.
hideLoading
()
let
extendData
=
[]
data
.
content
.
forEach
((
item
)
=>
{
// for (var i in data.content){
//内容类型 1.文章 2.商品 3.页面
// //内容类型 1.文章 2.商品 3.页面
if
(
item
.
content
){
// if (data.content[i].contentType !
= 3){
if
(
item
.
contentType
=
=
3
){
// console.log('=====', data.content[i].content)
item
.
content
=
item
.
content
// console.log('--------', JSON.parse(data.content[i].content))
}
else
{
// var content = JSON.parse(data.content[i]
.content)
let
content
=
JSON
.
parse
(
item
.
content
)
// data.content[i].content = content
item
.
contentArr
=
[
content
]
//
}
}
}
// }
})
this
.
setData
({
this
.
setData
({
myExtendList
:
this
.
data
.
pageNum
==
1
?
[...
data
.
content
]
:
[...
this
.
data
.
myExtendList
,
...
data
.
content
],
myExtendList
:
this
.
data
.
pageNum
==
1
?
[...
data
.
content
]
:
[...
this
.
data
.
myExtendList
,
...
data
.
content
],
myTotalPages
:
data
.
totalPages
myTotalPages
:
data
.
totalPages
},
()
=>
{
},
()
=>
{
// this.setData({
// no_data: this.data.orderList.length ? true : false
// })
})
})
console
.
log
(
'00000'
,
this
.
data
.
myExtendList
)
}
}
}
}
})
})
...
@@ -314,9 +310,9 @@ wxService.page({
...
@@ -314,9 +310,9 @@ wxService.page({
}
}
let
tentacleInfo
=
{
let
tentacleInfo
=
{
content
:
this
.
route
,
content
:
'推广商品'
,
title
:
this
.
route
,
title
:
'推广商品'
,
contentType
:
3
,
contentType
:
app
.
globalData
.
contants
.
SHARE_TYPE
.
PAGE
,
type
:
3
// 1:门店,2:员工(暂时不做),3:会员,4:第三方外部渠道,5:智能营销
type
:
3
// 1:门店,2:员工(暂时不做),3:会员,4:第三方外部渠道,5:智能营销
};
};
wxService
.
getTentacleContent
(
tentacleInfo
).
then
(
res
=>
{
wxService
.
getTentacleContent
(
tentacleInfo
).
then
(
res
=>
{
...
...
src/pages/extendProduct/extendProduct.wxml
View file @
53f18953
...
@@ -49,12 +49,12 @@
...
@@ -49,12 +49,12 @@
<button class="btn btn-primary">预计赚5元红包</button>
<button class="btn btn-primary">预计赚5元红包</button>
</view> -->
</view> -->
<view class="benefit-info">
<view class="benefit-info">
<view class="benefit-point">
<view class="benefit-point"
wx:if="{{item.point}}"
>
<image src="/assets/imgs/7_1_0/integral-icon.png" class="integral-icon" mode="widthFix" />
<image src="/assets/imgs/7_1_0/integral-icon.png" class="integral-icon" mode="widthFix" />
<text class="benefit-num">{{item.point}}</text>
<text class="benefit-num">{{item.point}}</text>
</view>
</view>
<view class="coupon-title">
<view class="coupon-title">
<image src="/assets/imgs/7_1_0/
coupon-icon.png" class="coupon-icon" mode="widthFix
" />
<image src="/assets/imgs/7_1_0/
rmb.png" class="coupon-icon" mode="widthFix" wx:if="{{item.shareBonuses && item.shareBonuses.length > 0}}
" />
<block
<block
wx:for="{{item.shareBonuses}}"
wx:for="{{item.shareBonuses}}"
wx:for-item="shareItem"
wx:for-item="shareItem"
...
@@ -112,24 +112,32 @@
...
@@ -112,24 +112,32 @@
wx:key="{{index}}"
wx:key="{{index}}"
wx:for-item="extendItem"
wx:for-item="extendItem"
>
>
<view class="order-header">
<navigator url="/subPackage/page/pages/orderBenefit/orderBenefit" hover-class="none">
<view class="order-number">
<view class="order-header">
<text>{{extendItem.createTime}}</text>
<view class="order-number">
</view>
<text>{{extendItem.createTime}}</text>
<text class="order-status">查看收益</text>
</view>
</view>
<text class="order-status">查看收益</text>
<view class="pro-list">
</view>
<image class="pro-img" />
<view class="pro-list" wx:if="{{extendItem.contentArr}}" wx:for="{{extendItem.contentArr}}" wx:for-item="contentItem" wx:key="{{index}}" >
<image class="pro-img" />
<image class="pro-img" src="{{contentItem.url}}" />
<image class="pro-img" />
<!-- <image class="pro-img" />
<image class="pro-img" />
<image class="pro-img" />
<text class="pro-img-dot">...</text>
<image class="pro-img" /> -->
</view>
<text class="pro-img-dot">...</text>
<view class="pro-number">
</view>
<text class="total-pro">促成订单 <text class="help-order">5</text>
<view class="pro-list" wx:if="{{!extendItem.contentArr}}">
笔
</text>
<!-- <image class="pro-img" />
</view>
<image class="pro-img" />
<image class="pro-img" /> -->
<text class="pro-img-dot">{{extendItem.content}}</text>
</view>
<view class="pro-number">
<text class="total-pro">促成订单 <text class="help-order">5</text>笔
</text>
</view>
</navigator>
</view>
</view>
</view>
</view>
<view class="loading-complete">已经到底啦!</view>
<view class="loading-complete">已经到底啦!</view>
...
...
src/pages/extendProduct/extendProduct.wxss
View file @
53f18953
...
@@ -144,7 +144,16 @@ swiper {
...
@@ -144,7 +144,16 @@ swiper {
display: flex;
display: flex;
justify-content: space-around;
justify-content: space-around;
height: 88rpx;
height: 88rpx;
line-height: 88rpx;
align-items: center;
}
.share-button{
width: 200rpx;
height: 52rpx;
line-height: 52rpx;
border-radius: 26rpx;
background-color: rgba(216, 216, 216, 0.4);
text-align: center;
font-size: 26rpx;
}
}
.share-button image{
.share-button image{
width: 18rpx;
width: 18rpx;
...
@@ -212,7 +221,7 @@ swiper {
...
@@ -212,7 +221,7 @@ swiper {
.pro-img{
.pro-img{
width: 140rpx;
width: 140rpx;
height: 140rpx;
height: 140rpx;
border:1px solid red;
/* border:1px solid red; */
vertical-align: middle;
vertical-align: middle;
}
}
.pro-img-dot{
.pro-img-dot{
...
@@ -255,6 +264,7 @@ swiper {
...
@@ -255,6 +264,7 @@ swiper {
}
}
.benefit-num{
.benefit-num{
font-size: 18rpx;
font-size: 18rpx;
margin-left: 15rpx;
}
}
.benefit-point{
.benefit-point{
margin-right: 30rpx;
margin-right: 30rpx;
...
...
src/subPackage/page/pages/myInvite/myInvite.js
View file @
53f18953
...
@@ -77,8 +77,8 @@ wxService.page({
...
@@ -77,8 +77,8 @@ wxService.page({
// 邀请会员列表
// 邀请会员列表
getInviteMemberList
(){
getInviteMemberList
(){
let
params
=
{
let
params
=
{
userId
:
memberId
,
//
userId: memberId,
tentacleType
:
3
//
tentacleType: 3
}
}
wx
.
showLoading
({
wx
.
showLoading
({
title
:
'加载中'
,
title
:
'加载中'
,
...
...
src/subPackage/page/pages/plus/plus.js
View file @
53f18953
// subPackage/home/pages/plus/plus.js
// subPackage/home/pages/plus/plus.js
const
app
=
getApp
()
const
wxService
=
require
(
'../../../../utils/wxService'
)
const
wxService
=
require
(
'../../../../utils/wxService'
)
import
{
Integer
}
from
'../../../../utils/integerDigitalConvertion'
wxService
.
page
({
wxService
.
page
({
/**
/**
...
@@ -75,6 +78,21 @@ wxService.page({
...
@@ -75,6 +78,21 @@ wxService.page({
* 用户点击右上角分享
* 用户点击右上角分享
*/
*/
onShareAppMessage
:
function
()
{
onShareAppMessage
:
function
()
{
console
.
log
(
'00000'
,
app
.
globalData
.
contants
)
let
tentacleInfo
=
{
content
:
'plus购买页'
,
title
:
'plus购买页'
,
contentType
:
app
.
globalData
.
contants
.
SHARE_TYPE
.
PAGE
,
type
:
3
// 1:门店,2:员工(暂时不做),3:会员,4:第三方外部渠道,5:智能营销
};
wxService
.
getTentacleContent
(
tentacleInfo
).
then
(
res
=>
{
if
(
res
&&
res
.
tentacleId
)
{
let
tentacleId
=
Integer
.
digit
(
res
.
tentacleId
,
10
,
64
);
var
path
=
`subPackage/page/pages/plus/plus?t=
${
tentacleId
}
`
;
return
{
path
:
path
}
}
});
}
}
})
})
src/subPackage/page/pages/share/share.js
View file @
53f18953
...
@@ -2,6 +2,8 @@ import Card from '../../../../palette/inviteFriends';
...
@@ -2,6 +2,8 @@ import Card from '../../../../palette/inviteFriends';
var
app
=
getApp
()
var
app
=
getApp
()
const
wxService
=
require
(
'../../../../utils/wxService'
)
const
wxService
=
require
(
'../../../../utils/wxService'
)
const
utils
=
require
(
'../../../../utils/util'
)
const
utils
=
require
(
'../../../../utils/util'
)
import
{
Integer
}
from
'../../../../utils/integerDigitalConvertion'
// src/pages/xml2can/xml2can.js
// src/pages/xml2can/xml2can.js
wxService
.
page
({
wxService
.
page
({
...
@@ -30,6 +32,7 @@ wxService.page({
...
@@ -30,6 +32,7 @@ wxService.page({
onShow
:
function
()
{
onShow
:
function
()
{
this
.
getShareImg
()
this
.
getShareImg
()
this
.
getMiniCode
()
this
.
getMiniCode
()
},
},
//轮播图的切换事件
//轮播图的切换事件
...
@@ -104,13 +107,10 @@ wxService.page({
...
@@ -104,13 +107,10 @@ wxService.page({
// 保存海报
// 保存海报
savePoster
(){
savePoster
(){
let
content
=
{
currentPosterImg
:
this
.
data
.
currentPosterImg
}
let
tentacleInfo
=
{
let
tentacleInfo
=
{
content
:
JSON
.
stringify
(
content
)
,
content
:
"我的邀请"
,
contentType
:
3
,
//内容类型 1.文章 2.商品 3.页面
contentType
:
app
.
globalData
.
contants
.
SHARE_TYPE
.
PAGE
,
//内容类型 1.文章 2.商品 3.页面
title
:
'
首页
'
,
//标题
title
:
'
我的邀请
'
,
//标题
type
:
3
// 1:门店,2:员工(暂时不做),3:会员,4:第三方外部渠道,5:智能营销
type
:
3
// 1:门店,2:员工(暂时不做),3:会员,4:第三方外部渠道,5:智能营销
}
}
...
...
src/utils/const.js
View file @
53f18953
export
default
{
const
contants
=
{
SHARE_TYPE
:
{
SHARE_TYPE
:
{
CONETNT
:
1
,
CONETNT
:
1
,
//内容
GOODS
:
2
,
GOODS
:
2
,
//商品
PAGE
:
3
PAGE
:
3
//页面
}
}
}
}
module
.
exports
=
contants
\ No newline at end of file
\ No newline at end of file
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