From a75d50f4fe924a8dad62c2711e19050ed45d5060 Mon Sep 17 00:00:00 2001
From: liushaowen <565850092@qq.com>
Date: Wed, 8 Jul 2020 09:02:54 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BF=94=E5=9B=9E=E6=8C=89=E9=92=AE=E4=BD=8D?=
 =?UTF-8?q?=E7=BD=AE=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../subpages/education/pages/class/class.wxml               | 4 ++--
 .../subpages/education/pages/classDetail/classDetail.wxml   | 6 +++---
 .../subpages/education/pages/healthyLife/healthyLife.wxml   | 4 ++--
 .../subpages/education/pages/hobby/hobby.wxml               | 4 ++--
 .../subpages/education/pages/index/index.wxml               | 4 ++--
 .../components/announcementList/announcementList.wxss       | 1 -
 .../safety/components/precautionList/precautionList.wxss    | 1 -
 .../subpages/safety/pages/addQuestion/addQuestion.wxml      | 4 ++--
 .../subpages/safety/pages/consultIndex/consultIndex.wxml    | 4 ++--
 .../safety/pages/consultantDetail/consultantDetail.wxml     | 4 ++--
 .../safety/pages/consultantList/consultantList.wxml         | 4 ++--
 .../subpages/safety/pages/index/index.wxml                  | 4 ++--
 .../subpages/safety/pages/myQuestion/myQuestion.wxml        | 4 ++--
 13 files changed, 23 insertions(+), 25 deletions(-)

diff --git a/epdc-resident-mp-yushan/subpages/education/pages/class/class.wxml b/epdc-resident-mp-yushan/subpages/education/pages/class/class.wxml
index 25e3454..baf6766 100644
--- a/epdc-resident-mp-yushan/subpages/education/pages/class/class.wxml
+++ b/epdc-resident-mp-yushan/subpages/education/pages/class/class.wxml
@@ -1,7 +1,7 @@
 <view class="header" style="height: {{statusHeight + navigationHeight}}px;">
   <image class="header-bg" src="../../../../images/home/home-status.png" />
-  <view style="height: 80rpx;position: fixed;margin-top: 60rpx;width: 70rpx;z-index: 101;"  bindtap="naviBack">
-      <image class="header-back"  style="margin-top:{{statusHeight/2}}px" src="../../images/back.png"></image>
+<view style="height: 80rpx;position: fixed;margin-top: {{statusHeight}}px;width: 70rpx;z-index: 101;"  bindtap="naviBack">
+      <image class="header-back"  style="margin-top:{{navigationHeight/3}}px" src="../../images/back.png"></image>
   </view>
   <view class="navigation" style="height: {{navigationHeight}}px; top: {{statusHeight}}px;">
     社区讲坛
diff --git a/epdc-resident-mp-yushan/subpages/education/pages/classDetail/classDetail.wxml b/epdc-resident-mp-yushan/subpages/education/pages/classDetail/classDetail.wxml
index fefac11..06fd8b0 100644
--- a/epdc-resident-mp-yushan/subpages/education/pages/classDetail/classDetail.wxml
+++ b/epdc-resident-mp-yushan/subpages/education/pages/classDetail/classDetail.wxml
@@ -1,9 +1,9 @@
 <wux-dialog id="wux-dialog" />
 <view class="header" style="height: {{statusHeight + navigationHeight}}px;">
 	<image class="header-bg" src="../../../../images/home/home-status.png" />
-	<view style="height: 80rpx;position: fixed;margin-top: 60rpx;width: 70rpx;z-index: 101;" bindtap="naviBack">
-		<image class="header-back" style="margin-top:{{statusHeight/2}}px" src="../../images/back.png"></image>
-	</view>
+	<view style="height: 80rpx;position: fixed;margin-top: {{statusHeight}}px;width: 70rpx;z-index: 101;"  bindtap="naviBack">
+      <image class="header-back"  style="margin-top:{{navigationHeight/3}}px" src="../../images/back.png"></image>
+  </view>
 	<view class="navigation" style="height: {{navigationHeight}}px; top: {{statusHeight}}px;">
 		详情
 	</view>
