0921修改

app.js

@@ -91,7 +91,7 @@ App({
                 console.log("用户的openid:" + res.data.openid);
                 wx.setStorageSync('openId', res.data.openid)
                 wx.request({
-                  url: 'http://10.16.4.7:7001/applet/isExist',
+                  url: 'http://info.windd.cn:8080/test/applet/isExist',
                   method: "GET",
                   data: {
                     appletsId: wx.getStorageSync('openId')

app.json

@@ -1,18 +1,19 @@
 {
   "pages": [
     "pages/index/index",
+    "pages/love/love",
     "pages/visitandinfo/visitandinfo",
     "pages/collectInfo/collectInfo",
     "pages/finishInfo/finishInfo",
     "pages/idCard/idCard",
     "pages/paiming/paiming",
     "pages/idCardDetail/idCardDetail",
-    "pages/love/love",
     "pages/login/login",
     "pages/updatepassword/updatepassword",
     "pages/notice/notice",
     "pages/card/card",
-    "pages/personInfo/personInfo"
+    "pages/personInfo/personInfo",
+    "pages/userBook/userBook"
   ],
   "window": {
     "backgroundTextStyle": "light",
@@ -61,9 +62,10 @@
   },
   "tabBar": {
     "color": "#a9b7b7",
-    "selectedColor": "#999999",
+    "selectedColor": "#000",
     "borderStyle": "black",
-    "list": [{
+    "list": [
+      {
         "pagePath": "pages/index/index",
         "text": "首页",
         "selectedIconPath": "/images/tabbar5.png",
@@ -87,7 +89,6 @@
         "selectedIconPath": "./images/tabbar8.png",
         "iconPath": "./images/tabbar4.png"
       }
-
     ]
   },
   "style": "v2",

pages/collectInfo/collectInfo.json

@@ -1,4 +1,4 @@
 {
   "usingComponents": {},
-  "navigationBarTitleText": "开始采集"
+  "navigationBarTitleText": "采集"
 }

pages/collectInfo/collectInfo.wxss

@@ -101,7 +101,7 @@ page {
 
 .right {
   height: 90vh;
-  width: 510rpx;
+  width: 520rpx;
   float: right;
   margin-right: 20rpx;
   font-size: 28rpx;
@@ -197,7 +197,7 @@ page {
 .title2 {
   color: #666666;
   width: 150rpx;
-  margin-top: 80rpx;
+  margin-top: 70rpx;
   font-size: 26rpx;
   display: inline-block;
   text-align: center;

pages/idCardDetail/idCardDetail.wxml

@@ -10,20 +10,20 @@
 	</view>
 	<view class="userInfo">
 		<view style="display: flex;">
-			<view style=" width: 130rpx;">身份证号：</view>
-			<view style="width: 310rpx;">{{info.idCardNumber}}</view>
+			<view class="title1">身份证号：</view>
+			<view class="title2">{{info.idCardNumber}}</view>
 		</view>
-		<view style="display: flex;">
-			<view style=" width: 130rpx;">认证时间：</view>
-			<view style="width: 310rpx;">2020年09月15日</view>
+		<view style="display:flex;margin-top:15rpx">
+			<view class="title1">认证时间：</view>
+			<view class="title2">2020年09月15日</view>
 		</view>
-		<view style="display: flex;">
-			<view style=" width: 130rpx;">认证地点：</view>
-			<view style="width: 310rpx;">{{info.dept1.name}}{{info.dept2.name}}{{info.dept3.name}}{{info.dept4.name}}{{info.dept15.name}}</view>
+		<view style="display: flex;margin-top:15rpx">
+			<view class="title1">认证地点：</view>
+			<view class="title2">{{info.dept1.name}}{{info.dept2.name}}{{info.dept3.name}}{{info.dept4.name}}{{info.dept15.name}}</view>
 		</view>
-		<view style="display: flex;">
-			<view style=" width: 130rpx;">联系方式：</view>
-			<view style="width: 310rpx;">{{info.phone}}</view>
+		<view style="display: flex;margin-top:15rpx">
+			<view class="title1">联系方式：</view>
+			<view class="title2">{{info.phone}}</view>
 		</view>
 	</view>
 	<image class="zhang" src="/images/zhang.png"></image>

pages/idCardDetail/idCardDetail.wxss

@@ -2,8 +2,9 @@
   width: 180rpx;
   height: 180rpx;
   position: absolute;
-  top:34%;
-  left: 300rpx
+  top:33%;
+  left: 300rpx;
+  border-radius: 20rpx;
 }
 
 .home {
@@ -53,4 +54,12 @@
   width: 100%;
   text-align: center;
   color: white;
+}
+.title1{
+  color: #0a0204;
+  width: 130rpx;
+}
+.title2{
+  color: #666666;
+  width: 300rpx;
 }

pages/index/index.wxml

@@ -46,14 +46,14 @@
 	</view>
 	<view class="top4">
 		<view class="top4-box" bindtap="goCollect">
-			<image src="/images/indexicon4.png" style="width: 140rpx; height: 100rpx;  margin-top: 10rpx;"></image>
+			<image src="/images/indexicon4.png" style="width: 120rpx;height: 120rpx;margin-top: 10rpx;"></image>
 			<view class="top4-box1">
 				<view class="top4-title">信息采集</view>
 				<view class="top4-smalltitle">信息采集</view>
 			</view>
 		</view>
 		<view class="top4-box" bindtap="goXunfang">
-			<image src="/images/indexicon5.png" style="width: 140rpx; height: 100rpx;  margin-top: 10rpx;"></image>
+			<image src="/images/indexicon5.png" style="width: 120rpx;height: 120rpx;margin-top: 10rpx;"></image>
 			<view class="top4-box1">
 				<view class="top4-title">巡访信息</view>
 				<view class="top4-smalltitle">巡访信息</view>
@@ -62,14 +62,14 @@
 	</view>
 	<view class="top4">
 		<view class="top4-box" bindtap="goPaiming">
-			<image src="/images/indexicon6.png" style="width: 140rpx; height: 100rpx;  margin-top: 10rpx;"></image>
+			<image src="/images/indexicon6.png" style="width: 120rpx;height: 120rpx;margin-top: 10rpx;"></image>
 			<view class="top4-box1">
 				<view class="top4-title">我的排名</view>
 				<view class="top4-smalltitle">我的排名</view>
 			</view>
 		</view>
 		<view class="top4-box" bindtap="goSaoMa">
-			<image src="/images/indexicon7.png" style="width: 140rpx; height: 100rpx;  margin-top: 10rpx;"></image>
+			<image src="/images/indexicon7.png" style="width: 120rpx;height: 120rpx;margin-top: 10rpx;"></image>
 			<view class="top4-box1">
 				<view class="top4-title">扫一扫</view>
 				<view class="top4-smalltitle">扫一扫</view>

pages/index/index.wxss

@@ -84,19 +84,18 @@
 
 .top3-title {
   color: #9eb7c9;
-  font-size: 30rpx;
+  font-size: 28rpx;
   font-family: SourceHanSansCN;
-  font-weight: 500;
+  font-weight: 600;
   margin-top: 5rpx;
-
 }
 
-top3-num {
-  font-size: 36rpx;
+.top3-num {
+  font-size: 38rpx;
   font-family: SourceHanSansCN;
-  font-weight: 500;
-  color: #9DB7C9;
-  margin-top: 20rpx;
+  font-weight: 700;
+  color: #003e75;
+  margin-top: 10rpx;
 }
 
 .top4 {
@@ -135,6 +134,7 @@ top3-num {
   font-weight: 400;
   font-size: 26rpx;
   color: #999999;
+  margin-top: 10rpx;
 }
 
 .top4-box1 {
@@ -154,10 +154,10 @@ top3-num {
 }
 
 .swiper_item {
-  font-size: 30rpx;
+  font-size: 25rpx;
+  font-weight: 900;
   overflow: hidden;
   text-overflow: ellipsis;
   white-space: nowrap;
   letter-spacing: 2px;
-
 }

pages/notice/notice.wxml

@@ -1,6 +1,6 @@
 <wxs module="time" src="../../utils/time.wxs"></wxs>
 <view id='tabs'>
-	<view class='tabs-box'>
+	<view class='tabs-box' style="background-color:#fff;border-radius:40rpx">
 		<block wx:for="{{['未读消息','已读消息']}}" wx:key="index">
 			<view class="tabs-item {{currentTabIndex == index ? 'selected' : '' }}" bindtap='onTabsItemTap' data-index='{{index}}'>
 				{{item}}
@@ -22,7 +22,7 @@
 					<view class="readwenzi">未读</view>
 					<view style="display: flex;">
 						<image src="/images/dui.png" style="width: 40rpx; height: 40rpx; margin-right: 10rpx;"></image>
-						<view bindtap="know" data-infos='{{item}}'>我知道了</view>
+						<view bindtap="know" data-infos='{{item}}' style="color:#666666">我知道了</view>
 					</view>
 				</view>
 			</view>
@@ -37,7 +37,7 @@
 				</view>
 				<view class="title">{{item.content}}</view>
 				<view class="flex-box">
-					<view class="readwenzi" style="background:#dcdcdc">已读</view>
+					<view class="readwenzi" style="background:#999999">已读</view>
 					<!-- <view style="display: flex;  align-items: center;">
 							<image src="/images/shan.png" style="width: 50rpx; height: 50rpx; margin-right: 10rpx;"></image>
 							<view>删除</view>

pages/notice/notice.wxss

@@ -14,8 +14,8 @@ page {
   display: flex;
   align-items: center;
   justify-content: center;
-  height: 80rpx;
-  line-height: 80rpx;
+  height: 60rpx;
+  line-height: 60rpx;
   text-align: center;
   /* position: fixed;
   width: 100%;
@@ -44,9 +44,8 @@ page {
   top: 20rpx;
   left: 50rpx;
   position: absolute;
-  top: 42rpx;
-  left: 265rpx;
-
+  top: 32rpx;
+  left: 250rpx;
 }
 
 .onread {
@@ -58,20 +57,19 @@ page {
 }
 
 .title {
-  color: #a7a7a7;
+  color: #999999;
   font-size: 26rpx;
   margin-top: 10rpx;
 }
 
 .readwenzi {
   color: whitesmoke;
-  padding: 10rpx;
+  padding: 5rpx 10rpx;
   width: 48rpx;
   font-size: 24rpx;
   background: #2087f7;
   border-radius: 10rpx;
-  margin-top: 10rpx;
-
+  margin-top: 20rpx;
 }
 
 .flex-box {
@@ -80,5 +78,4 @@ page {
   align-items: center;
   font-size: 24rpx;
   color: #a7a7a7;
-  
 }

pages/personInfo/personInfo.js

@@ -25,6 +25,11 @@ Page({
       url: '/pages/updatepassword/updatepassword',
     })
   },
+  userBook(){
+    wx.navigateTo({
+      url: '/pages/userBook/userBook',
+    })
+  },
   tuichu() {
     wx.showModal({
       showCancel: true,

pages/personInfo/personInfo.wxml

@@ -4,45 +4,45 @@
 		<view class="tx">
 			<open-data type="userAvatarUrl"></open-data>
 		</view>
-		<view class="nc">
+		<view class="nc" style="font-size:35rpx">
 			<!-- <open-data type="userNickName" lang="zh_CN"></open-data> -->
 			{{info.userName}}
 		</view>
-		<view class="nc" style="">
+		<view class="nc" >
 			账号：{{info.loginName}}
 		</view>
 	</view>
 	<view class="title"  bindtap="wanshan">
 		<view class="small-title">
-			<image src="/images/person1.png" style="width: 80rpx; height: 80rpx;"></image>
+			<image src="/images/person1.png" style="width: 60rpx; height: 60rpx;"></image>
 			<view class="small-zi">完善资料</view>
 		</view>
 		<view class="jiantou">></view>
 	</view>
 	<view class="title" bindtap="shenfen">
 		<view class="small-title">
-			<image src="/images/person2.png" style="width: 80rpx; height: 80rpx;"></image>
+			<image src="/images/person2.png" style="width: 60rpx; height: 60rpx;"></image>
 			<view class="small-zi">身份卡</view>
 		</view>
 		<view class="jiantou">></view>
 	</view>
 	<view class="title" bindtap="xiugai">
 		<view class="small-title">
-			<image src="/images/person3.png" style="width: 80rpx; height: 80rpx;"></image>
+			<image src="/images/person3.png" style="width: 60rpx; height: 60rpx;"></image>
 			<view class="small-zi">修改密码</view>
 		</view>
 		<view class="jiantou">></view>
 	</view>
 		<view class="title" bindtap="userBook">
 		<view class="small-title" >
-			<image src="/images/userbook.png" style="width: 80rpx; height: 80rpx;"></image>
+			<image src="/images/userbook.png" style="width: 60rpx; height: 60rpx;"></image>
 			<view class="small-zi">用户手册</view>
 		</view>
 		<view class="jiantou">></view>
 	</view>
 	<view class="title" bindtap="tuichu">
 		<view class="small-title" >
-			<image src="/images/person4.png" style="width: 80rpx; height: 80rpx;"></image>
+			<image src="/images/person4.png" style="width: 60rpx; height: 60rpx;"></image>
 			<view class="small-zi">退出登录</view>
 		</view>
 		<view class="jiantou">></view>

pages/personInfo/personInfo.wxss

@@ -50,8 +50,8 @@ page {
   display: flex; 
   align-items: center;
   justify-content: center;
-
-  
+  color: #333333;
+  font-weight: 600;
 }
 
 .small-zi {
@@ -59,5 +59,6 @@ page {
 }
 
 .jiantou {
-  font-size: 50rpx;
+  font-size: 40rpx;
+  color: #9b9b9b;
 }

pages/updatepassword/updatepassword.wxml

@@ -1,25 +1,28 @@
 <view>
 	<image src="/images/bg_main_new2.jpg" style="width: 100%; height: 380rpx;"> </image>
 	<view class="home">
-		账号:{{info.loginName}}({{info.dept5.name}})
+		账号 : {{info.loginName}}({{info.dept5.name}})
 	</view>
 	<view class="home">
-		姓名:{{info.userName}} 手机: {{info.phone}}
+		姓名 : {{info.userName}}
+	</view>
+	<view class="home">
+		手机 : {{info.phone}}
 	</view>
 	<form bindsubmit="formSubmit">
 		<view class="box">
 			<view class="name" style=" margin-top: 20rpx;">
-				<image src="/images/pwd.png" style="width: 40rpx; height: 40rpx;"> </image>
+				<image src="/images/pwd.png" style="width: 30rpx; height: 30rpx;margin-top:10rpx;margin-left:10rpx"> </image>
 				<input name='oldPwd' class="weui-input" password='{{passwordType1}}' placeholder="请输入原密码" />
 				<image src='{{defaultType1? "/images/eye_close.png": "/images/eye_open.png"}}' class='eye-image' bindtap='eyeStatus1'></image>
 			</view>
 			<view class="name" style=" margin-top: 20rpx;">
-				<image src="/images/pwd.png" style="width: 40rpx; height: 40rpx;"> </image>
+				<image src="/images/pwd.png" style="width: 30rpx; height: 30rpx;margin-top:10rpx;margin-left:10rpx"> </image>
 				<input name='pwd' class="weui-input" password='{{passwordType2}}' placeholder="请输入新密码" />
 				<image src='{{defaultType2? "/images/eye_close.png": "/images/eye_open.png"}}' class='eye-image' bindtap='eyeStatus2'></image>
 			</view>
 			<view class="name" style=" margin-top: 20rpx;">
-				<image src="/images/pwd.png" style="width: 40rpx; height: 40rpx;"> </image>
+				<image src="/images/pwd.png" style="width: 30rpx; height: 30rpx;margin-top:10rpx;margin-left:10rpx"> </image>
 				<input name='newPwd' class="weui-input" password='{{passwordType3}}' placeholder="请再次输入新密码" />
 				<image src='{{defaultType3? "/images/eye_close.png": "/images/eye_open.png"}}' class='eye-image' bindtap='eyeStatus3'></image>
 			</view>

pages/updatepassword/updatepassword.wxss

@@ -1,16 +1,16 @@
 .home {
- 
   color: #409EFF;
   font-size: 28rpx;
   width: 80%;
   margin: 0 auto;
-  margin-top: 30rpx;
+  margin-top: 20rpx;
+  font-weight: 700;
 }
 
 .name {
   display: flex;
   border: 1px solid #ccc;
-  padding: 20rpx;
+  padding: 8rpx;
   border-radius: 10rpx;
 }
 
@@ -43,4 +43,8 @@ button:not([size='mini']) {
   color: white;
   background: #1989FA;
   font-size: 28rpx;
+}
+.weui-input{
+  font-size: 25rpx;
+  margin-top:5rpx;
 }

pages/userBook/userBook.js

@@ -0,0 +1,45 @@
+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.json

@@ -0,0 +1,4 @@
+{
+  "usingComponents": {},
+  "navigationBarTitleText":"用户手册"
+}

pages/userBook/userBook.wxml

@@ -0,0 +1,95 @@
+<view style="margin-bottom:100rpx">
+	<view class="block">
+		<view class="num">
+			Q1
+		</view>
+		<view class="question">
+			如何找到小程序
+		</view>
+	</view>
+	<view class="hd">①下滑微信界面，在搜索框中搜索吉顺致养，点击进入小程序</view>
+	<view class="hd">②微信扫描下方二维码进入小程序</view>
+	<image src="../../images/ewm.jpg" class="img"></image>
+	<view class="block">
+		<view class="num">
+			Q2
+		</view>
+		<view class="question">
+			登录账号
+		</view>
+	</view>
+	<view class="hd">①处于未登录状态时点击除首页外其他功能，弹出登录页面。输入账号密码登录即可。</view>
+	<image src="../../images/user_login.png" class="img1"></image>
+	<view class="block">
+		<view class="num">
+			Q3
+		</view>
+		<view class="question">
+			完善资料
+		</view>
+	</view>
+	<view class="hd">①点击我的->完善资料，填写基本信息。所有信息都为必填项。</view>
+	<image src="../../images/user_finish.png" class="img2"></image>
+	<view class="block">
+		<view class="num">
+			Q4
+		</view>
+		<view class="question">
+			生成身份卡
+		</view>
+	</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>
+	</view>
+	<view class="block">
+		<view class="num">
+			Q5
+		</view>
+		<view class="question">
+			采集老人信息流程
+		</view>
+	</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>
+	</view>
+	<view class="block">
+		<view class="num">
+			Q6
+		</view>
+		<view class="question">
+			采集老人信息查看
+		</view>
+	</view>
+	<view class="hd">①点点击工作日志->采集记录</view>
+	<view class="hd">②可查看到我的全部采集记录，也可分类（填全未审，未完成，审核中，审核完成，审核失败）查看。点击每条信息的选框可删除此条信息，审核完成的不可删除。</view>
+	<image src="../../images/user_collect.png" class="img2"></image>
+	<view class="block">
+		<view class="num">
+			Q7
+		</view>
+		<view class="question">
+			探访老人流程
+		</view>
+	</view>
+	<view class="hd">①点击首页->扫一扫</view>
+	<view class="hd">②扫描老人家里粘贴的二维码，进入探访页面。填写探访老人的情况即可。</view>
+	<image src="../../images/user_old.png" class="img5"></image>
+	<view class="block">
+		<view class="num">
+			Q8
+		</view>
+		<view class="question">
+			探访信息查看
+		</view>
+	</view>
+	<view class="hd">①点击工作日志->探访记录</view>
+	<view class="hd">②可查看到我的全部探访记录。</view>
+	<image src="../../images/user_visit.png" class="img6"></image>
+</view>

pages/visitandinfo/visitandinfo.json

@@ -1,4 +1,4 @@
 {
-  "navigationBarTitleText":"采集记录与探访记录",
+  "navigationBarTitleText":"工作日志",
   "usingComponents": {}
 }

pages/visitandinfo/visitandinfo.wxml

@@ -5,7 +5,7 @@
 	<wxs module="oldMind" src="../../utils/oldmind.wxs"></wxs>
 	<wxs module="oldHealth" src="../../utils/oldhealth.wxs"></wxs>
 	<wxs module="oldSecurity" src="../../utils/oldsecurity.wxs"></wxs>
-	<view>
+	<view style="margin-bottom:100rpx">
 		<view id='tabs'>
 			<view class='tabs-box'>
 				<block wx:for="{{['采集记录','探访记录']}}" wx:key="index">
@@ -24,7 +24,7 @@
 						<van-tab title="审核完成"></van-tab>
 						<van-tab title="审核失败"></van-tab>
 					</van-tabs>
-					<view class="zizi">共<text class="number">{{listData.length}}</text>条采集记录</view>
+					<view class="zizi">共<text class="number"> {{listData.length}} </text>条采集记录</view>
 					<scroll-view class="center" scroll-y="true" style='height: {{scrollHeight + "px"}}'>
 						<view class="tr" style=" border-bottom: 1px solid #dadada; padding-bottom: 15rpx;">
 							<view class="td " style="border-bottom: unset; width: 38%; ">
@@ -41,9 +41,9 @@
 								</view>
 								<view class="td idcard" value="{{item.text}}" bindtap="cellClick" data-infos='{{item}}'>
 									<view>{{item.name}}</view>
-									<!-- <view wx:if='{{item.idNumber}}' class="oldzi">({{item.idNumber}}</view> -->
-									<view wx:if='{{item.idNumber}}' class="oldzi">({{subqian.subqian(item.idNumber)}}</view>
-									<view wx:if='{{item.idNumber}}' class="oldzi">{{subhou.subhou(item.idNumber)}})</view>
+									<view wx:if='{{item.idNumber}}' class="oldzi">{{item.idNumber}}</view>
+									<!-- <view wx:if='{{item.idNumber}}' class="oldzi">({{subqian.subqian(item.idNumber)}}</view> -->
+									<!-- <view wx:if='{{item.idNumber}}' class="oldzi">{{subhou.subhou(item.idNumber)}})</view> -->
 								</view>
 								<view class="td" bindtap="cellClick" data-infos='{{item}}' value="{{item.text}}">{{time.formatDate(item.time)}}</view>
 								<view class="td status" bindtap="cellClick" data-infos='{{item}}' wx:if="{{item.status == '1'}}" style="color: #67C23A">填全未审</view>
@@ -56,16 +56,16 @@
 					</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: 70%;">老人姓名</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">
-								<view class="td0"><text>{{item.oldInfo}}<text wx:if='{{item.oldIdNumber}}' class="oldzi">({{item.oldIdNumber}})</text></text></view>
-								<view class="td0 td11" style="  padding: 0rpx 10rpx;"><text> {{time.formatDate(item.visitTime)}}</text></view>
+								<view class="td0"><text>{{item.oldInfo}}</text><text wx:if='{{item.oldIdNumber}}' class="oldzi">({{item.oldIdNumber}})</text></view>
+								<view class="td0 td11" style="padding: 0rpx 10rpx;"><text> {{time.formatDate(item.visitTime)}}</text></view>
 							</view>
 						</block>
 					</scroll-view>

pages/visitandinfo/visitandinfo.wxss

@@ -16,19 +16,22 @@
   justify-content: center;
   height: 80rpx;
   line-height: 80rpx;
-  text-align: center
+  text-align: center;
+  border-top: 1px solid #d3d7e0;
 }
 
 .tabs-item.selected {
   color: #2892ff;
   background-color: white;
+  border: none;
 }
 
 .tabs-item {
   width: 50%;
   color: #666;
   background: #F5F7FA;
-
+  font-size: 27rpx;
+  border: 1px solid #d3d7e0;
 }
 
 .table {
@@ -58,10 +61,7 @@
   width: 100%;
   border-bottom: 1px solid #dadada;
   font-size: 28rpx;
-
 }
-
-
 .td {
   background-color: #fff;
   /* text-align: center;
@@ -69,6 +69,7 @@
   width: 80%;
   border-bottom: 1px solid #dadada;
   padding: 10rpx 0;
+  font-size: 27rpx;
 }
 
 .status {
@@ -88,6 +89,7 @@
   justify-content: center;
   border-bottom: 1px solid #dadada;
   padding: 20rpx 0rpx;
+  font-size: 27rpx;
 }
 .td0 {
   text-align: center;
@@ -116,6 +118,9 @@
 
 .number {
   color: #2087F7;
+  font-weight: 800;
+  margin-left: 5rpx;
+  margin-right: 5rpx;
 }
 
 checkbox .wx-checkbox-input {
@@ -192,6 +197,7 @@ checkbox .wx-checkbox-input {
     text-align: center;
     color:white;
     padding: 10rpx 0;
+    border-radius: 10rpx;
 }
 .scroll {
   flex: 1;

project.config.json

@@ -22,7 +22,7 @@
 			"disablePlugins": [],
 			"outputPath": ""
 		},
-		"useCompilerModule": true,
+		"useCompilerModule": false,
 		"userConfirmedUseCompilerModuleSwitch": false
 	},
 	"compileType": "miniprogram",

utils/photoUrl.wxs

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

utils/util.js

@@ -1,8 +1,8 @@
 const globalData = {
-  // publicUrl: 'http://info.windd.cn:8080/test',
+  publicUrl: 'http://info.windd.cn:8080/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,