Merge branch 'master' of http://git.cc-lotus.info/roose/mzxiaochengxu

pages/collectInfo/collectInfo.js

@@ -980,6 +980,7 @@ Page({
                     console.log("返回临时文件路径");
                     //返回临时文件路径
                     let img = 'data:image/png;base64,' + res1.data
+                    console.log(img,"1232323231222222");
                     wx.request({
                       url: 'https://aip.baidubce.com/rest/2.0/ocr/v1/idcard?access_token=' + token,
                       method: 'POST',
@@ -1048,8 +1049,6 @@ Page({
                               duration: 2000,
                             })
                           }
-
-
                         } else {
                           wx.showToast({
                             title: "身份证OCR识别失败",

pages/personInfo/personInfo.js

@@ -50,7 +50,7 @@ Page({
                 })
               }
             },
-            fail:()=>{
+            fail: () => {
               wx.hideLoading()
             }
           })