优化

wangyu
pages/main/addinfo/addinfo.js
pages/main/addinfo/addinfo.wxml
pages/main/editinfo/editinfo.js
pages/main/editinfo/editinfo.wxml
pages/main/idinfo/idinfo.js
--- a/pages/main/addinfo/addinfo.js
查看文件 @61b6ce5
+++ b/pages/main/addinfo/addinfo.js
查看文件 @61b6ce5
@@ -603,7 +603,7 @@ Page({
     // var pro_index = this.data.profession_index
     // 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 formdata = e.detail.value;
     console.log("formdata", formdata);
     if (formdata.name.length < 1) {
@@ -624,8 +624,8 @@ Page({
     } else if (!this.data.isIdCard && (!formdata.id_card_no || formdata.id_card_no.length < 1)) {
       this.showtoast('请输入证件号码');
       return
-    } else if (formdata.mobile.length < 1) {
-      this.showtoast('请输入联系电话');
+    } else if (formdata.mobile.length < 1 || !regMobile.test(formdata.mobile) ) {
+      this.showtoast('请输入有效手机号');
       return
     } else if (this.data.investInfo.selected.length < 1) {
       this.showtoast('请选择是否股东投资者');
--- a/pages/main/addinfo/addinfo.wxml
查看文件 @61b6ce5
+++ b/pages/main/addinfo/addinfo.wxml
查看文件 @61b6ce5
@@ -165,7 +165,7 @@
           <view class="divide_line"></view>
           <view class='item_body'>
             <text class='text_666_28 float_left'>备注</text>
-            <input class='extra_input float_right' type='number' value='{{taxInfo.comment}}' name='comment'  placeholder-class='text_999_28' placeholder='请输入备注' ></input>
+            <input class='input_wrap float_right' type='number' value='{{taxInfo.comment}}' name='comment'  placeholder-class='text_999_28' placeholder='请输入备注' ></input>
           </view>
         </view>
       </view>
--- a/pages/main/editinfo/editinfo.js
查看文件 @61b6ce5
+++ b/pages/main/editinfo/editinfo.js
查看文件 @61b6ce5
@@ -20,6 +20,8 @@ Page({
     profession_haschanges: false,
     name: '',
     mobile: '',
+    birthday: '',
+    id_error:false,
     card_number: '',
     long_birth_date: 0,
     long_start_date: 0,
@@ -438,16 +440,51 @@ Page({
   /**
    * 生命周期函数--监听页面显示
    */
-  onShow: function() {
+  onShow: function () {
     var that = this
+    var id_error = this.data.id_error
     wx.getStorage({
       key: 'id_info',
-      success: function(res) {
-        console.log(res.data)
-        that.setData({
-          name: res.data.name,
-          card_number: res.data.card_number
-        })
+      success: function (res) {
+        console.log('id_info', res.data)
+        if (res.data && res.data.length > 0) {
+          var id_info = JSON.parse(res.data)
+
+          var birth_day = id_info.birthday.year + '-' + id_info.birthday.month + '-' + id_info.birthday.day;
+          var cardtype_Data = that.data.cardtypeData
+          cardtype_Data.selected = '居民身份证'
+          var gender_Data = that.data.genderData
+          gender_Data.selected = id_info.gender
+
+          that.data.birthDate.selected = birth_day
+
+          if (that.data.name.length > 0 && id_info.name != that.data.name) {
+            that.showtoast("证照与所填姓名冲突")
+            id_error = true
+            return
+          }
+          if (that.data.card_number.length > 0 && id_info.card_number != that.data.id_card_no) {
+            that.showtoast("证照与所填证照号码冲突")
+            id_error = true
+            return
+          }
+          that.setData({
+            name: id_info.name,
+            birthday: birth_day,
+            cardtypeData: cardtype_Data,
+            genderData: gender_Data,
+            birthDate: that.data.birthDate,
+            card_number: id_info.id_card_number
+          })
+          console.log('-cardtypeData--', that.data.cardtypeData)
+
+        }
+      },
+    })
+    wx.removeStorage({
+      key: 'id_info',
+      success: function (res) {
+        console.log('remove_idinfo', res)
       },
     })
   },
--- a/pages/main/editinfo/editinfo.wxml
查看文件 @61b6ce5
+++ b/pages/main/editinfo/editinfo.wxml
查看文件 @61b6ce5
@@ -165,7 +165,7 @@
           <view class="divide_line"></view>
           <view class='item_body'>
             <text class='text_666_28 float_left'>备注</text>
-            <input class='extra_input float_right' type='number' value='{{taxInfo.comment}}' name='comment'  placeholder-class='text_999_28' placeholder='请输入备注' ></input>
+            <input class='input_wrap float_right' type='number' value='{{taxInfo.comment}}' name='comment'  placeholder-class='text_999_28' placeholder='请输入备注' ></input>
           </view>
         </view>
       </view>
--- a/pages/main/idinfo/idinfo.js
查看文件 @61b6ce5
+++ b/pages/main/idinfo/idinfo.js
查看文件 @61b6ce5
@@ -124,7 +124,6 @@ Page({
             })
           }
           that.checkAndupload()
-          wx.hideLoading()
         } else {
           var title = '图片上传失败，请重新上传'
           if (res.statusCode == 413) {
@@ -146,13 +145,14 @@ Page({
           confirmColor: '#4E8FE7'
         })
       },
+      complete(res){
+        console.log('complete', res.data)
+        wx.hideLoading()
+      }
     })
   },
   checkAndupload: function() {
-    wx.showLoading({
-      title: '解析图片中...',
-    })
     var that = this
     var frontdata = that.data.front_card_info
     var backdata = that.data.back_card_info
@@ -164,6 +164,9 @@ Page({
     if (!backdata || !backdata.object_id) {
       return;
     }
+    wx.showLoading({
+      title: '解析图片中...',
+    })
     var Authorization = getApp().globalData.Authorization;
     wx.request({
       url: baseUrl + 'common/v1/ocr/id-card-verify',
@@ -195,6 +198,10 @@ Page({
       fail(res) {
         console.log('fail', res.data)
         wx.hideLoading()
+      },
+      complete(res){
+        console.log('complete', res.data)
+        wx.hideLoading()
       }
     })
   },