1

pages/bindOld/bindOld.js

@@ -15,45 +15,59 @@ Page({
       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',
-              })
-            }
+    wx.showModal({
+      showCancel: true,
+      content: '确定要解除绑定关系吗',
+      success: (res) => {
+        if (res.confirm) {
+          wx.showLoading({
+            title: '加载中',
           })
-        } else {
-          wx.showModal({
-            showCancel: false,
-            content: res.data.message,
+          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) {
+                wx.showModal({
+                  showCancel: false,
+                  content: '已解除绑定',
+                  success: (res) => {
+                    wx.navigateTo({
+                      url: '/pages/visitFind/visitFind',
+                    })
+                  }
+                })
+              } else {
+                wx.showModal({
+                  showCancel: false,
+                  content: res.data.message,
+                })
+              }
+            },
+            complete: () => {
+              wx.hideLoading()
+            }
           })
         }
       }
     });
   },
-
   /**
    * 生命周期函数--监听页面加载
    */
   onLoad: function () {
     let id = wx.getStorageSync('openId');
+    wx.showLoading({
+      title: '加载中',
+    })
     wx.request({
       url: app.globalData.publicUrl + '/applet/appletVisitIsExist',
       method: "GET",
@@ -63,6 +77,7 @@ Page({
       success: res => {
         if (res.data.code == 1) {
           console.log("用户没绑定", res);
+          wx.hideLoading()
           wx.navigateTo({
             url: '/pages/visitFind/visitFind',
           })
@@ -74,6 +89,7 @@ Page({
           })
           this.findFamilyInfo(res.data.data._id)
         } else {
+          wx.hideLoading()
           wx.showModal({
             showCancel: false,
             content: res.data.message,
@@ -101,6 +117,9 @@ Page({
             content: res.data.message,
           })
         }
+      },
+      complete: () => {
+        wx.hideLoading()
       }
     });
   },

pages/bindOld/bindOld.wxml

@@ -4,7 +4,7 @@
 		<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="6"></van-col>
+			<van-col span="6">操作</van-col>
 		</van-row>
 	</view>
 	<view class="b1" wx:for='{{arr}}'>

pages/collectInfo/collectInfo.js

@@ -2061,6 +2061,7 @@ Page({
     }
   },
   goPhoto() {
+    console.log('我走')
     let that = this;
     isTwoOnshow = true;
     wx.setStorageSync('isTwoOnshow', true)

pages/index/index.js

@@ -180,14 +180,14 @@ Page({
       wx.scanCode({
         onlyFromCamera: true,
         success: (res) => {
-          console.log(res, "打印锕");
+          console.log(res, "扫码成功");
           let length = res.result.substring(res.result.lastIndexOf('/') + 1, res.result.length)
           wx.navigateTo({
             url: '/pages/love/love?id=' + length,
           })
         },
         fail: (res) => {
-          console.log(res, "假的");
+          console.log(res, "扫码失败");
           wx.showToast({
             title: '扫码失败',
             icon: 'none',

pages/index/index.wxml

@@ -57,8 +57,8 @@
 			<view class="top4-box1">
 				<!-- <view class="top4-title">巡访信息</view>
 				<view class="top4-smalltitle">巡访信息</view> -->
-				<view class="top4-title">巡访查询</view>
-				<view class="top4-smalltitle">查询绑定</view>
+				<view class="top4-title">子女查询</view>
+				<view class="top4-smalltitle">巡访情况</view>
 			</view>
 		</view>
 	</view>

pages/love/love.js

@@ -152,6 +152,7 @@ Page({
         },
         success: (res) => {
           // 如果上传不是人脸图片 则没有score
+          console.log(res)
           if (res.data && res.data.data && res.data.data.score) {
             console.log(res.data.data.score, "分数是");
             if (res.data.data.score > 80) {

pages/notice/notice.wxml

@@ -26,6 +26,7 @@
 					</view>
 				</view>
 			</view>
+			<image src="../../images/nodata1.png" class='nodata' wx:if="{{noreadList.length==0}}"></image>
 		</view>
 		<view hidden='{{currentTabIndex != 1}}'>
 			<view class="onread" wx:for='{{readList}}'>
@@ -44,6 +45,7 @@
 						</view> -->
 				</view>
 			</view>
+			<image src="../../images/nodata1.png" class='nodata' wx:if="{{readList.length==0}}"></image>
 		</view>
 	</view>
 </view>

pages/notice/notice.wxss

@@ -78,4 +78,11 @@ page {
   align-items: center;
   font-size: 24rpx;
   color: #a7a7a7;
+}
+.nodata{
+  width: 220rpx;
+  height: 169rpx;
+  position: fixed;
+  top: 500rpx;
+  left: 265rpx;
 }

pages/userBook/userBook.wxml

@@ -1,5 +1,5 @@
 <view style="margin-bottom:100rpx">
-	<van-divider contentPosition="center">巡访员使用手册</van-divider>
+	<van-divider customStyle="color: #000;font-size: 16px;font-weight:800" contentPosition="center">巡访员使用手册</van-divider>
 	<view class="block">
 		<view class="num">
 			Q1
@@ -118,10 +118,14 @@
 		<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>
+	<van-divider   customStyle="color: #000;font-size: 16px;font-weight:800" contentPosition="center">子女（赡养人）使用手册</van-divider>
 	<view class="hd">①点击首页->巡访查询</view>
 	<view class="hd">②输入要绑定的老人身份证号->绑定成功</view>
+	<image src="../../images/user_7.jpg" class="img11"></image>
 	<view class="hd">③进入老人信息页面，可在此页面点击查看更多老人信息，也可以点击下方按钮解除绑定关系。</view>
+	<image src="../../images/user_6.jpg" class="img12"></image>
 	<view class="hd">④进入老人巡访记录页面，显示最近15条此老人的巡访信息和时间，点击可查看具体巡访情况。</view>
+	<image src="../../images/user_5.jpg" class="img11"></image>
 	<view class="hd">⑤进入老人信息详情页面，显示每次巡访的具体情况。</view>
+	<image src="../../images/user_8.png" class="img12"></image>
 </view>

pages/userBook/userBook.wxss

@@ -32,7 +32,7 @@
   margin-left: 175rpx;
   margin-top: 20rpx;
   margin-bottom: 20rpx;
-  border: 1px solid #999999;
+
 }
 
 .img {
@@ -49,39 +49,39 @@
   margin-left: 175rpx;
   margin-top: 20rpx;
   margin-bottom: 20rpx;
-  border: 1px solid #999999;
+
 }
 
 .img2 {
   width: 400rpx;
-  height: 700rpx;
+  height: 660rpx;
   margin-left: 175rpx;
   margin-top: 20rpx;
   margin-bottom: 20rpx;
-  border: 1px solid #999999;
+
 }
 
 .img3 {
   width: 250rpx;
   height: 300rpx;
   margin-left: 80rpx;
-  border: 1px solid #999999;
+
 }
 
 .img4 {
   width: 290rpx;
   height: 350rpx;
   margin-left: 60rpx;
-  border: 1px solid #999999;
+
 }
 
 .img5 {
   width: 400rpx;
-  height: 730rpx;
+  height: 740rpx;
   margin-left: 175rpx;
   margin-top: 20rpx;
   margin-bottom: 20rpx;
-  border: 1px solid #999999;
+
 }
 
 .img6 {
@@ -90,7 +90,7 @@
   margin-left: 175rpx;
   margin-top: 20rpx;
   margin-bottom: 20rpx;
-  border: 1px solid #999999;
+
 }
 
 .img7 {
@@ -105,7 +105,7 @@
 .img8 {
   width: 300rpx;
   height: 390rpx;
-  margin-left: 15rpx;
+  margin-left: 25rpx;
   margin-top: 20rpx;
   margin-bottom: 20rpx;
   border: 1px solid #999999;
@@ -125,4 +125,18 @@
   margin-left: 15rpx;
   margin-top: 20rpx;
   margin-bottom: 20rpx;
+}
+.img11{
+  width: 400rpx;
+  height: 450rpx;
+  margin-left: 175rpx;
+  margin-top: 20rpx;
+  margin-bottom: 20rpx;
+}
+.img12{
+  width: 400rpx;
+  height: 650rpx;
+  margin-left: 175rpx;
+  margin-top: 20rpx;
+  margin-bottom: 20rpx;
 }

pages/visitFind/visitFind.js

@@ -47,6 +47,9 @@ Page({
           this.setData({
             wrong: false
           })
+          wx.showLoading({
+            title: '加载中',
+          })
           wx.request({
             url: app.globalData.publicUrl + '/applet/appletVisitBing',
             method: "GET",
@@ -66,6 +69,9 @@ Page({
                   content: res.data.message,
                 })
               }
+            },
+            complete: () => {
+              wx.hideLoading()
             }
           });
         }

pages/visitList/visitList.js

@@ -17,6 +17,9 @@ Page({
    * 生命周期函数--监听页面加载
    */
   onLoad: function (options) {
+    wx.showLoading({
+      title: '加载中',
+    })
     console.log(options)
     wx.request({
       url: app.globalData.publicUrl + '/wxinfo/visitByNumber',
@@ -28,8 +31,12 @@ Page({
         console.log(res)
         if (res.data.code == 0) {
           console.log('我查到15条信息了', res)
+          let arr = res.data.data
+          arr.forEach(item => {
+            item.visitTime = this.formatDate(item.visitTime);
+          })
           this.setData({
-            arr: res.data.data
+            arr
           })
         } else {
           wx.showModal({
@@ -37,10 +44,37 @@ Page({
             content: res.data.message,
           })
         }
+      },
+      complete: () => {
+        wx.hideLoading()
       }
     });
   },
-
+  formatTen(num) {
+    return num > 9 ? num + "" : "0" + num;
+  },
+  formatDate(date) {
+    var date = new Date(date);
+    var year = date.getFullYear();
+    var month = date.getMonth() + 1;
+    var day = date.getDate();
+    var hour = date.getHours();
+    var minute = date.getMinutes();
+    var second = date.getSeconds();
+    return (
+      year +
+      "-" +
+      this.formatTen(month) +
+      "-" +
+      this.formatTen(day) +
+      " " +
+      this.formatTen(hour) +
+      ":" +
+      this.formatTen(minute) +
+      ":" +
+      this.formatTen(second)
+    );
+  },
   /**
    * 生命周期函数--监听页面初次渲染完成
    */

pages/visitList/visitList.wxml

@@ -1,14 +1,15 @@
-<view style="font-size:30rpx;margin:30rpx;">巡访数量：{{arr.length}}条（注：最多显示15条）</view>
+<view style="font-size:28rpx;text-align:center;height:80rpx;background-color:#f9f9f7;width:750rpx;line-height:80rpx">巡访数量:<text style="color:#2087f7;font-weight:600">{{arr.length}}</text>条 (最多显示最近15条)</view>
 	<view class="b1">
-		<van-row style='text-align:center;color:rgba(144,147,153)'>
+		<van-row style='text-align:center;color:#333333'>
 			<van-col span="6">老人姓名</van-col>
 			<van-col span="12">巡访时间</van-col>
+			<van-col span="6">操作</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.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>
+	<view class="b1" style='font-weight:500'  wx:for="{{arr}}" wx:key="index">
+		<van-row style='text-align:center;'  bindtap='go' data-item='{{item._id}}'>
+			<van-col span="6" style='color:#333333'>{{item.oldInfo}}</van-col>
+			<van-col span="12" style='color:#666666'>{{item.visitTime}}</van-col>
+			<van-col span="5" style='font-weight:600;color:#2087f7;'>查看详情</van-col>
 		</van-row>
 	</view>

pages/visitList/visitList.wxss

@@ -2,8 +2,9 @@
 .b1 {
   width: 700rpx;
   margin-left: 25rpx;
-  font-size: 30rpx;
-  /* margin-top: 30rpx; */
+  font-size: 28rpx;
+  font-weight: 600;
   line-height: 90rpx;
   border-bottom: 1px solid #c0c4cc;
+  text-align: center;
 }

pages/visitListInfo/visitListInfo.js

@@ -1,20 +1,73 @@
 // pages/visitListInfo/visitListInfo.js
+const app = require('../../utils/util.js');
 Page({
 
   /**
    * 页面的初始数据
    */
   data: {
-
+    arr: {}
   },
 
   /**
    * 生命周期函数--监听页面加载
    */
   onLoad: function (options) {
+    wx.showLoading({
+      title: '加载中',
+    })
     console.log(options.id)
+    wx.request({
+      url: app.globalData.publicUrl + '/visit/one',
+      method: "GET",
+      data: {
+        id: options.id
+      },
+      success: res => {
+        if (res.data.code == 0) {
+          console.log('我查到老人详细的巡访信息了', res.data.data.visitTime)
+          res.data.data.visitTime = this.formatDate1(res.data.data.visitTime);
+          this.setData({
+            arr: res.data.data
+          })
+          console.log(res.data.data)
+        } else {
+          wx.showModal({
+            showCancel: false,
+            content: res.data.message,
+          })
+        }
+      },
+      complete: () => {
+        wx.hideLoading()
+      }
+    });
+  },
+  formatTen(num) {
+    return num > 9 ? num + "" : "0" + num;
+  },
+  formatDate1(date) {
+    var date = new Date(date);
+    var year = date.getFullYear();
+    var month = date.getMonth() + 1;
+    var day = date.getDate();
+    var hour = date.getHours();
+    var minute = date.getMinutes();
+    var second = date.getSeconds();
+    return (
+      year +
+      "-" +
+      this.formatTen(month) +
+      "-" +
+      this.formatTen(day) +
+      " " +
+      this.formatTen(hour) +
+      ":" +
+      this.formatTen(minute) +
+      ":" +
+      this.formatTen(second)
+    );
   },
-
   /**
    * 生命周期函数--监听页面初次渲染完成
    */

pages/visitListInfo/visitListInfo.wxml

@@ -1,28 +1,119 @@
-<view class='container'>
-	<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>
+<wxs module="urls" src="../../utils/photoUrl.wxs"></wxs>
+<!-- <view class='container'>
+	<view>巡访日期：{{arr.visitTime}}</view>
+	<view>巡访位置： <text style="text-decoration:underline">{{arr.visitLocation}}</text></view>
+	<view>经度：<text style="text-decoration:underline;margin-right:30rpx">{{arr.lng}}</text>纬度：<text style="text-decoration:underline">{{arr.lat}}</text></view>
+	<view>老人姓名：<text style="color:rgba(133,194,90)">{{arr.oldInfo}}({{arr.oldIdNumber}})</text></view>
 	<view>1.巡访情况：</view>
 	<view style="display:flex;flex-direction:row;flex-wrap:wrap">
-		<view style="width:340rpx">
-			健康情况：健康
+		<view style="width:340rpx;display:flex">
+			健康情况：<view class="{{arr.health == '健康' ? 'green-marker' : arr.health == '一般' ? 'blue-marker' : arr.health == '较差' ? 'red-marker': 'marker'}}">{{arr.health}}</view>
 		</view>
-		<view style="width:340rpx">
-			精神状态：良好
+		<view style="width:340rpx;display:flex">
+			精神状态：<view class="{{arr.mind == '良好' ? 'green-marker' : arr.mind == '一般' ? 'blue-marker' : arr.mind == '较差' ? 'red-marker': 'marker'}}">{{arr.mind}}</view>
 		</view>
-		<view style="width:340rpx">
-			安全情况：安全
+		<view style="width:340rpx;display:flex">
+			安全情况：<view class="{{arr.security == '安全' ? 'green-marker' : arr.security == '一般' ? 'blue-marker' : arr.security == '较差' ? 'red-marker': 'marker'}}">{{arr.security}}</view>
 		</view>
-		<view style="width:340rpx">
-			卫生环境：良好
+		<view style="width:340rpx;display:flex">
+			卫生环境：<view class="{{arr.hygiene == '良好' ? 'green-marker' : arr.hygiene == '一般' ? 'blue-marker' : arr.hygiene == '较差' ? 'red-marker': 'marker'}}">{{arr.hygiene}}</view>
 		</view>
-		<view style="width:340rpx">
-			居住环境：良好
+		<view style="width:340rpx;display:flex">
+			居住环境：<view class="{{arr.live == '良好' ? 'green-marker' : arr.live == '一般' ? 'blue-marker' : arr.live == '较差' ? 'red-marker': 'marker'}}">{{arr.live}}</view>
 		</view>
 	</view>
-	<view>2.老人需求说明：坚决解决军军军军军</view>
-	<view>3.巡访备注说明：就哈哈哈哈哈哈</view>
+	<view>2.老人需求说明：{{arr.demand}}</view>
+	<view>3.巡访备注说明：{{arr.visitMessage}}</view>
 	<view>4.现场含面部照片：</view>
-	<image mode='aspectFit' src="../../images/findbj.png"></image>
+	<image mode='aspectFit' src="{{urls.url(arr.visitPhoto)}}"></image>
+</view> -->
+<view class="container">
+	<view class="top">
+	</view>
+	<view class="fd">
+		<view class="name">老人姓名：{{arr.oldInfo}}</view>
+		<view class="card">身份证号：<text style="color:#85c25a">{{arr.oldIdNumber}}</text></view>
+	</view>
+	<view class="bottom">
+		<view style="border-bottom:1px solid #e5e5e5;line-height:50rpx;padding-bottom:20rpx;padding-top:20rpx;color:#666666;">
+			<van-row>
+				<van-col span="2">
+					<van-icon name="coupon-o" color="#2087f7" size='40rpx' />
+				</van-col>
+				<van-col span="5">巡访日期：</van-col>
+				<van-col span="17">{{arr.visitTime}}</van-col>
+			</van-row>
+		</view>
+		<view style="border-bottom:1px solid #e5e5e5;line-height:50rpx;padding-bottom:20rpx;padding-top:20rpx;color:#666666;">
+			<van-row>
+				<van-col span="2">
+					<van-icon name="location-o" color="#2087f7" size='40rpx' />
+				</van-col>
+				<van-col span="5">巡访位置：</van-col>
+				<van-col span="17">{{arr.visitLocation}}</van-col>
+			</van-row>
+		</view>
+		<!-- <view style="display:flex;border-bottom:1px solid #e5e5e5;">
+			<van-icon name="edit" color="#2087f7" size='40rpx' style="margin-left:30rpx" /><text style="color:#666666;margin-left:20rpx;line-height:100rpx">经度：{{arr.lng}}</text>
+		</view> -->
+		<view style="border-bottom:1px solid #e5e5e5;line-height:50rpx;padding-bottom:20rpx;padding-top:20rpx;color:#666666;">
+			<van-row>
+				<van-col span="2">
+				<!-- <van-icon name="share" /> -->
+					<!-- <van-icon name="share" color="#2087f7" size='40rpx' /> -->
+					<image src="../../images/lat.png" style="width:30rpx;height:30rpx"></image>
+				</van-col>
+				<van-col span="3">经度：</van-col>
+				<van-col span="19">{{arr.lng}}</van-col>
+			</van-row>
+		</view>
+		<!-- <view style="display:flex;border-bottom:1px solid #e5e5e5;">
+			<van-icon name="edit" color="#2087f7" size='40rpx' style="margin-left:30rpx" /><text style="color:#666666;margin-left:20rpx;line-height:100rpx">纬度：{{arr.lat}}</text>
+		</view> -->
+				<view style="border-bottom:1px solid #e5e5e5;line-height:50rpx;padding-bottom:20rpx;padding-top:20rpx;color:#666666;">
+			<van-row>
+				<van-col span="2">
+					<image src="../../images/lat.png" style="width:30rpx;height:30rpx"></image>
+				</van-col>
+				<van-col span="3">纬度：</van-col>
+				<van-col span="19">{{arr.lat}}</van-col>
+			</van-row>
+		</view>
+	</view>
+	<view class="yellow"></view>
+	<view style="display:flex;color:#2087f7;font-size:30rpx;font-weight:800">
+		<view class="blueBar"></view>巡访情况
+	</view>
+	<view style="display:flex;flex-direction:row;flex-wrap:wrap;margin-left:35rpx;margin-top:20rpx;text-align: center;">
+		<view class="status_box"> <text style="margin-left:50rpx">健康情况：</text>
+			<view class="{{arr.health == '健康' ? 'green-marker' : arr.health == '一般' ? 'blue-marker' : arr.health == '较差' ? 'red-marker': 'marker'}}">{{arr.health}}</view>
+		</view>
+		<view class="status_box"> <text style="margin-left:50rpx">精神状态：</text>
+			<view class="{{arr.mind == '良好' ? 'green-marker' : arr.mind == '一般' ? 'blue-marker' : arr.mind == '较差' ? 'red-marker': 'marker'}}">{{arr.mind}}</view>
+		</view>
+		<view class="status_box"> <text style="margin-left:50rpx">安全情况：</text>
+			<view class="{{arr.security == '安全' ? 'green-marker' : arr.security == '一般' ? 'blue-marker' : arr.security == '较差' ? 'red-marker': 'marker'}}">{{arr.security}}</view>
+		</view>
+		<view class="status_box"> <text style="margin-left:50rpx">卫生环境：</text>
+			<view class="{{arr.hygiene == '良好' ? 'green-marker' : arr.hygiene == '一般' ? 'blue-marker' : arr.hygiene == '较差' ? 'red-marker': 'marker'}}">{{arr.hygiene}}</view>
+		</view>
+		<view class="status_box"> <text style="margin-left:50rpx">居住环境：</text>
+			<view class="{{arr.live == '良好' ? 'green-marker' : arr.live == '一般' ? 'blue-marker' : arr.live == '较差' ? 'red-marker': 'marker'}}">{{arr.live}}</view>
+		</view>
+	</view>
+	<view class="yellow"></view>
+	<view style="display:flex;color:#2087f7;font-size:30rpx;font-weight:800">
+		<view class="blueBar"></view>老人需求说明
+	</view>
+	<view class="bj">{{arr.demand}}</view>
+	<view class="yellow"></view>
+	<view style="display:flex;color:#2087f7;font-size:30rpx;font-weight:800">
+		<view class="blueBar"></view>巡访备注说明
+	</view>
+	<view class="bj">{{arr.visitMessage}}</view>
+	<view class="yellow"></view>
+	<view style="display:flex;color:#2087f7;font-size:30rpx;font-weight:800">
+		<view class="blueBar"></view>现场含面部照片
+	</view>
+	<image style='margin-top:20rpx;margin-bottom:100rpx;width:auto' mode='aspectFit' src="{{urls.url(arr.visitPhoto)}}"></image>
 </view>

pages/visitListInfo/visitListInfo.wxss

@@ -1,9 +1,146 @@
-/* pages/visitListInfo/visitListInfo.wxss */
-.container{
+/* 
+.container {
   margin: 30rpx;
   width: 690rpx;
-  border: 1px solid red;
   font-size: 28rpx;
   line-height: 80rpx;
   letter-spacing: 2rpx;
+}
+
+.green-marker {
+  color: #07c160;
+  border: 1px solid #07c160;
+  width:80rpx;
+  height:50rpx;
+  line-height: 50rpx;
+  text-align: center;
+  margin-top: 15rpx;
+}
+
+.blue-marker {
+  color: #1989fa;
+  border: 1px solid #1989fa;
+  width:80rpx;
+  height:50rpx;
+  line-height: 50rpx;
+  text-align: center;
+  margin-top: 15rpx;
+}
+
+.red-marker {
+  color: #ee0a24;
+  border: 1px solid #ee0a24;
+  width:80rpx;
+  height:50rpx;
+  line-height: 50rpx;
+  text-align: center;
+  margin-top: 15rpx;
+}
+.marker {
+  color: #ff976a;
+  width:80rpx;
+  height:50rpx;
+  line-height: 50rpx;
+  text-align: center;
+  margin-top: 15rpx;
+} */
+.container {
+  font-size: 28rpx;
+}
+
+.top {
+  width: 750rpx;
+  height: 150rpx;
+  background-color: #2087f7;
+}
+
+.fd {
+  width: 700rpx;
+  height: 150rpx;
+  border-radius: 20rpx;
+  background-color: #fff;
+  position: relative;
+  top: -75rpx;
+  left: 25rpx;
+  /* box-shadow: #2087f7; */
+  box-shadow: #2087f7 0px 0px 20rpx;
+}
+
+.bottom {
+  width: 680rpx;
+  margin-left: 35rpx;
+  /* height: 100rpx; */
+  /* border: 1px solid red; */
+  margin-top: 0rpx;
+}
+
+.name {
+  color: #333333;
+  margin-left: 50rpx;
+  margin-top: 25rpx;
+  font-weight: 600;
+}
+
+.card {
+  color: #333333;
+  margin-left: 50rpx;
+  margin-top: 15rpx;
+  font-weight: 600;
+}
+
+.yellow {
+  width: 750rpx;
+  height: 30rpx;
+  background-color: #f9f9f7;
+  margin-bottom: 20rpx;
+  margin-top: 20rpx;
+}
+
+.blueBar {
+  width: 10rpx;
+  height: 40rpx;
+  background-color: #2087f7;
+  margin-left: 30rpx;
+  border-radius: 5rpx;
+  margin-right: 15rpx;
+}
+
+.status_box {
+  width: 300rpx;
+  display: flex;
+  margin-top: 20rpx;
+  /* border: 1px solid red; */
+  padding: 15rpx 5rpx;
+  box-shadow: #2087f7 0px 0px 6rpx;
+  border-radius: 10rpx;
+  margin-left: 25rpx;
+  color: #666666;
+  text-align: center;
+}
+.green-marker {
+  color: #07c160;
+  font-weight: 900;
+}
+
+.blue-marker {
+  color: #1989fa;
+  font-weight: 900;
+}
+
+.red-marker {
+  color: #ee0a24;
+  font-weight: 900;
+}
+.marker {
+  color: #ff976a;
+  font-weight: 900;
+} 
+.bj{
+  width: 670rpx;
+  margin-left: 25rpx;
+  background-color: #f9f9f7;
+  padding: 10rpx 20rpx;
+  margin-top: 20rpx;
+  border-radius: 10rpx;
+  color: #999999;
 }

pages/visitandinfo/visitandinfo.js

@@ -293,7 +293,8 @@ Page({
       let searchHeight = res[0].height
       let titleHeight = res[1].height
       let windowHeight = wx.getSystemInfoSync().windowHeight
-      let scrollHeight = windowHeight - searchHeight - titleHeight - 30 - 10 - 50 - 44
+      // 54
+      let scrollHeight = windowHeight - searchHeight - titleHeight - 30 - 10 - 50 - 84
       this.setData({
         scrollHeight: scrollHeight
       })

pages/visitandinfo/visitandinfo.wxml

@@ -154,8 +154,7 @@
 						</view>
 					</van-overlay>
 				</view>
-				<view wx:if='{{currentTabIndex != 1}}' class="delete-box" bindtap="deletes">删除</view>
+				<view wx:if='{{currentTabIndex != 1}}' hidden="{{!listData.length}}" class="delete-box" bindtap="deletes">删除</view>
 			</view>
 		</view>
-
 	</view>

project.config.json

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

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',//公众号
-  // publicUrl: 'https://info.windd.cn/test',//正式
+  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,