فهرست منبع

1019 新加意见反馈 关于我们页面

ssfg 4 سال پیش
والد
کامیت
415b3a0b44

+ 5 - 2
app.json

@@ -1,6 +1,8 @@
 {
   "pages": [
     "pages/index/index",
+    "pages/aboutUs/aboutUs",
+   
     "pages/visitList/visitList",
     "pages/bindOld/bindOld",
     "pages/visitListInfo/visitListInfo",
@@ -18,8 +20,9 @@
     "pages/card/card",
     "pages/personInfo/personInfo",
     "pages/userBook/userBook",
-    "pages/aboutUs/aboutUs",
-    "pages/adviceSubmit/adviceSubmit"
+    
+    "pages/adviceSubmit/adviceSubmit",
+    "pages/workDailyInfo/workDailyInfo"
   ],
   "window": {
     "backgroundTextStyle": "light",

BIN
images/aboutus.png


BIN
images/aboutus_bottom.png


BIN
images/aboutus_top.png


BIN
images/feedback.png


BIN
images/submit.png


+ 7 - 2
pages/aboutUs/aboutUs.js

@@ -5,7 +5,8 @@ Page({
    * 页面的初始数据
    */
   data: {
-
+    phone: '000000000000',
+    email: '11111111'
   },
 
   /**
@@ -21,7 +22,11 @@ Page({
   onReady: function () {
 
   },
-
+  call() {
+    wx.makePhoneCall({
+      phoneNumber: this.data.phone
+    })
+  },
   /**
    * 生命周期函数--监听页面显示
    */

+ 40 - 2
pages/aboutUs/aboutUs.wxml

@@ -1,2 +1,40 @@
-<!--pages/aboutUs/aboutUs.wxml-->
-<text>pages/aboutUs/aboutUs.wxml</text>
+<view class="bj">
+	<image src='../../images/aboutus_top.png' class='top'></image>
+	<view class="middle">
+		<view style="color:#4d4d4d;padding-top:30rpx">吉顺致养</view>
+		<view style="color:#999999;margin-top:10rpx;font-size:28rpx">版本号:1.0.0</view>
+		<view class="js">
+			吉顺致养介绍,吉顺致养介绍吉顺致养介绍吉顺致养介绍,吉顺致养介绍,吉顺致养介绍吉顺致养介绍吉顺致养介绍,吉顺致养介绍吉顺致养介
+		</view>
+		<view class="phone">
+			<view style="line-height:80rpx;width:600rpx;height:80rpx;border-bottom:1rpx solid #d5d9dd">
+				<view style="float:left;margin-left:50rpx">客服电话:</view>
+				<view style="float:right;margin-right:50rpx;color:#407cf3" bindtap="call">{{phone}}</view>
+			</view>
+			<view style="line-height:80rpx;width:600rpx;height:80rpx;border-bottom:1rpx solid #d5d9dd">
+				<view style="float:left;margin-left:50rpx">客服邮箱:</view>
+				<view style="float:right;margin-right:50rpx;" bindtap="call">{{email}}</view>
+			</view>
+			<view style="line-height:80rpx;width:600rpx;height:80rpx">
+				<view style="float:left;margin-left:50rpx">客服邮箱:</view>
+				<view style="float:right;margin-right:50rpx;" bindtap="call">{{email}}</view>
+			</view>
+			<!-- <view style="line-height:70rpx;width:600rpx">
+				<view style="float:left;margin-left:50rpx">客服时间:</view>
+				<view style="float:right;margin-right:50rpx;color:#407cf3" bindtap="call">8:00-17:00</view>
+			</view> -->
+			<!-- <view> 客服电话:<text bindtap="call">{{phone}}</text></view>
+			<view>客服邮箱:<text bindtap="call">{{email}}</text></view> -->
+		</view>
+	</view>
+	<view class="middle1"></view>
+	<view class="middle2"></view>
+</view>
+<!-- <image src='../../images/aboutus_top.png' class='top'></image>
+<view class="middle">
+<view class="whitebj">
+<view class="bb">版本号:1.0.0</view>
+<view class="js">吉顺致养介绍,吉顺致养介绍吉顺致养介绍吉顺致养介绍,吉顺致养介绍,吉顺致养介绍吉顺致养介绍吉顺致养介绍,吉顺致养介绍吉顺致养介</view>
+</view>
+</view>
+<image src='../../images/aboutus_bottom.png' class='bottom'></image> -->

+ 60 - 1
pages/aboutUs/aboutUs.wxss

@@ -1 +1,60 @@
-/* pages/aboutUs/aboutUs.wxss */
+/* pages/aboutUs/aboutUs.wxss */
+.bj {
+  width: 750rpx;
+  height: 100vh;
+  background-color: #2187f6;
+}
+
+.top {
+  width: 700rpx;
+  height: 355rpx;
+  margin: 0rpx 25rpx;
+  display: flex;
+  padding-top: 50rpx;
+}
+
+.middle {
+  width: 700rpx;
+  height: 60vh;
+  background-color: #fff;
+  margin-left: 25rpx;
+  border-radius: 0 0 20rpx 20rpx;
+  text-align: center;
+}
+
+.middle1 {
+  width: 680rpx;
+  height: 20rpx;
+  background-color: #f5f5f5;
+  margin-left: 35rpx;
+  border-radius: 0 0 20rpx 20rpx;
+  margin-top: -2rpx;
+}
+
+.middle2 {
+  width: 660rpx;
+  height: 20rpx;
+  background-color: #79b7fa;
+  margin-left: 45rpx;
+  border-radius: 0 0 20rpx 20rpx;
+  margin-top: -2rpx;
+}
+
+.js {
+  padding: 50rpx 50rpx;
+  font-size: 35rpx;
+  text-indent: 56rpx;
+  text-align: left;
+  line-height: 55rpx;
+}
+
+.phone {
+  width: 600rpx;
+  height: 240rpx;
+  background-color: #e7f2fe;
+  border-radius: 15rpx;
+  margin-left: 50rpx;
+  /* line-height: 80rpx; */
+  color: #4d4d4d;
+  font-size: 30rpx;
+}

+ 2 - 1
pages/adviceSubmit/adviceSubmit.wxml

@@ -4,4 +4,5 @@
         <!-- <text class="hint">{{texts}}{{num}}{{textss}}</text> -->
     </textarea>
 </view>
-<button bindtap="submit">提交</button>
+<image class="submit" src="../../images/submit.png" bindtap="submit"></image>
+<!-- <view bindtap="submit" class="submit">提交</view> -->

+ 10 - 2
pages/adviceSubmit/adviceSubmit.wxss

@@ -9,12 +9,13 @@
   height:380rpx;
   font-size: 30rpx;
   text-indent: 20rpx;
-  border: 1rpx solid gainsboro;
+  border: 1rpx solid #2087f7;
   padding-top: 20rpx;
   margin: 0 auto;
   overflow: hidden;   
   position: relative; 
   padding-right: 40rpx;
+  border-radius: 10rpx;
 }
 .currentWordNumber{
   font-size: 28rpx;
@@ -23,10 +24,17 @@
   right: 20rpx;
   bottom: 10rpx;
 }
-.hint{
+/* .hint{
    font-size: 28rpx;
    position: absolute;
    top: 130rpx;
    left: 320rpx;
    color: #FF6600;
+} */
+.submit{
+  width: 674rpx;
+  margin:50rpx 38rpx;
+  height: 80rpx;
+  /* margin-top: 50rpx; */
+
 }

+ 1 - 1
pages/collectInfo/collectInfo.wxml

@@ -71,7 +71,7 @@
 					<view wx:if="{{oldInfo[activeIndex].remark}}">{{oldInfo[activeIndex].remark}}</view>
 					<view wx:else>暂无驳回理由</view>
 				</van-popup>
-				<view class="scan" bindtap="goOcr">
+				<view class="scan" bindtap="goOcr" >
 					<van-icon name="photograph" color="#2087f7" size="30rpx" style="margin-left:20rpx" />
 					<text>可拍身份证照片上传基本信息</text>
 				</view>

+ 6 - 6
pages/personInfo/personInfo.wxml

@@ -34,17 +34,17 @@
 		</view>
 		<view class="jiantou">></view>
 	</view>
-	<view class="title" bindtap="aboutUs">
+	<view class="title" bindtap="adviceSubmit">
 		<view class="small-title">
-			<image src="/images/userbook.png" style="width: 60rpx; height: 60rpx;"></image>
-			<view class="small-zi">关于我们</view>
+			<image src="/images/feedback.png" style="width: 60rpx; height: 60rpx;"></image>
+			<view class="small-zi">意见反馈</view>
 		</view>
 		<view class="jiantou">></view>
 	</view>
-	<view class="title" bindtap="adviceSubmit">
+		<view class="title" bindtap="aboutUs">
 		<view class="small-title">
-			<image src="/images/userbook.png" style="width: 60rpx; height: 60rpx;"></image>
-			<view class="small-zi">意见反馈</view>
+			<image src="/images/aboutus.png" style="width: 60rpx; height: 60rpx;"></image>
+			<view class="small-zi">关于我们</view>
 		</view>
 		<view class="jiantou">></view>
 	</view>

+ 0 - 28
pages/visitListInfo/visitListInfo.wxml

@@ -1,32 +1,4 @@
 <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;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;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;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;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;display:flex">
-			居住环境:<view class="{{arr.live == '良好' ? 'green-marker' : arr.live == '一般' ? 'blue-marker' : arr.live == '较差' ? 'red-marker': 'marker'}}">{{arr.live}}</view>
-		</view>
-	</view>
-	<view>2.老人需求说明:{{arr.demand}}</view>
-	<view>3.巡访备注说明:{{arr.visitMessage}}</view>
-	<view>4.现场含面部照片:</view>
-	<image mode='aspectFit' src="{{urls.url(arr.visitPhoto)}}"></image>
-</view> -->
 <view class="container">
 	<view class="top">
 	</view>

+ 11 - 12
pages/visitandinfo/visitandinfo.js

@@ -52,13 +52,16 @@ Page({
   },
   // 巡访的记录详情页面
   visitJilu(e) {
-    console.log(e.currentTarget.dataset.infos, "000");
-    let photos = e.currentTarget.dataset.infos.visitPhoto.split(",");
-    console.log(photos, "打印下锕");
-    this.setData({
-      show: true,
-      infos: e.currentTarget.dataset.infos,
-      photos: photos
+    console.log(e.currentTarget.dataset.infos, "巡访信息");
+    // let photos = e.currentTarget.dataset.infos.visitPhoto.split(",");
+    // console.log(photos, "打印下锕");
+    // this.setData({
+    //   // show: true,
+    //   infos: e.currentTarget.dataset.infos,
+    //   photos: photos
+    // })
+    wx.navigateTo({
+      url: '../../pages/workDailyInfo/workDailyInfo?infos=' + JSON.stringify(e.currentTarget.dataset.infos),
     })
   },
   onClickHide() {
@@ -139,7 +142,7 @@ Page({
               })
             }
             console.log(num)
-          
+
           } else {
             wx.showToast({
               title: '请选择要删除的记录',
@@ -162,12 +165,10 @@ Page({
     var that = this;
     var arr = []; //存放选中id的数组
     console.log(that.data.listData);
-
     for (let i = 0; i < that.data.listData.length; i++) {
       if (that.data.listData[i].status != '3') {
         that.data.listData[i].checked = (!that.data.select_all);
         console.log(that.data.select_all);
-
         if (that.data.listData[i].checked == true) {
           // 全选获取选中的值
           arr = arr.concat(that.data.listData[i]._id.split(','));
@@ -282,14 +283,12 @@ Page({
     })
   },
   computeScrollViewHeight() {
-    let that = this
     let query = wx.createSelectorQuery().in(this)
     console.log(query, "111111111111111");
     query.select('.zizi').boundingClientRect()
     query.select('.delete-box').boundingClientRect()
     query.exec(res => {
       console.log(res, "000000000000000000000");
-
       let searchHeight = res[0].height
       let titleHeight = res[1].height
       let windowHeight = wx.getSystemInfoSync().windowHeight

+ 6 - 7
pages/visitandinfo/visitandinfo.wxml

@@ -67,7 +67,7 @@
 							<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="tr0" data-infos="{{item}}" bindtap="visitJilu">
 								<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>
@@ -85,7 +85,7 @@
 							</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">
@@ -134,7 +134,6 @@
 											</view>
 										</view>
 									</view>
-									<!-- <view>居住环境:<van-tag size='large' plain type="{{oldMind.url(infos.live)}}">{{infos.live}}</van-tag> -->
 									<view class="flex-box" style=" margin: 10rpx 0;">
 										<view>
 											<view>居住环境:<van-tag plain size='large' type="{{oldMind.url(infos.live)}}">{{infos.live}}</van-tag>
@@ -146,7 +145,7 @@
 										</view>
 									</view>
 								</view>
-						<!-- </view> -->
+						 </view>
 						<view style="font-size:30rpx;">
 							2.老人需求说明
 						</view>
@@ -164,9 +163,9 @@
 						</view>
 						</scroll-view>
 				</view>
-				</van-overlay>
+				</van-overlay> -->
+				</view>
+				<view wx:if='{{currentTabIndex != 1}}' hidden="{{!listData.length}}" class="delete-box" bindtap="deletes">删除</view>
 			</view>
-			<view wx:if='{{currentTabIndex != 1}}' hidden="{{!listData.length}}" class="delete-box" bindtap="deletes">删除</view>
 		</view>
-	</view>
 	</view>

+ 96 - 0
pages/workDailyInfo/workDailyInfo.js

@@ -0,0 +1,96 @@
+// pages/workDailyInfo/workDailyInfo.js
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad: function (options) {
+    console.log(JSON.parse(options.infos),'我是带过来的信息')
+    let value=JSON.parse(options.infos)
+    value.visitTime = this.formatDate1(value.visitTime);
+    this.setData({
+      arr:value
+    })
+    // console.log(options.photos,'我是带过来的图片')
+  },
+  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)
+    );
+  },
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload: function () {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh: function () {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom: function () {
+
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage: function () {
+
+  }
+})

+ 3 - 0
pages/workDailyInfo/workDailyInfo.json

@@ -0,0 +1,3 @@
+{
+  "usingComponents": {}
+}

+ 94 - 0
pages/workDailyInfo/workDailyInfo.wxml

@@ -0,0 +1,94 @@
+<wxs module="urls" src="../../utils/photoUrl.wxs"></wxs>
+<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 class="status_box" wx:if="{{arr.urgency}}"> <text style="margin-left:15rpx">需求紧急程度:</text>
+			<view class="{{arr.urgency == '不紧急' ? 'green-marker' : arr.urgency == '一般' ? 'blue-marker' : arr.urgency == '紧急' ? 'red-marker': 'marker'}}">{{arr.urgency}}</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>

+ 146 - 0
pages/workDailyInfo/workDailyInfo.wxss

@@ -0,0 +1,146 @@
+/* 
+.container {
+  margin: 30rpx;
+  width: 690rpx;
+  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;
+}

+ 2 - 2
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,