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
8548b5a1
Commit
8548b5a1
authored
Sep 17, 2019
by
赵雅纹
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
邀请注册判断
parent
730e4204
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
33 additions
and
14 deletions
+33
-14
wantToBuyDetail.json
src/pages/wantToBuyDetail/wantToBuyDetail.json
+3
-1
wantToBuyDetail.wxml
src/pages/wantToBuyDetail/wantToBuyDetail.wxml
+1
-1
myInvite.js
src/subPackage/page/pages/myInvite/myInvite.js
+21
-7
myInvite.wxml
src/subPackage/page/pages/myInvite/myInvite.wxml
+1
-1
myRelease.js
src/subPackage/page/pages/myRelease/myRelease.js
+2
-0
myRelease.wxml
src/subPackage/page/pages/myRelease/myRelease.wxml
+1
-1
myReleaseDetail.json
...ubPackage/page/pages/myReleaseDetail/myReleaseDetail.json
+3
-1
myReleaseDetail.wxml
...ubPackage/page/pages/myReleaseDetail/myReleaseDetail.wxml
+1
-2
No files found.
src/pages/wantToBuyDetail/wantToBuyDetail.json
View file @
8548b5a1
...
@@ -3,6 +3,7 @@
...
@@ -3,6 +3,7 @@
"usingComponents"
:
{
"usingComponents"
:
{
"go-home"
:
"/component/goHome/goHome"
,
"go-home"
:
"/component/goHome/goHome"
,
"card-modal"
:
"/component/cardModal/cardModal"
,
"card-modal"
:
"/component/cardModal/cardModal"
,
"buy-image-swiper"
:
"/component/buyImageSwiper/buyImageSwiper"
"buy-image-swiper"
:
"/component/buyImageSwiper/buyImageSwiper"
,
"x-html"
:
"/component/html2wxml/wxHtml"
}
}
}
}
\ No newline at end of file
src/pages/wantToBuyDetail/wantToBuyDetail.wxml
View file @
8548b5a1
<view class='page-want-buy'>
<view class='page-want-buy'>
<buy-image-swiper bind:updatePage="updatePage" image-data="{{contentInfo.shareShowPictureRESDTOList}}" />
<buy-image-swiper bind:updatePage="updatePage" image-data="{{contentInfo.shareShowPictureRESDTOList}}" />
<view class="buy-desc">
<view class="buy-desc">
<view>
{{contentInfo.describe}}
</view>
<view>
<x-html html="{{contentInfo.article}}" />
</view>
<view class="share-wrap">
<view class="share-wrap">
<view class="share-oprate" bindtap="gotoLike">
<view class="share-oprate" bindtap="gotoLike">
<image class="share-img" src="{{contentInfo.type ? '/assets/imgs/heart-primary.png' : '/assets/imgs/heart-default.png'}}" />
<image class="share-img" src="{{contentInfo.type ? '/assets/imgs/heart-primary.png' : '/assets/imgs/heart-default.png'}}" />
...
...
src/subPackage/page/pages/myInvite/myInvite.js
View file @
8548b5a1
...
@@ -28,6 +28,7 @@ wxService.page({
...
@@ -28,6 +28,7 @@ wxService.page({
this
.
getYesterdayInviteNumber
()
this
.
getYesterdayInviteNumber
()
this
.
getInviteMemberList
()
this
.
getInviteMemberList
()
this
.
getInviteBanner
()
this
.
getInviteBanner
()
this
.
getIsInvite
()
wx
.
hideShareMenu
()
wx
.
hideShareMenu
()
},
},
...
@@ -47,6 +48,19 @@ wxService.page({
...
@@ -47,6 +48,19 @@ wxService.page({
})
})
},
},
// 判断是否可以邀请注册
getIsInvite
(){
wxService
.
get
(
`/member/share/inviteFriends/buyer/checkShare`
).
then
(
res
=>
{
const
{
result
,
data
}
=
res
.
data
if
(
result
==
0
)
{
this
.
setData
({
isGoToInvite
:
data
})
}
}).
finally
(()
=>
{
})
},
// 获取昨日邀请人数
// 获取昨日邀请人数
getYesterdayInviteNumber
()
{
getYesterdayInviteNumber
()
{
// 昨天的时间
// 昨天的时间
...
@@ -111,13 +125,13 @@ wxService.page({
...
@@ -111,13 +125,13 @@ wxService.page({
inviteBanner
:
data
.
gradientAwardPage
inviteBanner
:
data
.
gradientAwardPage
},
()
=>
{
},
()
=>
{
})
})
let
now
=
new
Date
().
getTime
()
//
let now = new Date().getTime()
let
endTime
=
new
Date
(
data
.
endTime
).
getTime
()
//
let endTime = new Date(data.endTime).getTime()
if
(
now
<
endTime
){
//
if (now < endTime){
this
.
setData
({
//
this.setData({
isGoToInvite
:
true
//
isGoToInvite: true
})
//
})
}
//
}
}
}
}
}
})
})
...
...
src/subPackage/page/pages/myInvite/myInvite.wxml
View file @
8548b5a1
...
@@ -13,7 +13,7 @@
...
@@ -13,7 +13,7 @@
</view>
</view>
<!-- <navigator url="/subPackage/page/pages/share/share" hover-class="none"> -->
<!-- <navigator url="/subPackage/page/pages/share/share" hover-class="none"> -->
<view class="invite-banner" bindtap="gotoInviteShare">
<view class="invite-banner" bindtap="gotoInviteShare">
<image src="{{
!
isGoToInvite ? inviteBanner : '/assets/imgs/7_1_0/coming-soon.jpg'}}" mode="widthFix"></image>
<image src="{{isGoToInvite ? inviteBanner : '/assets/imgs/7_1_0/coming-soon.jpg'}}" mode="widthFix"></image>
</view>
</view>
<!-- </navigator> -->
<!-- </navigator> -->
<view class="order-benefit-wrap">
<view class="order-benefit-wrap">
...
...
src/subPackage/page/pages/myRelease/myRelease.js
View file @
8548b5a1
...
@@ -68,6 +68,7 @@ wxService.page({
...
@@ -68,6 +68,7 @@ wxService.page({
// 发布内容权限
// 发布内容权限
getContentPermission
(){
getContentPermission
(){
const
{
memberId
,
member
}
=
wx
.
getStorageSync
(
'_baseUserInfo'
)
wxService
.
post
(
`/merchant/contentMobileTerminal/getReleasePermissions`
,
{
wxService
.
post
(
`/merchant/contentMobileTerminal/getReleasePermissions`
,
{
userId
:
memberId
,
userId
:
memberId
,
plus
:
this
.
data
.
plus
,
plus
:
this
.
data
.
plus
,
...
@@ -86,6 +87,7 @@ wxService.page({
...
@@ -86,6 +87,7 @@ wxService.page({
// banner
// banner
getBannerInfo
(){
getBannerInfo
(){
const
{
memberId
,
member
}
=
wx
.
getStorageSync
(
'_baseUserInfo'
)
wxService
.
post
(
`/merchant/contentMobileTerminal/getBannerAndInviteSum`
,
{
wxService
.
post
(
`/merchant/contentMobileTerminal/getBannerAndInviteSum`
,
{
userId
:
memberId
userId
:
memberId
}).
then
(
res
=>
{
}).
then
(
res
=>
{
...
...
src/subPackage/page/pages/myRelease/myRelease.wxml
View file @
8548b5a1
...
@@ -10,7 +10,7 @@
...
@@ -10,7 +10,7 @@
</view>
</view>
</view>
</view>
<view class="diy-banner">
<view class="diy-banner">
<image src="{{bannerUrl}}" />
<image src="{{bannerUrl
? bannerUrl : '/assets/imgs/7_1_0/coming-soon.jpg'
}}" />
</view>
</view>
<button
<button
wx:if="{{!currentHasUserInfo}}"
wx:if="{{!currentHasUserInfo}}"
...
...
src/subPackage/page/pages/myReleaseDetail/myReleaseDetail.json
View file @
8548b5a1
...
@@ -3,6 +3,7 @@
...
@@ -3,6 +3,7 @@
"usingComponents"
:
{
"usingComponents"
:
{
"x-dialog"
:
"/component/dialog/dialog"
,
"x-dialog"
:
"/component/dialog/dialog"
,
"card-modal"
:
"/component/cardModal/cardModal"
,
"card-modal"
:
"/component/cardModal/cardModal"
,
"go-home"
:
"/component/goHome/goHome"
"go-home"
:
"/component/goHome/goHome"
,
"x-html"
:
"/component/html2wxml/wxHtml"
}
}
}
}
\ No newline at end of file
src/subPackage/page/pages/myReleaseDetail/myReleaseDetail.wxml
View file @
8548b5a1
...
@@ -5,10 +5,9 @@
...
@@ -5,10 +5,9 @@
</view>
</view>
<view class="detail-content border_box">
<view class="detail-content border_box">
<view class="detail-title">{{contentInfo.headline}}</view>
<view class="detail-title">{{contentInfo.headline}}</view>
<view class="detail-desc">
{{contentInfo.article}}
</view>
<view class="detail-desc">
<x-html html="{{contentInfo.article}}" />
</view>
<view class="detail-bottom weui-flex df-j--bt">
<view class="detail-bottom weui-flex df-j--bt">
<view class="bottom-collapse border_box"> 收起</view>
<view class="bottom-collapse border_box"> 收起</view>
</view>
</view>
</view>
</view>
<view class="release-action">
<view class="release-action">
...
...
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