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
fbd1c04d
Commit
fbd1c04d
authored
Aug 30, 2019
by
高淑倩
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
modify: plus_img
parent
649e30e9
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
26 additions
and
9 deletions
+26
-9
plus.js
src/component/plus/plus.js
+4
-0
plus.wxml
src/component/plus/plus.wxml
+3
-3
plus.wxss
src/component/plus/plus.wxss
+1
-0
userCenter.js
src/pages/userCenter/userCenter.js
+17
-4
userCenter.wxml
src/pages/userCenter/userCenter.wxml
+1
-1
plus.js
src/subPackage/page/pages/plus/plus.js
+0
-1
No files found.
src/component/plus/plus.js
View file @
fbd1c04d
...
@@ -10,6 +10,10 @@ Component({
...
@@ -10,6 +10,10 @@ Component({
type
:
Array
,
type
:
Array
,
value
:
[],
value
:
[],
},
},
plusBgi
:{
type
:
Object
,
value
:
null
}
},
},
/**
/**
...
...
src/component/plus/plus.wxml
View file @
fbd1c04d
...
@@ -6,7 +6,6 @@
...
@@ -6,7 +6,6 @@
wx:for-index="idx"
wx:for-index="idx"
wx:for-item="navItem"
wx:for-item="navItem"
wx:key="idx"
wx:key="idx"
>
>
<view
<view
class="scroll-view-item {{currentTab == idx ?'poster-active':''}}"
class="scroll-view-item {{currentTab == idx ?'poster-active':''}}"
...
@@ -16,7 +15,7 @@
...
@@ -16,7 +15,7 @@
data-btnText="{{navItem.buttonText}}"
data-btnText="{{navItem.buttonText}}"
data-id="{{navItem.id}}"
data-id="{{navItem.id}}"
bindtap="switchNav"
bindtap="switchNav"
style="background-image:url({{navItem.coverImgUrl}})
"
style="{{currentTab == idx ? 'background-image: url('+ plusBgi.activeUrl +');' : 'background-image: url('+ plusBgi.inactiveUrl +');'}}
"
>
>
<view class="plus-choose">
<view class="plus-choose">
<text>每月仅¥{{navItem.price / navItem.duration * 30}}</text>
<text>每月仅¥{{navItem.price / navItem.duration * 30}}</text>
...
@@ -30,7 +29,7 @@
...
@@ -30,7 +29,7 @@
</view>
</view>
<view class="select-plus" wx:if="{{idx == currentTab}}">
<view class="select-plus" wx:if="{{idx == currentTab}}">
<view class="circle-radio theme-color">
<view class="circle-radio theme-color">
<image class="tick-success" src="/assets/imgs/7_1_0/tick-success.png" mode="widthFix"></image
>
<image class="tick-success" src="/assets/imgs/7_1_0/tick-success.png" mode="widthFix" /
>
</view>
</view>
</view>
</view>
</view>
</view>
...
@@ -43,3 +42,4 @@
...
@@ -43,3 +42,4 @@
</button>
</button>
</view>
</view>
</view>
</view>
src/component/plus/plus.wxss
View file @
fbd1c04d
...
@@ -12,6 +12,7 @@
...
@@ -12,6 +12,7 @@
padding: 36rpx 0 36rpx 30rpx;
padding: 36rpx 0 36rpx 30rpx;
background-color: #C09A74;
background-color: #C09A74;
}
}
.scroll-view_H {
.scroll-view_H {
width: 100%;
width: 100%;
}
}
...
...
src/pages/userCenter/userCenter.js
View file @
fbd1c04d
...
@@ -29,7 +29,8 @@ wxService.page({
...
@@ -29,7 +29,8 @@ wxService.page({
// cardMember: null,
// cardMember: null,
pageBackgroundColor
:
0
,
pageBackgroundColor
:
0
,
guidePageModalShow
:
false
,
guidePageModalShow
:
false
,
currHomePageId
:
''
currHomePageId
:
''
,
skuVOList
:[]
},
},
/**
/**
* 生命周期函数--监听页面加载
* 生命周期函数--监听页面加载
...
@@ -102,7 +103,6 @@ wxService.page({
...
@@ -102,7 +103,6 @@ wxService.page({
isAuthorization
:
true
isAuthorization
:
true
})
})
}
}
// if (baseUserInfo){
// if (baseUserInfo){
// this.setData({
// this.setData({
// token: wx.getStorageSync('token'),
// token: wx.getStorageSync('token'),
...
@@ -120,6 +120,8 @@ wxService.page({
...
@@ -120,6 +120,8 @@ wxService.page({
// isAuthorization: true
// isAuthorization: true
// })
// })
// }
// }
// 获取plus购买信息
this
.
getPlusPurchase
()
// 获取手机信息
// 获取手机信息
wxService
.
getSystemInfo
().
then
(
res
=>
{
wxService
.
getSystemInfo
().
then
(
res
=>
{
this
.
setData
({
this
.
setData
({
...
@@ -144,7 +146,7 @@ wxService.page({
...
@@ -144,7 +146,7 @@ wxService.page({
title
:
'加载中'
title
:
'加载中'
})
})
// wxService.post(`/merchant/modelPage/getDetailById?pageId=${pageId}&brandId=${app.globalData.brandId}`).then(res => {
// wxService.post(`/merchant/modelPage/getDetailById?pageId=${pageId}&brandId=${app.globalData.brandId}`).then(res => {
wxService
.
post
(
`/merchant/modelPage/mainSetting?brandId=
${
app
.
globalData
.
brandId
}
`
).
then
(
res
=>
{
wxService
.
post
(
`/merchant/modelPage/mainSetting
/mall
?brandId=
${
app
.
globalData
.
brandId
}
`
).
then
(
res
=>
{
if
(
!
res
)
return
false
if
(
!
res
)
return
false
const
{
result
,
data
}
=
res
.
data
const
{
result
,
data
}
=
res
.
data
if
(
result
==
0
)
{
if
(
result
==
0
)
{
...
@@ -209,7 +211,18 @@ wxService.page({
...
@@ -209,7 +211,18 @@ wxService.page({
wx
.
hideLoading
()
wx
.
hideLoading
()
})
})
},
},
// 获取plus购买信息
getPlusPurchase
()
{
wxService
.
get
(
`/sale/premium/query`
).
then
(
res
=>
{
const
{
result
,
data
}
=
res
.
data
if
(
result
==
0
)
{
this
.
setData
({
skuVOList
:
data
})
}
}).
finally
(()
=>
{
})
},
/**
/**
* 用户点击右上角分享
* 用户点击右上角分享
*/
*/
...
...
src/pages/userCenter/userCenter.wxml
View file @
fbd1c04d
...
@@ -27,7 +27,7 @@
...
@@ -27,7 +27,7 @@
<attention focus-wx="{{pItem.focusWx}}" />
<attention focus-wx="{{pItem.focusWx}}" />
</view>
</view>
<view class="" wx:if="{{pItem.type == 9}}">
<view class="" wx:if="{{pItem.type == 9}}">
<plus sku-list="{{
pItem.plus}}"
/>
<plus sku-list="{{
skuVOList}}" plus-bgi="{{pItem.plus}}"
/>
</view>
</view>
</block>
</block>
</view>
</view>
...
...
src/subPackage/page/pages/plus/plus.js
View file @
fbd1c04d
...
@@ -16,7 +16,6 @@ wxService.page({
...
@@ -16,7 +16,6 @@ wxService.page({
},
},
/**
/**
* 生命周期函数--监听页面初次渲染完成
* 生命周期函数--监听页面初次渲染完成
*/
*/
...
...
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