From d562bd79d43a8f6f339f55629e3416b813c36ad1 Mon Sep 17 00:00:00 2001
From: xianghenggang <xianghenggang@lymsh.com>
Date: Fri, 1 Sep 2017 09:39:55 +0800
Subject: [PATCH] =?UTF-8?q?=E7=9F=A5=E8=AF=86=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 littleApp_child/app.json                           |  11 +--
 .../childcare_knowledge/childcare_knowledge.wxml   |  21 +++--
 .../childcare_knowledge/childcare_knowledge.wxss   |  37 ++++++--
 littleApp_child/pages/feedback/feedback.js         | 100 +++++++++++++--------
 4 files changed, 114 insertions(+), 55 deletions(-)

diff --git a/littleApp_child/app.json b/littleApp_child/app.json
index 9337767..58e8b47 100644
--- a/littleApp_child/app.json
+++ b/littleApp_child/app.json
@@ -1,9 +1,7 @@
 {
   "pages": [
-      
-    "pages/feedback/feedback",
-    "pages/mySaved/mySaved",
-    "pages/home/home",
+      "pages/home/home",
+   
    
     "pages/checkTabList/checkTabList",
     
@@ -24,7 +22,10 @@
     "pages/chat/chat",
     "pages/childcare_knowledge_detail/childcare_knowledge_detail",
     "pages/system_notifacations/system_notifacations",
-    "pages/childcare_knowledge/childcare_knowledge"
+    "pages/childcare_knowledge/childcare_knowledge",
+    "pages/feedback/feedback",
+    "pages/mySaved/mySaved"
+    
   ],
   "window": {
     "backgroundTextStyle": "light",
diff --git a/littleApp_child/pages/childcare_knowledge/childcare_knowledge.wxml b/littleApp_child/pages/childcare_knowledge/childcare_knowledge.wxml
index f4c0fce..e3afac5 100644
--- a/littleApp_child/pages/childcare_knowledge/childcare_knowledge.wxml
+++ b/littleApp_child/pages/childcare_knowledge/childcare_knowledge.wxml
@@ -24,13 +24,24 @@
                 <view>
                     <view bindtap="toDetail" data-id="{{item.id}}" wx:for="{{list}}" wx:key="{{index}}">
                         <view class="content_item">
-                            <view style="margin-left:15px;margin-right:75px;">
+                            <view style="margin-left:15px;margin-right:90px;">
                                 <view class="content_title">{{item.title}}</view>
                                 <view class="content_content">{{item.introduction}}</view>
-                                <view class="zar_box" catchtap="articleLike" data-id="{{item.id}}" data-index="{{index}}">
-                                    <image class="zar_img" src="../../source/{{item.isLike == 1 ? 'zanguo.png' : 'like.png'}}"></image>
-                                    <view class="content_zar">{{item.likeCount}}</view>
-                                </view>
+                                <view class="zarparent_box">
+
+                            <view class="zar_box" catchtap="articleLike" data-id="{{item.id}}" data-index="{{index}}">
+                                <image class="zar_img" src="../../source/{{item.isLike == 1 ? 'zanguo.png' : 'like.png'}}"></image>
+                                <view class="content_zar">{{item.likeCount}}</view>
+                            </view>
+                            <view class="zar_box">
+                                <image class="zar_img" src="../../source/{{item.isLike == 1 ? 'save_not.png' : 'like.png'}}"></image>
+                                <view class="content_zar">{{item.likeCount}}</view>
+                            </view>
+                            <view class="tags_view" >
+                                <view class="tags1">新生儿</view>
+                                <view class="tags1">健康宝宝</view>
+                            </view>
+                        </view>
 
                             </view>
                             <image class="content_image" mode="aspectFill" src="{{item.image.medium}}"></image>
diff --git a/littleApp_child/pages/childcare_knowledge/childcare_knowledge.wxss b/littleApp_child/pages/childcare_knowledge/childcare_knowledge.wxss
index d9b0963..df3dcbe 100644
--- a/littleApp_child/pages/childcare_knowledge/childcare_knowledge.wxss
+++ b/littleApp_child/pages/childcare_knowledge/childcare_knowledge.wxss
@@ -71,7 +71,7 @@
 
 .content_item {
     width: 100%;
-    height: 85px;
+    height: 120px;
     right: 75px;
 }
 
@@ -92,6 +92,7 @@
     font-size: 12px;
     color: #888;
     line-height: 18px;
+    margin-top: 10px;
     display: -webkit-box;
     overflow: hidden;
     text-overflow: ellipsis;
@@ -101,16 +102,21 @@
 }
 
 .content_image {
-    width: 50px;
-    transform: translateY(-65px);
+    width: 70px;
+    transform: translateY(-105px);
     float: right;
     margin-right: 15px;
-    height: 50px;
+    height: 70px;
+}
+
+.zarparent_box {
+    display: flex;
+    margin-top: 20px;
 }
 
 .zar_box {
     display: flex;
-    margin-left:-5px;
+    margin-left: -5px;
     width: 50px;
 }
 
@@ -119,14 +125,31 @@
     height: 25px;
 }
 
