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
add3832d
Commit
add3832d
authored
Sep 21, 2019
by
赵雅纹
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
bug修复
parent
abb5b0e1
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
24 additions
and
11 deletions
+24
-11
extendProduct.wxml
src/pages/extendProduct/extendProduct.wxml
+5
-5
extendProduct.wxss
src/pages/extendProduct/extendProduct.wxss
+1
-1
myInvite.js
src/subPackage/page/pages/myInvite/myInvite.js
+1
-0
myInvite.wxml
src/subPackage/page/pages/myInvite/myInvite.wxml
+3
-1
myInvite.wxss
src/subPackage/page/pages/myInvite/myInvite.wxss
+2
-1
myRelease.js
src/subPackage/page/pages/myRelease/myRelease.js
+9
-2
orderBenefit.js
src/subPackage/page/pages/orderBenefit/orderBenefit.js
+3
-1
No files found.
src/pages/extendProduct/extendProduct.wxml
View file @
add3832d
...
@@ -92,9 +92,9 @@
...
@@ -92,9 +92,9 @@
<text>生成海报</text>
<text>生成海报</text>
</view>
</view>
</view>
</view>
<view class="df no-list" wx:if="{{!extendProList.length}}">
<
!-- <
view class="df no-list" wx:if="{{!extendProList.length}}">
暂无推广商品
暂无推广商品
</view>
</view>
-->
</scroll-view>
</scroll-view>
<!-- </swiper-item>
<!-- </swiper-item>
<swiper-item> -->
<swiper-item> -->
...
@@ -151,14 +151,14 @@
...
@@ -151,14 +151,14 @@
<!-- </swiper-item>
<!-- </swiper-item>
</swiper> -->
</swiper> -->
</view>
</view>
<
share-modal show="{{showShareModal}}" /
>
<
!-- <share-modal show="{{showShareModal}}" /> --
>
<card-modal
<
!-- <
card-modal
show-card-modal="{{showCardModal}}"
show-card-modal="{{showCardModal}}"
card-title="{{cardTitle}}"
card-title="{{cardTitle}}"
card-url="{{cardUrl}}"
card-url="{{cardUrl}}"
page-path="{{pagePath}}"
page-path="{{pagePath}}"
/>
/>
<share-poster id="getPoster" bindmyevent="myEventListener" avater="{{cardUrl}}" productDesc="{{cardTitle}}" userAvatar="http://t2.hddhhn.com/uploads/tu/201806/9999/91480c0c87.jpg" bind:showMiniCard="_showMiniCard" pagePath="{{pagePath}}" code-img="{{codeImg}}"></share-poster>
<share-poster id="getPoster" bindmyevent="myEventListener" avater="{{cardUrl}}" productDesc="{{cardTitle}}" userAvatar="http://t2.hddhhn.com/uploads/tu/201806/9999/91480c0c87.jpg" bind:showMiniCard="_showMiniCard" pagePath="{{pagePath}}" code-img="{{codeImg}}"></share-poster>
-->
<!--goHome-->
<!--goHome-->
<go-home/>
<go-home/>
src/pages/extendProduct/extendProduct.wxss
View file @
add3832d
...
@@ -150,7 +150,7 @@ swiper {
...
@@ -150,7 +150,7 @@ swiper {
justify-content: space-around;
justify-content: space-around;
height: 88rpx;
height: 88rpx;
align-items: center;
align-items: center;
z-index: 99;
z-index: 99
99
;
}
}
.share-button{
.share-button{
width: 200rpx;
width: 200rpx;
...
...
src/subPackage/page/pages/myInvite/myInvite.js
View file @
add3832d
...
@@ -105,6 +105,7 @@ wxService.page({
...
@@ -105,6 +105,7 @@ wxService.page({
const
{
result
,
data
}
=
res
.
data
const
{
result
,
data
}
=
res
.
data
if
(
result
==
0
)
{
if
(
result
==
0
)
{
wx
.
hideLoading
()
wx
.
hideLoading
()
this
.
setData
({
this
.
setData
({
inviteMemberList
:
data
inviteMemberList
:
data
},
()
=>
{
},
()
=>
{
...
...
src/subPackage/page/pages/myInvite/myInvite.wxml
View file @
add3832d
...
@@ -20,7 +20,9 @@
...
@@ -20,7 +20,9 @@
<view class="order-benefit-list" wx:for="{{inviteMemberList}}" wx:key="{{index}}">
<view class="order-benefit-list" wx:for="{{inviteMemberList}}" wx:key="{{index}}">
<navigator url="/subPackage/page/pages/orderBenefit/orderBenefit?type=10" hover-class="none">
<navigator url="/subPackage/page/pages/orderBenefit/orderBenefit?type=10" hover-class="none">
<view class="top-info">
<view class="top-info">
<image class="invite-avatar" src="{{item.headimgurl}}"></image>
<!-- 暂时先把头像去掉 -->
<!-- <image class="invite-avatar" src="{{item.headimgurl}}"></image> -->
<view class="invite-phone">
<view class="invite-phone">
<view class="order-num">{{item.mobile}}</view>
<view class="order-num">{{item.mobile}}</view>
<view class="order-date">{{item.activateWxCardTime}}</view>
<view class="order-date">{{item.activateWxCardTime}}</view>
...
...
src/subPackage/page/pages/myInvite/myInvite.wxss
View file @
add3832d
...
@@ -67,7 +67,8 @@ page{
...
@@ -67,7 +67,8 @@ page{
.benefit-tips{
.benefit-tips{
width: 750rpx;
width: 750rpx;
height: 53rpx;
height: 53rpx;
background-color: rgba(0, 0, 0, 0.25);
/* background-color: rgba(0, 0, 0, 0.25); */
background-color: #ccc;
position: fixed;
position: fixed;
bottom: 0;
bottom: 0;
line-height: 53rpx;
line-height: 53rpx;
...
...
src/subPackage/page/pages/myRelease/myRelease.js
View file @
add3832d
...
@@ -2,6 +2,7 @@
...
@@ -2,6 +2,7 @@
const
app
=
getApp
()
const
app
=
getApp
()
const
wxService
=
require
(
'../../../../utils/wxService'
)
const
wxService
=
require
(
'../../../../utils/wxService'
)
const
utils
=
require
(
'../../../../utils/util'
)
const
utils
=
require
(
'../../../../utils/util'
)
const
CEvent
=
require
(
'../../../../utils/event'
)
const
envInfo
=
require
(
'../../../../config/index'
).
envInfo
const
envInfo
=
require
(
'../../../../config/index'
).
envInfo
const
{
memberId
,
member
}
=
wx
.
getStorageSync
(
'_baseUserInfo'
)
const
{
memberId
,
member
}
=
wx
.
getStorageSync
(
'_baseUserInfo'
)
import
{
Integer
}
from
'../../../../utils/integerDigitalConvertion'
import
{
Integer
}
from
'../../../../utils/integerDigitalConvertion'
...
@@ -44,7 +45,9 @@ wxService.page({
...
@@ -44,7 +45,9 @@ wxService.page({
this
.
generatePointObject
(
tentacleInfo
);
this
.
generatePointObject
(
tentacleInfo
);
}
}
//获取内容列表
this
.
getContentList
();
},
},
/**
/**
* 生命周期函数--监听页面显示
* 生命周期函数--监听页面显示
...
@@ -61,8 +64,8 @@ wxService.page({
...
@@ -61,8 +64,8 @@ wxService.page({
plus
:
0
plus
:
0
})
})
}
}
this
.
getBannerInfo
()
this
.
getBannerInfo
()
this
.
getContentList
()
this
.
getContentPermission
()
this
.
getContentPermission
()
this
.
data
.
currentShareContent
=
null
;
this
.
data
.
currentShareContent
=
null
;
...
@@ -126,7 +129,11 @@ wxService.page({
...
@@ -126,7 +129,11 @@ wxService.page({
contentList
:
this
.
data
.
pageNum
==
1
?
[...
data
.
content
]
:
[...
this
.
data
.
contentList
,
...
data
.
content
],
contentList
:
this
.
data
.
pageNum
==
1
?
[...
data
.
content
]
:
[...
this
.
data
.
contentList
,
...
data
.
content
],
totalPages
:
data
.
totalPages
,
totalPages
:
data
.
totalPages
,
totalElements
:
data
.
totalElements
totalElements
:
data
.
totalElements
},()
=>
{
console
.
log
(
this
.
data
.
contentList
)
})
})
}
else
{
}
else
{
this
.
setData
({
this
.
setData
({
contentList
:
[]
contentList
:
[]
...
...
src/subPackage/page/pages/orderBenefit/orderBenefit.js
View file @
add3832d
...
@@ -36,6 +36,8 @@ wxService.page({
...
@@ -36,6 +36,8 @@ wxService.page({
}
}
}
}
this
.
getOrderBenefit
(
1
,
10
)
},
},
/**
/**
...
@@ -49,7 +51,7 @@ wxService.page({
...
@@ -49,7 +51,7 @@ wxService.page({
* 生命周期函数--监听页面显示
* 生命周期函数--监听页面显示
*/
*/
onShow
:
function
()
{
onShow
:
function
()
{
this
.
getOrderBenefit
(
1
,
10
)
},
},
getOrderBenefit
(
pageNum
,
pageSize
){
getOrderBenefit
(
pageNum
,
pageSize
){
...
...
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