Merge refs/remotes/真香/master into refs/heads/master

app.json

@@ -1,3 +1,59 @@
+<<<<<<< HEAD
+{
+  "pages": [
+    
+    "shouye/shouye",
+    "chazhao/chazhao",
+    "jieyue/jieyue",
+    "denglu/denglu",
+    "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"
+      }
+      
+     
+    ]
+  }
+
+
+
+
+
+=======
 {
   "pages": [
     "denglu/denglu",
@@ -44,4 +100,5 @@
       }
     ]
   }
+>>>>>>> f7e8073ec38dbefbf543cb0f7243d1133f9a65e1
 }

shouye/shouye.wxml

@@ -1,8 +1,6 @@
-<image class="wx-image_932ETV"  mode="scaleToFill" src="http://qty83k.creatby.com/materials/143410/origin/09f2cc7b30d902cf6b776b9f51592073_origin.jpg" style="background-size:  100% 100%; background-position:  0% 0%; background-repeat:  no-repeat; background-image: url(http://qty83k.creatby.com/materials/143410/origin/09f2cc7b30d902cf6b776b9f51592073_origin.jpg); "/>
+<view class="flex-row" style="display: flex;"><image class="xiaohui"  mode="scaleToFill" style="background-size:  100% 100%; background-position:  0% 0%; background-repeat:  no-repeat; background-image: url(http://qty83k.creatby.com/materials/143410/origin/09f2cc7b30d902cf6b776b9f51592073_origin.jpg); "/></view>
-<text class="c-block wx-text_ymvzSH" >真香图书管理系统</text>
+<view class="flex-row" style="display: flex;"><text class="zxglxt" >真香图书管理系统</text></view>
-<image class="wx-image_YwOoSq"  mode="scaleToFill" src="http://qty83k.creatby.com/materials/143410/origin/4b8b98ccdd7ee31db30c3396304e9a49_origin.jpg" style="background-size:  100% 100%; background-position:  0% 0%; background-repeat:  no-repeat; background-image: url(http://qty83k.creatby.com/materials/143410/origin/4b8b98ccdd7ee31db30c3396304e9a49_origin.jpg); "/>
+<view class="flex-row" style="display: flex;"><image class="lingdang"  mode="scaleToFill" src="http://qty83k.creatby.com/materials/143410/origin/4b8b98ccdd7ee31db30c3396304e9a49_origin.jpg" style="background-size:  100% 100%; background-position:  0% 0%; background-repeat:  no-repeat; background-image: url(http://qty83k.creatby.com/materials/143410/origin/4b8b98ccdd7ee31db30c3396304e9a49_origin.jpg); "/><text class="tongzhi" >最新通知</text></view>
-<text class="c-block wx-text_oSMfDx" >最新通知</text>
+<view class="flex-row" style="display: flex;"><textarea class="wenbenkuang"  name="textarea1" placeholder="点击编辑文字" type="textarea"/></view>
-<textarea class="c-block c-fullwidth wx-textarea_MFH8uy"  name="textarea1" placeholder="点击编辑文字" type="textarea"/>
+<view class="flex-row" style="display: flex;"><image class="xingxing"  mode="scaleToFill" src="http://qty83k.creatby.com/materials/143410/origin/fb6ddb69dd70e448c86c0f24723487dd_origin.jpg" style="background-size:  100% 100%; background-position:  0% 0%; background-repeat:  no-repeat; background-image: url(http://qty83k.creatby.com/materials/143410/origin/fb6ddb69dd70e448c86c0f24723487dd_origin.jpg); "/><text class="tuijian" >书籍推荐</text></view>
-<image class="wx-image_HUHYdx"  mode="scaleToFill" src="http://qty83k.creatby.com/materials/143410/origin/fb6ddb69dd70e448c86c0f24723487dd_origin.jpg" style="background-size:  100% 100%; background-position:  0% 0%; background-repeat:  no-repeat; background-image: url(http://qty83k.creatby.com/materials/143410/origin/fb6ddb69dd70e448c86c0f24723487dd_origin.jpg); "/>
+
-<text class="c-block wx-text_NtuhgZ" >书籍推荐</text>
-<image class="wx-image_X5bpvb"  mode="scaleToFill" src="http://qty83k.creatby.com/materials/143410/origin/0f7db99d1cefaff2c52175de758e9d9d_origin.jpg" style="background-size:  100% 100%; background-position:  0% 0%; background-repeat:  no-repeat; background-image: url(http://qty83k.creatby.com/materials/143410/origin/0f7db99d1cefaff2c52175de758e9d9d_origin.jpg); "/>

shouye/shouye.wxss

@@ -1,48 +1,45 @@
 .xiaohui{padding-left:  31px;
-margin-left: 137px;
+margin:  -21px 37px -22px 137px;
-width:  80px;
+width:  70px;
-height:  80px;
+height:  70px;
-margin-right:  37px;
+display:  block;
-repeat: no-repeat;}
+padding-bottom:  31px;
-.zhenxiang{width:  200px;
+margin-top: 5px;
+}
+.zxglxt{width:  180px;
 height:  30px;
-margin-left: 100px;}
+color: #141e7a;
-.lingdang{width:  17px;
+font-size: 21px;
-height: 17px;
+margin-left:103px;
-margin-left:  20px;
+margin-top: 29px;
-transform:  rotate(0deg) scale(1) translate(0%, 109%);
-transition:  all 0s ease;
 }
+.lingdang{width:  17px;
+margin-top: 40px;
+height:  17px;
+margin-left:  20px;}
 .tongzhi{width:  100px;
 height:  30px;
-font-size: 16px;
+font-size:  16px;
+margin-top: 37px;
 color:  rgb(253, 119, 65);
-margin-left:  51px;
+margin-left:  15px;}
-transform:  rotate(0deg) scale(1) translate(0%, -22%);
-transition:  all 0s ease;}
 .wenbenkuang{margin-bottom:  -73px;
 padding-bottom:  46px;
-margin-top:  1px;
+margin-top: 0px;
 padding-top:  7px;
-height: 120px;
+height:  120px;
+width:  90%;
+margin-left:  5%;
 }
 .xingxing{width:  19px;
 height:  19px;
 margin-left:  19px;
-transform: rotate(0deg) scale(1) translate(0%,480%);
+margin-top:  40px;}
-transition: All 0s ease;
--ms-transform: rotate(0deg) scale(1) translate(0%,480%);
--o-transform: rotate(0deg) scale(1) translate(0%,480%);
--moz-transform: rotate(0deg) scale(1) translate(0%,480%);
--webkit-transform: rotate(0deg) scale(1) translate(0%,480%);
--ms-transition: All 0s ease;
--o-transition: All 0s ease;
--moz-transition: All 0s ease;
--webkit-transition: All 0s ease;
-}
 .tuijian{font-size:  16px;
 color:  rgb(253, 119, 65);
 width:  100px;
-height:  30px;}
+height:  30px;
+margin-top:  40px;
+margin-left: 10px;}