Переглянути джерело

1.增加时间选择如果没有默认是当前时间

zhangmengjie 5 роки тому
батько
коміт
74f5ec4084
2 змінених файлів з 31 додано та 19 видалено
  1. 10 11
      pages/components/BirthdayModal.js
  2. 21 8
      pages/components/PersonalInfo.js

+ 10 - 11
pages/components/BirthdayModal.js

@@ -257,7 +257,7 @@ export default class BirthdayModal extends Component<Props> {
 
   componentWillMount() {
     var date = new Date();
-    var year = parseInt(date.getFullYear().toString());
+    var year = parseInt(this.props.year);
     if (this.state.year_array.length == 0) {
       let position = 0;
       for (
@@ -277,8 +277,8 @@ export default class BirthdayModal extends Component<Props> {
     }
     console.log(parseInt(date.getDate()));
     this.setState({
-      month_array_views_indexs: parseInt(date.getMonth()),
-      day_array_views_index: parseInt(date.getDate()) - 1
+      month_array_views_indexs: parseInt(this.props.month) - 1,
+      day_array_views_index: parseInt(this.props.day) - 1
     });
 
     // var hour = date.getHours().toString();
@@ -459,14 +459,13 @@ export default class BirthdayModal extends Component<Props> {
     ) {
       alert("请选择完整日期");
     } else {
-      var nianyueri =
-        this.state.year_array[this.state.year_array_views_index] +
-        "年" +
-        this.state.month_array[this.state.month_array_views_indexs] +
-        "月" +
-        this.state.day_array[this.state.day_array_views_index] +
-        "日";
-      this.props.birthdaycommit(nianyueri);
+      var year = this.state.year_array[this.state.year_array_views_index];
+
+      var month = this.state.month_array[this.state.month_array_views_indexs];
+
+      var day = this.state.day_array[this.state.day_array_views_index];
+
+      this.props.birthdaycommit(year, month, day);
       this.setModalVisible(false);
     }
   }

+ 21 - 8
pages/components/PersonalInfo.js

@@ -39,6 +39,9 @@ export default class PersonalInfo extends BasePage {
     cisys: "北京市",
     grade_text: "七年级",
     grade_index: 6,
+    birthday_year: 0,
+    birthday_month: 0,
+    birthday_day: 0,
     birthday_time: 0
   };
   updateState(data) {
@@ -64,6 +67,9 @@ export default class PersonalInfo extends BasePage {
         <BirthdayModal
           ref={view => (this.birthdaymodal = view)}
           birthdaycommit={this.birthdaycommit.bind(this)}
+          year={this.state.birthday_year}
+          month={this.state.birthday_month}
+          day={this.state.birthday_day}
         />
         <StatusBar backgroundColor={"transparent"} translucent={true} />
 
@@ -520,11 +526,18 @@ export default class PersonalInfo extends BasePage {
     );
   }
 
-  // userInfo123() {
-  //   return (
-
-  //   );
-  // }
+  componentWillMount() {
+    var date = new Date();
+    var year = date.getFullYear().toString();
+    var month = (date.getMonth() + 1).toString();
+    var day = date.getDate().toString();
+    this.setState({
+      birthday_year: year,
+      birthday_month: month,
+      birthday_day: day,
+      birthday_time: year + "年" + month + "月" + day + "日"
+    });
+  }
 
   getArraowImg(type) {
     return (
@@ -618,7 +631,7 @@ export default class PersonalInfo extends BasePage {
 
   cityscommit(provinces_name, citys_name) {
     this.setState({
-      cisys: provinces_name + citys_name
+      cisys: provinces_name + "-" + citys_name
     });
   }
   commitGrade(text, index) {
@@ -627,9 +640,9 @@ export default class PersonalInfo extends BasePage {
       grade_index: index
     });
   }
-  birthdaycommit(time) {
+  birthdaycommit(year, month, day) {
     this.setState({
-      birthday_time: time
+      birthday_time: year + "年" + month + "月" + day + "日"
     });
   }
 }