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

pages/collectInfo/collectInfo.js

@@ -971,10 +971,13 @@ Page({
               sourceType: ['camera'], // 可以指定来源是相册还是相机，默认二者都有
               success: function (res) {
                 // 拿文件转换base64
+                const app = getApp()
+                app.globalData.id = '-1'
                 wx.getFileSystemManager().readFile({
                   filePath: res.tempFilePaths[0],
                   encoding: 'base64',
                   success: res1 => {
+                    console.log("返回临时文件路径");
                     //返回临时文件路径
                     let img = 'data:image/png;base64,' + res1.data
                     wx.request({
@@ -989,6 +992,8 @@ Page({
                       },
                       dataType: 'json',
                       success: (e) => {
+                        console.log(e,"看看那ocr返回了么数据呢");
+                        
                         // 扫描后赋值 
                         _this.setData({
                           showBj: false,
@@ -2593,6 +2598,8 @@ Page({
   },
   //tab4巡访方式
   tab4Change1: function (e) {
+    console.log(this.data.regularsInfos, "提交的regularsInfos");
+    console.log(this.data.regularsInfo, "提交的regularsInfo000000000000000000000");
     const items = this.data.regularsInfos[this.data.activeIndex].visitMode
     const values = e.detail.value
     for (let i = 0, lenI = items.length; i < lenI; ++i) {
@@ -2610,6 +2617,8 @@ Page({
       [visitMode]: items,
       [visitMode1]: e.detail.value
     })
+    console.log(this.data.regularsInfo, "我是？？？？？？？？？？？？？");
+
     this.SubmitOldmanInfo({
       id: this.data.nameArr[this.data.activeIndex]._id,
       regularsInfo: JSON.stringify(this.data.regularsInfo[this.data.activeIndex])
@@ -2996,20 +3005,26 @@ Page({
           that.setData({
             oldInfo: res.data.data
           })
-          let data = res.data.data;
-          let fristIndex = data.findIndex((item) => {
+          let datass = res.data.data;
+          let fristIndex = datass.findIndex((item) => {
             return name == item.name;
           });
-          let fristArray = data.filter((item) => {
+          let fristArray = datass.filter((item) => {
             return name == item.name;
           });
-
-          data.splice(fristIndex, 1);
-          data.unshift(fristArray[0]);
+          datass.splice(fristIndex, 1);
+          datass.unshift(fristArray[0]);
+          //regularsInfo: JSON.stringify(this.data.regularsInfo[this.data.activeIndex])
+          //   regularsInfo:data[this.data.activeIndex]
           that.setData({
-            nameArr: data,
+            nameArr: datass,
+            // regularsInfo: datass[that.data.activeIndex].regularsInfo
           })
-          console.log(data, "dadadsadasdasdsadsadsadsa");
+
+
+
+          console.log(that.data.regularsInfo, "赋值是么");
+
           let oldSex = [{
               name: '男',
               checked: false
@@ -3038,7 +3053,7 @@ Page({
           }, {
             name: "女"
           }];
-          let abc = data.map(item => {
+          let abc = datass.map(item => {
             let otherInfo = ''
             let imgPath = ''
             if (item.photo) {
@@ -3404,7 +3419,7 @@ Page({
               chooseAdressArr1: chooseAdressArr1,
             }
           })
-          let def = data.map(item => {
+          let def = datass.map(item => {
             console.log(item.otherInfo, "；；；；；；；；；；；；；；；；；；；；；；；；；；");
             let sex = [{
                 name: '男',
@@ -3509,7 +3524,7 @@ Page({
 
             }
           })
-          let ghi = data.map(item => {
+          let ghi = datass.map(item => {
             // console.log(item, "8888888888888888888888888888888888888888888888888888");
             let childrenNum = '';
             if (item.childrenNum) {
@@ -3569,7 +3584,7 @@ Page({
               Info: Info
             }
           })
-          let zzz = data.map(item => {
+          let zzz = datass.map(item => {
             let visitModeExt = ''
             let visitCountExt = ''
             let visitMode = [{
@@ -3603,7 +3618,6 @@ Page({
             ];
             if (item.regularsInfo) {
               let partol = this.removeExcess(item.regularsInfo);
-              console.log(partol, "777777777777777777777");
               if (partol.visitMode) {
                 visitMode.forEach(items => {
                   partol.visitMode.forEach(itemss => {
@@ -3635,32 +3649,42 @@ Page({
               visitCount: visitCounts,
             }
           })
-          let mmm = data.map(item => {
-            let json = '';
+          let mmm = datass.map(item => {
             if (item.regularsInfo) {
               let partol = this.removeExcess(item.regularsInfo);
-              json = JSON.stringify(partol);
-            }
-        
-            return {
-              regularsInfo: json
+              console.log(partol, "111111111111111111111");
+              return {
+                visitCount: partol.visitCount,
+                visitCountExt: partol.visitCountExt,
+                visitMode: partol.visitCouvisitModepartolnt,
+                visitModeExt: partol.visivisitModeExttCount,
+              }
             }
-       
-            //this.data.regularsInfo[this.data.activeIndex
           })
-          console.log(mmm,"你你你你你你你你in ini你inini你");
+          console.log(mmm,"mmmmmmmmmmmmmm");
           
+          // if (datass[that.data.activeIndex].regularsInfo) {
+          //   let regularsInfo = that.removeExcess(datass[that.data.activeIndex].regularsInfo);
+          //   console.log(regularsInfo,"解析的regularsInfo");
+
+          //   that.setData({
+          //     regularsInfo: regularsInfo
+          //   })
+          // }
+
           that.setData({
             oldInfo: abc,
             otherInfo: def,
             childInfo: ghi,
             regularsInfos: zzz,
-            // regularsInfo: mmm
+            regularsInfo: mmm,
+
           })
           console.log(that.data.oldInfo, "老人的返现数组")
           console.log(that.data.otherInfo, "其他的返现数组")
           console.log(that.data.childInfo, "孩子的返现数组")
           console.log(that.data.regularsInfos, "q巡访的返现数组")
+          console.log(that.data.regularsInfo, "巡访传值的返回")
           // let ghi = res.data.data.map(item => {
           //   console.log(item.otherInfo, "；；；；；；；；；；；；；；；；；；；；；；；；；；");
           //   let sex = [{
@@ -3997,7 +4021,7 @@ Page({
       return;
     };
     if (isonShow) {
-      // isonShow = false;
+      isonShow = false;
       return;
     };
 
@@ -4106,20 +4130,28 @@ Page({
           that.setData({
             oldInfo: res.data.data
           })
-          let data = res.data.data;
-          let fristIndex = data.findIndex((item) => {
+          let datass = res.data.data;
+          let fristIndex = datass.findIndex((item) => {
             return name == item.name;
           });
-          let fristArray = data.filter((item) => {
+          let fristArray = datass.filter((item) => {
             return name == item.name;
           });
 
-          data.splice(fristIndex, 1);
-          data.unshift(fristArray[0]);
+          datass.splice(fristIndex, 1);
+          datass.unshift(fristArray[0]);
           that.setData({
-            nameArr: data,
+            nameArr: datass,
           })
-          console.log(data, "dadadsadasdasdsadsadsadsa");
+          // if (datass[that.data.activeIndex].regularsInfo) {
+          //   let regularsInfo = that.removeExcess(datass[that.data.activeIndex].regularsInfo);
+          //   that.setData({
+          //     regularsInfo: regularsInfo
+          //   })
+          // }
+          // console.log(that.data.regularsInfo, "onload赋值是么");
+
+          // console.log(data, "dadadsadasdasdsadsadsadsa");
           let oldSex = [{
               name: '男',
               checked: false
@@ -4148,7 +4180,7 @@ Page({
           }, {
             name: "女"
           }];
-          let abc = data.map(item => {
+          let abc = datass.map(item => {
             let otherInfo = ''
             let imgPath = ''
             if (item.photo) {
@@ -4506,7 +4538,7 @@ Page({
               chooseAdressArr1: chooseAdressArr1,
             }
           })
-          let def = data.map(item => {
+          let def = datass.map(item => {
             console.log(item.otherInfo, "；；；；；；；；；；；；；；；；；；；；；；；；；；");
             let sex = [{
                 name: '男',
@@ -4611,7 +4643,7 @@ Page({
 
             }
           })
-          let ghi = data.map(item => {
+          let ghi = datass.map(item => {
             // console.log(item, "8888888888888888888888888888888888888888888888888888");
             let childrenNum = '';
             if (item.childrenNum) {
@@ -4671,7 +4703,7 @@ Page({
               Info: Info
             }
           })
-          let zzz = data.map(item => {
+          let zzz = datass.map(item => {
             let visitModeExt = ''
             let visitCountExt = ''
             let visitMode = [{
@@ -4737,12 +4769,25 @@ Page({
               visitCount: visitCounts,
             }
           })
-
+          let mmm = datass.map(item => {
+            if (item.regularsInfo) {
+              let partol = this.removeExcess(item.regularsInfo);
+              console.log(partol, "111111111111111111111");
+              return {
+                visitCount: partol.visitCount,
+                visitCountExt: partol.visitCountExt,
+                visitMode: partol.visitCouvisitModepartolnt,
+                visitModeExt: partol.visivisitModeExttCount,
+              }
+            }
+          })
+          console.log(mmm,"mmmmmmmmmmmmmm");
           that.setData({
             oldInfo: abc,
             otherInfo: def,
             childInfo: ghi,
             regularsInfos: zzz,
+            regularsInfo: mmm
           })
           console.log(that.data.oldInfo, "老人的返现数组")
           console.log(that.data.otherInfo, "其他的返现数组")

pages/visitandinfo/visitandinfo.js

@@ -77,17 +77,17 @@ Page({
       const app = getApp()
       app.globalData.id = fid
       app.globalData.name = name
-      wx.reLaunch({
-        url: '/pages/collectInfo/collectInfo?idss=' + fid +'&namess=' +name
-      })
-      // wx.switchTab({
-      //   url: `/pages/collectInfo/collectInfo`,
-      //   success: function (e) {
-      //     var page = getCurrentPages().pop();
-      //     if (page == undefined || page == null) return;
-      //     page.onLoad();
-      //   }
+      // wx.reLaunch({
+      //   url: '/pages/collectInfo/collectInfo?idss=' + fid +'&namess=' +name
       // })
+      wx.switchTab({
+        url: `/pages/collectInfo/collectInfo`,
+        success: function (e) {
+          var page = getCurrentPages().pop();
+          if (page == undefined || page == null) return;
+          page.onLoad();
+        }
+      })
     } else {
       wx.showToast({
         title: "审核中禁止修改",