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
64f51e17
Commit
64f51e17
authored
Sep 10, 2019
by
赵雅纹
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
bug修改
parent
73528bfc
Show whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
39 additions
and
12 deletions
+39
-12
plus.js
src/component/plus/plus.js
+5
-2
plus.wxml
src/component/plus/plus.wxml
+7
-3
plus.wxss
src/component/plus/plus.wxss
+10
-3
userCenter.wxss
src/pages/userCenter/userCenter.wxss
+3
-0
myInvite.js
src/subPackage/page/pages/myInvite/myInvite.js
+1
-1
myInvite.wxml
src/subPackage/page/pages/myInvite/myInvite.wxml
+4
-1
myInvite.wxss
src/subPackage/page/pages/myInvite/myInvite.wxss
+7
-0
myRelease.wxml
src/subPackage/page/pages/myRelease/myRelease.wxml
+2
-2
No files found.
src/component/plus/plus.js
View file @
64f51e17
...
...
@@ -25,7 +25,8 @@ Component({
* 组件的初始数据
*/
data
:
{
currentTab
:
'999'
currentTab
:
'999'
,
currentPrice
:
0
},
/**
* 组件的方法列表
...
...
@@ -84,9 +85,11 @@ Component({
},
200
)
},
switchNav
(
e
){
console
.
log
(
e
)
this
.
setData
({
currentTab
:
e
.
currentTarget
.
dataset
.
current
,
id
:
e
.
currentTarget
.
dataset
.
id
id
:
e
.
currentTarget
.
dataset
.
id
,
currentPrice
:
e
.
currentTarget
.
dataset
.
price
})
},
payPlus
()
{
...
...
src/component/plus/plus.wxml
View file @
64f51e17
...
...
@@ -14,11 +14,13 @@
data-endTimeStr="{{navItem.endTimeStr}}"
data-btnText="{{navItem.buttonText}}"
data-id="{{navItem.id}}"
data-price="{{navItem.price}}"
bindtap="switchNav"
style="{{currentTab == idx ? 'background-image: url('+ plusBgi.activeUrl +');' : 'background-image: url('+ plusBgi.inactiveUrl +');'}}"
>
<view class="plus-choose">
<text>每月仅¥{{navItem.price / navItem.duration * 30}}</text>
<text wx:if="{{navItem.duration == 365}}">每月仅¥{{navItem.price / 12}}</text>
<text wx:else>每月仅¥{{navItem.price / navItem.duration * 30}}</text>
</view>
<view class="card-kinds">
{{navItem.name}}
...
...
@@ -35,6 +37,7 @@
</view>
</block>
</scroll-view>
<view class="pay-wrap">
<view class="pay">
<!--微信授权-->
<block wx:if="{{!currentHasUserInfo}}">
...
...
@@ -46,15 +49,16 @@
hover-class="btn-hover"
>
<text>立即支付</text>
<text>¥158
</text>
<text>¥{{currentPrice}}
</text>
</button>
</block>
<block wx:else>
<button class="btn btn-primary" bindtap="payPlus">
<text>立即支付</text>
<text>¥158
</text>
<text>¥{{currentPrice}}
</text>
</button>
</block>
</view>
</view>
</view>
src/component/plus/plus.wxss
View file @
64f51e17
...
...
@@ -39,11 +39,10 @@
.pay{
height: 88rpx;
line-height: 88rpx;
position: fixed;
bottom: 0;
right: 30rpx;
display: flex;
align-items: center;
flex-direction: row-reverse;
margin-right: 30rpx;
}
.pay button{
width: 280rpx;
...
...
@@ -89,6 +88,14 @@
line-height: 26rpx;
text-align: center;
}
.pay-wrap{
width: 750rpx;
background-color: #ffffff;
height: 88rpx;
position: fixed;
bottom: 0;
right: 0;
}
src/pages/userCenter/userCenter.wxss
View file @
64f51e17
/* pages/userCenter.wxss */
@import './../../base/base.wxss';
page{
padding-bottom: 320rpx;
}
.user-center{
box-sizing: border-box;
padding-bottom: 200rpx;
...
...
src/subPackage/page/pages/myInvite/myInvite.js
View file @
64f51e17
...
...
@@ -125,7 +125,7 @@ wxService.page({
// 点击去分享页面
gotoInviteShare
(){
if
(
this
.
data
.
i
nviteMemberList
&&
this
.
data
.
i
sGoToInvite
){
if
(
this
.
data
.
isGoToInvite
){
wxService
.
router
(
'/subPackage/page/pages/share/share'
)
}
},
...
...
src/subPackage/page/pages/myInvite/myInvite.wxml
View file @
64f51e17
...
...
@@ -13,7 +13,7 @@
</view>
<!-- <navigator url="/subPackage/page/pages/share/share" hover-class="none"> -->
<view class="invite-banner" bindtap="gotoInviteShare">
<image src="{{i
nviteMemberList && i
sGoToInvite ? inviteBanner : '/assets/imgs/7_1_0/coming-soon.jpg'}}"></image>
<image src="{{isGoToInvite ? inviteBanner : '/assets/imgs/7_1_0/coming-soon.jpg'}}"></image>
</view>
<!-- </navigator> -->
<view class="order-benefit-wrap">
...
...
@@ -49,6 +49,9 @@
</view>
</view> -->
</view>
<view class="empty">
暂无邀请记录~
</view>
</view>
<view class="benefit-tips">
<text>邀请好友只显示前50名</text>
...
...
src/subPackage/page/pages/myInvite/myInvite.wxss
View file @
64f51e17
...
...
@@ -96,3 +96,9 @@
line-height: 35rpx;
font-size: 18rpx;
}
.empty{
color: #808080;
text-align: center;
width: 100%;
margin-top: 200rpx;
}
\ No newline at end of file
src/subPackage/page/pages/myRelease/myRelease.wxml
View file @
64f51e17
...
...
@@ -2,11 +2,11 @@
<view class="release-num weui-flex df-j--bt">
<view class="num-invite df-1 border_box">
<view class="num">{{inviteSum}}</view>
<view class="desc">当前
邀请人数
</view>
<view class="desc">当前
分享订单
</view>
</view>
<view class="num-invite-yesterday df-1 border_box">
<view class="num">{{yesterdayInviteSum}}</view>
<view class="desc">昨天
邀请新增
</view>
<view class="desc">昨天
新增分享订单
</view>
</view>
</view>
<view class="diy-banner">
...
...
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