Merge branch 'feature/wn-tsg-0811' into 'master'

修改个人信息

See merge request !1

pages/home/home.js

 Page({
-  onShow(){
-    console.log(111)
+  data: {
+    inputShowed: false,
+    inputVal: "",
+    personInfo: {
+      name: 'w.n',
+      department: '推啊前端活动组',
+      awater: 'http://yun.dui88.com/h5-mami/wn/wn.jpg'
+    },
+    myWish:{
+      num: 2
+    },
+    myRecommend:{
+      status: false
+    }
+
+  },
+  onLoad: function () {
+    this.setData({
+      icon60: '../../images/avatar.png'
+    });
   }
+
 });
\ No newline at end of file

pages/home/home.wxml

 <view class="page">
     <view class="page__bd">
         <view class="weui-cells weui-cells_after-title">
-            <view class="weui-cell">
+            <view class="weui-cell personCell">
                 <view class="weui-cell__hd" style="position: relative;margin-right: 10px;">
-                    <image src="../images/pic_160.png" style="width: 50px; height: 50px; display: block"/>
-                    <view class="weui-badge" style="position: absolute;top: -.4em;right: -.4em;">8</view>
+                    <image src="{{personInfo.awater}}" style="width: 50px; height: 50px; display: block"/>
                 </view>
                 <view class="weui-cell__bd">
-                    <view>借阅人姓名</view>
-                    <view style="font-size: 13px;color: #888888;">部门</view>
+                    <view class='personName'>{{personInfo.name}}</view>
+                    <view style="font-size: 13px;color: #888888;">{{personInfo.department}}</view>
                 </view>
             </view>
             <view class="weui-cell weui-cell_access">
                 <view class="weui-cell__bd">
-                    <view style="display: inline-block; vertical-align: middle">借阅信息</view>
+                  <navigator url='/pages/bookdetail/bookdetail' open-type='redirect' hover-class='other-navigator-hover'>
+                      <view style="display: inline-block; vertical-align: middle">借阅信息</view>
+                  </navigator>    
                 </view>
                 <view class="weui-cell__ft weui-cell__ft_in-access"></view>
             </view>
             <view class="weui-cell weui-cell_access">
                 <view class="weui-cell__bd">
-                    <view style="display: inline-block; vertical-align: middle">我的心愿单</view>
-                    <view class="weui-badge" style="margin-left: 5px;">8</view>
+                  <navigator url='/pages/bookdetail/bookdetail' open-type='redirect' hover-class='other-navigator-hover'>
+                      <view style="display: inline-block; vertical-align: middle">我的心愿单</view>
+                      <view class="weui-badge" style="margin-left: 5px;">{{myWish.num}}</view>
+                  </navigator>    
                 </view>
+                <view class="weui-cell__ft weui-cell__ft_in-access"></view>
             </view>
             <view class="weui-cell weui-cell_access">
                 <view class="weui-cell__bd">
+                  <navigator url='/pages/bookdetail/bookdetail' open-type='redirect' hover-class='other-navigator-hover'>
                     <view style="display: inline-block; vertical-align: middle">我的推荐</view>
-                    <view class="weui-badge" style="margin-left: 5px;">New</view>
+                    <view class="{{myRecommend.status == true ?'weui-badge':'recommendTip'}}" style="margin-left: 5px;">New</view>
+                  </navigator>
                 </view>
                 <view class="weui-cell__ft weui-cell__ft_in-access"></view>
             </view>
         </view>
+        <view class='markInfor'>兑吧图书馆</view>
     </view>
 </view>
\ No newline at end of file

pages/home/home.wxss

-/* example/badge/badge.wxss */
\ No newline at end of file
+/* example/badge/badge.wxss */
+.personName{
+  font-size: 18px;
+}
+.markInfor{
+  margin-top: 100px;
+  width: 100%;
+  text-align: center;
+  font-size: 24px;
+  font-style: italic;
+  color: #e0ddd8;
+}
+.recommendTip{
+  font-size: 0;
+}
\ No newline at end of file

project.config.json

@@ -33,13 +33,18 @@
 			"list": []
 		},
 		"miniprogram": {
-			"current": 0,
+			"current": 1,
 			"list": [
 				{
 					"id": 0,
 					"name": "1",
 					"pathName": "pages/borrowDetail/borrowDetail",
 					"query": ""
+				},
+				{
+					"id": -1,
+					"name": "wn",
+					"pathName": "pages/home/home"
 				}
 			]
 		}