diff --git a/app.json b/app.json
index cb76eb6..087fbdb 100644
--- a/app.json
+++ b/app.json
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
{
"pages": [
@@ -52,4 +53,52 @@
+=======
+{
+ "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/chazhao/chazhao.wxml b/chazhao/chazhao.wxml
index 715c082..4fbd855 100644
--- a/chazhao/chazhao.wxml
+++ b/chazhao/chazhao.wxml
@@ -1,6 +1,8 @@
-
-请输入书名或书号进行查询：
-
-
-
-
+
+
+
+
+请输入书名或书号进行查询：
+
diff --git a/chazhao/chazhao.wxss b/chazhao/chazhao.wxss
index 53d0f3d..958ad45 100644
--- a/chazhao/chazhao.wxss
+++ b/chazhao/chazhao.wxss
@@ -1,26 +1,8 @@
-/* chazhao/chazhao.wxss */
-.body_15H9bN{text-align: center; }
-.wx-button_6FVULy{display: none; justify-content: center; padding-top: 30px; padding-bottom: 0px; }
-.wx-input_TJFfvT{display: flex; flex-direction: row; justify-content: flex-start; width: 70%; height: 34px; padding-top: 0px; padding-bottom: 0px; margin-top: 18px; border: 1px solid rgba(237, 165, 26, 0.278431); transform: rotate(0deg) scale(1) translate(6%,118%); transition: All 0s ease; background-color: rgb(235, 227, 227); -ms-transform: rotate(0deg) scale(1) translate(6%,118%); -o-transform: rotate(0deg) scale(1) translate(6%,118%); -moz-transform: rotate(0deg) scale(1) translate(6%,118%); -webkit-transform: rotate(0deg) scale(1) translate(6%,118%); -ms-transition: All 0s ease; -o-transition: All 0s ease; -moz-transition: All 0s ease; -webkit-transition: All 0s ease; }
-.wx-button_aznzG8{display: inline-block; margin-top: auto; margin-bottom: 0px; left: 0px; right: 0px; top: 0px; bottom: 0px; position: absolute; width: 20px; height: 30px; }
-.wx-button_dfRS93{width: 24%; height: 30px; margin: 0px 25px 2px 270px; float: none; display: inline-block; clear: none; position: absolute; padding-left: 15px; min-width: 12px; left: 0px; right: 0px; top: 0px; bottom: 0px; text-align: center; font-style: normal; font-weight: 800; font-family: 'comic sans ms'; color: rgb(31, 29, 29); padding-right: 11px; font-size: 15px; }
-.wx-text_gEAMNq{text-align: left; margin-bottom: 6px; }
-.wx-label_OJK0Lh{float: none; margin-left: auto; margin-right: 0; }
-.wx-button_9IoctN{margin: -27px 10px 6px 270px; width: 20%; height: 37px; padding-top: 3px; font-weight: 600; font-size: 16px; letter-spacing: 1px; line-height: 2.06em; font-family: 'andale mono'; border-color: rgba(230, 197, 25, 0.00784314); transform: rotate(0deg) scale(1) translate(27%,85%); transition: All 0s ease; background-attachment: fixed; background-color: rgb(233, 62, 62); background-repeat: no-repeat; -ms-transform: rotate(0deg) scale(1) translate(27%,85%); -o-transform: rotate(0deg) scale(1) translate(27%,85%); -moz-transform: rotate(0deg) scale(1) translate(27%,85%); -webkit-transform: rotate(0deg) scale(1) translate(27%,85%); -ms-transition: All 0s ease; -o-transition: All 0s ease; -moz-transition: All 0s ease; -webkit-transition: All 0s ease; }
-.wx-icon_GpfW6V{transform: rotate(0deg) scale(1) translate(329%,-102%); transition: All 0s ease; -ms-transform: rotate(0deg) scale(1) translate(329%,-102%); -o-transform: rotate(0deg) scale(1) translate(329%,-102%); -moz-transform: rotate(0deg) scale(1) translate(329%,-102%); -webkit-transform: rotate(0deg) scale(1) translate(329%,-102%); -ms-transition: All 0s ease; -o-transition: All 0s ease; -moz-transition: All 0s ease; -webkit-transition: All 0s ease; }
-.wx-text_MmFX6O{text-align: left; color: rgb(240, 109, 14); width: 12%; transform: rotate(0deg) scale(1) translate(0%,75%); transition: All 0s ease; -ms-transform: rotate(0deg) scale(1) translate(0%,75%); -o-transform: rotate(0deg) scale(1) translate(0%,75%); -moz-transform: rotate(0deg) scale(1) translate(0%,75%); -webkit-transform: rotate(0deg) scale(1) translate(0%,75%); -ms-transition: All 0s ease; -o-transition: All 0s ease; -moz-transition: All 0s ease; -webkit-transition: All 0s ease; }
-.wx-image_j8v2zp{width: 13px; height: 13px; margin-left: -23px; margin-right: -6px; transform: rotate(0deg) scale(1) translate(-999%,-55%); transition: All 0s ease; -ms-transform: rotate(0deg) scale(1) translate(-999%,-55%); -o-transform: rotate(0deg) scale(1) translate(-999%,-55%); -moz-transform: rotate(0deg) scale(1) translate(-999%,-55%); -webkit-transform: rotate(0deg) scale(1) translate(-999%,-55%); -ms-transition: All 0s ease; -o-transition: All 0s ease; -moz-transition: All 0s ease; -webkit-transition: All 0s ease; }
-.wx-view_2KhCIC{border-bottom-style: solid; border-top-style: solid; border-right-style: solid; border-left-style: solid; }
-.wx-button_B3JX9L{width: 17%; height: 33px; transform: rotate(0deg) scale(1) translate(-162%, 32%); transition: all 0s ease; font-size: 13px; line-height: 2.26em; }
-.wx-button_Sz7O9N{width: 22%; height: 33px; transform: rotate(0deg) scale(1) translate(-5%, -69%); transition: all 0s ease; font-size: 4px; line-height: 2.26em; }
-.wx-button_611IPh{width: 17%; height: 33px; transform: rotate(0deg) scale(1) translate(158%, -172%); transition: all 0s ease; font-size: 13px; line-height: 2.26em; }
-.wx-button_AZnoVA{width: 22%; height: 33px; font-size: 13px; line-height: 2.26em; transform: rotate(0deg) scale(1) translate(-119%,-76%); transition: All 0s ease; -ms-transform: rotate(0deg) scale(1) translate(-119%,-76%); -o-transform: rotate(0deg) scale(1) translate(-119%,-76%); -moz-transform: rotate(0deg) scale(1) translate(-119%,-76%); -webkit-transform: rotate(0deg) scale(1) translate(-119%,-76%); -ms-transition: All 0s ease; -o-transition: All 0s ease; -moz-transition: All 0s ease; -webkit-transition: All 0s ease; }
-.wx-button_3u4EpZ{width: 17%; height: 33px; transform: rotate(0deg) scale(1) translate(-5%, -183%); transition: all 0s ease; font-size: 13px; line-height: 2.26em; }
-.wx-button_EQeA0y{width: 17%; height: 33px; transform: rotate(0deg) scale(1) translate(159%, -284%); transition: all 0s ease; font-size: 13px; line-height: 2.26em; }
-.wx-text_3A6Hbv{margin-left: 0px; margin-right: auto; width: 24%; color: rgb(240, 109, 14); text-align: left; transform: rotate(0deg) scale(1) translate(0%,-247%); transition: All 0s ease; -ms-transform: rotate(0deg) scale(1) translate(0%,-247%); -o-transform: rotate(0deg) scale(1) translate(0%,-247%); -moz-transform: rotate(0deg) scale(1) translate(0%,-247%); -webkit-transform: rotate(0deg) scale(1) translate(0%,-247%); -ms-transition: All 0s ease; -o-transition: All 0s ease; -moz-transition: All 0s ease; -webkit-transition: All 0s ease; }
-.wx-image_Kygu3V{width: 13px; height: 13px; transform: rotate(0deg) scale(1) translate(-776%,-226%); transition: All 0s ease; -ms-transform: rotate(0deg) scale(1) translate(-776%,-226%); -o-transform: rotate(0deg) scale(1) translate(-776%,-226%); -moz-transform: rotate(0deg) scale(1) translate(-776%,-226%); -webkit-transform: rotate(0deg) scale(1) translate(-776%,-226%); -ms-transition: All 0s ease; -o-transition: All 0s ease; -moz-transition: All 0s ease; -webkit-transition: All 0s ease; }
-.wx-view_deDyWJ{transform: rotate(0deg) scale(1) translate(0%, -441%); transition: all 0s ease; background-color: transparent; }
-.wx-view_W411Yg{width: 100%; height: 26%; transform: rotate(0deg) scale(1) translate(0%,-11%); transition: All 0s ease; -ms-transform: rotate(0deg) scale(1) translate(0%,-11%); -o-transform: rotate(0deg) scale(1) translate(0%,-11%); -moz-transform: rotate(0deg) scale(1) translate(0%,-11%); -webkit-transform: rotate(0deg) scale(1) translate(0%,-11%); -ms-transition: All 0s ease; -o-transition: All 0s ease; -moz-transition: All 0s ease; -webkit-transition: All 0s ease; }
-.wx-text_j8MhRR{height: 40px; text-align: left; transform: rotate(0deg) scale(1) translate(0%,-150%); transition: All 0s ease; -ms-transform: rotate(0deg) scale(1) translate(0%,-150%); -o-transform: rotate(0deg) scale(1) translate(0%,-150%); -moz-transform: rotate(0deg) scale(1) translate(0%,-150%); -webkit-transform: rotate(0deg) scale(1) translate(0%,-150%); -ms-transition: All 0s ease; -o-transition: All 0s ease; -moz-transition: All 0s ease; -webkit-transition: All 0s ease; }
+page {
+ text-align: center;
+}
+
+
+
diff --git a/denglu/denglu.js b/denglu/denglu.js
index 512b00d..2768ef2 100644
--- a/denglu/denglu.js
+++ b/denglu/denglu.js
@@ -1,66 +1,23 @@
-// denglu2.0/denglu2.0.js
-Page({
-
- /**
- * 页面的初始数据
- */
- data: {
-
- },
-
- /**
- * 生命周期函数--监听页面加载
- */
- onLoad: function (options) {
-
- },
-
- /**
- * 生命周期函数--监听页面初次渲染完成
- */
- onReady: function () {
-
- },
-
+// jieyue/jieyue.js
+Component({
/**
- * 生命周期函数--监听页面显示
+ * 组件的属性列表
*/
- onShow: function () {
+ properties: {
},
/**
- * 生命周期函数--监听页面隐藏
+ * 组件的初始数据
*/
- onHide: function () {
-
- },
-
- /**
- * 生命周期函数--监听页面卸载
- */
- onUnload: function () {
-
- },
-
- /**
- * 页面相关事件处理函数--监听用户下拉动作
- */
- onPullDownRefresh: function () {
-
- },
-
- /**
- * 页面上拉触底事件的处理函数
- */
- onReachBottom: function () {
+ data: {
},
/**
- * 用户点击右上角分享
+ * 组件的方法列表
*/
- onShareAppMessage: function () {
+ methods: {
}
})
\ No newline at end of file
diff --git a/denglu/denglu.json b/denglu/denglu.json
index 8835af0..af33de1 100644
--- a/denglu/denglu.json
+++ b/denglu/denglu.json
@@ -1,3 +1,6 @@
{
+
+ "component": true,
+
"usingComponents": {}
}
\ No newline at end of file
diff --git a/denglu/denglu.wxml b/denglu/denglu.wxml
index 177f157..d85572e 100644
--- a/denglu/denglu.wxml
+++ b/denglu/denglu.wxml
@@ -4,4 +4,5 @@
\ No newline at end of file
+ 登 录
+
diff --git a/denglu/denglu.wxss b/denglu/denglu.wxss
index 9a58051..70e0127 100644
--- a/denglu/denglu.wxss
+++ b/denglu/denglu.wxss
@@ -54,3 +54,6 @@ border-style: solid;
margin-top:50px;
}
+
+
+
diff --git a/jieyue/jieyue.wxml b/jieyue/jieyue.wxml
index 4e8d2b6..c8137a0 100644
--- a/jieyue/jieyue.wxml
+++ b/jieyue/jieyue.wxml
@@ -1,8 +1,6 @@
-
-jieyue/jieyue.wxml
-
-
-
\ No newline at end of file
+
+
+
+
diff --git a/jieyue/jieyue.wxss b/jieyue/jieyue.wxss
index 128b4c2..ace2529 100644
--- a/jieyue/jieyue.wxss
+++ b/jieyue/jieyue.wxss
@@ -1,78 +1,22 @@
/* jieyue/jieyue.wxss */
page {
- background-image: url("http://qty83k.creatby.com/materials/143414/origin/e7ca84df3ecfa54f87273d3bb346aaad_origin.jpg"); background-size: contain; background-repeat: no-repeat;
+ background-image:url('https://photo.16pic.com/00/24/39/16pic_2439427_b.jpg');
+ background-size: contain;
+ background-repeat: no-repeat;
+
+}
+.button1{
+ width: 80%;
+ margin-top: 450rpx;
+ background-color:rgba(253, 153, 65, 0.67);
+ color: white;
+ border-radius: 98rpx;
+ display: flex;
+ flex-direction: row;
+ align-items: center;
+ justify-content: center;
+}
+.button1::after
+{
+ border: 0;
}
-
-view,scroll-view,swiper,swiper-item,icon,text,progress,button,checkbox-group,checkbox,form,input,label,picker,radio-group,radio,slider,switch,action-sheet,action-sheet-item,action-sheet-cancel,modal,toast,loading,navigator,audio,image,video,map,canvas {
- -webkit-box-sizing: border-box;
- -moz-box-sizing: border-box;
- box-sizing: border-box;
-}
-page {
- height: 100%;
- font-family: -apple-system-font,Helvetica Neue,Helvetica,sans-serif;
-}
-
-
-
-
-checkbox-group,
-radio-group{
- display:block;
-}
-
-
-
-
-:before,
-:after ,
-::before,
-::after{
- -webkit-box-sizing: border-box;
- -moz-box-sizing: border-box;
- box-sizing: border-box;
-}
-.c-minheight {
- min-height: 80px;
-}
-.c-full {
- width: 100%;
- height: 100%;
-}
-.c-block {
- display: block;
-}
-.c-autosize {
- width: auto;
- height: auto;
-}
-.c-fullwidth {
- width: 100%;
-}
-.c-fullheight {
- height: 100%;
-}
-.c-initHide{
- opacity:0 !important;
-}
-.c-ellipse{
- text-overflow: ellipsis;
- display: -webkit-box;
- -webkit-box-orient: vertical;
- -webkit-line-clamp: 2;
- overflow:hidden;
-}
-/* 自定义样式 */
-
-
-
-
-.body_PPYMWQ{background-image: url("http://qty83k.creatby.com/materials/143414/origin/e7ca84df3ecfa54f87273d3bb346aaad_origin.jpg"); background-size: contain; background-repeat: no-repeat; }
-.wx-button_FNtt93{border-style: none; border-color: transparent; margin: 230px 25px 10px; border-radius: 20px; transition: all; font-family: andale mono; background-attachment: fixed; transform: rotate(0deg) scale(1) translate(0%, -43%); background-color: rgba(253,153, 65, 0.67); }
-.wx-button_MrC8rl{border-radius: 20px; margin-right: 25px; margin-left: 25px; border-bottom-right-radius: 20px; border-bottom-left-radius: 20px; border-top-right-radius: 20px; border-top-left-radius: 20px; }
-.wx-button_XgkbLE{border-radius: 20px; transition: all; margin-top: 210px; margin-right: 100px; margin-left: 100px; opacity: 0.73; background-color: rgba(253,153, 65, 0.67);}
-.wx-view_g5MjCx{border-radius: 200px; transition: all; transform: rotate(0deg) scale(1) translate(0%, -434%);}
-
-
-
-