+.save_img {
+    width: 25px;
+    height: 25px;
+}
 .content_zar {
     font-family: PingFangSC-Regular;
     font-size: 10px;
     margin-left: 3px;
     margin-top: 5px;
-    color: #c6c6c6;
+    color: #AFAFAF;
+}
+.tags_view{
+    display:flex;
+    float: right;
+    position: absolute;
+    right: 20px;
+}
+.tags1 {
+    background: #f2fdf7;
+    border-radius: 2px;
+    font-size: 12px;
+    margin-left: 10px;
+    color: #58a478;
+    margin-top: 5px;
 }
-
 /*item 分割线*/
 
 .home__list-item__bottom {
diff --git a/littleApp_child/pages/feedback/feedback.js b/littleApp_child/pages/feedback/feedback.js
index fa7dbef..eaaa0a6 100644
--- a/littleApp_child/pages/feedback/feedback.js
+++ b/littleApp_child/pages/feedback/feedback.js
@@ -13,42 +13,66 @@ var longitude = 0
 var hasMore = true
 
 Page({
-    data: {
-        chooseOne: 0,
-        chooseTwo: 0,
-        chooseThree: 0,
-        content: ""
-
-    },
-    chooseOne: function () {
-        this.setData({
-            chooseOne: 1,
-            chooseTwo: 0,
-            chooseThree: 0,
-        })
-    },
-    chooseTwo: function () {
-        this.setData({
-            chooseOne: 0,
-            chooseTwo: 1,
-            chooseThree: 0,
-        })
-    },
-    chooseThree: function () {
-        this.setData({
-            chooseOne: 0,
-            chooseTwo: 0,
-            chooseThree: 1,
-        })
-    },
-    inputOver: function (e) {
-
-        var value = e.detail.value
-        this.setData({
-            content: value
-        })
-    },
-    submit: function () {
-        console.log(this.data.content)
-    }
+  data: {
+    chooseOne: 0,
+    chooseTwo: 0,
+    chooseThree: 0,
+    content: ""
+
+  },
+  onLoad: function (e) {
+    wx.getSystemInfo({
+      success: function (res) {
+        console.log(res)
+        var system = res.system
+        var number = system.split(" ")[1]
+        console.log(system.split(" ")[1])
+        if (system.split(" ")[0] == "Android") {
+
+          if (number.split(".")[0] >= 6) {
+            console.log("beyond")
+          } else {
+            console.log("not  beyond")
+          }
+        } else {
+          console.log("ios")
+        }
+
+
+
+      }
+    })
+
+  },
+  chooseOne: function () {
+    this.setData({
+      chooseOne: 1,
+      chooseTwo: 0,
+      chooseThree: 0,
+    })
+  },
+  chooseTwo: function () {
+    this.setData({
+      chooseOne: 0,
+      chooseTwo: 1,
+      chooseThree: 0,
+    })
+  },
+  chooseThree: function () {
+    this.setData({
+      chooseOne: 0,
+      chooseTwo: 0,
+      chooseThree: 1,
+    })
+  },
+  inputOver: function (e) {
+
+    var value = e.detail.value
+    this.setData({
+      content: value
+    })
+  },
+  submit: function () {
+    console.log(this.data.content)
+  }
 })
-- 
1.8.3.1