更新文字 增加工作日志中删除

pages/index/index.wxml

@@ -10,7 +10,7 @@
 	</view>
 	<view class="flex-box" bindtap="goTongzhi">
 		<image src="/images/tongzhi.png" style="width: 80rpx; height: 31rpx;"></image>
-		<!-- <view class="bck">今日探访老人可得双倍积分</view> -->
+		<!-- <view class="bck">今日巡访老人可得双倍积分</view> -->
 		<swiper class="swiper_container" vertical="true" autoplay="true" circular="true" interval="3000">
 			<block wx:key="title" wx:for="{{msgList}}">
 				<swiper-item>
@@ -21,7 +21,7 @@
 	</view>
 	<view class="shu-top2">
 		<view class="shu"></view>
-		<view class="top2">{{number.dept}}统计</view>
+		<view class="top2">{{number.dept}}统计1</view>
 	</view>
 	<view class="top3">
 		<view class="top3-box">

pages/love/love.json

@@ -1,5 +1,5 @@
 {
-  "navigationBarTitleText": "现场爱心探访",
+  "navigationBarTitleText": "现场爱心巡访",
   "usingComponents": {
   
   }

pages/love/love.wxml

@@ -1,7 +1,7 @@
 <wxs module="urls" src="../../utils/photoUrl.wxs"></wxs>
 <view class="home">
-	<view class="title">探访日期：<text>{{time}}</text></view>
-	<view class="title">探访位置</view>
+	<view class="title">巡访日期：<text>{{time}}</text></view>
+	<view class="title">巡访位置</view>
 	<view class="visit-box">
 		<view>{{visitLocation}}</view>
 		<view class="flex-box">
@@ -18,7 +18,7 @@
 		<view class="pop-oldtitle">{{info.name}}<text >({{info.idNumber}})</text></view>
 		<view class="old-btn" bindtap="oldClick" data-infos='{{info}}'>老人详情</view>
 	</view>
-	<view class="title">探访情况</view>
+	<view class="title">巡访情况</view>
 	<form bindsubmit="formSubmit">
 		<view class="title">健康状况</view>
 		<radio-group name="health">
@@ -52,8 +52,8 @@
 		</radio-group>
 		<view class="title">老人需求说明</view>
 		<textarea class="view_textarea" name="demand" bindblur="bindTextAreaBlur" placeholder="请填写一下老人需求" />
-		<view class="title">探访备注说明</view>
-	<textarea class="view_textarea"  name="visitMessage" bindblur="bindTextAreaBlur" placeholder="请填写一下探访备注说明" />
+		<view class="title">巡访备注说明</view>
+	<textarea class="view_textarea"  name="visitMessage" bindblur="bindTextAreaBlur" placeholder="请填写一下巡访备注说明" />
 	<view  class="title">现场含面部照片(正面照)</view>
 		<view  style=" border: 1rpx solid #5398C8; color: #fff;  padding-left: 10rpx;background-color: #429EFF; font-size: 26rpx;width: 220rpx;margin-top: 40rpx; margin-bottom: 40rpx;" bindtap="zhaopian" wx:if='{{isTrue}}'>请上传含面部照片</view>
 		<view style="  display: flex;">

pages/paiming/paiming.wxml

@@ -26,7 +26,7 @@
 						</view>
 					</view>
 				</van-tab>
-				<van-tab title="探访记录">
+				<van-tab title="巡访记录">
 					<view class="flex-shu" wx:for="{{list.valueVisitList}}">
 						<view>
 							<view>{{item.infoId.name}}</view>

pages/personInfo/personInfo.json

@@ -1,4 +1,5 @@
 {
   "navigationBarTitleText":"我的",
-  "usingComponents": {}
+  "usingComponents": {},
+  "disableScroll":true
 }

pages/userBook/userBook.js

@@ -31,14 +31,14 @@ Page({
         answer1: "可查看到我的全部采集记录，也可分类（填全未审，未完成，审核中，审核完成，审核失败）查看。点击每条信息的选框可删除此条信息，审核完成的不可删除。"
       }, {
         num: "Q7",
-        question: "探访老人流程",
+        question: "巡访老人流程",
         answer: "点击首页->扫一扫",
-        answer1: "扫描老人家里粘贴的二维码，进入探访页面。填写探访老人的情况即可。"
+        answer1: "扫描老人家里粘贴的二维码，进入巡访页面。填写巡访老人的情况即可。"
       }, {
         num: "Q8",
-        question: "探访信息查看",
-        answer: "点击工作日志->探访记录",
-        answer1: "可查看到我的全部探访记录。"
+        question: "巡访信息查看",
+        answer: "点击工作日志->巡访记录",
+        answer1: "可查看到我的全部巡访记录。"
       }
     ]
   }