diff --git a/epdc-resident-mp-yushan/subpages/education/pages/healthyLife/healthyLife.wxml b/epdc-resident-mp-yushan/subpages/education/pages/healthyLife/healthyLife.wxml
index 5f309d0..2b1b18c 100644
--- a/epdc-resident-mp-yushan/subpages/education/pages/healthyLife/healthyLife.wxml
+++ b/epdc-resident-mp-yushan/subpages/education/pages/healthyLife/healthyLife.wxml
@@ -1,7 +1,7 @@
 <view class="header" style="height: {{statusHeight + navigationHeight}}px;">
 <image class="header-bg" src="../../../../images/home/home-status.png" />
-  <view style="height: 80rpx;position: fixed;margin-top: 60rpx;width: 70rpx;z-index: 101;"  bindtap="naviBack">
-      <image class="header-back"  style="margin-top:{{statusHeight/2}}px" src="../../images/back.png"></image>
+  <view style="height: 80rpx;position: fixed;margin-top: {{statusHeight}}px;width: 70rpx;z-index: 101;"  bindtap="naviBack">
+      <image class="header-back"  style="margin-top:{{navigationHeight/3}}px" src="../../images/back.png"></image>
   </view>
   <view class="navigation" style="height: {{navigationHeight}}px; top: {{statusHeight}}px;">
     {{page==='jksh'?'健康生活':'综合服务'}}
diff --git a/epdc-resident-mp-yushan/subpages/education/pages/hobby/hobby.wxml b/epdc-resident-mp-yushan/subpages/education/pages/hobby/hobby.wxml
index 2910f0c..25f7cb7 100644
--- a/epdc-resident-mp-yushan/subpages/education/pages/hobby/hobby.wxml
+++ b/epdc-resident-mp-yushan/subpages/education/pages/hobby/hobby.wxml
@@ -1,7 +1,7 @@
 <view class="header" style="height: {{statusHeight + navigationHeight}}px;">
   <image class="header-bg" src="../../../../images/home/home-status.png" />
-  <view style="height: 80rpx;position: fixed;margin-top: 60rpx;width: 70rpx;z-index: 101;"  bindtap="naviBack">
-      <image class="header-back"  style="margin-top:{{statusHeight/2}}px" src="../../images/back.png"></image>
+  <view style="height: 80rpx;position: fixed;margin-top: {{statusHeight}}px;width: 70rpx;z-index: 101;"  bindtap="naviBack">
+      <image class="header-back"  style="margin-top:{{navigationHeight/3}}px" src="../../images/back.png"></image>
   </view>
   <view class="navigation" style="height: {{navigationHeight}}px; top: {{statusHeight}}px;">
     兴趣爱好
diff --git a/epdc-resident-mp-yushan/subpages/education/pages/index/index.wxml b/epdc-resident-mp-yushan/subpages/education/pages/index/index.wxml
index f902086..c2a7b98 100644
--- a/epdc-resident-mp-yushan/subpages/education/pages/index/index.wxml
+++ b/epdc-resident-mp-yushan/subpages/education/pages/index/index.wxml
@@ -1,7 +1,7 @@
 <view class="header" style="height: {{statusHeight + navigationHeight}}px;">
   <image class="header-bg" src="../../../../images/home/home-status.png" />
-<view style="height: 80rpx;position: fixed;margin-top: 60rpx;width: 70rpx;z-index: 101;"  bindtap="naviBack">
-      <image class="header-back"  style="margin-top:{{statusHeight/2}}px" src="../../images/back.png"></image>
+<view style="height: 80rpx;position: fixed;margin-top: {{statusHeight}}px;width: 70rpx;z-index: 101;"  bindtap="naviBack">
+      <image class="header-back"  style="margin-top:{{navigationHeight/3}}px" src="../../images/back.png"></image>
   </view>
   <view class="navigation" style="height: {{navigationHeight}}px; top: {{statusHeight}}px;">
     社区教育
diff --git a/epdc-resident-mp-yushan/subpages/safety/components/announcementList/announcementList.wxss b/epdc-resident-mp-yushan/subpages/safety/components/announcementList/announcementList.wxss
index 87d7c5d..7b281d1 100644
--- a/epdc-resident-mp-yushan/subpages/safety/components/announcementList/announcementList.wxss
+++ b/epdc-resident-mp-yushan/subpages/safety/components/announcementList/announcementList.wxss
@@ -3,7 +3,6 @@
   background: #fff;
   box-sizing: border-box;
   padding: 0 35rpx;
