优化

wangyu
app.js
pages/main/addinfo/addinfo.js
pages/main/addinfo/addinfo.wxml
pages/main/editinfo/editinfo.js
pages/main/editinfo/editinfo.wxml
utils/util.js
--- a/app.js
查看文件 @5f5c8fe
+++ b/app.js
查看文件 @5f5c8fe
 //app.js
+const appId = 'wxe91c67adba6ac02d';
 App({
   onLaunch: function () {
     var that = this;
@@ -39,7 +40,7 @@ App({
       data: {
         "grant_type": "wx_app_code",
         "code": code,
-        "scope": "global_access:end_user,tenant:wxe91c67adba6ac02d"
+        "scope": "global_access:end_user,tenant:" + appId
       },
       method: "POST",
       header: {
@@ -89,6 +90,7 @@ App({
   },
   globalData: {
+    appId: appId,
     onshow_count: 0,
     baseUrl: "http://47.96.75.229:20000/",
     // baseUrl: "https://api.workai.com.cn/",
--- a/pages/main/addinfo/addinfo.js
查看文件 @5f5c8fe
+++ b/pages/main/addinfo/addinfo.js
查看文件 @5f5c8fe
 // pages/main/addinfo/addinfo.js
 var app = getApp();
+var format = require('../../../utils/util.js');
 var baseUrl = app.globalData.baseUrl;
 Page({
@@ -54,7 +55,7 @@ Page({
       isrequre: true,
       label: '是否境外人员',
       bindtype: 'forigner',
-      selected: '否',
+      placeholder: '否',
       disabled: true,
       values: ["否", "是"],
       onChange: 'onPickerSelect'
@@ -376,7 +377,6 @@ Page({
             birthDate: that.data.birthDate,
             card_number: id_info.id_card_number
           })
-          console.log('-cardtypeData--', that.data.cardtypeData)
         }
       },
@@ -604,11 +604,17 @@ Page({
     // var profession_datas = this.data.professionData.values[pro_index[pro_index[0]]][0]
     // console.log('profession_datas', profession_datas)
     var regMobile = /^1[3|4|5|7|8][0-9]{9}$/;
+    var regname = /^[\u4E00-\u9FA5\uf900-\ufa2d·s]{2,20}$/;
+    var regEmail = new RegExp("^[a-z0-9]+([._\\-]*[a-z0-9])*@([a-z0-9]+[-a-z0-9]*[a-z0-9]+.){1,63}[a-z0-9]+$");
     var formdata = e.detail.value;
     console.log("formdata", formdata);
+    console.log('idnum', this.data.card_number.length < 1&&!format.isIDCardNum(formdata.id_card_no))
     if (formdata.name.length < 1) {
       this.showtoast('请输入姓名');
       return
+    } else if (!regname.test(formdata.name)) {
+      this.showtoast('请输入正确姓名');
+      return
     } else if (this.data.relativeData.selected.length < 1) {
       this.showtoast('请选择成员关系');
       return
@@ -618,14 +624,17 @@ Page({
     } else if (this.data.cardtypeData.selected.length < 1) {
       this.showtoast('请选择证照类型');
       return
-    } else if (this.data.isIdCard && this.data.card_number.length < 1) {
-      this.showtoast('请上传有效证件照片');
+    } else if (this.data.isIdCard && (this.data.card_number.length < 1 && !format.isIDCardNum(formdata.id_card_no))) {
+      this.showtoast('请填写有效证件号');
       return
     } else if (!this.data.isIdCard && (!formdata.id_card_no || formdata.id_card_no.length < 1)) {
       this.showtoast('请输入证件号码');
       return
-    } else if (formdata.mobile.length < 1 || !regMobile.test(formdata.mobile) ) {
-      this.showtoast('请输入有效手机号');
+    } else if (formdata.mobile.length < 1) {
+      this.showtoast('请输入手机号');
+      return
+    } else if (!regMobile.test(formdata.mobile)){
+      this.showtoast('请输入正确手机号');
       return
     } else if (this.data.investInfo.selected.length < 1) {
       this.showtoast('请选择是否股东投资者');
@@ -633,6 +642,9 @@ Page({
     } else if (this.data.specificIndustryInfo.selected.length < 1) {
       this.showtoast('请选择是否特定行业');
       return
+    } else if (formdata.email && formdata.email.length > 0 && !regEmail.test(formdata.email)){
+      this.showtoast('请输入正确的邮箱');
+      return
     }
     var new_card_num = ''
     if (this.data.isIdCard && this.data.card_number.length > 0) {
@@ -662,7 +674,7 @@ Page({
         "name": that.data.name.length > 0 ? that.data.name : formdata.name,
         "family_ties": that.data.relativeData.selected,
         "native": "中国",
-        "id_card_type": that.data.relativeData.selected,
+        "id_card_type": that.data.cardtypeData.selected,
         "id_card_no": that.data.card_number,
         "gender": that.data.genderData.selected,
         "birth_date": Date.parse(new Date(this.data.birthday)) / 1000,
--- a/pages/main/addinfo/addinfo.wxml
查看文件 @5f5c8fe
+++ b/pages/main/addinfo/addinfo.wxml
查看文件 @5f5c8fe
@@ -75,15 +75,16 @@
         <template is="picker_cell_normal" data="{{...cardtypeData}}" />
         <view class="divide_line"></view>
-        <view class='item_body' bindtap='getIdInfo'>
+        <view class='item_body'>
           <text style='color:red;font-size: 28rpx;line-height: 80rpx;float:left'>*</text>
           <text class='text_black_28 float_left'>证照号码</text>
-          <view wx:if="{{isIdCard}}"  >
-            <image class='image_camera float_right' src='/images/camera.png'></image>
-            <text class='text_333_28 float_right'>{{card_number}}</text>
+          <view wx:if="{{isIdCard}}"   >
+            <image class='image_camera float_right' src='/images/camera.png' bindtap='getIdInfo'></image>
+            <!-- <text class='text_333_28 float_right'>{{card_number}}</text> -->
+             <input class='input_wrap float_right' placeholder='请输入证件号码'  placeholder-class='text_999_28' name='id_card_no' maxlength='24' value='{{card_number}}'></input>
           </view>
           <view wx:else>
-            <input class='input_wrap float_right' placeholder='请输入证件号码'  placeholder-class='text_999_28' name='id_card_no' maxlength='24'></input>
+            <input class='input_wrap float_right' placeholder='请输入证件号码'  placeholder-class='text_999_28' name='id_card_no' maxlength='24' value='{{card_number}}'></input>
           </view>
         </view>
         <view class="divide_line"></view>
@@ -313,7 +314,7 @@
           <view class="divide_line"></view>
           <view class='item_body'>
             <text class='text_666_28 float_left'>工号</text>
-            <input class='input_wrap float_right' name='employee_no' type='number'  placeholder-class='text_999_28' placeholder='请输入工号' maxlength='24'></input>
+            <input class='input_wrap float_right' name='employee_no' placeholder-class='text_999_28' placeholder='请输入工号' maxlength='24'></input>
           </view>
           <view class="divide_line"></view>
           <!-- <view class='item_body'>
@@ -322,8 +323,8 @@
             <text class='text_333_28 float_right'></text>
           </view> -->
           <template is="picker_cell_normal" data="{{...investpersonalInfo}}" />
-          <view class="divide_line" hidden="{{investpersonalInfo.selected!='是'}}"></view>
-          <view class='item_body' hidden="{{investpersonalInfo.selected!='是'}}">
+          <view class="divide_line" hidden="{{investpersonalInfo.selected=='否'}}"></view>
+          <view class='item_body' hidden="{{investpersonalInfo.selected=='否'}}">
             <text class='text_666_28 float_left'>个人投资总额</text>
             <input class='input_wrap float_right' name='personal_equity_total' type='digit'  placeholder-class='text_999_28' placeholder='请输入个人投资总额' maxlength='20'></input>
           </view>
--- a/pages/main/editinfo/editinfo.js
查看文件 @5f5c8fe
+++ b/pages/main/editinfo/editinfo.js
查看文件 @5f5c8fe
@@ -33,7 +33,7 @@ Page({
       isrequre: true,
       label: '关系',
       bindtype: 'relative',
-      placeholder: '请选择关系',
+      placeholder: '',
       selected: '',
       disabled: true,
       values: ["子女", "配偶"],
@@ -63,7 +63,7 @@ Page({
       isrequre: true,
       label: '是否境外人员',
       bindtype: 'forigner',
-      selected: '否',
+      placeholder: '否',
       disabled: true,
       values: ["否", "是"],
       onChange: 'onPickerSelect'
@@ -226,6 +226,7 @@ Page({
    * 生命周期函数--监听页面加载
    */
   onLoad: function(options) {
+
     console.log('options.id', options.id)
     if (options.id && options.id.length > 0) {
       this.setData({
@@ -269,13 +270,14 @@ Page({
   },
   //对各参数初始赋值
-  handleDatas: function() {
+  handleDatas: function() { 
     //todo
-    // var curdate = format.getNowFormatDate()
-    console.log('curdate', curdate)    
+    var curdate = format.curDateTime()
+    console.log('curdate', curdate) 
+
     var tax_info = this.data.taxInfo
     this.data.name = tax_info.name
-    this.data.relativeData.selected = tax_info.family_ties
+    this.data.relativeData.placeholder = tax_info.family_ties
     this.data.personstatusData.selected = tax_info.taxpayer_status
     this.data.cardtypeData.selected = tax_info.id_card_type
@@ -288,7 +290,9 @@ Page({
     this.data.birthDate.selected = format.yearFormString(tax_info.birth_date) + '-' + format.monthFormString(tax_info.birth_date) + '-' + format.dayFormString(tax_info.birth_date)
     this.data.professionData.selected = tax_info.profession.three_level_name
     this.data.startDate.selected = format.yearFormString(tax_info.join_date) + '-' + format.monthFormString(tax_info.join_date) + '-' + format.dayFormString(tax_info.join_date)
+    this.data.startDate.end = curdate
     this.data.endDate.selected = format.yearFormString(tax_info.separate_date) + '-' + format.monthFormString(tax_info.separate_date) + '-' + format.dayFormString(tax_info.separate_date)
+    this.data.endDate.end = curdate
     this.data.degreeData.selected = tax_info.education
     this.data.disabilityInfo.selected = tax_info.is_disability
     this.data.lieshuInfo.selected = tax_info.is_martyr_family
@@ -737,17 +741,19 @@ Page({
   formSubmit: function(e) {
     console.log("date", Date.parse(new Date(this.data.birthday)) / 1000)
-
+    var regEmail = new RegExp("^[a-z0-9]+([._\\-]*[a-z0-9])*@([a-z0-9]+[-a-z0-9]*[a-z0-9]+.){1,63}[a-z0-9]+$");
     var formdata = e.detail.value;
     console.log("formdata", formdata)
     console.log("card_number", this.data.card_number)
     if (this.data.name && this.data.name.length < 1 && formdata.name.length < 1) {
       this.showtoast('请输入姓名');
       return
-    } else if (!this.data.isself && this.data.relativeData.selected.length < 1) {
-      this.showtoast('请选择成员关系');
-      return
-    } else if (this.data.personstatusData.selected.length < 1) {
+    } 
+    // else if (!this.data.isself && this.data.relativeData.placeholder.length < 1) {
+    //   this.showtoast('请选择成员关系');
+    //   return
+    // }
+     else if (this.data.personstatusData.selected.length < 1) {
       this.showtoast('请选择纳税人状态');
       return
     } else if (this.data.cardtypeData.selected.length < 1) {
@@ -768,6 +774,9 @@ Page({
     } else if (this.data.specificIndustryInfo.selected.length < 1) {
       this.showtoast('请选择是否特定行业');
       return
+    } else if (formdata.email && formdata.email.length > 0 && !regEmail.test(formdata.email)) {
+      this.showtoast('请输入正确的邮箱');
+      return
     }
     var new_ard_num = ''
     if (this.data.isIdCard && this.data.card_number.length > 0) {
--- a/pages/main/editinfo/editinfo.wxml
查看文件 @5f5c8fe
+++ b/pages/main/editinfo/editinfo.wxml
查看文件 @5f5c8fe
@@ -13,7 +13,7 @@
         <view class='item_body'>
           <text style='color:red;font-size: 28rpx;line-height: 80rpx;float:left'>*</text>
           <text class='text_black_28 float_left'>姓名</text>
-          <input class='input_wrap float_right' placeholder='请填写姓名' name='name' value='{{name}}' disabled='true'></input>
+          <input class='input_wrap float_right' placeholder="{{name?name:'请填写姓名'}}" name='name'  disabled='true'></input>
         </view>
         <view class="divide_line"></view>
         <!-- <view class='item_body' bindtap='openpicker'>
@@ -46,7 +46,7 @@
         <view class='item_body' hidden="{{!isself}}">
           <text style='color:red;font-size: 28rpx;line-height: 80rpx;float:left'>*</text>
           <text class='text_black_28 float_left'>姓名</text>
-          <input class='input_wrap float_right' placeholder='请填写姓名' value='{{taxInfo.name}}' disabled='true'></input>
+          <input class='input_wrap float_right'  placeholder="{{name?name:'请填写姓名'}}"disabled='true'></input>
         </view>
         <view class="divide_line"></view>
@@ -314,7 +314,7 @@
           <view class="divide_line"></view>
           <view class='item_body '>
             <text class='text_666_28 float_left '>工号</text>
-            <input class='input_wrap float_right ' name='employee_no' type='number' value='{{taxInfo.employee_no}}' placeholder-class='text_999_28' placeholder='请输入工号' maxlength='20'></input>
+            <input class='input_wrap float_right ' name='employee_no' value='{{taxInfo.employee_no}}' placeholder-class='text_999_28' placeholder='请输入工号' maxlength='20'></input>
           </view>
           <view class="divide_line"></view>
           <!-- <view class='item_body '>
@@ -323,8 +323,8 @@
             <text class='text_333_28 float_right '></text>
           </view> -->
           <template is="picker_cell_normal" data="{{...investpersonalInfo}}" />
-          <view class="divide_line" hidden="{{investpersonalInfo.selected!='是'}}"></view>
-          <view class='item_body ' hidden="{{investpersonalInfo.selected!='是'}}">
+          <view class="divide_line" hidden="{{investpersonalInfo.selected=='否'}}"></view>
+          <view class='item_body ' hidden="{{investpersonalInfo.selected=='否'}}">
             <text class='text_666_28 float_left '>个人投资总额</text>
             <input class='input_wrap float_right ' name='personal_equity_total' type='digit' value='{{taxInfo.personal_equity_total}}' placeholder-class='text_999_28' placeholder='请输入个人投资总额' maxlength='20'></input>
           </view>
--- a/utils/util.js
查看文件 @5f5c8fe
+++ b/utils/util.js
查看文件 @5f5c8fe
@@ -41,20 +41,22 @@ function dayFormString(dateStr) {
 }
 //获取当前时间，格式YYYY-MM-DD
-function getNowFormatDate() {
-  var date = new Date();
-  var seperator1 = "-";
-  var year = date.getFullYear();
-  var month = date.getMonth() + 1;
-  var strDate = date.getDate();
-  if (month >= 1 && month <= 9) {
-    month = "0" + month;
-  }
-  if (strDate >= 0 && strDate <= 9) {
-    strDate = "0" + strDate;
-  }
-  var currentdate = year + seperator1 + month + seperator1 + strDate;
-  return currentdate;
+function curDateTime() {
+    var d = new Date();
+    var year = d.getFullYear();
+    var month = d.getMonth() + 1;
+    var date = d.getDate();
+    var day = d.getDay();
+    var curDateTime = year;
+    if (month > 9)
+      curDateTime = curDateTime + "-" + month;
+    else
+      curDateTime = curDateTime + "-0" + month;
+    if (date > 9)
+      curDateTime = curDateTime + "-" + date;
+    else
+      curDateTime = curDateTime + "-0" + date;
+    return curDateTime;
 }
 /** 
@@ -91,5 +93,6 @@ module.exports = {
   yearFormString: yearFormString,
   monthFormString: monthFormString,
   dayFormString: dayFormString,
-  isIDCardNum: isIDCardNum
+  isIDCardNum: isIDCardNum,
+  curDateTime: curDateTime
 }