Skip to content

7
7-Eleven
Commit d43c9fed by 赵雅纹
Options

Merge branch 'dev' into feature-zyw

parents fad8266c d2209bf3
Showing with 171 additions and 251 deletions
src/base/base.wxss
...@@ -164,7 +164,7 @@ i { ...@@ -164,7 +164,7 @@ i {
.bg-fff { .bg-fff {
background-color: #fff; } background-color: #fff; }
page { page {
width: 100%; width: 100%;
box-sizing: border-box; box-sizing: border-box;
background-color: #f2f4f7; background-color: #f2f4f7;
......
src/pages/memberOfOwn/memberOfOwn.js
...@@ -27,6 +27,7 @@ wxService.page({ ...@@ -27,6 +27,7 @@ wxService.page({
} }
], ],
index: 0, index: 0,
date: '',
}, },
bindPickerChange (e) { bindPickerChange (e) {
this.setData({ this.setData({
...@@ -36,14 +37,12 @@ wxService.page({ ...@@ -36,14 +37,12 @@ wxService.page({
/** /**
* 生命周期函数--监听页面加载 * 生命周期函数--监听页面加载
*/ */
onLoad: function (options) { onLoad (options) {},
},
/** /**
* 生命周期函数--监听页面显示 * 生命周期函数--监听页面显示
*/ */
onShow: function () { onShow () {
// 取会员卡号 // 取会员卡号
const {memberCardNo, memberId} = wx.getStorageSync('_baseUserInfo') const {memberCardNo, memberId} = wx.getStorageSync('_baseUserInfo')
this.setData({ this.setData({
...@@ -54,18 +53,30 @@ wxService.page({ ...@@ -54,18 +53,30 @@ wxService.page({
// 条形码 // 条形码
wxbarcode.barcode('barcode', memberCardNo, 500, 60); wxbarcode.barcode('barcode', memberCardNo, 500, 60);
}, },
bindDateChange (e) {
this.setData({
date: e.detail.value
})
},
formSubmit(e) { formSubmit(e) {
// 生日 0 男 1 女 // 0 男 1 女
const { birthday } = this.data.memberInfo const {email} = e.detail.value
if(birthday) {
e.detail.value.birthday = birthday
}
if(this.data.index == 0){ if(this.data.index == 0){
e.detail.value.sex = '男' e.detail.value.sex = '男'
} else { } else {
e.detail.value.sex = '女' e.detail.value.sex = '女'
} }
if(email) {
let emailFlag = utils.validateEmail(email)
if(!emailFlag){
wx.showToast({
title: `请输入正确的邮箱地址!`,
icon: 'none'
})
return false
}
}
const params = e.detail.value const params = e.detail.value
// 保存接口 // 保存接口
this.handelMemberUplate(params) this.handelMemberUplate(params)
...@@ -86,7 +97,8 @@ wxService.page({ ...@@ -86,7 +97,8 @@ wxService.page({
data.member.sex = data.member.sex == '男'? 0 : 1 data.member.sex = data.member.sex == '男'? 0 : 1
this.setData({ this.setData({
memberInfo: data.member, memberInfo: data.member,
index: data.member.sex index: data.member.sex,
date: data.member.birthday
}) })
} }
}) })
......
src/pages/memberOfOwn/memberOfOwn.wxml
<!--pages/userCenter.wxml--> <!--pages/userCenter.wxml-->
<view class='page-memberOfOwn'> <view class='page-memberOfOwn'>
<view class='own-content'> <view class='own-content'>
<view class='user-info'> <view class='user-info'>
<image class='own-bg' src='/assets/imgs/711_08.png'></image> <image class='own-bg' src='/assets/imgs/711_08.png' />
<view class="user-avatar"> <view class="user-avatar">
<open-data type="userAvatarUrl"></open-data> <open-data type="userAvatarUrl" />
</view> </view>
<view class='user-name-content'> <view class='user-name-content'>
<view class='user-name'> <view class='user-name'>
<open-data type="userNickName" class="userinfo-nickname" lang="zh_CN"></open-data> <open-data type="userNickName" class="userinfo-nickname" lang="zh_CN" />
</view> </view>
<view class='user-id'>{{memberCardNo}}</view> <view class='user-id'>{{memberCardNo}}</view>
</view> </view>
<view class='qr-code pr'> <view class='qr-code pr'>
<image src='/assets/imgs/711_11.png' bindtap='handleGoWxCard'></image> <image src='/assets/imgs/711_11.png' bindtap='handleGoWxCard' />
</view> </view>
</view> </view>
<view class='user-qr-code'> <view class='user-qr-code'>
<canvas canvas-id="barcode" /> <canvas canvas-id="barcode" />
</view> </view>
</view> </view>
<!-- <view class="section"> <view class="form-info">
<view class="section__title">普通选择器</view> <form bindsubmit="formSubmit">
<picker bindchange="bindPickerChange" value="{{index}}" range="{{array}}"> <view class="picker">
<view class="picker"> <view class='form-label'>姓名</view>
当前选择：{{array[index]}} <view class="right-input">
</view> <input
</picker> class='form-input'
</view>--> name="name"
value="{{memberInfo.name}}"
placeholder="用户姓名"
/>
</view>
</view>
<view class="picker">
<view class='form-label'>手机号</view>
<view class="right-input">
<input
class='form-input'
name="mobile"
disabled
value="{{memberInfo.mobile}}"
placeholder="请输入手机号"
/>
</view>
</view>
<view class='form-info'> <picker bindchange="bindPickerChange" value="{{index}}" range="{{array}}">
<form bindsubmit="formSubmit"> <view class="picker">
<view class='form-section'> <view class='form-label'>性别</view>
<label class='form-label'>姓名</label> <view class="right-input form-input">{{array[index]}}</view>
<view class="right-input"> </view>
<input class='form-input' name="name" value="{{memberInfo.name}}" placeholder="用户姓名" /> </picker>
</view>
</view> <picker
<view class='form-section'> mode="date"
<label class='form-label'>手机号</label> value="{{date}}"
<view class="right-input"> start=""
<input class='form-input' disabled value="{{memberInfo.mobile}}" placeholder="请输入手机号" /> end=""
</view> name="birthday"
</view> disabled="{{memberInfo.birthday}}"
<view class='form-section'> bindchange="bindDateChange"
<label class='form-label'>性别</label> >
<picker bindchange="bindPickerChange" value="{{index}}" range="{{array}}"> <view class="picker">
<view class="picker"> <view class='form-label'>生日</view>
{{array[index]}} <view class="right-input">
</view> <view class="form-input" wx:if="{{date == ''}}">请选择生日</view>
</picker> <view class="form-input" wx:else>{{date}}</view>
</view> <view class='birthday-desc'>*生日信息一经填写，不可调整</view>
<view class='form-picker-section'> </view>
<label class='form-label'>生日</label> </view>
<picker </picker>
class="right-input"
mode="date" <view class="picker">
value="{{date}}" <view class='form-label'>邮箱</view>
start="" <view class="right-input">
end="" <input
name="birthday" class='form-input'
bindchange="bindDateChange" name="email"
class='form-picker' value="{{memberInfo.email}}"
disabled="{{memberInfo.birthday}}" placeholder="请输入邮箱"
> />
<view class="picker">{{memberInfo.birthday ? memberInfo.birthday : '请选择生日'}}</view> </view>
<view class='birthday-desc'>*生日信息一经填写，不可调整</view> </view>
</picker>
<view class="picker-address">
</view> <view class='form-label'>地址</view>
<view class='form-section'> <view class="right-input">
<label class='form-label'>邮箱</label> <view wx:if="{{memberInfo.address}}">{{memberInfo.address}}</view>
<view class="right-input"> <view>
<input class='form-input' name="email" value="{{memberInfo.email}}" placeholder="请输入邮箱" /> <textarea
</view> wx:if="{{!memberInfo.address}}"
</view> bindblur="bindTextAreaBlur"
<view class="page-body"> placeholder="请填写真实收件地址"
<view class="page-section"> name="address"
<view><label class='address-label'>地址</label></view> auto-height
<view class="textarea-wrp"> maxlength='30'
<span wx:if="{{memberInfo.address}}">{{memberInfo.address}}</span> />
<textarea wx:if="{{!memberInfo.address}}" bindblur="bindTextAreaBlur" placeholder="请填写真实收件地址" name="address" auto-height maxlength='30'/> </view>
</view>
</view> </view>
</view> </view>
<button type='primary' class='btn-primary' form-type="submit" style="background-color: rgb(2, 186, 112);">确认</button>
</form> <button type='primary' class='btn-primary' form-type="submit" style="background-color: rgb(2, 186, 112);">确认</button>
</view> </form>
</view> </view>
\ No newline at end of file
</view>
src/pages/memberOfOwn/memberOfOwn.wxss
/* pages/userCenter.wxss */ /* pages/userCenter.wxss */
@import './../../base/base.wxss'; @import './../../base/base.wxss';
/* .own-content{ .own-content{
padding: 30rpx 50rpx 0; padding: 30rpx 50rpx 0;
} }
.user-info{ .user-info{
position: relative; position: relative;
width: 650rpx; width: 650rpx;
height: 298rpx; height: 280rpx;
box-shadow: 0 0 40rpx 1rpx #ccc; box-shadow: 0 0 40rpx 1rpx #ccc;
border-radius: 7rpx; border-radius: 7rpx;
padding-top: 30rpx; padding-top: 30rpx;
box-sizing:border-box; box-sizing: border-box;
} }
.own-bg{ .own-bg{
width: 100%; width: 100%;
...@@ -53,183 +53,65 @@ ...@@ -53,183 +53,65 @@
line-height: 100rpx; line-height: 100rpx;
text-align: center; text-align: center;
} }
canvas{ canvas {
top: 20rpx; top: 20rpx;
left: 70rpx; left: 70rpx;
} */ height: 100% !important;
.textarea-wrp {
padding-left: 46rpx;
}
.own-content{
padding: 30rpx 50rpx 0;
}
.user-info{
position: relative;
width: 650rpx;
height: 298rpx;
box-shadow: 0 0 40rpx 1rpx #ccc;
border-radius: 7rpx;
padding-top: 30rpx;
box-sizing:border-box;
}
.picker {
color: rgb(119, 119, 119);
}
.own-bg{
width: 100%;
height: 100%;
position: absolute;
top: 0;
left: 0;
z-index: -1;
}
.user-content{
height: 92rpx;
width: 598rpx;
padding: 37rpx 46rpx;
}
.user-avatar{
width: 90rpx;
height: 90rpx;
overflow:hidden;
border-radius: 50%;
display: inline-block;
margin-right: 18rpx;
margin-left: 30rpx;
}
.userinfo-nickname {
font-size: 28rpx;
color:#FFF;
}
.user-name-content{
display: inline-block;
} }
.user-name{
margin-bottom: 10rpx; .picker, .picker-address {
} padding: 20rpx;
.icon-edit{ background-color: #FFFFFF;
width: 28rpx; display: flex;
height: 28rpx;
vertical-align: middle;
margin-left: 8rpx;
}
.user-id{
color: #FFF;
font-size: 24rpx;
}
.qr-code image{
width: 50rpx;
height: 50rpx;
margin-right: 31rpx;
margin-top:15rpx;
} }
.user-qr-code{ .picker-address {
background-color: #ffffff; padding-top: 50rpx;
border-radius: 7rpx; box-sizing: border-box;
width:650rpx;
height: 100rpx;
line-height: 100rpx;
text-align: center;
} }
.picker{
.user-qr-code image{ border-bottom: 1px solid #eee;
width: 200rpx;
height: 50rpx;
display: inline-block;
margin-top: 25rpx;
} }
.form-info{ .form-info{
background-color: #ffffff; background-color: #ffffff;
margin-top: 60rpx; margin-top: 45rpx;
padding-left: 50rpx; padding-left: 50rpx;
padding-bottom: 20rpx; padding-bottom: 20rpx;
} }
.form-section{
height: 100rpx;
line-height: 100rpx;
border-bottom: 1px solid #ccc;
display: flex;
}
.form-label,.form-input,.form-picker{
display: inline-block;
vertical-align: middle;
font-size:26rpx;
}
.right-input { .right-input {
margin-top:-4rpx; width: 100%;
color: #666;
} }
.form-label{ .form-label{
width: 150rpx; width: 150rpx;
}
.form-label, .address-label {
color: #333; color: #333;
font-size: 28rpx;
} }
.btn-primary{
width: 650rpx;
margin-top: 100rpx;
padding-left: 0;
margin-left: 0;
margin-bottom: 20rpx;
font-size:14px;
}
.form-picker-section{
border-bottom: 1px solid #ccc;
padding: 30rpx 0;
}
.form-picker-section .form-label{
vertical-align: top;
}
.birthday-desc{ .birthday-desc{
color: red; color: red;
font-size: 20rpx; font-size: 20rpx;
margin-top: 15rpx; margin-top: 15rpx;
} }
.address {
border-bottom: none;
}
.address-label {
width: 100rpx;
display: inline-block;
height: 100rpx;
line-height:100rpx;
}
.page-section{
width: 100%;
margin-bottom: 60rpx;
display: flex;
padding-top: 10rpx;
}
textarea { textarea {
width:280px;
padding: 33rpx 0;
margin-right: 20rpx;
}
.page-section{
width: 100%; width: 100%;
margin-bottom: 60rpx; margin-right: 20rpx;
line-height: 100rpx;
}
.page-section:last-child{
margin-bottom: 0;
}
.page-section-title{
font-size: 28rpx;
color: #999999;
margin-bottom: 10rpx;
padding-left: 30rpx;
padding-right: 30rpx;
} }
canvas{ .form-input {
top: 20rpx; color: rgb(112, 112, 112);
left: 70rpx; font-size: 26rpx;
} }
.btn-primary{
width: 650rpx;
margin-top: 100rpx;
padding-left: 0;
margin-left: 0;
margin-bottom: 20rpx;
font-size: 14px;
box-sizing: border-box;
}
\ No newline at end of file
src/utils/util.js
...@@ -159,6 +159,12 @@ function getAppUserInfo() { ...@@ -159,6 +159,12 @@ function getAppUserInfo() {
return Promise.reject('userinfo is null') return Promise.reject('userinfo is null')
} }
} }
/** 邮箱校验 */
function validateEmail(email) {
let str = /^[a-zA-Z0-9_.-]+@[a-zA-Z0-9-]+(\.[a-zA-Z0-9-]+)*\.[a-zA-Z0-9]{2,6}$/
return str.test(email)
}
/** /**
* 处理分页数据安全加载,渲染 * 处理分页数据安全加载,渲染
...@@ -305,6 +311,7 @@ module.exports = { ...@@ -305,6 +311,7 @@ module.exports = {
getTouchData, getTouchData,
getAccountInfo, getAccountInfo,
aspectRatio, aspectRatio,
imageUtil imageUtil,
validateEmail
// checkFullSucreen // checkFullSucreen
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment