1

pages/bindOld/bindOld.js

@@ -1,24 +1,109 @@
 // pages/bindOld/bindOld.js
+const app = require('../../utils/util.js');
 Page({
 
   /**
    * 页面的初始数据
    */
   data: {
-
+    arr: []
   },
-  go(){
+  go(e) {
+    console.log(e)
+    let idNumber = e.currentTarget.dataset.item
     wx.navigateTo({
-      url: '/pages/visitList/visitList',
+      url: '/pages/visitList/visitList?id=' + idNumber,
     })
   },
+
+  // 解除绑定
+  nobindNumber() {
+    let id = wx.getStorageSync('openId');
+    wx.request({
+      url: app.globalData.publicUrl + '/applet/appletVisitUnbind',
+      method: "GET",
+      data: {
+        appletId: id,
+        fid: this.data.fid
+      },
+      success: res => {
+        console.log(res)
+        if (res.data.code == 0) {
+          console.log('我解除绑定了', res)
+          wx.showModal({
+            showCancel: false,
+            content: '已解除绑定',
+            success: (res) => {
+              wx.navigateTo({
+                url: '/pages/visitFind/visitFind',
+              })
+            }
+          })
+        } else {
+          wx.showModal({
+            showCancel: false,
+            content: res.data.message,
+          })
+        }
+      }
+    });
+  },
+
   /**
    * 生命周期函数--监听页面加载
    */
-  onLoad: function (options) {
-
+  onLoad: function () {
+    let id = wx.getStorageSync('openId');
+    wx.request({
+      url: app.globalData.publicUrl + '/applet/appletVisitIsExist',
+      method: "GET",
+      data: {
+        appletId: id
+      },
+      success: res => {
+        if (res.data.code == 1) {
+          console.log("用户没绑定", res);
+          wx.navigateTo({
+            url: '/pages/visitFind/visitFind',
+          })
+        } else if (res.data.code == 0) {
+          console.log("用户已经绑定了", res);
+          console.log(res.data.data._id)
+          this.setData({
+            fid: res.data.data._id
+          })
+          this.findFamilyInfo(res.data.data._id)
+        } else {
+          wx.showModal({
+            showCancel: false,
+            content: res.data.message,
+          })
+        }
+      }
+    });
+  },
+  findFamilyInfo(_id) {
+    wx.request({
+      url: app.globalData.publicUrl + '/wxinfo/visitByFid',
+      method: "GET",
+      data: {
+        fid: _id
+      },
+      success: res => {
+        if (res.data.code == 0) {
+          console.log(res.data.data, '我查到户的id了')
+          this.setData({
+            arr: res.data.data
+          })
+        } else {
+          wx.showModal({
+            showCancel: false,
+            content: res.data.message,
+          })
+        }
+      }
+    });
   },
-
   /**
    * 生命周期函数--监听页面初次渲染完成
    */

pages/bindOld/bindOld.wxml

@@ -7,11 +7,11 @@
 			<van-col span="6"></van-col>
 		</van-row>
 	</view>
-	<view class="b1">
+	<view class="b1" wx:for='{{arr}}'>
 		<van-row style='text-align:center;color:rgba(102,177,255)'>
-			<van-col span="6">啦啦啦</van-col>
-			<van-col span="12">220323199404083643</van-col>
-			<van-col span="6" style='font-weight:600' bindtap='go'>点击查看</van-col>
+			<van-col span="6">{{item.name}}</van-col>
+			<van-col span="12">{{item.idNumber}}</van-col>
+			<van-col span="6" style='font-weight:600' bindtap='go' data-item = '{{item.idNumber}}'>点击查看</van-col>
 		</van-row>
 	</view>
 	<van-button type="info" block custom-style="width:600rpx;height:65rpx;border-radius:10rpx;font-size:25rpx;position:fixed;bottom:100rpx;left:75rpx" bindtap="nobindNumber">解除绑定</van-button>

pages/collectInfo/collectInfo.js

@@ -56,11 +56,11 @@ Page({
       "柯尔克孜族", "达斡尔族", "景颇族", "毛南族", "撒拉族", "布朗族", "塔吉克族", "阿昌族", "普米族", "鄂温克族", "怒族", "京族", "基诺族", "德昂族", "保安族",
       "俄罗斯族", "裕固族", "乌孜别克族", "门巴族", "鄂伦春族", "独龙族", "塔塔尔族", "赫哲族", "珞巴族"
     ],
-    ableStatus: ["完全自理", "半失能(部分自理)", "完全失能"], //老年人能力情况
+    ableStatus: ["完全自理", "半失能(部分自理)", "失能"], //老年人能力情况
     chooseAdressArr: [],
     disableLeval: ["一级", "二级", "三级", "四级"],
     moneyStatus: ["建档立卡贫困户", "一般家庭", "低保", "特困供养人员"],
-    payMoney: ["5000元以下", "5000-10000元", "10000元以上"],
+    payMoney: ["5000元以下", "5000元~10000元", "10000元以上"],
     loveRequire: [{
         name: "生活照料"
       },
@@ -68,7 +68,7 @@ Page({
         name: "生产帮助"
       },
       {
-        name: "精神慰藉"
+        name: "精神慰籍"
       },
       {
         name: "医疗保健"
@@ -494,7 +494,7 @@ Page({
                 name: "生产帮助"
               },
               {
-                name: "精神慰藉"
+                name: "精神慰籍"
               },
               {
                 name: "医疗保健"
@@ -537,11 +537,11 @@ Page({
               disable: false,
               checked: false
             }, {
-              name: "重残老年人",
+              name: "重残老人",
               disable: false,
               checked: false
             }, {
-              name: "高龄老年人",
+              name: "高龄老人",
               disable: false,
               checked: false
             }, {
@@ -553,7 +553,6 @@ Page({
             isHavePhoto: false,
             imgPath: '',
             photoAndLocation: '',
-
           })
           this.data.childInfo.push({
             childrenNum: '',
@@ -2669,6 +2668,7 @@ Page({
         visitWaysFromOther: false
       })
     }
+    console.log(this.data.regularsInfo)
     this.SubmitOldmanInfo({
       id: this.data.nameArr[this.data.activeIndex]._id,
       regularsInfo: JSON.stringify(this.data.regularsInfo[this.data.activeIndex])
@@ -2678,17 +2678,17 @@ Page({
   tab4Change2: function (e) {
     let Info = 'regularsInfos[' + this.data.activeIndex + '].visitModeExt'
     let Info1 = 'regularsInfo[' + this.data.activeIndex + '].visitModeExt'
-    let visitMode1 = 'regularsInfo[' + this.data.activeIndex + '].visitMode'
-    let arrs = [];
-    this.data.regularsInfos[this.data.activeIndex].visitMode.forEach(item => {
-      if (item.checked) {
-        arrs.push(item.name)
-      }
-    })
+    // let visitMode1 = 'regularsInfo[' + this.data.activeIndex + '].visitMode'
+    // let arrs = [];
+    // this.data.regularsInfos[this.data.activeIndex].visitMode.forEach(item => {
+    //   if (item.checked) {
+    //     arrs.push(item.name)
+    //   }
+    // })
     this.setData({
       [Info]: e.detail.value,
       [Info1]: e.detail.value,
-      [visitMode1]: JSON.stringify(arrs),
+      // [visitMode1]: arrs,
     })
     if (!e.detail.value) {
       this.setData({
@@ -2721,17 +2721,17 @@ Page({
     })
     let visitCount = 'regularsInfos[' + this.data.activeIndex + '].visitCount'
     let visitCount1 = 'regularsInfo[' + this.data.activeIndex + '].visitCount'
-    let visitMode1 = 'regularsInfo[' + this.data.activeIndex + '].visitMode'
-    let arrs = [];
-    this.data.regularsInfos[this.data.activeIndex].visitMode.forEach(item => {
-      if (item.checked) {
-        arrs.push(item.name)
-      }
-    })
+    // let visitMode1 = 'regularsInfo[' + this.data.activeIndex + '].visitMode'
+    // let arrs = [];
+    // this.data.regularsInfos[this.data.activeIndex].visitMode.forEach(item => {
+    //   if (item.checked) {
+    //     arrs.push(item.name)
+    //   }
+    // })
     this.setData({
       [visitCount]: data,
       [visitCount1]: e.detail.value,
-      [visitMode1]: JSON.stringify(arrs),
+      // [visitMode1]: JSON.stringify(arrs),
     })
     this.SubmitOldmanInfo({
       id: this.data.nameArr[this.data.activeIndex]._id,
@@ -2944,7 +2944,7 @@ Page({
             name: "生产帮助"
           },
           {
-            name: "精神慰藉"
+            name: "精神慰籍"
           },
           {
             name: "医疗保健"
@@ -2987,11 +2987,11 @@ Page({
           disable: false,
           checked: false
         }, {
-          name: "重残老年人",
+          name: "重残老人",
           disable: false,
           checked: false
         }, {
-          name: "高龄老年人",
+          name: "高龄老人",
           disable: false,
           checked: false
         }, {
@@ -3212,7 +3212,7 @@ Page({
                 name: "生产帮助"
               },
               {
-                name: "精神慰藉"
+                name: "精神慰籍"
               },
               {
                 name: "医疗保健"
@@ -3330,7 +3330,7 @@ Page({
             let oldTypeArr = [];
             for (let i = 0; i < 9; i++) {
               let obj = new Object();
-              obj.name = (i == 0 ? "农村留守老年人" : i == 1 ? "分散供养特困老年人" : i == 2 ? "计划生育特殊家庭老人" : i == 3 ? "空巢老年人" : i == 4 ? "独居老年人" : i == 5 ? "重残老年人" : i == 6 ? "高龄老年人" : i == 7 ? "失能老人" : "居家老年人");
+              obj.name = (i == 0 ? "农村留守老年人" : i == 1 ? "分散供养特困老年人" : i == 2 ? "计划生育特殊家庭老人" : i == 3 ? "空巢老年人" : i == 4 ? "独居老年人" : i == 5 ? "重残老人" : i == 6 ? "高龄老人" : i == 7 ? "失能老人" : "居家老年人");
               obj.checked = (i == 0 ? false : false);
               obj.disable = (i == 0 ? false : false);
               oldTypeArr.push(obj)
@@ -3368,10 +3368,10 @@ Page({
             if (item.oldType.includes("独居老年人")) {
               oldTypeArr[4].checked = true;
             }
-            if (item.oldType.includes("重残老年人")) {
+            if (item.oldType.includes("重残老人")) {
               oldTypeArr[5].checked = true;
             }
-            if (item.oldType.includes("高龄老年人")) {
+            if (item.oldType.includes("高龄老人")) {
               oldTypeArr[6].checked = true;
             }
             if (item.oldType.includes("失能老人")) {
@@ -3891,7 +3891,8 @@ Page({
         console.log('获取失败了打开设置')
         wx.showModal({
           showCancel: false,
-          content: '定位权限获取失败'
+          title: '定位权限获取失败',
+          content: '点击右上方三个点->设置->打开位置权限'
         })
         // wx.openSetting({
         //   success: function (osrs) {

pages/index/index.js

@@ -58,9 +58,9 @@ Page({
     //     url: '/pages/login/login',
     //   })
     // } else {
-      // wx.switchTab({
-      //   url: '/pages/collectInfo/collectInfo',
-      // })
+    // wx.switchTab({
+    //   url: '/pages/collectInfo/collectInfo',
+    // })
     // }
     wx.navigateTo({
       url: '/pages/userBook/userBook',
@@ -95,9 +95,58 @@ Page({
     //     url: '/pages/visitandinfo/visitandinfo',
     //   })
     // }
-    wx.navigateTo({
-      url: '/pages/visitFind/visitFind',
-    })
+    if (!wx.getStorageSync('openId')) {
+      wx.login({
+        success: res => {
+          console.log("用户的code:" + res.code);
+          wx.request({
+            url: app.globalData.publicUrl + '/wx/getAppletOpenId',
+            method: "GET",
+            data: {
+              cid: 'applet',
+              code: res.code
+            },
+            success: res => {
+              console.log("用户的openid:" + res.data.data.openid);
+              wx.setStorageSync('openId', res.data.data.openid)
+              this.isBInd(res.data.data.openid);
+            }
+          });
+        }
+      });
+    } else {
+      this.isBInd();
+    }
+    console.log(wx.getStorageSync('openId'))
+  },
+  // 判断是否绑定
+  isBInd() {
+    let id = wx.getStorageSync('openId');
+    wx.request({
+      url: app.globalData.publicUrl + '/applet/appletVisitIsExist',
+      method: "GET",
+      data: {
+        appletId: id
+      },
+      success: res => {
+        if (res.data.code == 1) {
+          console.log("用户没绑定", res);
+          wx.navigateTo({
+            url: '/pages/visitFind/visitFind',
+          })
+        } else if (res.data.code == 0) {
+          console.log("用户已经绑定了", res);
+          wx.navigateTo({
+            url: '/pages/bindOld/bindOld',
+          })
+        } else {
+          wx.showModal({
+            showCancel: false,
+            content: res.data.message,
+          })
+        }
+      }
+    });
   },
   goTongzhi() {
     if (wx.getStorageSync('user') == '') {
@@ -158,8 +207,8 @@ Page({
         appletsId: wx.getStorageSync('openId')
       },
       success: (res) => {
-        console.log("resrrrrrrrrrrrrrrrrrrrrrrr",res);
-        
+        console.log("resrrrrrrrrrrrrrrrrrrrrrrr", res);
+
         if (res.data.code == 0) {
           this.setData({
             number: res.data.data
@@ -234,7 +283,7 @@ Page({
   },
   onLoad: function () {
     console.log("主页load11111");
-    
+
     var that = this;
     const apps = getApp()
     apps.getAuthKey().then(function (res) {

pages/paiming/paiming.json

@@ -1,4 +1,4 @@
 {
-  "navigationBarTitleText":"排行",
+  "navigationBarTitleText":"我的排名",
   "usingComponents": {}
 }

pages/paiming/paiming.wxml

@@ -11,7 +11,7 @@
 				</view>
 			</view>
 			<view class="wenzi">累计积分</view>
-			<view class="btn">当前全省排名<text class="shuzi">{{list.order}}</text>名</view>
+			<view class="btn">当前全省排第<text class="shuzi">{{list.order}}</text>名</view>
 		</view>
 		<view class="white-box">
 			<van-tabs active="{{ active }}" bind:change="onChange" color="#2087F7">

pages/userBook/userBook.js

@@ -1,45 +1,5 @@
 Page({
   data: {
-    Arr: [{
-        num: "Q1",
-        question: "如何找到小程序",
-        answer: "①下滑微信界面，在搜索框中搜索吉顺致养，点击进入小程序。",
-        answer1: "②微信扫描下方二维码进入小程序",
-        img:'../../images/ewm.jpg'
-      }, {
-        num: "Q2",
-        question: "登录账号",
-        answer: "处于未登录状态时点击除首页外其他功能，弹出登录页面。输入账号密码登录即可。"
-      }, {
-        num: "Q3",
-        question: "完善资料",
-        answer: "点击我的->完善资料，填写基本信息。所有信息都为必填项。"
-      }, {
-        num: "Q4",
-        question: "生成身份卡",
-        answer: "点击我的->身份卡，上传本人照片，即可生成专属身份卡。此卡可做为工作人员的身份认证，也可做为老人辨别来访人员的身份标识。"
-      },
-      {
-        num: "Q5",
-        question: "采集老人信息流程",
-        answer: "点击首页->信息采集，即可跳转采集页,或者点击页面下方采集，也可跳转采集页。",
-        answer1: "首先输入要采集的老人姓名，然后按内容填写老人的信息、子女信息、其他赡养义务人信息、寻访联系人信息。完成之后左上角的标识会变成绿色,全部填写完成等待管理员审核即可。如添加同一家庭的老人，点击右方加号然后填写信息即可。"
-      }, {
-        num: "Q6",
-        question: "采集老人信息查看",
-        answer: "点击工作日志->采集记录",
-        answer1: "可查看到我的全部采集记录，也可分类（填全未审，未完成，审核中，审核完成，审核失败）查看。点击每条信息的选框可删除此条信息，审核完成的不可删除。"
-      }, {
-        num: "Q7",
-        question: "巡访老人流程",
-        answer: "点击首页->扫一扫",
-        answer1: "扫描老人家里粘贴的二维码，进入巡访页面。填写巡访老人的情况即可。"
-      }, {
-        num: "Q8",
-        question: "巡访信息查看",
-        answer: "点击工作日志->巡访记录",
-        answer1: "可查看到我的全部巡访记录。"
-      }
-    ]
+
   }
 })

pages/userBook/userBook.wxml

@@ -59,7 +59,7 @@
 	<view class="hd">③因为采集老人信息要确定您的地理位置，所以在上传老人照片时请点击同意您的手机定位设置对小程序开放。否则可能因为缺少定位信息导致不能审核。如果不小心点击拒绝，操作步骤为点击小程序右上角三个点->设置->打开位置权限。</view>
 	<view class="hd">④首先输入要采集的老人姓名，然后按内容填写老人的信息、子女信息、其他赡养义务人信息、寻访联系人信息。每一项完成之后左上角的标识会变成绿色,全部填写完成等待管理员审核即可。</view>
 	<view class="hd">⑤如添加同一家庭的老人，点击第一位老人姓名右方的加号然后继续填写所有信息。点击✖可删除当前老人。</view>
-		<view class="hd">⑥采集一个老人积分+5</view>
+	<view class="hd">⑥采集一个老人积分+5</view>
 	<view style="display:flex;margin-top: 20rpx;margin-bottom: 20rpx;">
 		<image src="../../images/user_inputname.png" class="img4"></image>
 		<image src="../../images/user_info.png" class="img4"></image>
@@ -100,7 +100,11 @@
 	</view>
 	<view class="hd">①点击工作日志->巡访记录</view>
 	<view class="hd">②可查看到我的全部巡访记录。点击每条记录都可查看老人的巡访详情。</view>
-		<view class="block">
+	<view style="display:flex;margin-top: 20rpx;margin-bottom: 20rpx;">
+		<image src="../../images/user_1.png" class="img7"></image>
+		<image src="../../images/user_3.png" class="img8"></image>
+	</view>
+	<view class="block">
 		<view class="num">
 			Q9
 		</view>
@@ -110,5 +114,14 @@
 	</view>
 	<view class="hd">①点击首页->我的排名</view>
 	<view class="hd">②当前在省里的排名以及积分获得情况</view>
+	<view style="display:flex;margin-top: 20rpx;margin-bottom: 20rpx;">
+		<image src="../../images/user_2.png" class="img9"></image>
+		<image src="../../images/user_4.png" class="img10"></image>
+	</view>
 	<van-divider contentPosition="center">赡养人使用手册</van-divider>
+	<view class="hd">①点击首页->巡访查询</view>
+	<view class="hd">②输入要绑定的老人身份证号->绑定成功</view>
+	<view class="hd">③进入老人信息页面，可在此页面点击查看更多老人信息，也可以点击下方按钮解除绑定关系。</view>
+	<view class="hd">④进入老人巡访记录页面，显示最近15条此老人的巡访信息和时间，点击可查看具体巡访情况。</view>
+	<view class="hd">⑤进入老人信息详情页面，显示每次巡访的具体情况。</view>
 </view>

pages/userBook/userBook.wxss

@@ -25,7 +25,8 @@
   color: #999999;
   font-size: 28rpx;
 }
-.im{
+
+.im {
   width: 400rpx;
   height: 250rpx;
   margin-left: 175rpx;
@@ -33,6 +34,7 @@
   margin-bottom: 20rpx;
   border: 1px solid #999999;
 }
+
 .img {
   width: 200rpx;
   height: 200rpx;
@@ -40,6 +42,7 @@
   margin-top: 20rpx;
   margin-bottom: 20rpx;
 }
+
 .img1 {
   width: 400rpx;
   height: 400rpx;
@@ -48,6 +51,7 @@
   margin-bottom: 20rpx;
   border: 1px solid #999999;
 }
+
 .img2 {
   width: 400rpx;
   height: 700rpx;
@@ -70,6 +74,7 @@
   margin-left: 60rpx;
   border: 1px solid #999999;
 }
+
 .img5 {
   width: 400rpx;
   height: 730rpx;
@@ -78,6 +83,7 @@
   margin-bottom: 20rpx;
   border: 1px solid #999999;
 }
+
 .img6 {
   width: 400rpx;
   height: 650rpx;
@@ -85,4 +91,38 @@
   margin-top: 20rpx;
   margin-bottom: 20rpx;
   border: 1px solid #999999;
+}
+
+.img7 {
+  width: 300rpx;
+  height: 420rpx;
+  margin-left: 75rpx;
+  margin-top: 20rpx;
+  margin-bottom: 20rpx;
+  border: 1px solid #999999;
+}
+
+.img8 {
+  width: 300rpx;
+  height: 390rpx;
+  margin-left: 15rpx;
+  margin-top: 20rpx;
+  margin-bottom: 20rpx;
+  border: 1px solid #999999;
+}
+
+.img9 {
+  width: 300rpx;
+  height: 380rpx;
+  margin-left: 75rpx;
+  margin-top: 20rpx;
+  margin-bottom: 20rpx;
+}
+
+.img10 {
+  width: 300rpx;
+  height: 420rpx;
+  margin-left: 15rpx;
+  margin-top: 20rpx;
+  margin-bottom: 20rpx;
 }

pages/visitFind/visitFind.js

@@ -1,4 +1,5 @@
 // pages/visitFind/visitFind.js
+const app = require('../../utils/util.js');
 Page({
   /**
    * 页面的初始数据
@@ -11,8 +12,8 @@ Page({
       idNumber: e.detail.value
     })
   },
-  // 表单校验老人身份证号
   bindNumber() {
+    let id = wx.getStorageSync('openId');
     console.log(this.data.idNumber)
     if (!this.data.idNumber) {
       this.setData({
@@ -46,13 +47,30 @@ Page({
           this.setData({
             wrong: false
           })
-          wx.navigateTo({
-            url: '/pages/bindOld/bindOld',
-          })
+          wx.request({
+            url: app.globalData.publicUrl + '/applet/appletVisitBing',
+            method: "GET",
+            data: {
+              appletId: id,
+              number: this.data.idNumber
+            },
+            success: res => {
+              if (res.data.code == 0) {
+                console.log('我绑定成功了', res)
+                wx.navigateTo({
+                  url: '/pages/bindOld/bindOld?idNumber=' + this.data.idNumber,
+                })
+              } else {
+                wx.showModal({
+                  showCancel: false,
+                  content: res.data.message,
+                })
+              }
+            }
+          });
         }
       }
     }
-
   },
   /**
    * 生命周期函数--监听页面加载
@@ -60,14 +78,12 @@ Page({
   onLoad: function (options) {
 
   },
-
   /**
    * 生命周期函数--监听页面初次渲染完成
    */
   onReady: function () {
 
   },
-
   /**
    * 生命周期函数--监听页面显示
    */

pages/visitList/visitList.js

@@ -1,31 +1,44 @@
 // pages/visitList/visitList.js
+const app = require('../../utils/util.js');
 Page({
-
   /**
    * 页面的初始数据
    */
   data: {
-    arr: [{
-      name: 1111,
-      time: '2020-09-09'
-    },{
-      name: 1111,
-      time: '2020-09-09'
-    },{
-      name: 1111,
-      time: '2020-09-09'
-    }]
+    arr: []
   },
-  go(){
+  go(e) {
+    console.log(e.currentTarget.dataset.item)
     wx.navigateTo({
-      url: '/pages/visitListInfo/visitListInfo',
+      url: '/pages/visitListInfo/visitListInfo?id=' + e.currentTarget.dataset.item
     })
   },
   /**
    * 生命周期函数--监听页面加载
    */
   onLoad: function (options) {
-
+    console.log(options)
+    wx.request({
+      url: app.globalData.publicUrl + '/wxinfo/visitByNumber',
+      method: "GET",
+      data: {
+        number: options.id
+      },
+      success: res => {
+        console.log(res)
+        if (res.data.code == 0) {
+          console.log('我查到15条信息了', res)
+          this.setData({
+            arr: res.data.data
+          })
+        } else {
+          wx.showModal({
+            showCancel: false,
+            content: res.data.message,
+          })
+        }
+      }
+    });
   },
 
   /**

pages/visitList/visitList.json

@@ -1,4 +1,4 @@
 {
   "usingComponents": {},
-  "navigationBarTitleText":"探访老人信息记录"
+  "navigationBarTitleText":"巡访老人信息记录"
 }

pages/visitList/visitList.wxml

@@ -1,14 +1,14 @@
-<view style="font-size:30rpx;margin:30rpx;">探访数量：0条（注：最多显示15条）</view>
+<view style="font-size:30rpx;margin:30rpx;">巡访数量：{{arr.length}}条（注：最多显示15条）</view>
 	<view class="b1">
 		<van-row style='text-align:center;color:rgba(144,147,153)'>
 			<van-col span="6">老人姓名</van-col>
-			<van-col span="12">探访时间</van-col>
+			<van-col span="12">巡访时间</van-col>
 		</van-row>
 	</view>
 	<view class="b1"  wx:for="{{arr}}" wx:key="index">
 		<van-row style='text-align:center;color:rgba(102,177,255)'>
-			<van-col span="6">{{item.name}}</van-col>
-			<van-col span="12">{{item.time}}</van-col>
-			<van-col span="6" style='font-weight:600' bindtap='go'>查看详情</van-col>
+			<van-col span="6">{{item.oldInfo}}</van-col>
+			<van-col span="12">{{item.visitTime}}</van-col>
+			<van-col span="6" style='font-weight:600' bindtap='go' data-item='{{item._id}}'>查看详情</van-col>
 		</van-row>
 	</view>

pages/visitListInfo/visitListInfo.js

@@ -12,7 +12,7 @@ Page({
    * 生命周期函数--监听页面加载
    */
   onLoad: function (options) {
-
+    console.log(options.id)
   },
 
   /**

pages/visitListInfo/visitListInfo.wxml

@@ -1,9 +1,9 @@
 <view class='container'>
-	<view>探访日期：2020-09-09</view>
-	<view>探访位置：	<text style="text-decoration:underline">位置位置位置位置位置位置位置位置位置位置位置位置位置位置位置位置位置位置位置位置位置位置位置</text></view>
+	<view>巡访日期：2020-09-09</view>
+	<view>巡访位置：	<text style="text-decoration:underline">位置位置位置位置位置位置位置位置位置位置位置位置位置位置位置位置位置位置位置位置位置位置位置</text></view>
 	<view>经度：<text style="text-decoration:underline;margin-right:30rpx">888888888</text>纬度：<text style="text-decoration:underline">888888888</text></view>
 	<view>老人姓名：<text style="color:rgba(133,194,90)">啦啦（22032319999999）</text></view>
-	<view>1.探访情况：</view>
+	<view>1.巡访情况：</view>
 	<view style="display:flex;flex-direction:row;flex-wrap:wrap">
 		<view style="width:340rpx">
 			健康情况：健康
@@ -22,7 +22,7 @@
 		</view>
 	</view>
 	<view>2.老人需求说明：坚决解决军军军军军</view>
-	<view>3.探访备注说明：就哈哈哈哈哈哈</view>
+	<view>3.巡访备注说明：就哈哈哈哈哈哈</view>
 	<view>4.现场含面部照片：</view>
 	<image mode='aspectFit' src="../../images/findbj.png"></image>
 </view>

utils/photoUrl.wxs

@@ -1,7 +1,7 @@
 var url = function (val) {
   //  return  'https://info.windd.cn/collection' + val
-   return  'https://info.windd.cn/test' + val
-  // return 'http://10.16.4.7:7001' + val
+  //  return  'https://info.windd.cn/test' + val
+  return 'http://10.16.4.7:7001' + val
 }
 module.exports = {
   url: url

utils/util.js

@@ -1,10 +1,10 @@
 const globalData = {
   // publicUrl: 'http://info.windd.cn:8080/test',//测试
-  //  publicUrl: 'https://info.windd.cn/collection',//正式1
-  publicUrl: 'https://info.windd.cn/test',//正式2
+  //  publicUrl: 'https://info.windd.cn/collection',//公众号
+  // publicUrl: 'https://info.windd.cn/test',//正式
   //publicUrl: 'http://10.16.4.12:7001',
   //publicUrl: 'http://10.16.4.8:7001',
-  // publicUrl:'http://10.16.4.7:7001'//立秋
+  publicUrl:'http://10.16.4.7:7001'//立秋
 };
 module.exports = {
   globalData: globalData,