add user/orgs and styles/color

uniquexiaobai · uniquexiaobai · commit c4e20ba04804 · 2016-11-26T14:43:11.000+08:00
diff --git a/.vscode/settings.json b/.vscode/settings.json
diff --git a/app.json b/app.json
@@ -7,6 +7,7 @@
     "pages/settings/settings",
     "pages/auth/onboard/onboard",
     "pages/repo/repo",
+    "pages/org/org",
     "pages/user/user"
   ],
 
diff --git a/app.wxss b/app.wxss
@@ -1,3 +1,5 @@
+@import './styles/main.wxss';
+
 .container {
   position: absolute;
   top: 0;
@@ -29,3 +31,5 @@
 view, text {
   font-family: 'Segoe UI', '微软雅黑';
 }
+
+
diff --git a/pages/explore/explore.js b/pages/explore/explore.js
@@ -49,8 +49,8 @@ Page({
         this.setData({
           items: res.data
         });
+        this.hideLoadingToast();
       }
-      this.hideLoadingToast();
     });
   },
 
diff --git a/pages/explore/explore.wxml b/pages/explore/explore.wxml
@@ -20,10 +20,10 @@
               <image class="avatar" mode="aspectFit" src="{{item.owner.avatar_url}}"></image>
             </navigator>
             <view class="col" style="flex: 1">
-              <text class="full_name">{{item.full_name}}</text>
-              <text class="language">{{item.language ? item.language : ''}}</text>
+              <text class="color_blue full_name">{{item.full_name}}</text>
+              <text class="color_gray language">{{item.language ? item.language : ''}}</text>
             </view>
-            <view class="stargazers_count">{{item.stargazers_count}}</view>
+            <view class="color_gray stargazers_count">{{item.stargazers_count}}</view>
           </view>
         </navigator>
       </block>
diff --git a/pages/explore/explore.wxss b/pages/explore/explore.wxss
@@ -28,15 +28,12 @@ scroll-view {
 }
 .full_name {
   font-size: 25rpx;
-  color: #4078c0;
 }
 .language {
   margin-top: 5rpx;
-  color: #9A9A9A;
   font-size: 20rpx;
 }
 .stargazers_count {
-  color: #9A9A9A;
   font-size: 20rpx;
 }
 .avatar {
diff --git a/pages/famous/famous.js b/pages/famous/famous.js
@@ -49,8 +49,8 @@ Page({
           page: 1,
           incomplete_results: res.data.incomplete_results
         });
+        this.hideLoadingToast();
       }
-      this.hideLoadingToast();
     });
   },
 
diff --git a/pages/famous/famous.wxml b/pages/famous/famous.wxml
@@ -17,7 +17,7 @@
         <navigator url="../user/user?user_name={{item.login}}">
           <view class="row user_item">
             <image class="avatar" mode="aspectFit" src="{{item.avatar_url}}"></image>
-            <text class="col justify_center username">{{item.login}}</text>
+            <text class="col justify_center color_black username">{{item.login}}</text>
           </view>
         </navigator>
       </block>
diff --git a/pages/famous/famous.wxss b/pages/famous/famous.wxss
@@ -28,5 +28,4 @@ scroll-view {
 .username {
   font-size: 25rpx;
   font-weight: bold;
-  color: #333333;
 }
diff --git a/pages/index/index.js b/pages/index/index.js
@@ -48,8 +48,8 @@ Page({
         this.setData({
           items: this.data.items.concat(res.data)
         });
+        this.hideLoadingToast();
       }
-      this.hideLoadingToast();
     });
   },
 
diff --git a/pages/index/index.wxml b/pages/index/index.wxml
@@ -9,15 +9,15 @@
             </navigator>
             <view class="col">
               <navigator url="../user/user?user_name={{item.actor.login}}">
-                <view class="actor_name">{{item.actor.display_login}}</view>
+                <view class="color_blue actor_name">{{item.actor.display_login}}</view>
               </navigator>
-              <text class="created_at">{{item.created_at}}</text>
+              <text class="color_gray created_at">{{item.created_at}}</text>
             </view>
           </view>
           <view class="row" style="margin-top: 10rpx;">
-            <text class="action_type">{{item.type}}</text>
+            <text class="color_black action_type">{{item.type}}</text>
             <navigator url="../repo/repo?repo_full_name={{item.repo.name}}">
-              <view class="action_repo">{{item.repo.name}}</view>
+              <view class="color_blue action_repo">{{item.repo.name}}</view>
             </navigator>
           </view>
         </view>
