diff --git a/app.json b/app.json
index 087fbdb..59ec8d6 100644
--- a/app.json
+++ b/app.json
@@ -1,11 +1,9 @@
-<<<<<<< HEAD
 {
   "pages": [
-    
-    "shouye/shouye",
+     "denglu/denglu",
+     "shouye/shouye",
     "chazhao/chazhao",
     "jieyue/jieyue",
-    "denglu/denglu",
     "wode/wode"
   ],
   "window": {
@@ -35,70 +33,15 @@
       {
         "pagePath": "jieyue/jieyue",
         "text": "借阅",
-        "iconPath":"image/jieyue.png",
-        "selectedIconPath":"image/jieyue-hl.png"
-       },
+        "iconPath": "image/jieyue.png",
+        "selectedIconPath": "image/jieyue-hl.png"
+      },
       {
         "pagePath": "wode/wode",
         "text": "我的",
         "iconPath": "image/wode.png",
         "selectedIconPath": "image/wode-hl.png"
       }
-      
-     
     ]
   }
-
-
-
-
-
-=======
-{
-  "pages": [
-    "denglu/denglu",
-    "shouye/shouye",
-    "chazhao/chazhao",
-    "jieyue/jieyue",
-    "wode/wode"
-  ],
-  "window": {
-    "backgroundTextStyle": "light",
-    "navigationBarBackgroundColor": "#fff",
-    "navigationBarTitleText": "真香图书管理系统",
-    "navigationBarTextStyle": "black"
-  },
-  "tabBar": {
-    "color": "#000000",
-    "selectedColor": "#fd9941",
-    "borderStyle": "white",
-    "backgroundColor": "#ffffff",
-    "list": [
-      {
-        "pagePath": "shouye/shouye",
-        "text": "首页",
-        "iconPath": "image/shouye.png",
-        "selectedIconPath": "image/shouye-hl.png"
-      },
-      {
-        "pagePath": "chazhao/chazhao",
-        "text": "查找",
-        "iconPath": "image/chazhao.png",
-        "selectedIconPath": "image/chazhao-hl.png"
-      },
-      {
-        "pagePath": "jieyue/jieyue",
-        "text": "借阅",
-        "iconPath": "image/jieyue.png",
-        "selectedIconPath": "image/jieyue-hl.png"
-      },
-      {
-        "pagePath": "wode/wode",
-        "text": "我的",
-        "iconPath": "image/wode.png",
-        "selectedIconPath": "image/wode-hl.png"
-      }
-    ]
-  }
->>>>>>> f7e8073ec38dbefbf543cb0f7243d1133f9a65e1
 }
