update

README.md

@@ -1,4 +1,4 @@
 ### 微信小程序试玩，踩坑中。。。
 参考：[react-native-gitfeed](https://github.com/xiekw2010/react-native-gitfeed)
 
-![](./screenshot/githubfeed.gif)
+![](./screenshots/githubfeed.gif)

app.js

@@ -1,9 +1,5 @@
 App({
   onLaunch () {
-    //调用API从本地缓存中获取数据
-    var logs = wx.getStorageSync('logs') || []
-    logs.unshift(Date.now())
-    wx.setStorageSync('logs', logs);
+
   }
-
-})
+});

app.json

@@ -1,5 +1,5 @@
 {
-  "pages":[
+  "pages": [
     "pages/index/index",
     "pages/explore/explore",
     "pages/famous/famous",
@@ -8,13 +8,14 @@
     "pages/auth/onboard/onboard",
     "pages/repo/repo"
   ],
+
   "window":{
-    "backgroundTextStyle":"light",
-    "navigationBarBackgroundColor": "#fff",
+    "backgroundTextStyle": "light",
     "navigationBarTitleText": "wx-github-feed",
-    "navigationBarTextStyle":"white",
+    "navigationBarTextStyle": "white",
     "navigationBarBackgroundColor": "#4078C0"
   },
+
   "tabBar": {
     "color": "#9A9A9A",
     "selectedColor": "#4078c0",
@@ -23,26 +24,26 @@
       {
         "pagePath": "pages/index/index",
         "text": "Feed",
-        "iconPath": "img/tab/feed.png",
-        "selectedIconPath": "img/tab/feed1.png"
+        "iconPath": "images/tab/feed.png",
+        "selectedIconPath": "images/tab/feed1.png"
       },
       {
         "pagePath": "pages/explore/explore",
         "text": "Explore",
-        "iconPath": "img/tab/explore.png",
-        "selectedIconPath": "img/tab/explore1.png"
+        "iconPath": "images/tab/explore.png",
+        "selectedIconPath": "images/tab/explore1.png"
       },
       {
         "pagePath": "pages/famous/famous",
         "text": "Famous",
-        "iconPath": "img/tab/famous.png",
-        "selectedIconPath": "img/tab/famous1.png"
+        "iconPath": "images/tab/famous.png",
+        "selectedIconPath": "images/tab/famous1.png"
       },
       {
         "pagePath": "pages/me/me",
         "text": "Me",
-        "iconPath": "img/tab/me.png",
-        "selectedIconPath": "img/tab/me1.png"
+        "iconPath": "images/tab/me.png",
+        "selectedIconPath": "images/tab/me1.png"
       }
     ]
   }

app.wxss

@@ -1,10 +1,12 @@
 .container {
-  display: flex;
-  width: 100%;
+  position: absolute;
+  top: 0;
+  bottom: 0;
+  left: 0;
+  right: 0;
   box-sizing: border-box;
-}
-.flex {
   display: flex;
+  flex-direction: column;
 }
 .row {
   display: flex;
@@ -24,3 +26,6 @@
   align-items: center;
   justify-content: center;
 }
+view, text {
+  font-family: 'Segoe UI', '微软雅黑';
+}

pages/auth/onboard/onboard.js

@@ -1,7 +1,6 @@
-
 const app = getApp();
-const util = require('../../../utils/util.js');
-const helper = require('../../helper/auth.js');
+import util from '../../../utils/util';
+import helpers from '../../helpers/auth';
 
 Page({
   data: {
@@ -11,26 +10,24 @@ Page({
 
   onLoad() {
     this.setData({
-      avatar_url: '/img/octocat.png'
+      avatar_url: '/images/onboard/octocat.png'
     });
   },
 
   handleOnboardSubmit(e) {
     const name = e.detail.value.username;
 
-    helper.findUserByName(name, result => {
+    helpers.findUserByName(name, result => {
       if (result) {
-        const user = {
-          username: name,
-          avatar_url: result
-        };
+        const user = { username: name, avatar_url: result };
+
         wx.setStorageSync('user', user);
         wx.navigateTo({
           url: '../../index/index'
         });
       } else {
         this.setData({
-          avatar_url: '/img/octocat.png',
+          avatar_url: '/images/onboard/octocat.png',
           error_msg_hidden: false
         });
       }
@@ -43,17 +40,17 @@ Page({
 function isUserExisted(e) {
   const name = e.detail.value;
 
-  helper.findUserByName(name, result => {
+  helpers.findUserByName(name, result => {
     if (result) {
       app.getCurrentPage().setData({
         avatar_url: result,
         error_msg_hidden: true
       });
     } else {
       app.getCurrentPage().setData({
-        avatar_url: '/img/octocat.png',
+        avatar_url: '/images/onboard/octocat.png',
         error_msg_hidden: false
       });
     }
   });
-}
+};

pages/auth/onboard/onboard.wxml

@@ -1,10 +1,10 @@
-<view class="container col align_center">
-  <image class="octocat" mode="aspectFit" src="{{avatar_url}}"></image>
+<view class="container align_center">
+  <image class="avatar" mode="aspectFit" src="{{avatar_url}}"></image>
   <view class="error_view">
     <text hidden="{{error_msg_hidden}}" class="error_text"> Not Found </text>
   </view>
-  <form class="col onboard" bindsubmit="handleOnboardSubmit">
-    <input class="input" name="username" bindinput="handleInputChange" placeholder="请填写 GitHub 用户名" placeholder-class="placeholder"/>
+  <form class='col' bindsubmit="handleOnboardSubmit">
+    <input name="username" bindinput="handleInputChange" placeholder="请填写 GitHub 用户名" placeholder-class="placeholder"/>
     <button class="btn" formType="submit" type="primary" size="mini">Go</button>
   </form>
 </view>

pages/auth/onboard/onboard.wxss

@@ -1,6 +1,5 @@
-.octocat {
+.avatar {
   margin-top: 50rpx;
-  flex: 1;
   width: 400rpx;
   height: 400rpx;
 }
@@ -11,14 +10,19 @@
   font-size: 30rpx;
   color: #f00;
 }
-.onboard {
-  width: 95%;
+form {
+  width: 100%;
+  box-sizing: border-box;
+  padding: 20rpx;
 }
-.input {
+input {
   padding: 10rpx;
   border-bottom: 1rpx solid #1AAD19;
   margin-bottom: 20rpx;
 }
 .placeholder {
   font-size: 20rpx;
 }
+.btn {
+  width: 100%;
+}

pages/explore/explore.js

@@ -1,31 +1,30 @@
-
 const app = getApp();
-const services = require('../../utils/services.js');
-
-const basic_url = 'http://trending.codehub-app.com/v2/trending?since=';
+import services from '../../utils/services';
 
 Page({
   data: {
-    languageArray: ['All Language', 'CSS', 'JavaScript', 'C', 'Java', 'PHP', 'Python', 'Ruby', 'Swift'],
+    languageArray: ['All Languages', 'C', 'CSS', 'Go', 'HTML', 'Java', 'JavaScript', 'Lua', 'Objective-C', 'Perl', 'PHP', 'Python', 'R', 'Ruby', 'Scala', 'Shell', 'Swift'],
     languageIndex: 0,
-    tabArray: ['daily', 'weekly', 'monthly'],
+    tabArray: ['Daily', 'Weekly', 'Monthly'],
     tabIndex: 0,
     loading_hidden: true
   },
 
-  onLoad (options) {
+  onLoad() {
     this.refreshData();
   },
 
-  _reloadUrl () {
+  _reloadUrl() {
     const basic_url = 'http://trending.codehub-app.com/v2/trending?since=';
-    if (this.data.languageIndex === 0) {
-      return url = basic_url + this.data.tabArray[this.data.tabIndex];
+
+    // locationIndex may be 0 or '0'
+    if (this.data.languageIndex == 0) {
+      return basic_url + this.data.tabArray[this.data.tabIndex].toLowerCase();
     }
-    return `${basic_url}${this.data.tabArray[this.data.tabIndex]}&language=${this.data.languageArray[this.data.languageIndex].toLowerCase()}`;
+    return `${basic_url}${this.data.tabArray[this.data.tabIndex].toLowerCase()}&language=${this.data.languageArray[this.data.languageIndex].toLowerCase()}`;
   },
 
-  fetchReposData (url) {
+  fetchReposData(url) {
     services.fetch(url).then(res => {
       if (res.data) {
         this.setData({
@@ -38,23 +37,23 @@ Page({
     });
   },
 
-  handleLanguagePickerChange (e) {
+  handleLanguagePickerChange(e) {
     this.setData({
       languageIndex: e.detail.value,
       loading_hidden: false
     });
     this.fetchReposData(this._reloadUrl());
   },
 
-  handleTabPickerChange (e) {
+  handleTabPickerChange(e) {
     this.setData({
       tabIndex: e.detail.value,
       loading_hidden: false
     });
     this.fetchReposData(this._reloadUrl());
   },
 
-  refreshData () {
+  refreshData() {
     this.setData({
       loading_hidden: false
     });

pages/explore/explore.wxml

@@ -3,22 +3,24 @@
     玩命加载中...
   </loading>
   <view class="col explore">
-    <picker bindchange="handleLanguagePickerChange" mode="selector" value="{{languageIndex}}" range="{{languageArray}}">
-      <view class="picker">
-        挑选语言：{{languageArray[languageIndex]}}
-      </view>
-    </picker>
-    <picker bindchange="handleTabPickerChange" value="{{tabIndex}}" range="{{tabArray}}">
-      <view class="picker">
-      挑选时间：{{tabArray[tabIndex]}}
-      </view>
-    </picker>
-    <scroll-view scroll-y="true" class="scroll_view" bindscrolltoupper="refreshData">
+    <view class="col pickers">
+      <picker bindchange="handleLanguagePickerChange" mode="selector" value="{{languageIndex}}" range="{{languageArray}}">
+        <view class="picker_text">
+          挑选语言：{{languageArray[languageIndex]}}
+        </view>
+      </picker>
+      <picker bindchange="handleTabPickerChange" value="{{tabIndex}}" range="{{tabArray}}">
+        <view class="picker_text">
+        挑选时间：{{tabArray[tabIndex]}}
+        </view>
+      </picker>
+    </view>
+    <scroll-view scroll-y="true" bindscrolltoupper="refreshData">
       <block wx:for="{{items}}">
         <navigator url="../repo/repo?repo_full_name={{item.full_name}}">
           <view class="row repo_item">
             <image class="avatar" mode="aspectFit" src="{{item.owner.avatar_url}}"></image>
-            <view class="repo_item_center">
+            <view class="col" style="flex: 1">
               <text class="full_name">{{item.full_name}}</text>
               <text class="language">{{item.language ? item.language : ''}}</text>
             </view>

pages/explore/explore.wxss

@@ -1,35 +1,40 @@
 .container {
-  height: 100%;
   background: rgba(255,255,255,0.8);
 }
 .explore {
   flex: 1;
 }
-picker {
-  height: 5%;
+.pickers {
+  height: 15%;
+  box-sizing: border-box;
+  justify-content: space-around;
+  padding: 20rpx;
 }
-.scroll_view {
-  height: 90%;
+.picker_text {
+  font-size: 35rpx;
+}
+scroll-view {
+  height: 85%;
 }
 .repo_item {
-  padding: 10rpx;
-  border-bottom: 1rpx solid #ccc;
+  padding: 20rpx;
+  border-bottom: 1rpx solid #E2E2E2;
 }
 .avatar {
-
-}
-.repo_item_center {
-  flex: 1;
-  display: flex;
-  flex-direction: column;
+  width: 80rpx;
+  height: 80rpx;
 }
 .full_name {
   font-size: 20rpx;
+  color: #4078c0;
 }
 .language {
-  font-size: 20rpx;
+  margin-top: 5rpx;
+  color: #9A9A9A;
+  font-size: 10rpx;
 }
 .stargazers_count {
+  color: #9A9A9A;
   font-size: 20rpx;
 }
 .avatar {