diff --git a/pages/index/index.wxss b/pages/index/index.wxss
@@ -16,20 +16,16 @@ scroll-view {
 }
 .actor_name {
   font-size: 25rpx;
-  color: #4078c0;
 }
 .created_at {
   margin-top: 5rpx;
   font-size: 20rpx;
-  color: #9A9A9A;
 }
 .action_type {
   font-size: 25rpx;
   font-weight: bold;
   margin-right: 20rpx;
-  color: #333333;
 }
 .action_repo {
   font-size: 25rpx;
-  color: #4078c0;
 }
diff --git a/pages/org/org.js b/pages/org/org.js
@@ -0,0 +1,20 @@
+// pages/org/org.js
+Page({
+  data:{},
+  onLoad:function(options){
+    // 页面初始化 options为页面跳转所带来的参数
+    console.log('#org#', options.org_url);
+  },
+  onReady:function(){
+    // 页面渲染完成
+  },
+  onShow:function(){
+    // 页面显示
+  },
+  onHide:function(){
+    // 页面隐藏
+  },
+  onUnload:function(){
+    // 页面关闭
+  }
+})
diff --git a/pages/org/org.json b/pages/org/org.json
@@ -0,0 +1 @@
+{}
diff --git a/pages/org/org.wxml b/pages/org/org.wxml
@@ -0,0 +1,2 @@
+<!--pages/org/org.wxml-->
+<text>pages/org/org.wxml</text>
diff --git a/pages/org/org.wxss b/pages/org/org.wxss
@@ -0,0 +1 @@
+/* pages/org/org.wxss */
diff --git a/pages/repo/repo.json b/pages/repo/repo.json
@@ -0,0 +1 @@
+{}
diff --git a/pages/repo/repo.wxml b/pages/repo/repo.wxml
@@ -3,15 +3,15 @@
     <view class="row repo_header">
       <view class="row align_center repo_top_item">
         <image class="avatar" mode="aspectFit" src="{{repo.owner.avatar_url}}"></image>
-        <view class="owner_name">{{repo.owner.login}}</view>
+        <view class="color_black owner_name">{{repo.owner.login}}</view>
       </view>
       <view class="row align_center repo_top_item">
         <view class="watch">Watch</view>
         <view class="watch_number">{{repo.subscribers_count}}</view>
       </view>
       <view class="row align_center repo_top_item">
-        <view class="watch">Star</view>
-        <view class="watch_number">{{repo.watchers_count}}</view>
+        <view class="color_black watch">Star</view>
+        <view class="color_black watch_number">{{repo.watchers_count}}</view>
       </view>
     </view>
     <view class="repo_desc">{{repo.description}}</view>
