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
25e13b0f
Commit
25e13b0f
authored
May 22, 2019
by
赵雅纹
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
消費列表,我的會員
parent
bf8578f6
Show whitespace changes
Inline
Side-by-side
Showing
11 changed files
with
257 additions
and
49 deletions
+257
-49
app.json
src/app.json
+2
-2
3x-21.png
src/assets/imgs/3x-21.png
+0
-0
imageSwiper.wxss
src/component/imageSwiper/imageSwiper.wxss
+9
-1
memberOfOwn.js
src/pages/memberOfOwn/memberOfOwn.js
+21
-40
memberOfOwn.wxml
src/pages/memberOfOwn/memberOfOwn.wxml
+66
-1
memberOfOwn.wxss
src/pages/memberOfOwn/memberOfOwn.wxss
+104
-0
mySpend.wxml
src/pages/mySpend/mySpend.wxml
+21
-1
mySpend.wxss
src/pages/mySpend/mySpend.wxss
+27
-0
userCenter.wxml
src/pages/userCenter/userCenter.wxml
+2
-0
userCenter.wxss
src/pages/userCenter/userCenter.wxss
+1
-0
util.js
src/utils/util.js
+4
-4
No files found.
src/app.json
View file @
25e13b0f
{
"pages"
:
[
"pages/mySpend/mySpend"
,
"pages/memberOfOwn/memberOfOwn"
,
"pages/userCenter/userCenter"
,
"pages/welcome/welcome"
,
"pages/mySpend/mySpend"
,
"pages/memberRules/memberRules"
,
"pages/memberOfOwn/memberOfOwn"
,
"pages/integralWater/integralWater"
,
"pages/deliveryService/deliveryService"
,
"pages/coupons/coupons"
,
...
...
src/assets/imgs/
711-ui-190509-切图
3x-21.png
→
src/assets/imgs/3x-21.png
View file @
25e13b0f
File moved
src/component/imageSwiper/imageSwiper.wxss
View file @
25e13b0f
/* component/imageSwiper/imageSwiper.wxss */
swiper{
height: 374rpx;
}
swiper image{
width: 100%;
border-radius:14rpx;
border-radius:7rpx;
}
swiper-item{
border-radius: 7rpx;
height: 374rpx;
}
\ No newline at end of file
src/pages/memberOfOwn/memberOfOwn.js
View file @
25e13b0f
...
...
@@ -9,7 +9,17 @@ wxService.page({
* 页面的初始数据
*/
data
:
{
sexArray
:[
{
id
:
'1'
,
name
:
'女'
},{
id
:
'2'
,
name
:
'男'
}
],
sexIndex
:
0
,
date
:
''
},
/**
...
...
@@ -20,51 +30,23 @@ wxService.page({
},
/**
* 生命周期函数--监听页面初次渲染完成
*/
onReady
:
function
()
{
},
/**
* 生命周期函数--监听页面显示
*/
onShow
:
function
()
{
},
/**
* 生命周期函数--监听页面隐藏
*/
onHide
:
function
()
{
},
/**
* 生命周期函数--监听页面卸载
*/
onUnload
:
function
()
{
},
/**
* 页面相关事件处理函数--监听用户下拉动作
*/
onPullDownRefresh
:
function
()
{
//性别选择
bindSexChange
(
e
){
this
.
setData
({
sexIndex
:
e
.
detail
.
value
})
},
/
**
* 页面上拉触底事件的处理函数
*/
onReachBottom
:
function
()
{
/
/日期选择
bindDateChange
(
e
)
{
this
.
setData
({
date
:
e
.
detail
.
value
})
},
/**
* 用户点击右上角分享
*/
onShareAppMessage
:
function
()
{
}
})
\ No newline at end of file
src/pages/memberOfOwn/memberOfOwn.wxml
View file @
25e13b0f
<!--pages/userCenter.wxml-->
<text>pages/userCenter.wxml</text>
<view class='page-memberOfOwn'>
<view class='own-content'>
<view class='user-info'>
<image class='own-bg' src='/assets/imgs/3X-21.png'></image>
<view class="user-avatar">
<open-data type="userAvatarUrl"></open-data>
</view>
<view class='user-name-content'>
<view class='user-name'>
<open-data type="userNickName" class="userinfo-nickname" lang="zh_CN"></open-data>
</view>
<view class='user-id'>34765736454</view>
</view>
<view class='qr-code pr'>
<image src='/assets/imgs/qr-code.png'></image>
</view>
</view>
<view class='user-qr-code'>
<image src='/assets/imgs/3X-21.png'></image>
</view>
</view>
<view class='form-info'>
<form>
<view class='form-section'>
<view class='form-label'>姓名</view>
<input class='form-input' name="input" placeholder="用户名" />
</view>
<view class='form-section'>
<view class='form-label'>手机号</view>
<input class='form-input' name="input" placeholder="请输入手机号" />
</view>
<view class='form-section'>
<view class='form-label'>性别</view>
<picker bindchange="bindSexChange" value="{{sexIndex}}" range="{{sexArray}}" range-key="name" class='form-picker'>
<view class="picker">
{{sexArray[sexIndex].name ? sexArray[sexIndex].name : '请选择性别'}}
</view>
</picker>
</view>
<view class='form-picker-section'>
<view class='form-label'>生日</view>
<picker
mode="date"
value="{{date}}"
start=""
end=""
bindchange="bindDateChange"
class='form-picker'
>
<view class="picker">{{date ? date : '请选择生日'}}</view>
<view class='birthday-desc'>*生日信息一经填写,不可调整</view>
</picker>
</view>
<view class='form-section'>
<view class='form-label'>邮箱</view>
<input class='form-input' name="input" placeholder="请输入邮箱" />
</view>
<view class='form-section'>
<view class='form-label'>地址</view>
<input class='form-input' name="input" placeholder="请填写真实收件地址" />
</view>
<button type='primary' class='btn-primary'>确认</button>
</form>
</view>
</view>
src/pages/memberOfOwn/memberOfOwn.wxss
View file @
25e13b0f
/* pages/userCenter.wxss */
@import './../../base/base.wxss';
.own-content{
padding: 60rpx 50rpx 0;
}
.user-info{
position: relative;
width: 650rpx;
height: 260rpx;
box-shadow: 0 0 40rpx 1rpx #666666;
border-radius: 7rpx;
padding-top: 30rpx;
}
.own-bg{
width: 650rpx;
height: 290rpx;
position: absolute;
top: 0;
left: 0;
z-index: -1;
}
.user-content{
height: 92rpx;
width: 598rpx;
padding: 37rpx 46rpx;
}
.user-avatar{
width: 100rpx;
height: 100rpx;
overflow:hidden;
border-radius: 50%;
display: inline-block;
margin-right: 18rpx;
margin-left: 30rpx;
}
.user-name-content{
display: inline-block;
}
.user-name{
margin-bottom: 25rpx;
}
.icon-edit{
width: 28rpx;
height: 28rpx;
vertical-align: middle;
margin-left: 8rpx;
}
.user-id{
color: #666666;
font-size: 24rpx;
}
.qr-code image{
width: 50rpx;
height: 50rpx;
margin-right: 36rpx
}
.user-qr-code{
background-color: #ffffff;
border-radius: 7rpx;
width:650rpx;
height: 100rpx;
line-height: 100rpx;
text-align: center;
/* box-shadow: 0 0 10rpx 1rpx #666666; */
}
.user-qr-code image{
width: 200rpx;
height: 50rpx;
display: inline-block;
margin-top: 25rpx;
}
/* form表单 */
.form-info{
background-color: #ffffff;
margin-top: 60rpx;
padding-left: 50rpx;
}
.form-section{
height: 120rpx;
line-height: 120rpx;
border-bottom: 1px solid #777777;
}
.form-label,.form-input,.form-picker{
display: inline-block;
vertical-align: middle;
}
.form-label{
width: 150rpx;
}
.btn-primary{
width: 650rpx;
margin-top: 100rpx;
padding-left: 0;
margin-left: 0;
}
.form-picker-section{
border-bottom: 1px solid #777777;
padding: 30rpx 0;
}
.birthday-desc{
color: red;
font-size: 20rpx;
margin-top: 15rpx;
}
src/pages/mySpend/mySpend.wxml
View file @
25e13b0f
<!--pages/userCenter.wxml-->
<text>pages/userCenter.wxml</text>
<view class='page-mySpend'>
<scroll-view>
<view class='spend-wrap'>
<navigator url='/pages/consumptionDetails/consumptionDetails'></navigator>
<view class='spend-list'>
<view class='spend-id fs-22'>订单编号:8327878435</view>
<view class='spend-time fs-25'>消费时间:</view>
<view class='spend-shop fs-25'>消费门店:张江高科店</view>
<view class="spend-status fs-22 {{true ? 'fail-status' : ''}}">交易成功</view>
</view>
</view>
<view class='spend-wrap'>
<view class='spend-list'>
<view class='spend-id fs-22'>订单编号:8327878435</view>
<view class='spend-time fs-25'>消费时间:</view>
<view class='spend-shop fs-25'>消费门店:张江高科店</view>
<view class='spend-status fs-22'>交易成功</view>
</view>
</view>
</scroll-view>
</view>
src/pages/mySpend/mySpend.wxss
View file @
25e13b0f
/* pages/userCenter.wxss */
@import './../../base/base.wxss';
.page-mySpend{
padding: 0 32rpx;
}
.spend-wrap{
padding: 28rpx 0;
border-bottom: 1px solid #e5e5e5;
}
.spend-id{
color: #999999;
}
.spend-time,.spend-shop{
color: #666666;
}
.spend-list{
position: relative;
}
.spend-status{
color: #05c35b;
position: absolute;
right: 0;
bottom: 0;
}
.fail-status{
color: #999999;
}
\ No newline at end of file
src/pages/userCenter/userCenter.wxml
View file @
25e13b0f
...
...
@@ -11,7 +11,9 @@
<view class='user-name-content'>
<view class='user-name'>
<open-data type="userNickName" class="userinfo-nickname" lang="zh_CN"></open-data>
<navigator url='/pages/memberOfOwn/memberOfOwn' style='display:inline-block' hover-class="none">
<image class='icon-edit' src='/assets/imgs/icon-edit.png'></image>
</navigator>
</view>
<view class='user-id'>34765736454</view>
</view>
...
...
src/pages/userCenter/userCenter.wxss
View file @
25e13b0f
...
...
@@ -2,6 +2,7 @@
@import './../../base/base.wxss';
.user-center{
padding: 15rpx 30rpx;
margin-bottom: 120rpx;
}
.activation-content{
position: relative;
...
...
src/utils/util.js
View file @
25e13b0f
...
...
@@ -158,10 +158,10 @@ function getUserInfoByBtn(userInfo) {
icon
:
'none'
,
mask
:
true
})
//
return wxService.post(`/minaLogin`, {
//
code: res[1].code,
//
wechatInfo: res[0]
//
})
return
wxService
.
post
(
`/minaLogin`
,
{
code
:
res
[
1
].
code
,
wechatInfo
:
res
[
0
]
})
},
(
err
)
=>
{
return
Promise
.
reject
(
err
)
}).
then
(
response
=>
{
...
...
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