-  margin-top: 20rpx;
 } 
 .news-list .list-item {
   width: 100%;
diff --git a/epdc-resident-mp-yushan/subpages/safety/components/precautionList/precautionList.wxss b/epdc-resident-mp-yushan/subpages/safety/components/precautionList/precautionList.wxss
index b884a8c..5303fa5 100644
--- a/epdc-resident-mp-yushan/subpages/safety/components/precautionList/precautionList.wxss
+++ b/epdc-resident-mp-yushan/subpages/safety/components/precautionList/precautionList.wxss
@@ -3,7 +3,6 @@
   background: #fff;
   box-sizing: border-box;
   padding: 0 35rpx;
-  margin-top: 20rpx;
 } 
 .news-list .list-item {
   width: 100%;
diff --git a/epdc-resident-mp-yushan/subpages/safety/pages/addQuestion/addQuestion.wxml b/epdc-resident-mp-yushan/subpages/safety/pages/addQuestion/addQuestion.wxml
index 381166e..e626451 100644
--- a/epdc-resident-mp-yushan/subpages/safety/pages/addQuestion/addQuestion.wxml
+++ b/epdc-resident-mp-yushan/subpages/safety/pages/addQuestion/addQuestion.wxml
@@ -1,7 +1,7 @@
 <view class="header" style="height: {{statusHeight + navigationHeight}}px;">
   <image class="header-bg" src="../../../../images/home/home-status.png" />
-  <view style="height: 80rpx;position: fixed;margin-top: 60rpx;width: 70rpx;z-index: 101;"  bindtap="naviBack">
-      <image class="header-back"  style="margin-top:{{statusHeight/2}}px" src="../../images/back.png"></image>
+  <view style="height: 80rpx;position: fixed;margin-top: {{statusHeight}}px;width: 70rpx;z-index: 101;"  bindtap="naviBack">
+      <image class="header-back"  style="margin-top:{{navigationHeight/3}}px" src="../../images/back.png"></image>
   </view>
   <view class="navigation" style="height: {{navigationHeight}}px; top: {{statusHeight}}px;">
     咨询
diff --git a/epdc-resident-mp-yushan/subpages/safety/pages/consultIndex/consultIndex.wxml b/epdc-resident-mp-yushan/subpages/safety/pages/consultIndex/consultIndex.wxml
index 4d04f92..d0c2540 100644
--- a/epdc-resident-mp-yushan/subpages/safety/pages/consultIndex/consultIndex.wxml
+++ b/epdc-resident-mp-yushan/subpages/safety/pages/consultIndex/consultIndex.wxml
@@ -1,7 +1,7 @@
 <view class="header" style="height: {{statusHeight + navigationHeight}}px;">
   <image class="header-bg" src="../../../../images/home/home-status.png" />
-  <view style="height: 80rpx;position: fixed;margin-top: 60rpx;width: 70rpx;z-index: 101;"  bindtap="naviBack">
-      <image class="header-back"  style="margin-top:{{statusHeight/2}}px" src="../../images/back.png"></image>
+  <view style="height: 80rpx;position: fixed;margin-top: {{statusHeight}}px;width: 70rpx;z-index: 101;"  bindtap="naviBack">
+      <image class="header-back"  style="margin-top:{{navigationHeight/3}}px" src="../../images/back.png"></image>
   </view>
   <view class="navigation" style="height: {{navigationHeight}}px; top: {{statusHeight}}px;">
     心理咨询
diff --git a/epdc-resident-mp-yushan/subpages/safety/pages/consultantDetail/consultantDetail.wxml b/epdc-resident-mp-yushan/subpages/safety/pages/consultantDetail/consultantDetail.wxml
index f464f4e..29ee8a4 100644
--- a/epdc-resident-mp-yushan/subpages/safety/pages/consultantDetail/consultantDetail.wxml
+++ b/epdc-resident-mp-yushan/subpages/safety/pages/consultantDetail/consultantDetail.wxml
@@ -1,7 +1,7 @@
 <view class="header" style="height: {{statusHeight + navigationHeight}}px;">
   <image class="header-bg" src="../../../../images/home/home-status.png" />
-  <view style="height: 80rpx;position: fixed;margin-top: 60rpx;width: 70rpx;z-index: 101;"  bindtap="naviBack">
-      <image class="header-back"  style="margin-top:{{statusHeight/2}}px" src="../../images/back.png"></image>
+  <view style="height: 80rpx;position: fixed;margin-top: {{statusHeight}}px;width: 70rpx;z-index: 101;"  bindtap="naviBack">
+      <image class="header-back"  style="margin-top:{{navigationHeight/3}}px" src="../../images/back.png"></image>
   </view>
   <view class="navigation" style="height: {{navigationHeight}}px; top: {{statusHeight}}px;">
     详情
diff --git a/epdc-resident-mp-yushan/subpages/safety/pages/consultantList/consultantList.wxml b/epdc-resident-mp-yushan/subpages/safety/pages/consultantList/consultantList.wxml
index 6ba9013..97ea93d 100644
--- a/epdc-resident-mp-yushan/subpages/safety/pages/consultantList/consultantList.wxml
+++ b/epdc-resident-mp-yushan/subpages/safety/pages/consultantList/consultantList.wxml
@@ -1,7 +1,7 @@
 <view class="header" style="height: {{statusHeight + navigationHeight}}px;">
   <image class="header-bg" src="../../../../images/home/home-status.png" />
-  <view style="height: 80rpx;position: fixed;margin-top: 60rpx;width: 70rpx;z-index: 101;"  bindtap="naviBack">
-      <image class="header-back"  style="margin-top:{{statusHeight/2}}px" src="../../images/back.png"></image>
+  <view style="height: 80rpx;position: fixed;margin-top: {{statusHeight}}px;width: 70rpx;z-index: 101;"  bindtap="naviBack">
+      <image class="header-back"  style="margin-top:{{navigationHeight/3}}px" src="../../images/back.png"></image>
   </view>
   <view class="navigation" style="height: {{navigationHeight}}px; top: {{statusHeight}}px;">
     列表
diff --git a/epdc-resident-mp-yushan/subpages/safety/pages/index/index.wxml b/epdc-resident-mp-yushan/subpages/safety/pages/index/index.wxml
index cd172d3..36723eb 100644
--- a/epdc-resident-mp-yushan/subpages/safety/pages/index/index.wxml
+++ b/epdc-resident-mp-yushan/subpages/safety/pages/index/index.wxml
@@ -1,7 +1,7 @@
 <view class="header" style="height: {{statusHeight + navigationHeight}}px;">
   <image class="header-bg" src="../../../../images/home/home-status.png" />
-  <view style="height: 80rpx;position: fixed;margin-top: 60rpx;width: 70rpx;z-index: 101;"  bindtap="naviBack">
-      <image class="header-back"  style="margin-top:{{statusHeight/2}}px" src="../../images/back.png"></image>
+  <view style="height: 80rpx;position: fixed;margin-top: {{statusHeight}}px;width: 70rpx;z-index: 101;"  bindtap="naviBack">
+      <image class="header-back"  style="margin-top:{{navigationHeight/3}}px" src="../../images/back.png"></image>
   </view>
   <view class="navigation" style="height: {{navigationHeight}}px; top: {{statusHeight}}px;">
     平安榆山
diff --git a/epdc-resident-mp-yushan/subpages/safety/pages/myQuestion/myQuestion.wxml b/epdc-resident-mp-yushan/subpages/safety/pages/myQuestion/myQuestion.wxml
index dd6c8d6..8ae610b 100644
--- a/epdc-resident-mp-yushan/subpages/safety/pages/myQuestion/myQuestion.wxml
+++ b/epdc-resident-mp-yushan/subpages/safety/pages/myQuestion/myQuestion.wxml
@@ -1,7 +1,7 @@
 <view class="header" style="height: {{statusHeight + navigationHeight}}px;">
   <image class="header-bg" src="../../../../images/home/home-status.png" />
-  <view style="height: 80rpx;position: fixed;margin-top: 60rpx;width: 70rpx;z-index: 101;"  bindtap="naviBack">
-      <image class="header-back"  style="margin-top:{{statusHeight/2}}px" src="../../images/back.png"></image>
+  <view style="height: 80rpx;position: fixed;margin-top: {{statusHeight}}px;width: 70rpx;z-index: 101;"  bindtap="naviBack">
+      <image class="header-back"  style="margin-top:{{navigationHeight/3}}px" src="../../images/back.png"></image>
   </view>
   <view class="navigation" style="height: {{navigationHeight}}px; top: {{statusHeight}}px;">
     我的问题