pages/userBook/userBook.wxml

@@ -78,12 +78,12 @@
 			Q7
 		</view>
 		<view class="question">
-			探访老人流程
+			巡访老人流程
 		</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>
 	<image src="../../images/user_old.png" class="img5"></image>
@@ -92,10 +92,10 @@
 			Q8
 		</view>
 		<view class="question">
-			探访信息查看
+			巡访信息查看
 		</view>
 	</view>
-	<view class="hd">①点击工作日志->探访记录</view>
-	<view class="hd">②可查看到我的全部探访记录。点击每条记录都可查看老人的探访详情。</view>
+	<view class="hd">①点击工作日志->巡访记录</view>
+	<view class="hd">②可查看到我的全部巡访记录。点击每条记录都可查看老人的巡访详情。</view>
 	<!-- <image src="../../images/user_visit.png" class="img6"></image> -->
 </view>

pages/visit/visit.json

@@ -1,4 +1,4 @@
 {
-  "navigationBarTitleText":"探访",
+  "navigationBarTitleText":"巡访",
   "usingComponents": {}
 }

pages/visitandinfo/visitandinfo.js

@@ -14,7 +14,7 @@ Page({
     photos: [],
     scrollHeight: '',
     scrollHeight1: '',
-    list: [], //探访的数据哈
+    list: [], //巡访的数据哈
     number: null,
   },
   onTabsItemTap: function (event) {
@@ -50,7 +50,7 @@ Page({
 
     }
   },
-  // 探访的记录详情页面
+  // 巡访的记录详情页面
   visitJilu(e) {
     console.log(e.currentTarget.dataset.infos, "000");
     let photos = e.currentTarget.dataset.infos.visitPhoto.split(",");
@@ -75,52 +75,56 @@ Page({
       success(res) {
         if (res.confirm) {
           //确定绑定的操作
+          let isDeteleTrue = true;
           if (that.data.batchIds.length) {
             for (let item of that.data.batchIds) {
               that.deleteById(item);
+              isDeteleTrue = false;
             }
-            wx.showToast({
-              title: '删除成功',
-              icon: 'none',
-              duration: 2000,
-              success: function () {
-                switch (that.data.number) {
-                  case 0:
-                    that.openIdInfo();
-                    break;
-                  case 1:
-                    that.openIdInfo({
-                      status: "1"
-                    });
-                    break;
-                  case 2:
-                    that.openIdInfo({
-                      status: "0"
-                    });
-                    break;
-                  case 3:
-                    this.openIdInfo({
-                      status: "2"
-                    });
-                    break;
-                  case 4:
-                    this.openIdInfo({
-                      status: "3"
-                    });
-                    break;
-                  case 5:
-                    that.openIdInfo({
-                      status: "4"
-                    });
-                    break;
-                  default:
-                    that.openIdInfo();
+            if(!isDeteleTrue){
+              wx.showToast({
+                title: '删除成功',
+                icon: 'none',
+                duration: 2000,
+                success: function () {
+                  switch (that.data.number) {
+                    case 0:
+                      that.openIdInfo();
+                      break;
+                    case 1:
+                      that.openIdInfo({
+                        status: "1"
+                      });
+                      break;
+                    case 2:
+                      that.openIdInfo({
+                        status: "0"
+                      });
+                      break;
+                    case 3:
+                      this.openIdInfo({
+                        status: "2"
+                      });
+                      break;
+                    case 4:
+                      this.openIdInfo({
+                        status: "3"
+                      });
+                      break;
+                    case 5:
+                      that.openIdInfo({
+                        status: "4"
+                      });
+                      break;
+                    default:
+                      that.openIdInfo();
+                  }
                 }
-              }
-            })
-            that.setData({
-              isAllTrue: false,
-            })
+              })
+              that.setData({
+                isAllTrue: false,
+              })
+            }
           } else {
             wx.showToast({
               title: '请选择要删除的记录',

pages/visitandinfo/visitandinfo.wxml

@@ -9,7 +9,7 @@
 	<view >
 		<view id='tabs'>
 			<view class='tabs-box'>
-				<block wx:for="{{['采集记录','探访记录']}}" wx:key="index">
+				<block wx:for="{{['采集记录','巡访记录']}}" wx:key="index">
 					<view class="tabs-item {{currentTabIndex == index ? 'selected' : '' }}" bindtap='onTabsItemTap' data-index='{{index}}'>
 						{{item}}
 					</view>
@@ -57,11 +57,11 @@
 					</scroll-view>
 				</view>
 				<view hidden='{{currentTabIndex != 1}}'>
-					<view class="zizi">共<text class="number"> {{list.length}} </text>条探访记录</view>
+					<view class="zizi">共<text class="number"> {{list.length}} </text>条巡访记录</view>
 					<scroll-view class="table0" scroll-y="true" style='height: {{scrollHeight1 + "px"}}'>
 						<view class="tr0 bg-w0" style="padding:0">
 							<view class="th0" style="width: 70%;">老人姓名</view>
-							<view class="th0" style="width: 30%;">探访时间</view>
+							<view class="th0" style="width: 30%;">巡访时间</view>
 						</view>
 						<block wx:for="{{list}}" wx:key="unique">
 							<view class="tr0" bindtap="bindtap" data-infos="{{item}}" bindtap="visitJilu">
@@ -73,7 +73,7 @@
 					<!-- <view class="table0">
 						<view class="tr0 bg-w0" style="padding:0">
 							<view class="th0">老人姓名</view>
-							<view class="th0">探访时间</view>
+							<view class="th0">巡访时间</view>
 						</view>
 						<block wx:for="{{list}}" wx:key="unique">
 							<view class="tr0" bindtap="bindtap" data-infos="{{item}}" bindtap="visitJilu">
@@ -87,14 +87,14 @@
 							<scroll-view scroll-y="true" class="block">
 								<view style="margin-bottom:25rpx">
 									<view style="font-size:30rpx;">
-										探访时间:
+										巡访时间:
 									</view>
 									<view>
 										{{time.formatDate(infos.visitTime)}}
 									</view>
 								</view>
 								<view style="font-size:30rpx;">
-									探访位置:
+									巡访位置:
 								</view>
 								<view class="wai-box" style="margin-bottom:25rpx">
 									<view>{{infos.visitLocation}}</view>
@@ -108,7 +108,7 @@
 								</view>
 								<view class="pop-oldtitle">{{infos.oldInfo}}<text class="oldzi">（{{infos.oldIdNumber}}）</text></view>
 								<view style="font-size:30rpx;">
-									1.探访情况
+									1.巡访情况
 								</view>
 								<view class="tanfang">
 									<view class="flex-box" style=" margin: 10rpx 0;">
@@ -138,7 +138,7 @@
 									2.老人需求说明
 								</view>
 								<view class="wai-box" style="margin-bottom:25rpx"> {{infos.demand}}</view>
-								<view style="font-size:30rpx;"> 3.探访备注说明</view>
+								<view style="font-size:30rpx;"> 3.巡访备注说明</view>
 								<view class="wai-box" style="margin-bottom:25rpx">{{infos.visitMessage}}</view>
 								<view style="font-size:30rpx;"> 4.现场含面部照片</view>
 								<view class="pop-boxs">