Merge branch 'develop' into 'test'

src/pages/UserSetting/UserSetting.scss

@@ -36,6 +36,7 @@
     font-size: 32px;
     color: #333;
   }
+  .UserSetting-placeholder,
   .UserSetting-ContentItem.Disabled {
     color: #999;
   }

src/pages/UserSetting/UserSetting.tsx

@@ -43,7 +43,7 @@ interface UserSetting {
     updateUserInfo(entity: UserState) {
       dispatch(updateUserInfo(entity));
     },
-  })
+  }),
 )
 class UserSetting extends Component {
   config: Config = {
@@ -171,8 +171,7 @@ class UserSetting extends Component {
                   this.setState({
                     customerSex: '2',
                   })
-                }
-              >
+                }>
                 {customerSex === '2' ? (
                   <Image className='sexBox-icon' src={radioCheckIcon} />
                 ) : (
@@ -186,8 +185,7 @@ class UserSetting extends Component {
                   this.setState({
                     customerSex: '1',
                   })
-                }
-              >
+                }>
                 {customerSex === '1' ? (
                   <Image className='sexBox-icon' src={radioCheckIcon} />
                 ) : (
@@ -206,9 +204,14 @@ class UserSetting extends Component {
                 this.setState({
                   birthDay: value,
                 })
-              }
-            >
+              }>
+              {birthDay ? (
                 <View>{birthDay}</View>
+              ) : (
+                <View className='UserSetting-placeholder'>
+                  {'请选择出生日期'}
+                </View>
+              )}
             </Picker>
           </View>
           <View className='UserSetting-ContentItem Disabled'>
@@ -233,6 +236,8 @@ class UserSetting extends Component {
             <Input
               className='UserSetting-ContentItem-input'
               value={studentNo}
+              placeholderClass='UserSetting-placeholder'
+              placeholder='请输入学号'
               onInput={({ detail: { value } }) => {
                 this.setState({
                   studentNo: value.trim(),
@@ -250,9 +255,14 @@ class UserSetting extends Component {
                 this.setState({
                   entranceDate: value,
                 })
-              }
-            >
+              }>
+              {entranceDate ? (
                 <View>{entranceDate}</View>
+              ) : (
+                <View className='UserSetting-placeholder'>
+                  {'请选择入学日期'}
+                </View>
+              )}
             </Picker>
           </View>
         </View>