Skip to content

7
7-Eleven
Commit d43c9fed by 赵雅纹
Options

Merge branch 'dev' into feature-zyw

parents fad8266c d2209bf3
Showing with 127 additions and 206 deletions
src/base/base.wxss
......@@ -164,7 +164,7 @@ i {
.bg-fff {
background-color: #fff; }
page {
page {
width: 100%;
box-sizing: border-box;
background-color: #f2f4f7;
......
src/pages/memberOfOwn/memberOfOwn.js
......@@ -27,6 +27,7 @@ wxService.page({
}
],
index: 0,
date: '',
},
bindPickerChange (e) {
this.setData({
......@@ -36,14 +37,12 @@ wxService.page({
/**
* 生命周期函数--监听页面加载
*/
onLoad: function (options) {
},
onLoad (options) {},
/**
* 生命周期函数--监听页面显示
*/
onShow: function () {
onShow () {
// 取会员卡号
const {memberCardNo, memberId} = wx.getStorageSync('_baseUserInfo')
this.setData({
......@@ -54,18 +53,30 @@ wxService.page({
// 条形码
wxbarcode.barcode('barcode', memberCardNo, 500, 60);
},
bindDateChange (e) {
this.setData({
date: e.detail.value
})
},
formSubmit(e) {
// 生日 0 男 1 女
const { birthday } = this.data.memberInfo
if(birthday) {
e.detail.value.birthday = birthday
}
// 0 男 1 女
const {email} = e.detail.value
if(this.data.index == 0){
e.detail.value.sex = '男'
} else {
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
// 保存接口
this.handelMemberUplate(params)
......@@ -86,7 +97,8 @@ wxService.page({
data.member.sex = data.member.sex == '男'? 0 : 1
this.setData({
memberInfo: data.member,
index: data.member.sex
index: data.member.sex,
date: data.member.birthday
})
}
})
......
src/pages/memberOfOwn/memberOfOwn.wxml
......@@ -2,18 +2,18 @@
<view class='page-memberOfOwn'>
<view class='own-content'>
<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">
<open-data type="userAvatarUrl"></open-data>
<open-data type="userAvatarUrl" />
</view>
<view class='user-name-content'>
<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 class='user-id'>{{memberCardNo}}</view>
</view>
<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 class='user-qr-code'>
......@@ -21,72 +21,91 @@
</view>
</view>
<!-- <view class="section">
<view class="section__title">普通选择器</view>
<picker bindchange="bindPickerChange" value="{{index}}" range="{{array}}">
<view class="picker">
当前选择：{{array[index]}}
</view>
</picker>
</view>-->
<view class='form-info'>
<view class="form-info">
<form bindsubmit="formSubmit">
<view class='form-section'>
<label class='form-label'>姓名</label>
<view class="picker">
<view class='form-label'>姓名</view>
<view class="right-input">
<input class='form-input' name="name" value="{{memberInfo.name}}" placeholder="用户姓名" />
<input
class='form-input'
name="name"
value="{{memberInfo.name}}"
placeholder="用户姓名"
/>
</view>
</view>
<view class='form-section'>
<label class='form-label'>手机号</label>
<view class="picker">
<view class='form-label'>手机号</view>
<view class="right-input">
<input class='form-input' disabled value="{{memberInfo.mobile}}" placeholder="请输入手机号" />
<input
class='form-input'
name="mobile"
disabled
value="{{memberInfo.mobile}}"
placeholder="请输入手机号"
/>
</view>
</view>
<view class='form-section'>
<label class='form-label'>性别</label>
<picker bindchange="bindPickerChange" value="{{index}}" range="{{array}}">
<view class="picker">
{{array[index]}}
<view class='form-label'>性别</view>
<view class="right-input form-input">{{array[index]}}</view>
</view>
</picker>
</view>
<view class='form-picker-section'>
<label class='form-label'>生日</label>
<picker
class="right-input"
mode="date"
value="{{date}}"
start=""
end=""
name="birthday"
bindchange="bindDateChange"
class='form-picker'
disabled="{{memberInfo.birthday}}"
bindchange="bindDateChange"
>
<view class="picker">{{memberInfo.birthday ? memberInfo.birthday : '请选择生日'}}</view>
<view class="picker">
<view class='form-label'>生日</view>
<view class="right-input">
<view class="form-input" wx:if="{{date == ''}}">请选择生日</view>
<view class="form-input" wx:else>{{date}}</view>
<view class='birthday-desc'>*生日信息一经填写，不可调整</view>
</view>
</view>
</picker>
</view>
<view class='form-section'>
<label class='form-label'>邮箱</label>
<view class="picker">
<view class='form-label'>邮箱</view>
<view class="right-input">
<input class='form-input' name="email" value="{{memberInfo.email}}" placeholder="请输入邮箱" />
<input
class='form-input'
name="email"
value="{{memberInfo.email}}"
placeholder="请输入邮箱"
/>
</view>
</view>
<view class="page-body">
<view class="page-section">
<view><label class='address-label'>地址</label></view>
<view class="textarea-wrp">
<span wx:if="{{memberInfo.address}}">{{memberInfo.address}}</span>
<textarea wx:if="{{!memberInfo.address}}" bindblur="bindTextAreaBlur" placeholder="请填写真实收件地址" name="address" auto-height maxlength='30'/>
<view class="picker-address">
<view class='form-label'>地址</view>
<view class="right-input">
<view wx:if="{{memberInfo.address}}">{{memberInfo.address}}</view>
<view>
<textarea
wx:if="{{!memberInfo.address}}"
bindblur="bindTextAreaBlur"
placeholder="请填写真实收件地址"
name="address"
auto-height
maxlength='30'
/>
</view>
</view>
</view>
<button type='primary' class='btn-primary' form-type="submit" style="background-color: rgb(2, 186, 112);">确认</button>
</form>
</view>
</view>
</view>
src/pages/memberOfOwn/memberOfOwn.wxss
/* pages/userCenter.wxss */
@import './../../base/base.wxss';
/* .own-content{
.own-content{
padding: 30rpx 50rpx 0;
}
.user-info{
position: relative;
width: 650rpx;
height: 298rpx;
height: 280rpx;
box-shadow: 0 0 40rpx 1rpx #ccc;
border-radius: 7rpx;
padding-top: 30rpx;
box-sizing:border-box;
box-sizing: border-box;
}
.own-bg{
width: 100%;
......@@ -53,183 +53,65 @@
line-height: 100rpx;
text-align: center;
}
canvas{
canvas {
top: 20rpx;
left: 70rpx;
} */
.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;
height: 100% !important;
}
.userinfo-nickname {
font-size: 28rpx;
color:#FFF;
}
.user-name-content{
display: inline-block;
.picker, .picker-address {
padding: 20rpx;
background-color: #FFFFFF;
display: flex;
}
.user-name{
margin-bottom: 10rpx;
.picker-address {
padding-top: 50rpx;
box-sizing: border-box;
}
.icon-edit{
width: 28rpx;
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{
background-color: #ffffff;
border-radius: 7rpx;
width:650rpx;
height: 100rpx;
line-height: 100rpx;
text-align: center;
}
.user-qr-code image{
width: 200rpx;
height: 50rpx;
display: inline-block;
margin-top: 25rpx;
.picker{
border-bottom: 1px solid #eee;
}
.form-info{
background-color: #ffffff;
margin-top: 60rpx;
margin-top: 45rpx;
padding-left: 50rpx;
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 {
margin-top:-4rpx;
width: 100%;
color: #666;
}
.form-label{
width: 150rpx;
}
.form-label, .address-label {
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{
color: red;
font-size: 20rpx;
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 {
width:280px;
padding: 33rpx 0;
margin-right: 20rpx;
}
.page-section{
width: 100%;
margin-bottom: 60rpx;
line-height: 100rpx;
}
.page-section:last-child{
margin-bottom: 0;
margin-right: 20rpx;
}
.page-section-title{
font-size: 28rpx;
color: #999999;
margin-bottom: 10rpx;
padding-left: 30rpx;
padding-right: 30rpx;
.form-input {
color: rgb(112, 112, 112);
font-size: 26rpx;
}
canvas{
top: 20rpx;
left: 70rpx;
.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() {
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 = {
getTouchData,
getAccountInfo,
aspectRatio,
imageUtil
imageUtil,
validateEmail
// 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