Revert "11"

This reverts commit 9c7719c7ba40b60b5c1be62f1b12bdf0803125e2.

pages/collectInfo/collectInfo.js

@@ -980,7 +980,7 @@ Page({
                     console.log("返回临时文件路径");
                     //返回临时文件路径
                     let img = 'data:image/png;base64,' + res1.data
-                    console.log(img, "1232323231222222");
+                    console.log(img,"1232323231222222");
                     wx.request({
                       url: 'https://aip.baidubce.com/rest/2.0/ocr/v1/idcard?access_token=' + token,
                       method: 'POST',
@@ -993,8 +993,8 @@ Page({
                       },
                       dataType: 'json',
                       success: (e) => {
-                        console.log(e, "看看那ocr返回了么数据呢");
-
+                        console.log(e,"看看那ocr返回了么数据呢");
+                        
                         // 扫描后赋值 
                         _this.setData({
                           showBj: false,
@@ -1105,11 +1105,9 @@ Page({
     } else {
       console.log(this.data.nameArr)
       let name = 'nameArr[' + this.data.activeIndex + '].name'
-      let names = 'oldInfo[' + this.data.activeIndex + '].name'
       this.setData({
         oldName: false,
-        [name]: e.detail.value,
-        [names]: e.detail.value
+        [name]: e.detail.value
       })
       console.log(this.data.nameArr)
     }
@@ -2118,7 +2116,7 @@ Page({
         [revise5]: true
       })
       return false;
-    } else if (index4 >= 0) {
+    } else if(index4 >= 0){
       this.setData({
         [revise1]: false,
         [revise2]: false,
@@ -2126,13 +2124,13 @@ Page({
         [revise4]: false,
         [revise5]: true
       })
-    } else {
+    }else {
       this.setData({
         [revise1]: false,
         [revise2]: false,
         [revise3]: false,
         [revise4]: false,
-
+       
       })
     }
 
@@ -3109,8 +3107,17 @@ Page({
             }, {
               name: "多重残疾"
             }];
-
-
+            let sickType =  [{
+              name: "重大器官类疾病"
+            }, {
+              name: "心脑血管类疾病"
+            }, {
+              name: "神经与代谢类疾病"
+            }, {
+              name: "肢体与病毒类疾病"
+            }, {
+              name: "恶性肿瘤"
+            }];
             let moneyFromAyy = [{
               name: "家庭经营性收入"
             }, {
@@ -3165,18 +3172,6 @@ Page({
                 name: "其它"
               },
             ];
-
-            let sickType = [{
-              name: "重大器官类疾病"
-            }, {
-              name: "心脑血管类疾病"
-            }, {
-              name: "神经与代谢类疾病"
-            }, {
-              name: "肢体与病毒类疾病"
-            }, {
-              name: "恶性肿瘤"
-            }];
             let isSameWithAddresss = [{
               name: '现居地址与户籍地址一致'
             }]
@@ -3347,25 +3342,16 @@ Page({
                 }
               })
             })
-
-            moneyFromAyy.forEach(itemss => {
-              item.sourceOfIncome.forEach(item => {
-                if (itemss.name == item) {
-                  itemss.checked = true;
+           if(item.majorDiseases[0]){
+             let patorl = this.removeExcess(item.majorDiseases[0]);
+             sickType.forEach(items => {
+              patorl.forEach(itemss => {
+                if (items.name == itemss) {
+                  items.checked = true;
                 }
               })
             })
-
-            if (item.majorDiseases) {
-              let partol = this.removeExcess(item.majorDiseases);
-              sickType.forEach(itemss => {
-                partol.forEach(item => {
-                  if (itemss.name == item) {
-                    itemss.checked = true;
-                  }
-                })
-              })
-            }
+           }
             loveRequire.forEach(itemss => {
               item.demand.forEach(item => {
                 if (itemss.name == item) {
@@ -3411,6 +3397,7 @@ Page({
 
             return {
               ...item,
+              sickType:sickType,
               oldSex: oldSex.map(items => {
                 if (items.name == item.sex) {
                   return {
@@ -3474,12 +3461,11 @@ Page({
               chooseAdressArr: chooseAdressArr,
               isSameWithAddress: isSameWithAddresss,
               chooseAdressArr1: chooseAdressArr1,
-              sickType: sickType
             }
           })
           let def = datass.map(item => {
             console.log(item.otherInfo, "；；；；；；；；；；；；；；；；；；；；；；；；；；");
-            let sexs = [{
+            let sex = [{
                 name: '男',
                 checked: false
               },
@@ -3500,21 +3486,18 @@ Page({
             let outgoingplace = ''
             let phone2 = ''
             let name2 = ''
-            let sex = ''
+
             let visit = '';
             if (item.otherInfo) {
               let partol = this.removeExcess(item.otherInfo);
-              console.log(partol,"赡养人的解析jsonparse");
-              
               otherInfo = '是'
               if (partol.name) {
                 name = partol.name
               }
               if (partol.sex) {
-                sexs.forEach(items => {
+                sex.forEach(items => {
                   if (items.name == partol.sex) {
                     items.checked = true;
-                    sex = partol.sex
                   }
                 })
               }
@@ -3580,8 +3563,7 @@ Page({
                 visit: visit,
                 name2: name2,
                 phone2: phone2,
-                othersyrSexArr: sexs,
-                sex : sex
+                othersyrSexArr: sex
               }
 
             }
@@ -3723,8 +3705,8 @@ Page({
               }
             }
           })
-          console.log(mmm, "mmmmmmmmmmmmmm");
-
+          console.log(mmm,"mmmmmmmmmmmmmm");
+          
           // if (datass[that.data.activeIndex].regularsInfo) {
           //   let regularsInfo = that.removeExcess(datass[that.data.activeIndex].regularsInfo);
           //   console.log(regularsInfo,"解析的regularsInfo");
@@ -4843,7 +4825,7 @@ Page({
               }
             }
           })
-          console.log(mmm, "mmmmmmmmmmmmmm");
+          console.log(mmm,"mmmmmmmmmmmmmm");
           that.setData({
             oldInfo: abc,
             otherInfo: def,

utils/service.js

@@ -14,11 +14,6 @@ import {get, post, put, del} from './network';
 // .then(data => {
 //   console.log(data, "000000")
 // })
-
-
-
-
-
 /**
  * 服务器根域名
  * 试玩更多接口看这里
@@ -34,4 +29,4 @@ export const API_ROOT = 'https://sqdx.jiaxintech.com';
  */
 export const getXczsArr = (id) => post(`${API_ROOT}/wx/course/listCategory`);
 
-export const getBing = (id) => get(`${API_ROOT}/applet/bing`,id);
+