Merge pull request #264 from hongxiangliu/master

#2 #27 第2次实验代码
hzuapps · Nov 6, 2017 · b91e5ad · b91e5ad
2 parents e24ec6b + 2aad535
commit b91e5ad
Show file tree

Hide file tree

Showing 12 changed files with 122 additions and 3 deletions.
diff --git a/1514080901119/app.json b/1514080901119/app.json
@@ -1,12 +1,33 @@
 {
   "pages":[
     "pages/index/index",
-    "pages/logs/logs"
+    "pages/logs/logs",
+    "pages/words/words"
   ],
   "window":{
     "backgroundTextStyle":"light",
     "navigationBarBackgroundColor": "#fff",
     "navigationBarTitleText": "贝雷书签",
     "navigationBarTextStyle":"black"
+  },
+  "tabBar": {
+    "color": "#7A7E83",
+    "selectedColor": "#3cc5···1f",
+    "borderStyle": "black",
+    "backgroundColor": "#ffffff",
+    "list": [
+      {
+        "pagePath": "pages/index/index",
+        "iconPath": "image/icon_component.png",
+        "selectedIconPath": "image/icon_component_HL.png",
+        "text": "个人"
+      },
+      {
+        "pagePath": "pages/logs/logs",
+        "iconPath": "image/icon_API.png",
+        "selectedIconPath": "image/icon_API_HL.png",
+        "text": "书"
+      }
+    ]
   }
 }
diff --git a/1514080901119/image/icon_API.png b/1514080901119/image/icon_API.png
diff --git a/1514080901119/image/icon_API_HL.png b/1514080901119/image/icon_API_HL.png
diff --git a/1514080901119/image/icon_component.png b/1514080901119/image/icon_component.png
diff --git a/1514080901119/image/icon_component_HL.png b/1514080901119/image/icon_component_HL.png
diff --git a/1514080901119/pages/index/index.js b/1514080901119/pages/index/index.js
@@ -4,7 +4,7 @@ const app = getApp()
 
 Page({
   data: {
-    motto: 'Hello World',
+    motto: '多读书 多看报 多睡觉',
     userInfo: {},
     hasUserInfo: false,
     canIUse: wx.canIUse('button.open-type.getUserInfo')

diff --git a/1514080901119/pages/index/index.wxss b/1514080901119/pages/index/index.wxss
@@ -18,4 +18,26 @@
 
 .usermotto {
   margin-top: 200px;
-}
+}
+/*
+.index-hd {
+  padding: 80rpx;
+  text-align: center;
+}
+.index-bd {
+  padding: 0 30rpx 40rpx;
+}
+.index-ft {
+  padding-bottom: 20rpx;
+  text-align: center;
+}
+.index-logo {
+  width: 86rpx;
+  height: 86rpx;
+}
+.index-desc {
+  margin-top: 20rpx;
+  color: #888888;
+  font-size: 28rpx;
+}
+*/
diff --git a/1514080901119/pages/words/words.js b/1514080901119/pages/words/words.js
@@ -0,0 +1,66 @@
+// pages/words/words.js
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad: function (options) {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload: function () {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh: function () {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom: function () {
+
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage: function () {
+
+  }
+})
diff --git a/1514080901119/pages/words/words.json b/1514080901119/pages/words/words.json
@@ -0,0 +1 @@
+{}
diff --git a/1514080901119/pages/words/words.wxml b/1514080901119/pages/words/words.wxml
@@ -0,0 +1,2 @@
+<!--pages/words/words.wxml-->
+<text>{{page}}.wxml</text>
diff --git a/1514080901119/pages/words/words.wxss b/1514080901119/pages/words/words.wxss
@@ -0,0 +1 @@
+/* pages/words/words.wxss */
diff --git a/1514080901119/weui.wxss b/1514080901119/weui.wxss
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		<!--pages/words/words.wxml-->
		<text>{{page}}.wxml</text>