From 38f17941d52e72e1e3ac5899f5c50b6d7b05258c Mon Sep 17 00:00:00 2001
From: luoye <397379429@qq.com>
Date: Mon, 14 Aug 2017 18:38:31 +0800
Subject: [PATCH] no

---
 littleApp_child/pages/CheckReport/CheckReport.wxml | 39 +++++++++++-----------
 littleApp_child/pages/CheckReport/CheckReport.wxss | 24 +++++--------
 littleApp_child/pages/home/home.json               |  2 +-
 .../system_notifacations/system_notifacations.json |  2 +-
 littleApp_child/utils/util_UI.wxss                 |  2 +-
 5 files changed, 30 insertions(+), 39 deletions(-)

diff --git a/littleApp_child/pages/CheckReport/CheckReport.wxml b/littleApp_child/pages/CheckReport/CheckReport.wxml
index 51668d3..6b2e5e7 100644
--- a/littleApp_child/pages/CheckReport/CheckReport.wxml
+++ b/littleApp_child/pages/CheckReport/CheckReport.wxml
@@ -38,8 +38,7 @@
     </view>
     <!--医院名称横条-->
     <view class="hospitalName" wx:if="{{todayInfo.checkhospital}}">{{todayInfo.checkhospital}}</view>
-
-    <view class="title_banner">检查项目</view>
+    <view class="title_banner" style="margin-top:-12px;">检查项目</view>
     <view class="report_list_bg">
       <scroll-view class="report_list_scroll" scroll-x="true">
          <view class="report_list_item_bg">
@@ -122,22 +121,22 @@
 
 
 
-
+<!-- {{subscribeDetails.office ? subscribeDetails.office : '-'}} -->
 <view class="mask_subscribe_bg" wx:if="{{flag}}"> 
-      <view class="mask_subscribe_content"> 
-        <view class="mask_subscribe_title">预约信息</view>
-        <view class="mask_subscribe_time">
-          <label>预约时间：</label>
-          <label class="mask_subscribe_content_text">{{subscribeDetails.nextcheck}}</label>
-        </view>
-        <view class="mask_subscribe_office">
-          <label>检查科室：</label>
-          <label class="mask_subscribe_content_text">{{subscribeDetails.office ? subscribeDetails.office : '-'}}</label>
-        </view>
-        <view class="mask_subscribe_hospital">
-          <label>医院名称：</label>
-          <label class="mask_subscribe_content_text">{{subscribeDetails.checkhospital}}</label>
-        </view>
-        <view class="mask_subscribe_content_closeBtn" bindtap="closeMask">知道了</view>
-      </view>
-  </view> 
\ No newline at end of file
+  <view class="mask_subscribe_content"> 
+    <view class="mask_subscribe_title">预约信息</view>
+    <view class="mask_subscribe_time">
+      <label>预约时间：</label>
+      <label class="mask_subscribe_content_text">{{subscribeDetails.nextcheck}}</label>
+    </view>
+    <view class="mask_subscribe_office">
+      <label>检查医生：</label>
+      <label class="mask_subscribe_content_text">{{todayInfo.doctorname ? todayInfo.doctorname : '-'}}</label>
+    </view>
+    <view class="mask_subscribe_hospital">
+      <label>医院名称：</label>
+      <label class="mask_subscribe_content_text">{{subscribeDetails.checkhospital}}</label>
+    </view>
+    <view class="mask_subscribe_content_closeBtn" bindtap="closeMask">知道了</view>
+  </view>
+</view> 
\ No newline at end of file
diff --git a/littleApp_child/pages/CheckReport/CheckReport.wxss b/littleApp_child/pages/CheckReport/CheckReport.wxss
index 30335d4..a617649 100644
--- a/littleApp_child/pages/CheckReport/CheckReport.wxss
+++ b/littleApp_child/pages/CheckReport/CheckReport.wxss
@@ -6,14 +6,6 @@
   position: relative;
 }
 
-.promptText {
-  background: #f4879b;
-  font: bold;
-  text-align: center;
-  font-size: 10px;
-  color: white;
-}
-
 .circle_bg {
   width:118px;
   height:118px;
@@ -66,7 +58,7 @@
   position: absolute;
   top: 59px;
   left: 50%;
-  transform: translateX(-84px);
+  transform: translateX(-94px);
 }
 
 .icon_right {
@@ -75,7 +67,7 @@
   position: absolute;
   top: 59px;
   left: 50%;
-  transform: translateX(59px);
+  transform: translateX(69px);
 }
 
 .subscribe_bg {
@@ -137,14 +129,14 @@
 
 .hospitalName {
   width: 100%;
-  height: 30px;
+  height: 25px;
   background-color: white;
   color: #ee7289;
   font-size: 11px;
   font: medium;
   text-align: center;
-  line-height: 30px;
-  margin-top: 1px;
+  line-height: 25px;
+  transform: translateY(-12px);
 }
 
 .title_banner {
@@ -192,7 +184,7 @@
 }
 
 .report_list_item label {
-  font-size: 10px;
+  font-size: 12px;
   color: #333333;
   margin-top: 5px;
 }
@@ -268,7 +260,7 @@
 
 .check_diagnosis_name {
     font-family: PingFangSC-Regular;
-    font-size: 15px;
+    font-size: 13px;
     margin-left: 10px;
     margin-top: 5px;
     color: #222;
@@ -291,7 +283,7 @@
 
 .check_diagnosis_content_1_line {
     font-family: PingFangSC-Regular;
-    font-size: 13px;
+    font-size: 12px;
     color: #666;
     margin-left: 10px;
     padding-right: 10px;
diff --git a/littleApp_child/pages/home/home.json b/littleApp_child/pages/home/home.json
index 61be68e..5ec9045 100644
--- a/littleApp_child/pages/home/home.json
+++ b/littleApp_child/pages/home/home.json
@@ -1,6 +1,6 @@
 {
     "navigationBarBackgroundColor": "#48C17B",
-    "navigationBarTitleText": "妈咪Baby儿保",
+    "navigationBarTitleText": "儿童保健",
     "navigationBarTextStyle": "white",
     "backgroundColor": "#F4F4F4",
     "enablePullDownRefresh": true
diff --git a/littleApp_child/pages/system_notifacations/system_notifacations.json b/littleApp_child/pages/system_notifacations/system_notifacations.json
index 70ed2c1..876e660 100644
--- a/littleApp_child/pages/system_notifacations/system_notifacations.json
+++ b/littleApp_child/pages/system_notifacations/system_notifacations.json
@@ -1,5 +1,5 @@
 {    
-    "navigationBarBackgroundColor": "#48C17B ",
+    "navigationBarBackgroundColor": "#48C17B",
     "navigationBarTitleText": "系统通知",
     "navigationBarTextStyle": "white",
     "backgroundColor": "#d8dbd4"
diff --git a/littleApp_child/utils/util_UI.wxss b/littleApp_child/utils/util_UI.wxss
index 942959a..47057bd 100644
--- a/littleApp_child/utils/util_UI.wxss
+++ b/littleApp_child/utils/util_UI.wxss
@@ -52,7 +52,7 @@
 }
 
 .util_bottom_line {
-  border-bottom: 1px solid #e2e2e2;
+  border-bottom: 1px solid #ECECEC;
 }
 
 .whiteColor {
-- 
1.8.3.1