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
c18a7dae
Commit
c18a7dae
authored
Aug 29, 2019
by
赵雅纹
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
推广商品
parent
41ecd597
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
137 additions
and
62 deletions
+137
-62
extendProduct.js
src/pages/extendProduct/extendProduct.js
+75
-47
extendProduct.json
src/pages/extendProduct/extendProduct.json
+1
-0
extendProduct.wxml
src/pages/extendProduct/extendProduct.wxml
+31
-15
extendProduct.wxss
src/pages/extendProduct/extendProduct.wxss
+30
-0
No files found.
src/pages/extendProduct/extendProduct.js
View file @
c18a7dae
...
@@ -16,11 +16,15 @@ wxService.page({
...
@@ -16,11 +16,15 @@ wxService.page({
showShareModal
:
false
,
showShareModal
:
false
,
showCardModal
:
false
,
showCardModal
:
false
,
totalPages
:
0
,
totalPages
:
0
,
myTotalPages
:
0
,
currentShareContent
:
null
,
currentShareContent
:
null
,
pageNo
:
1
,
pageNum
:
1
,
pageNum
:
1
,
pageSize
:
10
,
pageSize
:
10
,
extendProList
:[],
extendProList
:[],
myExtendList
:[]
myExtendList
:[],
myShareCount
:
''
,
extendProBanner
:
''
},
},
/**
/**
...
@@ -30,25 +34,7 @@ wxService.page({
...
@@ -30,25 +34,7 @@ wxService.page({
},
},
//滑动切换
swiperTab
:
function
(
e
)
{
const
{
current
}
=
e
.
detail
if
(
this
.
data
.
currentTab
==
current
)
{
return
false
;
}
else
{
this
.
setData
({
currentTab
:
current
})
}
// 可使用
if
(
current
==
0
)
{
this
.
getExtendProList
()
}
else
if
(
current
==
1
)
{
// 我的推广
wx
.
hideShareMenu
();
this
.
getMyExtendOrderList
()
}
},
// 点击切换
// 点击切换
clickTab
:
function
(
e
)
{
clickTab
:
function
(
e
)
{
const
{
current
}
=
e
.
target
.
dataset
const
{
current
}
=
e
.
target
.
dataset
...
@@ -63,11 +49,13 @@ wxService.page({
...
@@ -63,11 +49,13 @@ wxService.page({
}
}
// 可使用
// 可使用
if
(
current
==
0
)
{
if
(
current
==
0
)
{
this
.
getExtendProList
()
this
.
getExtendProBanner
()
this
.
getExtendProList
(
1
,
10
)
}
else
if
(
current
==
1
)
{
}
else
if
(
current
==
1
)
{
// 我的推广
// 我的推广
wx
.
hideShareMenu
();
wx
.
hideShareMenu
();
this
.
getMyExtendOrderList
()
this
.
getMyShareCount
()
this
.
getMyExtendOrderList
(
1
,
10
)
}
}
},
},
...
@@ -163,23 +151,23 @@ wxService.page({
...
@@ -163,23 +151,23 @@ wxService.page({
},
},
// 获取推广商品列表
// 获取推广商品列表
getExtendProList
(){
getExtendProList
(
pageNo
,
pageSize
){
wx
.
showLoading
({
wx
.
showLoading
({
title
:
'加载中'
,
title
:
'加载中'
,
mask
:
true
mask
:
true
})
})
wxService
.
post
(
`/merchant/share/productBonus/buyer/findPage?pageNo=
${
this
.
data
.
pageNum
}
&pageSize=
${
this
.
data
.
pageSize
}
`
,{}).
then
(
res
=>
{
wxService
.
post
(
`/merchant/share/productBonus/buyer/findPage?pageNo=
${
pageNo
}
&pageSize=
${
pageSize
}
`
,{}).
then
(
res
=>
{
if
(
res
)
{
if
(
res
)
{
const
{
result
,
data
}
=
res
.
data
const
{
result
,
data
}
=
res
.
data
if
(
result
==
0
)
{
if
(
result
==
0
)
{
wx
.
hideLoading
()
wx
.
hideLoading
()
this
.
setData
({
this
.
setData
({
extendProList
:
this
.
data
.
pageN
um
==
1
?
[...
data
.
content
]
:
[...
this
.
data
.
extendProList
,
...
data
.
content
],
extendProList
:
this
.
data
.
pageN
o
==
1
?
[...
data
.
content
]
:
[...
this
.
data
.
extendProList
,
...
data
.
content
],
totalPages
:
data
.
totalPages
totalPages
:
data
.
totalPages
},
()
=>
{
},
()
=>
{
this
.
setData
({
//
this.setData({
no_data
:
this
.
data
.
extendProList
.
length
?
true
:
false
//
no_data: this.data.extendProList.length ? true : false
})
//
})
})
})
}
}
}
}
...
@@ -187,31 +175,65 @@ wxService.page({
...
@@ -187,31 +175,65 @@ wxService.page({
},
},
// 获取我的推广订单列表
// 获取我的推广订单列表
getMyExtendOrderList
(){
getMyExtendOrderList
(
pageNum
,
pageSize
){
wx
.
showLoading
({
wx
.
showLoading
({
title
:
'加载中'
,
title
:
'加载中'
,
mask
:
true
mask
:
true
})
})
wxService
.
post
(
`/marketing/tentacleContent/getTentacleContentDTO?pageNum=
${
this
.
data
.
pageNum
}
&pageSize=
${
this
.
data
.
pageSize
}
`
).
then
(
res
=>
{
wxService
.
post
(
`/marketing/tentacleContent/getTentacleContentDTO?pageNum=
${
pageNum
}
&pageSize=
${
pageSize
}
`
).
then
(
res
=>
{
if
(
res
)
{
if
(
res
)
{
const
{
result
,
data
}
=
res
.
data
const
{
result
,
data
}
=
res
.
data
if
(
result
==
0
)
{
if
(
result
==
0
)
{
wx
.
hideLoading
()
wx
.
hideLoading
()
let
extendData
=
[]
let
extendData
=
[]
for
(
var
i
in
data
.
content
){
// for (var i in data.content){
if
(
data
.
content
[
i
].
content
){
// if (data.content[i].content){
var
content
=
JSON
.
parse
(
data
.
content
[
i
].
content
)
// console.log('=====', data.content[i].content)
extendData
.
push
(
content
)
// console.log('--------', JSON.parse(data.content[i].content))
}
// var content = JSON.parse(data.content[i].content)
data
.
content
[
i
].
content
=
extendData
// extendData.push(content)
}
// }
// data.content[i].content = extendData
// }
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
],
totalPages
:
res
.
totalPages
myTotalPages
:
data
.
totalPages
},
()
=>
{
},
()
=>
{
this
.
setData
({
// this.setData({
no_data
:
this
.
data
.
orderList
.
length
?
true
:
false
// no_data: this.data.orderList.length ? true : false
})
// })
})
}
}
})
},
// 分享促成的订单数
getMyShareCount
(){
wxService
.
get
(
`/sale/trade/buyer/countByMyShare`
).
then
(
res
=>
{
if
(
res
)
{
const
{
result
,
data
}
=
res
.
data
if
(
result
==
0
)
{
this
.
setData
({
myShareCount
:
data
},
()
=>
{
})
}
}
})
},
// 推广商品banner
getExtendProBanner
()
{
wxService
.
get
(
`/merchant/share/productSectionBonus/buyer/query`
).
then
(
res
=>
{
if
(
res
)
{
const
{
result
,
data
}
=
res
.
data
if
(
result
==
0
)
{
this
.
setData
({
extendProBanner
:
data
.
backgroundImgUrl
},
()
=>
{
})
})
}
}
}
}
...
@@ -222,7 +244,8 @@ wxService.page({
...
@@ -222,7 +244,8 @@ wxService.page({
* 生命周期函数--监听页面显示
* 生命周期函数--监听页面显示
*/
*/
onShow
:
function
()
{
onShow
:
function
()
{
this
.
getExtendProList
()
this
.
getExtendProBanner
()
this
.
getExtendProList
(
1
,
10
)
this
.
data
.
currentShareContent
=
null
;
this
.
data
.
currentShareContent
=
null
;
},
},
...
@@ -251,20 +274,25 @@ wxService.page({
...
@@ -251,20 +274,25 @@ wxService.page({
* 页面上拉触底事件的处理函数
* 页面上拉触底事件的处理函数
*/
*/
onReachBottom
:
function
()
{
onReachBottom
:
function
()
{
console
.
log
(
'onReachBottom'
)
console
.
log
(
this
.
data
.
currentTab
)
if
(
this
.
data
.
currentTab
==
0
){
if
(
this
.
data
.
currentTab
==
0
){
if
(
this
.
data
.
pageNum
<
this
.
data
.
totalPages
){
console
.
log
(
'11111'
)
if
(
this
.
data
.
pageNo
<
this
.
data
.
totalPages
){
console
.
log
(
'22222'
)
this
.
setData
({
this
.
setData
({
pageN
um
:
this
.
data
.
pageNum
+
1
,
pageN
o
:
this
.
data
.
pageNo
+
1
,
},
()
=>
{
},
()
=>
{
this
.
getExtendProList
()
this
.
getExtendProList
(
this
.
data
.
pageNo
,
10
)
})
})
}
}
}
else
{
}
else
{
if
(
this
.
data
.
pageNum
<
this
.
data
.
totalPages
)
{
if
(
this
.
data
.
pageNum
<
this
.
data
.
myTotalPages
)
{
console
.
log
(
'333'
)
this
.
setData
({
this
.
setData
({
pageNum
:
this
.
data
.
pageNum
+
1
,
pageNum
:
this
.
data
.
pageNum
+
1
,
},
()
=>
{
},
()
=>
{
this
.
getMyExtendOrderList
()
this
.
getMyExtendOrderList
(
this
.
data
.
pageNum
,
10
)
})
})
}
}
}
}
...
...
src/pages/extendProduct/extendProduct.json
View file @
c18a7dae
{
{
"enablePullDownRefresh"
:
true
,
"navigationBarTitleText"
:
"推广商品"
,
"navigationBarTitleText"
:
"推广商品"
,
"usingComponents"
:
{
"usingComponents"
:
{
"card-modal"
:
"/component/cardModal/cardModal"
"card-modal"
:
"/component/cardModal/cardModal"
...
...
src/pages/extendProduct/extendProduct.wxml
View file @
c18a7dae
...
@@ -10,17 +10,19 @@
...
@@ -10,17 +10,19 @@
<view class="line" wx-if="{{currentTab==1}}"></view>
<view class="line" wx-if="{{currentTab==1}}"></view>
</view>
</view>
</view>
</view>
<swiper current="{{currentTab}}" duration="300" bindchange="swiperTab">
<swiper-item>
<!-- <swiper current="{{currentTab}}" duration="300" bindchange="swiperTab">
<swiper-item > -->
<scroll-view scroll-y wx:if="{{currentTab==0}}">
<view class="extend-img">
<view class="extend-img">
<image mode="widthFix"></image>
<image mode="widthFix"
src="{{extendProBanner}}"
></image>
</view>
</view>
<view class="pro-nav-wrap">
<view class="pro-nav-wrap">
<view class="nav-list">
<view class="nav-list">
<view class="nav-item nav-active">推荐</view>
<
!-- <
view class="nav-item nav-active">推荐</view>
<view class="nav-item">最新</view>
<view class="nav-item">最新</view>
<view class="nav-item">最热</view>
<view class="nav-item">最热</view>
<view class="nav-item">价格</view>
<view class="nav-item">价格</view>
-->
</view>
</view>
<view class="select-radio all-radio" bindtap="allSelect">
<view class="select-radio all-radio" bindtap="allSelect">
<text class="all" >全选</text>
<text class="all" >全选</text>
...
@@ -34,12 +36,24 @@
...
@@ -34,12 +36,24 @@
<view class="buy-product-content">
<view class="buy-product-content">
<view class="buy-list" wx:for="{{extendProList}}" wx:key="{{index}}">
<view class="buy-list" wx:for="{{extendProList}}" wx:key="{{index}}">
<view class="prod-img">
<view class="prod-img">
<image src="
/assets/imgs/avatar.png
"></image>
<image src="
{{item.productImgUrl}}
"></image>
</view>
</view>
<view class="prod-info">
<view class="prod-info">
<view class="prod-name">{{item.productName}}</view>
<view class="prod-name">{{item.productName}}</view>
<view class="hongbao">
<
!-- <
view class="hongbao">
<button class="btn btn-primary">预计赚5元红包</button>
<button class="btn btn-primary">预计赚5元红包</button>
</view> -->
<view class="benefit-info">
<view class="benefit-point">
<image src="/assets/imgs/7_1_0/integral-icon.png" class="integral-icon" mode="widthFix"></image>
<text class="benefit-num">{{item.point}}</text>
</view>
<view class="coupon-title">
<image src="/assets/imgs/7_1_0/coupon-icon.png" class="coupon-icon" mode="widthFix"></image>
<block wx:for="{{item.shareBonuses}}" wx:for-item="shareItem" wx:for-index="idx" wx:key="{{idx}}">
<text class="benefit-num " >{{shareItem.couponSettingTitle}} </text>
</block>
</view>
</view>
</view>
</view>
</view>
<view class="select-radio pro-radio" catchtap="selectPro" data-index="{{index}}">
<view class="select-radio pro-radio" catchtap="selectPro" data-index="{{index}}">
...
@@ -61,21 +75,23 @@
...
@@ -61,21 +75,23 @@
<text>生成卡片</text>
<text>生成卡片</text>
</view>
</view>
</view>
</view>
</swiper-item>
</scroll-view>
<swiper-item>
<!-- </swiper-item>
<swiper-item> -->
<scroll-view scroll-y wx:if="{{currentTab==1}}">
<view class="release-num weui-flex df-j--bt">
<view class="release-num weui-flex df-j--bt">
<view class="num-invite df-1 border_box">
<view class="num-invite df-1 border_box">
<view class="share-number">
1287
</view>
<view class="share-number">
{{myShareCount.totalCount}}
</view>
<view class="share-title">当前分享订单</view>
<view class="share-title">当前分享订单</view>
</view>
</view>
<view class="extension-line"></view>
<view class="extension-line"></view>
<view class="num-invite-yesterday df-1 border_box">
<view class="num-invite-yesterday df-1 border_box">
<view class="share-number">
87
</view>
<view class="share-number">
{{myShareCount.yesterdayCount}}
</view>
<view class="share-title">昨日新增分享订单</view>
<view class="share-title">昨日新增分享订单</view>
</view>
</view>
</view>
</view>
<view class="order-content">
<view class="order-content">
<view class="order-list" wx:for="{{myExtendList}}" wx:key="{{index}}" wx:for-item="
{{extendItem}}
">
<view class="order-list" wx:for="{{myExtendList}}" wx:key="{{index}}" wx:for-item="
extendItem
">
<view class="order-header">
<view class="order-header">
<view class="order-number">
<view class="order-number">
<text>{{extendItem.createTime}}</text>
<text>{{extendItem.createTime}}</text>
...
@@ -92,12 +108,12 @@
...
@@ -92,12 +108,12 @@
<view class="pro-number">
<view class="pro-number">
<text class="total-pro">促成订单 <text class="help-order">5</text> 笔</text>
<text class="total-pro">促成订单 <text class="help-order">5</text> 笔</text>
</view>
</view>
</view>
</view>
</view>
</view>
<view class="loading-complete">已经到底啦!</view>
<view class="loading-complete">已经到底啦!</view>
</swiper-item>
</scroll-view >
</swiper>
<!-- </swiper-item>
</swiper> -->
</view>
</view>
<share-modal show="{{showShareModal}}" />
<share-modal show="{{showShareModal}}" />
<card-modal show-card-modal="{{showCardModal}}" card-title="{{cardTitle}}" card-url="{{cardUrl}}" page-path="{{pagePath}}"/>
<card-modal show-card-modal="{{showCardModal}}" card-title="{{cardTitle}}" card-url="{{cardUrl}}" page-path="{{pagePath}}"/>
src/pages/extendProduct/extendProduct.wxss
View file @
c18a7dae
...
@@ -2,6 +2,7 @@
...
@@ -2,6 +2,7 @@
@import './../../base/base.wxss';
@import './../../base/base.wxss';
page{
page{
background: #ffffff;
background: #ffffff;
padding-bottom: 100rpx;
}
}
scroll-view{
scroll-view{
height: 100%;
height: 100%;
...
@@ -50,6 +51,7 @@ swiper {
...
@@ -50,6 +51,7 @@ swiper {
width: 750rpx;
width: 750rpx;
height: 174rpx;
height: 174rpx;
background-color: #C09A74;
background-color: #C09A74;
margin-top: 100rpx;
}
}
.all-radio{
.all-radio{
...
@@ -154,6 +156,7 @@ swiper {
...
@@ -154,6 +156,7 @@ swiper {
height: 120rpx;
height: 120rpx;
background: linear-gradient(to right, rgba(192,154,116,0.2) 69%,rgba(207,179,150,0.1) 100%);
background: linear-gradient(to right, rgba(192,154,116,0.2) 69%,rgba(207,179,150,0.1) 100%);
align-items: center;
align-items: center;
margin-top: 100rpx;
}
}
/* .num-invite {
/* .num-invite {
border-right: 1rpx solid #C09A74 ;
border-right: 1rpx solid #C09A74 ;
...
@@ -237,7 +240,34 @@ swiper {
...
@@ -237,7 +240,34 @@ swiper {
left: 313rpx;
left: 313rpx;
}
}
.benefit-info{
margin-top: 20rpx;
display: flex;
}
.integral-icon{
width: 36rpx;
vertical-align: middle;
}
.coupon-icon{
width: 29rpx;
height: 29rpx;
vertical-align: middle;
}
.benefit-num{
font-size: 18rpx;
}
.benefit-point{
margin-right: 30rpx;
}
.coupon-title{
width:300rpx;
text-overflow: ellipsis;
display: -webkit-box;
-webkit-box-orient: vertical;
-webkit-line-clamp: 1;
overflow: hidden;
}
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