From 687b9b208bb70cfa52fc97e3be01cdaa0bece373 Mon Sep 17 00:00:00 2001
From: luoye <397379429@qq.com>
Date: Thu, 10 Aug 2017 13:45:53 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 littleApp_child/app.json                           |   5 +-
 .../pages/articleDetail/articleDetail.wxml         |  50 ++++++----
 .../pages/articleDetail/articleDetail.wxss         | 106 ++++++++++++++-------
 .../pages/articleLists/articleLists.wxml           |   2 +-
 .../childcare_knowledge/childcare_knowledge.wxml   |   2 +-
 littleApp_child/pages/home/home.wxml               |   6 +-
 littleApp_child/pages/home/home.wxss               |  33 +++----
 7 files changed, 118 insertions(+), 86 deletions(-)

diff --git a/littleApp_child/app.json b/littleApp_child/app.json
index 2d16359..4dba3c4 100644
--- a/littleApp_child/app.json
+++ b/littleApp_child/app.json
@@ -1,11 +1,12 @@
 {
   "pages": [
-
+    "pages/articleDetail/articleDetail",
+    
     "pages/home/home",
 
     "pages/articleLists/articleLists",
     "pages/hospitalList/hospitalList",
-    "pages/articleDetail/articleDetail",
+    
 
     
     "pages/SearchPage/SearchPage",
diff --git a/littleApp_child/pages/articleDetail/articleDetail.wxml b/littleApp_child/pages/articleDetail/articleDetail.wxml
index 9400e1c..dc6c709 100644
--- a/littleApp_child/pages/articleDetail/articleDetail.wxml
+++ b/littleApp_child/pages/articleDetail/articleDetail.wxml
@@ -1,25 +1,33 @@
-
-<!--顶部红色有头像等信息的栏目-->
-<view class="TopBar">
-    <!--头像-->
-    <image class="avatar" bindtap="tapAvatar" src="{{userData.avatar.medium ? userData.avatar.medium : ''}}" background-size="cover"></image>
-    <!--用户名-->
-    <text class="userName">{{userData.username}}</text>
-    <!--下方黑色横条-->
-    <view class="infoBar">
-        <view class="infoView">
-            <text class="titleText">体检医院</text>
-            <text class="timeText">{{userData.checkhospital}}</text>
+<view class="backgroundView">
+    <!-- <image class="TopBgImage" src=""></image> -->
+    <!--顶部红色有头像等信息的栏目-->
+    <view class="TopBar">
+        <!--头像-->
+        <view class="circle_bg">
+          <image src="{{userData.avatar.medium ? userData.avatar.medium : ''}}" background-size="cover"></image>
+          <text>7月1日</text>
+          <view class="circle_year">2017</view>
         </view>
-        <view class="infoView">
-            <text class="titleText">月龄</text>
-            <text class="timeText">{{userData.monthage ? userData.monthage : '-'}}</text>
-            <view class="lineView"></view>
-        </view>
-        <view class="infoView">
-            <text class="titleText">健康状况</text>
-            <text class="timeText">{{userData.hstatus}}</text>
+        <!--用户名-->
+        <text class="userName">{{userData.username}}</text>
+        <!--下方黑色横条-->
+        <view class="infoBar">
+            <view class="infoView">
+                <text class="titleText">出生日期</text>
+                <text class="timeText">{{userData.checkhospital}}</text>
+            </view>
+            <view class="infoView">
+                <text class="titleText">月龄</text>
+                <text class="timeText">{{userData.monthage ? userData.monthage : '0'}}</text>
+                <view class="lineView"></view>
+            </view>
+            <view class="infoView">
+                <text class="titleText">健康状况</text>
+                <text class="timeText">{{userData.hstatus}}</text>
+            </view>
         </view>
+        <!--下方黑色横条-->
     </view>
-    <!--下方黑色横条-->
+    <!--医院名称横条-->
+    <view class="hospitalName" wx:if="{{userData.checkhospital}}">{{userData.checkhospital}}</view>
 </view>
\ No newline at end of file
diff --git a/littleApp_child/pages/articleDetail/articleDetail.wxss b/littleApp_child/pages/articleDetail/articleDetail.wxss
index 131c086..b07d0dc 100644
--- a/littleApp_child/pages/articleDetail/articleDetail.wxss
+++ b/littleApp_child/pages/articleDetail/articleDetail.wxss
@@ -2,6 +2,8 @@
 .TopBar {
   width:100%;
   height:202px;
+  background: white;
+  position: relative;
 }
 
 .promptText {
@@ -12,23 +14,43 @@
   color: white;
 }
 
-.TopBgImage {
-  width:100%;
-  height:202px;
-  position: absolute;
-  background: #48C17B;
-}
-
-.avatar {
-  width:70px;
-  height:70px;
+.circle_bg {
+  width:118px;
+  height:118px;
   border-radius: 50%;
-  position: absolute;
-  top: 15px;
-  left: 50%;
+  margin-top: 12px;
+  margin-left: 50%;
   transform: translateX(-50%);
-  border: 3px solid white;
-  box-shadow: 0 2px 4px 0 rgba(186,70,70,0.50);
+  border: 1px solid #ededed;
+  box-shadow: 0 2px 4px 0 rgba(186,70,70,0.5);
+
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: flex-start;
+  box-sizing: border-box;
+}
+
+.circle_bg image {
+  height: 42.6px;
+  width: 42.6px;
+  background: rebeccapurple;
+  margin-top: 13px;
+}
+
+.circle_bg text{
+  font-size: 18px;
+  color: #222222;
+  letter-spacing: 0;
+  margin-top: 7.4px;
+  display: inline-block;
+  line-height: 18px;
+  border-bottom: 1px solid #dcdcdc;
+}
+
+.circle_year {
+  font-size: 13px;
+  margin-top: 0px;
 }
 
 .userName {
@@ -40,54 +62,64 @@
   /*居中*/
   left: 50%;
   transform: translateX(-50%);
+  color: white;
 }
 
-.documentView {
+/*上方信息条部分*/
+.lineView {
+  width: 100%;
+  border-right: solid rgba(255, 255, 255, 0.7) 0.5px;
+  border-left: solid rgba(255, 255, 255, 0.7) 0.5px;
+  height: 40px;
   position: absolute;
-  top: 0px;
-  left: 0px;
-  right: 0px;
-  bottom: 0px;
+  top: 10px;
 }
 
-/*上方信息条部分*/
 .infoBar {
   width: 100%;
-  height: 60px;
-  top: 142px;
+  min-height: 60px;
+  /* top: 142px;  */
+  bottom: 0px; 
   position: absolute;
+  display: flex;
+  justify-content: space-between;
+  background: rgba(255, 255, 255, 0.2);
 }
 
 .infoView {
   text-align: center;
   width: 33.3%;
   height: 100%;
-  display:inline-block;   
-  box-sizing: border-box;
   position: relative;
-  background-color: rgba(255, 255, 255, 0.1);
-}
-
-.lineView {
-  width: 100%;
-  border-right: solid rgba(255, 255, 255, 0.7) 0.5px;
-  border-left: solid rgba(255, 255, 255, 0.7) 0.5px;
-  height: 40px;
-  position: absolute;
-  top: 10px;
 }
 
 .titleText {
   margin-top: 12px;
   display:block;
   font-size: 11px;
-color: #D8FCE7;
+  color: #787878;
 }
 
 .timeText {
   font-family: PingFangSC-Medium;
   font-size: 12px;
-  color: #FFFFFF;
+  color: #4a4a4a;
   display:block;
   margin-top: 2px;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  display: -webkit-box;
+  -webkit-box-orient: vertical;
+  -webkit-line-clamp: 2; 
+}
+
+.hospitalName {
+  width: 100%;
+  height: 30px;
+  background-color: white;
+  color: #ee7289;
+  font-size: 11px;
+  font: medium;
+  text-align: center;
+  line-height: 30px;
 }
\ No newline at end of file
diff --git a/littleApp_child/pages/articleLists/articleLists.wxml b/littleApp_child/pages/articleLists/articleLists.wxml
index 0cf7ee8..64428a8 100644
--- a/littleApp_child/pages/articleLists/articleLists.wxml
+++ b/littleApp_child/pages/articleLists/articleLists.wxml
@@ -16,7 +16,7 @@
       </view>
       <view class="home__list-item__bottom"></view>
     </navigator> -->
-    <navigator url="../childcare_knowledge_detail/childcare_knowledge_detail?titlle={{'id=' + item.id + '&category=' + category}}" wx:for="{{list}}" wx:key="{{index}}">
+    <navigator url="../childcare_knowledge_detail/childcare_knowledge_detail?{{'id=' + item.id + '&category=' + category}}" wx:for="{{list}}" wx:key="{{index}}">
         <view class="content_item">
             <view style="margin-left:15px;margin-right:75px;">
                 <view class="content_title">{{item.title}}</view>
diff --git a/littleApp_child/pages/childcare_knowledge/childcare_knowledge.wxml b/littleApp_child/pages/childcare_knowledge/childcare_knowledge.wxml
index d847eec..7f4754d 100644
--- a/littleApp_child/pages/childcare_knowledge/childcare_knowledge.wxml
+++ b/littleApp_child/pages/childcare_knowledge/childcare_knowledge.wxml
@@ -22,7 +22,7 @@
         </swiper> -->
                 <image class="swiper" mode="aspectFill" src="{{images.medium}}"></image>
                 <view>
-                    <navigator url="../childcare_knowledge_detail/childcare_knowledge_detail" wx:for="{{list}}" wx:key="{{index}}">
+                    <navigator url="../childcare_knowledge_detail/childcare_knowledge_detail?{{'id=' + item.id + '&category=' + category}}" wx:for="{{list}}" wx:key="{{index}}">
                         <view class="content_item">
                             <view style="margin-left:15px;margin-right:75px;">
                                 <view class="content_title">{{item.title}}</view>
diff --git a/littleApp_child/pages/home/home.wxml b/littleApp_child/pages/home/home.wxml
index e98e2d5..03562b0 100644
--- a/littleApp_child/pages/home/home.wxml
+++ b/littleApp_child/pages/home/home.wxml
@@ -5,7 +5,7 @@
 </view>
 <!--首页模块-->
 <view class="backgroundView" wx:if="{{pageType == 2}}">
-    <image class="TopBgImage" src=""></image>
+    <!-- <image class="TopBgImage" src=""></image> -->
     <!--顶部红色有头像等信息的栏目-->
     <view class="TopBar">
         <!--头像-->
@@ -15,7 +15,7 @@
         <!--下方黑色横条-->
         <view class="infoBar">
             <view class="infoView">
-                <text class="titleText">体检医院</text>
+                <text class="titleText">出生日期</text>
                 <text class="timeText">{{userData.checkhospital}}</text>
             </view>
             <view class="infoView">
@@ -31,7 +31,7 @@
         <!--下方黑色横条-->
     </view>
     <!--医院名称横条-->
-    <view class="hospitalName" wx:if="{{hospitalName}}">{{hospitalName}}</view>
+    <view class="hospitalName" wx:if="{{userData.checkhospital}}">{{userData.checkhospital}}</view>
     <!--功能模块-->
     <view class="foundation_BG" style="{{item_big_height}}">
         <!-- <navigator class="foundation_item_small" url="../inspectionReport/inspectionReport">
diff --git a/littleApp_child/pages/home/home.wxss b/littleApp_child/pages/home/home.wxss
index 4606d4c..e23644d 100644
--- a/littleApp_child/pages/home/home.wxss
+++ b/littleApp_child/pages/home/home.wxss
@@ -6,6 +6,8 @@
 .TopBar {
   width:100%;
   height:202px;
+  background: #48C17B;
+  position: relative;
 }
 
 .promptText {
@@ -16,12 +18,12 @@
   color: white;
 }
 
-.TopBgImage {
+/* .TopBgImage {
   width:100%;
   height:202px;
   position: absolute;
   background: #48C17B;
-}
+} */
 
 .avatar {
   width:70px;
@@ -47,14 +49,6 @@
   color: white;
 }
 
-.documentView {
-  position: absolute;
-  top: 0px;
-  left: 0px;
-  right: 0px;
-  bottom: 0px;
-}
-
 /*上方信息条部分*/
 
 .lineView {
@@ -69,20 +63,19 @@
 .infoBar {
   width: 100%;
   min-height: 60px;
-  /* top: 142px; */
-  bottom: 0px;
+  /* top: 142px;  */
+   bottom: 0px; 
   position: absolute;
+  display: flex;
+  justify-content: space-between;
+  background: rgba(255, 255, 255, 0.1);
 }
 
 .infoView {
   text-align: center;
   width: 33.3%;
   height: 100%;
-  display:inline-block;   
-  box-sizing: border-box;
   position: relative;
-  background-color: rgba(255, 255, 255, 0.1);
-  background: green;
 }
 
 .titleText {
@@ -90,21 +83,19 @@
   display:block;
   font-size: 11px;
   color: #D8FCE7;
-  background: red;
 }
 
 .timeText {
-  background: rebeccapurple;
   font-family: PingFangSC-Medium;
   font-size: 12px;
   color: #FFFFFF;
   display:block;
   margin-top: 2px;
-  /* overflow: hidden;
+     overflow: hidden;
   text-overflow: ellipsis;
   display: -webkit-box;
   -webkit-box-orient: vertical;
-  -webkit-line-clamp: 1; */
+  -webkit-line-clamp: 2; 
 }
 
 .hospitalName {
@@ -116,7 +107,6 @@
   font: medium;
   text-align: center;
   line-height: 30px;
-  
 }
 
 /*---------foundation---------*/
@@ -208,6 +198,7 @@
   font-size: 14px;
   color: #222222;
   margin-left: 15px;
+  margin-right: 85px;
   margin-top: 0px;
   overflow: hidden;
   text-overflow: ellipsis;
-- 
1.8.3.1