1

app.js

@@ -1,3 +1,4 @@
+const util = require('./utils/util.js');
 App({
   globalData: {
     showAnimation: true,
@@ -73,7 +74,6 @@ App({
     console.log(msg)
   },
   getAuthKey: function () {
-    var that = this;
     return new Promise(function (resolve, reject) {
       // 调用登录接口  
       wx.login({
@@ -91,8 +91,7 @@ App({
                 console.log("用户的openid:" + res.data.openid);
                 wx.setStorageSync('openId', res.data.openid)
                 wx.request({
-                  // url: 'http://info.windd.cn:8080/test/applet/isExist',
-                  url:'https://info.windd.cn/collection/applet/isExist',
+                  url: util.globalData.publicUrl + '/applet/isExist',
                   method: "GET",
                   data: {
                     appletsId: wx.getStorageSync('openId')

pages/collectInfo/collectInfo.js

@@ -731,7 +731,6 @@ Page({
                       dataType: 'json',
                       success: (e) => {
                         console.log(e, "看看那ocr返回了么数据呢");
-
                         // 扫描后赋值 
                         _this.setData({
                           showBj: false,
@@ -1222,6 +1221,17 @@ Page({
       showAdressBox: false,
       oldInfo: this.data.oldInfo,
     })
+    if (this.data.oldInfo[this.data.activeIndex].isSameWithAddress[0].checked) {
+      let Infos = 'oldInfo[' + this.data.activeIndex + '].chooseAdressArr1'
+      this.setData({
+        [Infos]: this.data.oldInfo[this.data.activeIndex].chooseAdressArr
+      })
+      this.SubmitOldmanInfo({
+        id: this.data.nameArr[this.data.activeIndex]._id,
+        address: a,
+        addressId: b
+      })
+    }
   },
   pickEsc() {
     this.setData({
@@ -1229,7 +1239,6 @@ Page({
     })
   },
   pickSure1() {
-    console.log('111111111')
     let arr = 'oldInfo[' + this.data.activeIndex + '].chooseAdressArr1';
     let codeArr = [];
     this.setData({
@@ -1237,7 +1246,6 @@ Page({
     })
     codeArr.push(this.data.provinceCode, this.data.cityCode, this.data.areaCode, this.data.townCode, this.data.villageCode)
     this.data.oldInfo[this.data.activeIndex].chooseAdressArr1.push(this.data.province, this.data.city, this.data.area, this.data.town, this.data.village)
-    console.log(this.data.oldInfo[this.data.activeIndex].chooseAdressArr1, '00000000000')
     let a = this.data.oldInfo[this.data.activeIndex].chooseAdressArr1.join("/");
     let b = codeArr.join(",")
     this.SubmitOldmanInfo({
@@ -1304,6 +1312,8 @@ Page({
     this.setData({
       [isSameWithAddress]: items
     })
+    let codeArr = [];
+    codeArr.push(this.data.provinceCode, this.data.cityCode, this.data.areaCode, this.data.townCode, this.data.villageCode)
     let Info = 'oldInfo[' + this.data.activeIndex + '].chooseAdressArr1'
     let Infos = 'oldInfo[' + this.data.activeIndex + '].addressExt'
     if (e.detail.value[0] == '现居地址与户籍地址一致') {
@@ -1317,7 +1327,7 @@ Page({
         isSameWithAddress: '是'
       })
       let a = this.data.oldInfo[this.data.activeIndex].chooseAdressArr.join("/");
-      let b = this.data.codeArr.join(",")
+      let b = codeArr.join(",")
       this.SubmitOldmanInfo({
         id: this.data.nameArr[this.data.activeIndex]._id,
         address: a,

pages/collectInfo/collectInfo.wxml

@@ -48,7 +48,6 @@
 			<image wx:else src="../../images/mz/unfinish.png" class="isfinish_icon"></image>
 		</view>
 	</view>
-	<!-- 右侧部分 -->
 	<view class="right">
 		<view class="name_box">
 			<view class="name_smallName">
@@ -91,7 +90,7 @@
 				<view wx:if="{{oldPhoneNull}}" class="required">老人联系电话不能为空哦！</view>
 				<view class="block"><text class="red">*</text>户籍地址
 					<view class="picker1">
-						<view wx:if="{{oldInfo[activeIndex].chooseAdressArr.length==0}}" bindtap="showAdressShow">点我选择现居地址</view>
+						<view wx:if="{{oldInfo[activeIndex].chooseAdressArr.length==0}}" bindtap="showAdressShow">点我选择户籍地址</view>
 						<view style="width:450rpx;height:100rpx" wx:else  bindtap="showAdressShow">{{oldInfo[activeIndex].chooseAdressArr}}</view>
 					</view>
 					<view class="picker_container" wx:if='{{showAdressBox}}'>
@@ -329,6 +328,7 @@
 					</checkbox-group>
 				</view>
 				<view wx:if="{{isoldtypeNull}}" class="required">老年人类别不能为空哦！</view>
+					<view class="name"><text class="red">*</text>老人照片</view>
 				<view class="scan" wx:if="{{oldInfo[activeIndex].imgPath == ''}}" style="margin-top:20rpx" bindtap="goPhoto">
 					<image src="../../images/mz/upload.png" style="width:40rpx;height:40rpx;margin-top:5rpx;margin-left:30rpx"></image><text >请上传老人含面部照片</text>
 				</view>
@@ -499,5 +499,5 @@
 				<view wx:if="{{regularsInfos[activeIndex].visitCount[4].checked&&isVisittimesQtnull}}" class="required">其它巡访频次不能为空哦！</view>
 			</view>
 		</view>
-	</view>
+	</view> 
 </view>

pages/idCard/idCard.wxml

@@ -1,6 +1,6 @@
 <wxs module="urls" src="../../utils/photoUrl.wxs"></wxs>
 <view class="home">
-	<view class="title1">上传照片</view>
+	<view class="title1">上传本人真实照片</view>
 	<view class="title2">生成专属身份卡</view>
 	<image wx:if="{{isTrue}}" src="/images/caream.png" style="width:350rpx;height:350rpx" bindtap="goPhoto"></image>
 	<image wx:else class="image" style="width:350rpx;height:350rpx" src="{{urls.url(imgPath)}}" mode='scaleToFill' bindtap="previewImg"></image>

pages/idCard/idCard.wxss

@@ -7,15 +7,11 @@
   margin-bottom: 40rpx;
   font-size: 30rpx;
   color: #aeaeae;
-
-
 }
-
 .title1 {
   margin-top: 100rpx;
   font-size: 38rpx;
 }
-
 .btn {
   background-color: #2087f7;
   color: white;

pages/userBook/userBook.wxml

@@ -8,6 +8,7 @@
 		</view>
 	</view>
 	<view class="hd">①下滑微信界面，在搜索框中搜索吉顺致养，点击进入小程序</view>
+	<image src="../../images/serched.png" class="im"></image>
 	<view class="hd">②微信扫描下方二维码进入小程序</view>
 	<image src="../../images/ewm.jpg" class="img"></image>
 	<view class="block">
@@ -18,7 +19,7 @@
 			登录账号
 		</view>
 	</view>
-	<view class="hd">①处于未登录状态时点击除首页外其他功能，弹出登录页面。输入账号密码登录即可。</view>
+	<view class="hd">①处于未登录状态时点击除首页外其他功能，弹出登录页面。输入账号密码登录即可。如账号密码出现异常，建议您先尝试清除手机缓存再登录。否则请联系管理员。</view>
 	<image src="../../images/user_login.png" class="img1"></image>
 	<view class="block">
 		<view class="num">
@@ -28,7 +29,7 @@
 			完善资料
 		</view>
 	</view>
-	<view class="hd">①点击我的->完善资料，填写基本信息。所有信息都为必填项。</view>
+	<view class="hd">①点击我的->完善资料，填写基本信息。所有信息都为必填项，请如实填写。进一步了解巡访员的基本信息。</view>
 	<image src="../../images/user_finish.png" class="img2"></image>
 	<view class="block">
 		<view class="num">
@@ -38,8 +39,8 @@
 			生成身份卡
 		</view>
 	</view>
-	<view class="hd">①点击我的->身份卡，上传本人照片，即可生成专属身份卡。</view>
-	<view class="hd">②此卡可做为工作人员的身份认证，也可做为老人辨别来访人员的身份标识</view>
+	<view class="hd">①点击我的->身份卡，照片仅可上传一次，请上传真实本人照片，生成专属身份卡。</view>
+	<view class="hd">②此卡可做为工作人员的身份认证，也可做为老人辨别来访人员的唯一标识</view>
 	<view style="display:flex;margin-top: 20rpx;margin-bottom: 20rpx;">
 		<image src="../../images/user_camrea.png" class="img3"></image>
 		<image src="../../images/user_card.png" class="img3"></image>
@@ -52,9 +53,11 @@
 			采集老人信息流程
 		</view>
 	</view>
-	<view class="hd">①点击首页->信息采集，即可跳转采集页，或者点击页面下方采集，也可跳转采集页</view>
-	<view class="hd">②首先输入要采集的老人姓名，然后按内容填写老人的信息、子女信息、其他赡养义务人信息、寻访联系人信息。完成之后左上角的标识会变成绿色,全部填写完成等待管理员审核即可。</view>
-	<view class="hd">③如添加同一家庭的老人，点击右方加号然后填写信息即可。</view>
+	<view class="hd">①点击首页->信息采集，即可跳转采集页，或者点击页面下方采集，也可跳转采集页。</view>
+	<view class="hd">②请认真填写信息，随填随记。如果此次信息未填写完全，误操作退出该页面，在工作日志->采集记录中可再次找到该老人，点击继续填写其他信息即可。</view>
+	<view class="hd">③因为采集老人信息要确定您的地理位置，所以请确保您的手机定位设置对小程序开放。否则可能因为缺少定位信息导致不能审核。</view>
+	<view class="hd">②首先输入要采集的老人姓名，然后按内容填写老人的信息、子女信息、其他赡养义务人信息、寻访联系人信息。每一项完成之后左上角的标识会变成绿色,全部填写完成等待管理员审核即可。</view>
+	<view class="hd">③如添加同一家庭的老人，点击第一位老人姓名右方的加号然后继续填写所有信息。点击✖可删除当前老人。</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>
@@ -79,7 +82,10 @@
 		</view>
 	</view>
 	<view class="hd">①点击首页->扫一扫</view>
-	<view class="hd">②扫描老人家里粘贴的二维码，进入探访页面。填写探访老人的情况即可。</view>
+	<view class="hd">②扫描老人家里粘贴的二维码，进入探访页面。填写探访老人的情况即可。所有信息都是必填的，请认真填写。</view>
+	<view class="hd">③因为探访老人要确定您的地理位置，所以请确保您的手机定位设置对小程序开放。否则可能因为缺少信息导致探访失败。</view>
+	<view class="hd">④您的位置必须和在采集老人时的定位信息保持一致(一定范围内)</view>
+	<view class="hd">⑤您上传的老人照片必须是真实且实时的，和采集时的老人是同一个老人。</view>
 	<image src="../../images/user_old.png" class="img5"></image>
 	<view class="block">
 		<view class="num">
@@ -90,6 +96,6 @@
 		</view>
 	</view>
 	<view class="hd">①点击工作日志->探访记录</view>
-	<view class="hd">②可查看到我的全部探访记录。</view>
-	<image src="../../images/user_visit.png" class="img6"></image>
+	<view class="hd">②可查看到我的全部探访记录。点击每条记录都可查看老人的探访详情。</view>
+	<!-- <image src="../../images/user_visit.png" class="img6"></image> -->
 </view>

pages/userBook/userBook.wxss

@@ -25,15 +25,21 @@
   color: #999999;
   font-size: 28rpx;
 }
-
+.im{
+  width: 400rpx;
+  height: 250rpx;
+  margin-left: 175rpx;
+  margin-top: 20rpx;
+  margin-bottom: 20rpx;
+  border: 1px solid #999999;
+}
 .img {
   width: 200rpx;
   height: 200rpx;
-  margin-left: 225rpx;
+  margin-left: 275rpx;
   margin-top: 20rpx;
   margin-bottom: 20rpx;
 }
-
 .img1 {
   width: 400rpx;
   height: 400rpx;
@@ -42,7 +48,6 @@
   margin-bottom: 20rpx;
   border: 1px solid #999999;
 }
-
 .img2 {
   width: 400rpx;
   height: 700rpx;

pages/visitandinfo/visitandinfo.js

@@ -6,20 +6,7 @@ Page({
     select_all: false,
     isTrue: false,
     isAllTrue: false, // 控制全选和反选的按钮
-    listData: [
-      // {
-      //   code: "1",
-      //   text: "测试1"
-      // },
-      // {
-      //   code: "2",
-      //   text: "测试2"
-      // },
-      // {
-      //   code: "3",
-      //   text: "测试3"
-      // }
-    ],
+    listData: [],
     batchIds: '', //选中的ids，
     active: 0,
     show: false,
@@ -27,46 +14,13 @@ Page({
     photos: [],
     scrollHeight: '',
     scrollHeight1: '',
-    list: [
-      // {visitTime: "2020-02-16T11:22:07.697Z",oldInfo:'战三的'},
-      // {visitTime: "2020-02-16T11:22:07.697Z",oldInfo:'战三的'},
-      // {visitTime: "2020-02-16T11:22:07.697Z",oldInfo:'战三的'},
-      // {visitTime: "2020-02-16T11:22:07.697Z",oldInfo:'战三的'},
-      // {visitTime: "2020-02-16T11:22:07.697Z",oldInfo:'战三的'},
-      // {visitTime: "2020-02-16T11:22:07.697Z",oldInfo:'战三的'},
-      // {visitTime: "2020-02-16T11:22:07.697Z",oldInfo:'战三的'},
-      // {visitTime: "2020-02-16T11:22:07.697Z",oldInfo:'战三的'},
-      // {visitTime: "2020-02-16T11:22:07.697Z",oldInfo:'战三的'},
-      // {visitTime: "2020-02-16T11:22:07.697Z",oldInfo:'战三的'},
-      // {visitTime: "2020-02-16T11:22:07.697Z",oldInfo:'战三的'},
-      // {visitTime: "2020-02-16T11:22:07.697Z",oldInfo:'战三的'},
-      // {visitTime: "2020-02-16T11:22:07.697Z",oldInfo:'战三的'},
-      // {visitTime: "2020-02-16T11:22:07.697Z",oldInfo:'战三的'},
-      // {visitTime: "2020-02-16T11:22:07.697Z",oldInfo:'战三的'},
-      // {visitTime: "2020-02-16T11:22:07.697Z",oldInfo:'战三的'},
-      // {visitTime: "2020-02-16T11:22:07.697Z",oldInfo:'战三的'},
-      // {visitTime: "2020-02-16T11:22:07.697Z",oldInfo:'战三的'},
-      // {visitTime: "2020-02-16T11:22:07.697Z",oldInfo:'战三的'},
-      //   {visitTime: "2020-02-16T11:22:07.697Z",oldInfo:'战三的'},
-      // {visitTime: "2020-02-16T11:22:07.697Z",oldInfo:'战三的'},
-      // {visitTime: "2020-02-16T11:22:07.697Z",oldInfo:'战三的'},
-      // {visitTime: "2020-02-16T11:22:07.697Z",oldInfo:'战三的'},
-      // {visitTime: "2020-02-16T11:22:07.697Z",oldInfo:'战三的'},
-      // {visitTime: "2020-02-16T11:22:07.697Z",oldInfo:'战三的'},
-      // {visitTime: "2020-02-16T11:22:07.697Z",oldInfo:'战三的'},
-      // {visitTime: "2020-02-16T11:22:07.697Z",oldInfo:'战三的'},
-      // {visitTime: "2020-02-16T11:22:07.697Z",oldInfo:'战三的'},
-      // {visitTime: "2020-02-16T11:22:07.697Z",oldInfo:'战三的'},
-      // {visitTime: "2020-02-16T11:22:07.697Z",oldInfo:'战三的'},
-    ], //探访的数据哈
+    list: [], //探访的数据哈
     number: null,
   },
   onTabsItemTap: function (event) {
     let index = event.currentTarget.dataset.index;
     this.setData({
-      currentTabIndex: index,
-      // isAllTrue: false,
-      // select_all: false
+      currentTabIndex: index
     })
   },
   cellClick(e) {
@@ -78,9 +32,6 @@ 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) {
@@ -167,7 +118,6 @@ Page({
                 }
               }
             })
-
           } else {
             wx.showToast({
               title: '请选择要删除的记录',
@@ -175,8 +125,6 @@ Page({
               duration: 2000,
             })
           }
-
-
         } else if (res.cancel) {
           //取消绑定的操作
         }
@@ -223,7 +171,6 @@ Page({
       batchIds: arr
     })
   },
-
   //单选
   checkboxChange: function (e) {
     console.log(e.detail.value, "打印的值是啥呢")
@@ -231,9 +178,7 @@ Page({
       batchIds: e.detail.value //单个选中的值
     })
   },
-
   tabsChange(e) {
-
     this.setData({
       number: e.detail.index,
       isAllTrue: false,

pages/visitandinfo/visitandinfo.wxml

@@ -81,10 +81,10 @@
 							</view>
 						</block>
 					</view> -->
-<van-overlay show="{{ show }}" bind:click="onClickHide">
+					<van-overlay show="{{ show }}" bind:click="onClickHide">
 						<view class="wrapper">
 							<scroll-view scroll-y="true" class="block">
-								<view style="margin-bottom:25rpx"> 
+								<view style="margin-bottom:25rpx">
 									<view style="font-size:30rpx;">
 										探访时间:
 									</view>

utils/photoUrl.wxs

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

utils/util.js

@@ -1,9 +1,9 @@
 const globalData = {
-  // publicUrl: 'http://info.windd.cn:8080/test',
-  publicUrl: 'https://info.windd.cn/collection',
+  // publicUrl: 'http://info.windd.cn:8080/test',//测试
+  // publicUrl: 'https://info.windd.cn/collection',//正式
   //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,