\ No newline at end of file
diff --git a/chazhaoazhao.js b/chazhaoazhao.js
new file mode 100644
index 0000000..bcf75dc
--- /dev/null
+++ b/chazhaoazhao.js
@@ -0,0 +1,66 @@
+// chazhaoazhao.js
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad: function (options) {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload: function () {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh: function () {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom: function () {
+
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage: function () {
+
+  }
+})
\ No newline at end of file
diff --git a/chazhaoazhao.json b/chazhaoazhao.json
new file mode 100644
index 0000000..8835af0
--- /dev/null
+++ b/chazhaoazhao.json
@@ -0,0 +1,3 @@
+{
+  "usingComponents": {}
+}
\ No newline at end of file
diff --git a/chazhaoazhao.wxml b/chazhaoazhao.wxml
new file mode 100644
index 0000000..df1a000
--- /dev/null
+++ b/chazhaoazhao.wxml
@@ -0,0 +1,2 @@
+<!--chazhaoazhao.wxml-->
+<text>chazhaoazhao.wxml</text>
diff --git a/chazhaoazhao.wxss b/chazhaoazhao.wxss
new file mode 100644
index 0000000..48b04f6
--- /dev/null
+++ b/chazhaoazhao.wxss
@@ -0,0 +1 @@
+/* chazhaoazhao.wxss */
\ No newline at end of file
diff --git a/denglu/denglu.js b/denglu/denglu.js
index 2768ef2..5d10572 100644
--- a/denglu/denglu.js
+++ b/denglu/denglu.js
@@ -1,23 +1,8 @@
 // jieyue/jieyue.js
-Component({
-  /**
-   * 组件的属性列表
-   */
-  properties: {
-
-  },
-
-  /**
-   * 组件的初始数据
-   */
-  data: {
-
-  },
-
-  /**
-   * 组件的方法列表
-   */
-  methods: {
-
+Page({
+  logBtn :function(options){
+    wx.switchTab({
+      url:'/shouye/shouye',
+    })
   }
-})
\ No newline at end of file
+})
diff --git a/denglu/denglu.wxml b/denglu/denglu.wxml
index d85572e..8c079ed 100644
--- a/denglu/denglu.wxml
+++ b/denglu/denglu.wxml
@@ -3,6 +3,5 @@
 <view class="flex-row" style="display: flex;"><text class="password" data-c_e_id="1">密码</text></view>
 <view class="flex-row" style="display: flex;"><input class="inputpassword" data-c_e_id="wx_input_dfbcd57f" password="true" name="input1" placeholder="默认身份证号后六位" type="number"/>
 </view>
-<button class="button1" >
-    登     录</button>
-
+<button class="button1" bindtap="logBtn">
+登    录</button> 
\ No newline at end of file
diff --git a/jieyueyue.js b/jieyueyue.js
new file mode 100644
index 0000000..ba7dd89
--- /dev/null
+++ b/jieyueyue.js
@@ -0,0 +1,66 @@
+// jieyueyue.js
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad: function (options) {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload: function () {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh: function () {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom: function () {
+
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage: function () {
+
+  }
+})
\ No newline at end of file
diff --git a/jieyueyue.json b/jieyueyue.json
new file mode 100644
index 0000000..8835af0
--- /dev/null
+++ b/jieyueyue.json
@@ -0,0 +1,3 @@
+{
+  "usingComponents": {}
+}
\ No newline at end of file
diff --git a/jieyueyue.wxml b/jieyueyue.wxml
new file mode 100644
index 0000000..e9dfce7
--- /dev/null
+++ b/jieyueyue.wxml
@@ -0,0 +1,2 @@
+<!--jieyueyue.wxml-->
+<text>jieyueyue.wxml</text>
diff --git a/jieyueyue.wxss b/jieyueyue.wxss
new file mode 100644
index 0000000..5b3bbf7
--- /dev/null
+++ b/jieyueyue.wxss
@@ -0,0 +1 @@
+/* jieyueyue.wxss */
\ No newline at end of file
diff --git a/shouyeouye.js b/shouyeouye.js
new file mode 100644
index 0000000..10191aa
--- /dev/null
+++ b/shouyeouye.js
@@ -0,0 +1,66 @@
+// shouyeouye.js
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad: function (options) {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload: function () {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh: function () {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom: function () {
+
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage: function () {
+
+  }
+})
\ No newline at end of file
diff --git a/shouyeouye.json b/shouyeouye.json
new file mode 100644
index 0000000..8835af0
--- /dev/null
+++ b/shouyeouye.json
@@ -0,0 +1,3 @@
+{
+  "usingComponents": {}
+}
\ No newline at end of file
diff --git a/shouyeouye.wxml b/shouyeouye.wxml
new file mode 100644
index 0000000..dad1f65
--- /dev/null
+++ b/shouyeouye.wxml
@@ -0,0 +1,2 @@
+<!--shouyeouye.wxml-->
+<text>shouyeouye.wxml</text>
diff --git a/shouyeouye.wxss b/shouyeouye.wxss
new file mode 100644
index 0000000..92eade8
--- /dev/null
+++ b/shouyeouye.wxss
@@ -0,0 +1 @@
+/* shouyeouye.wxss */
\ No newline at end of file