diff --git a/pages/repo/repo.wxss b/pages/repo/repo.wxss
@@ -12,11 +12,9 @@
 }
 .owner_name {
   font-size: 25rpx;
-  color: #333333;
 }
 .watch {
   font-size: 25rpx;
-  color: #333333;
   background: #F0F0F0;
   border-radius: 5rpx;
   margin-right: 10rpx;
@@ -26,7 +24,6 @@
 }
 .watch_number {
   font-size: 25rpx;
-  color: #333333;
 }
 .repo_desc {
   padding: 20rpx;
diff --git a/pages/user/user.js b/pages/user/user.js
@@ -28,13 +28,19 @@ Page({
   fetchUserData(url) {
     services.fetch(url, (err, res) => {
       if (res.data) {
-        this.setData({
-          user: res.data
+        const user = res.data;
+        const self = this;
+        services.fetch(user.organizations_url, (err, res) => {
+          if (res.data) {
+            user.orgs = res.data;
+            self.setData({
+              user: user
+            });
+            self.hideLoadingToast();
+          }
         });
       }
-      console.log('user', res.data);
-      this.hideLoadingToast();
-    })
+    });
   },
 
   showLoadingToast() {
diff --git a/pages/user/user.json b/pages/user/user.json
@@ -0,0 +1 @@
+{}
diff --git a/pages/user/user.wxml b/pages/user/user.wxml
@@ -5,18 +5,23 @@
         <image mode="aspectFit" src="{{user.avatar_url}}" />
       </view>
       <view class="col user_info_right">
-        <view class="user_name">{{user.name}}</view>
-        <view class="user_login">{{user.login}}</view>
-        <view class="user_location">{{user.location}}</view>
-        <view class="user_email">{{user.email}}</view>
-        <view class="user_blog">{{user.blog}}</view>
-        <view class="user_created_at">{{user.created_at}}</view>
+        <view class="color_black user_name">{{user.name}}</view>
+        <view class="color_gray user_login">{{user.login}}</view>
+        <view class="color_black user_company">{{user.company}}</view>
+        <view class="color_black user_location">{{user.location}}</view>
+        <view class="color_blue user_email">{{user.email}}</view>
+        <view class="color_blue user_blog">{{user.blog}}</view>
+        <view class="color_black user_created_at">{{user.created_at}}</view>
       </view>
     </view>
-    <view class="col user_organizations">
-      <view class="user_organizations_title">Organizations</view>
-      <view class="row user_organizations_list">
-        {{user.organizations_url}}
+    <view class="col user_orgs">
+      <view class="color_black user_orgs_title">Organizations</view>
+      <view class="row user_orgs_list">
+        <block wx:for="{{user.orgs}}" wx:key="{{user.id}}">
+          <navigator url="../org/org?org_url={{item.url}}">
+            <image src="{{item.avatar_url}}" mode="aspectFit" class="user_orgs_list__image"/>
+          </navigator>
+        </block>
       </view>
     </view>
     <view class="follow_btn">
diff --git a/pages/user/user.wxss b/pages/user/user.wxss
@@ -1,15 +1,65 @@
 .user {
-  border: 1rpx solid red;
-  padding: 20rpx;
+
 }
 .user_info {
-  border: 1rpx solid red;
+  padding: 20rpx;
+  padding-bottom: 10rpx;
+  margin-bottom: 10rpx;
+  border-bottom: 1rpx solid #E2E2E2;
 }
 .user_info_left {
-  border: 1rpx solid red;
+  padding-top: 10rpx;
   margin-right: 20rpx;  
 }
 .user_info_left image {
   width: 200rpx;
   height: 200rpx;
+}
+.user_name {
+  font-size: 35rpx;
+  font-weight: bold;
+}
+.user_login {
+  font-size: 28rpx;
+  margin-bottom: 10rpx;
+}
+.user_company {
+  font-size: 28rpx;
+  margin-bottom: 10rpx;
+}
+.user_location {
+  font-size: 28rpx;
+  margin-bottom: 5rpx;
+}
+.user_email {
+  font-size: 28rpx;
+  margin-bottom: 5rpx;
+}
+.user_blog {
+  font-size: 28rpx;
+  margin-bottom: 5rpx;
+}
+.user_created_at {
+  font-size: 28rpx;
+}
+
+.user_orgs {
+  font-size: 35rpx;
+  font-weight: bold;
+  padding: 20rpx;
+  padding-top: 10rpx;
+  padding-bottom: 10rpx;
+  margin-bottom: 20rpx;
+  border-bottom: 1rpx solid #E2E2E2;
+}
+.user_orgs_title {
+  margin-bottom: 10rpx;
+}
+.user_orgs_list {
+  flex-wrap: wrap;
+}
+.user_orgs_list__image {
+  margin: 5rpx;
+  width: 55rpx;
+  height: 55rpx;
 }
diff --git a/styles/_var.wxss b/styles/_var.wxss
@@ -0,0 +1,10 @@
+/* color */
+.color_black {
+  color: #333333;
+}
+.color_gray {
+  color: #9A9A9A;
+}
+.color_blue {
+  color: #4078C0;
+}
diff --git a/styles/main.wxss b/styles/main.wxss
@@ -0,0 +1,2 @@
+
+@import './_var.wxss';

Original file line number	Diff line number	Diff line change
`@@ -49,8 +49,8 @@ Page({`
`49`	`49`	`this.setData({`
`50`	`50`	`items: res.data`
`51`	`51`	`});`
	`52`	`+ this.hideLoadingToast();`
`52`	`53`	`}`
`53`		`- this.hideLoadingToast();`
`54`	`54`	`});`
`55`	`55`	`},`
`56`	`56`
Original file line number	Diff line number	Diff line change
`@@ -28,15 +28,12 @@ scroll-view {`
`28`	`28`	`}`
`29`	`29`	`.full_name {`
`30`	`30`	`font-size: 25rpx;`
`31`		`- color: #4078c0;`
`32`	`31`	`}`
`33`	`32`	`.language {`
`34`	`33`	`margin-top: 5rpx;`
`35`		`- color: #9A9A9A;`
`36`	`34`	`font-size: 20rpx;`
`37`	`35`	`}`
`38`	`36`	`.stargazers_count {`
`39`		`- color: #9A9A9A;`
`40`	`37`	`font-size: 20rpx;`
`41`	`38`	`}`
`42`	`39`	`.avatar {`
Original file line number	Diff line number	Diff line change
`@@ -28,5 +28,4 @@ scroll-view {`
`28`	`28`	`.username {`
`29`	`29`	`font-size: 25rpx;`
`30`	`30`	`font-weight: bold;`
`31`		`- color: #333333;`
`32`	`31`	`}`
Original file line number	Diff line number	Diff line change
`@@ -48,8 +48,8 @@ Page({`
`48`	`48`	`this.setData({`
`49`	`49`	`items: this.data.items.concat(res.data)`
`50`	`50`	`});`
	`51`	`+ this.hideLoadingToast();`
`51`	`52`	`}`
`52`		`- this.hideLoadingToast();`
`53`	`53`	`});`
`54`	`54`	`},`
`55`	`55`