Merge branch 'dev' into feature-zyw

src/pages/memberOfOwn/memberOfOwn.js

@@ -15,7 +15,7 @@ wxService.page({
     memberCardNo: '',
     memberInfo: {},
     memberId: '',
-    array: ['男', '女'],
+    array: ['男', '女', '保密'],
     objectArray: [
       {
         id: 0,
@@ -24,6 +24,10 @@ wxService.page({
       {
         id: 1,
         name: '女'
+      },
+      {
+        id: 2,
+        name: '保密'
       }
     ],
     index: 0,
@@ -60,13 +64,15 @@ wxService.page({
   },
   formSubmit(e) {
     // 0 男 1 女
-    const {email} = e.detail.value
-    if(this.data.index == 0){
+    const {sex,email} = e.detail.value
+    if(sex == 0){
       e.detail.value.sex = '男'
-    } else {
+    } else if(sex==1) {
       e.detail.value.sex = '女'
+    } else {
+      e.detail.value.sex = '保密'
     }
-
+    // 校验邮箱
      if(email) {
       let emailFlag = utils.validateEmail(email)
       if(!emailFlag){
@@ -94,7 +100,15 @@ wxService.page({
       if (result == 0) {
         wx.hideLoading()
         data.member.birthday = data.member.birthday && data.member.birthday.substring(0,10)
-        data.member.sex = data.member.sex == '男'? 0 : 1
+        // 性别
+        const {sex} = data.member
+        if(sex == '男'){
+          data.member.sex = 0
+        }else if(sex == '女'){
+          data.member.sex = 1
+        } else {
+          data.member.sex = 2
+        }
         this.setData({
           memberInfo: data.member,
           index: data.member.sex,

src/pages/memberOfOwn/memberOfOwn.wxml

@@ -47,7 +47,7 @@
 				</view>
 			</view>
 
-			<picker bindchange="bindPickerChange" value="{{index}}" range="{{array}}">
+			<picker bindchange="bindPickerChange"  name="sex" value="{{index}}" range="{{array}}">
 				<view class="picker">
 					<view class='form-label'>性别</view>
 					<view class="right-input form-input">{{array[index]}}</view>