From 4b9b8d745fbecc6f1f330e046b7685991fbbfa6f Mon Sep 17 00:00:00 2001
From: zjm2xzy99 <864576945@qq.com>
Date: Wed, 16 Jan 2019 10:35:40 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E8=83=8Cnew?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.json             | 13 ++-----------
 chazhao/chazhao.js   |  6 +-----
 chazhao/chazhao.wxml |  2 +-
 jieyue/jieyue.wxml   | 10 +++-------
 shouye/shouye.wxss   |  2 +-
 shuji/shuji.wxml     | 16 ++--------------
 shuji/shuji.wxss     | 16 ++++++++--------
 7 files changed, 18 insertions(+), 47 deletions(-)

diff --git a/app.json b/app.json
index d64b39b..84eaf7c 100644
--- a/app.json
+++ b/app.json
@@ -1,21 +1,12 @@
 
 {
   "pages": [
-<<<<<<< Updated upstream
-<<<<<<< Updated upstream
-    "denglu/denglu",
-=======
-    
->>>>>>> Stashed changes
+   "shouye/shouye", "denglu/denglu",
     "wode/wode",
     "gerenxinxi/gerenxinxi",
     "shuji/shuji",
-    
-=======
     "chazhao/chazhao",
-    "wode/wode",
->>>>>>> Stashed changes
-    "shouye/shouye",
+  
     
     "jieyue/jieyue",
     "jieyuejilu/yiwancheng/yiwancheng",
diff --git a/chazhao/chazhao.js b/chazhao/chazhao.js
index 91579f6..caff304 100644
--- a/chazhao/chazhao.js
+++ b/chazhao/chazhao.js
@@ -2,12 +2,8 @@ Page({
   shujichzhao: function (e) {
    var that = this
     wx.request({
-<<<<<<< Updated upstream
       url: 'http://localhost:9528/zxbook/find1',
-=======
-      
-      url: 'http://localhost:9527/zxbook/find1',
->>>>>>> Stashed changes
+
       data: {
         'search': e.detail.value.search,
       },
diff --git a/chazhao/chazhao.wxml b/chazhao/chazhao.wxml
index 759cc86..ccb1d9e 100644
--- a/chazhao/chazhao.wxml
+++ b/chazhao/chazhao.wxml
@@ -1,4 +1,4 @@
-<!--chazhao/chazhao.wxml-->
+
 <form bindsubmit="shujichzhao" > 
 <view class='page_row' >  
       <view class="search">  
diff --git a/jieyue/jieyue.wxml b/jieyue/jieyue.wxml
index 610a85c..fc8a341 100644
--- a/jieyue/jieyue.wxml
+++ b/jieyue/jieyue.wxml
@@ -1,11 +1,7 @@
-<<<<<<< Updated upstream
 
-<!--jieyue/jieyue.wxml-->
+
 <button class="button1" bindtap='sss'>
-=======
-<!--jieyue/jieyue.wxml-->
-<button class="button1">
->>>>>>> Stashed changes
+<button class="button2">
     扫一扫
-</button>
+</button></button>
 
diff --git a/shouye/shouye.wxss b/shouye/shouye.wxss
index fb75b51..a061578 100644
--- a/shouye/shouye.wxss
+++ b/shouye/shouye.wxss
@@ -1,5 +1,5 @@
 page { 
-    background-image:url('http://p0.so.qhimgs1.com/bdr/_240_/t01c068aeebee72fdf0.jpg'); 
+    background-image:url('http://img1.3lian.com/img2011/w1/104/31/d/51.jpg'); 
 }
 
 .xiaohui{padding-left:  31px;
diff --git a/shuji/shuji.wxml b/shuji/shuji.wxml
index 266af5c..7380824 100644
--- a/shuji/shuji.wxml
+++ b/shuji/shuji.wxml
@@ -1,17 +1,5 @@
 <view class="c-minheight wx-view_3ZhLNq" /> 
-<<<<<<< Updated upstream
-<text class="c-block wx-text_efNLZY" >书名：</text> 
-<text class="c-block wx-text_efNLZY" >{{bookname}}</text> 
-<text class="c-block wx-text_07leZC" >书号：</text> 
-<text class="c-block wx-text_07leZC" >{{bookid}}</text> 
-<text class="c-block wx-text_MWTyqb" >作者：</text>
-<text class="c-block wx-text_MWTyqb" >{{bookauthor}}</text>
-<text class="c-block wx-text_123" >库存：</text>
-<text class="c-block wx-text_123" >{{booknum}}</text>
-<text class="c-block wx-text_456" >分类：</text>
-<text class="c-block wx-text_456" >{{booksort}}</text>
-<button class="borrow">借阅</button>
-=======
+
 <text class="c-block 1" >书名：</text> 
 <text class="c-block 1" >{{bookname}}</text> 
 <text class="c-block 2" >书号：</text> 
@@ -23,4 +11,4 @@
 <text class="c-block 5" >分类：</text>
 <text class="c-block 5" >{{booksort}}</text>
 <button class="borrow" bindtap="borrowsubmit">借阅</button>
->>>>>>> Stashed changes
+
diff --git a/shuji/shuji.wxss b/shuji/shuji.wxss
index cb59bc8..5799f7e 100644
--- a/shuji/shuji.wxss
+++ b/shuji/shuji.wxss
@@ -74,13 +74,13 @@ radio-group{
  
  
 .wx-view_3ZhLNq{transition: All 0s ease; margin-right:  150px; margin-left:  150px; transform: rotate(0deg) scale(1.6) translate(0%,43%); -ms-transform: rotate(0deg) scale(1.6) translate(0%,43%); -o-transform: rotate(0deg) scale(1.6) translate(0%,43%); -moz-transform: rotate(0deg) scale(1.6) translate(0%,43%); -webkit-transform: rotate(0deg) scale(1.6) translate(0%,43%); -ms-transition: All 0s ease; -o-transition: All 0s ease; -moz-transition: All 0s ease; -webkit-transition: All 0s ease; } 
-.wx-text_efNLZY{transition: All 0s ease; margin-right:  80px; margin-left:  80px; transform: rotate(0deg) scale(1.2) translate(0%,434%); -ms-transform: rotate(0deg) scale(1.2) translate(0%,434%); -o-transform: rotate(0deg) scale(1.2) translate(0%,434%); -moz-transform: rotate(0deg) scale(1.2) translate(0%,434%); -webkit-transform: rotate(0deg) scale(1.2) translate(0%,434%); -ms-transition: All 0s ease; -o-transition: All 0s ease; -moz-transition: All 0s ease; -webkit-transition: All 0s ease; } 
-.wx-text_07leZC{transition: All 0s ease; margin-right:  80px; margin-left:  80px; transform: rotate(0deg) scale(1.2) translate(0%,543%); -ms-transform: rotate(0deg) scale(1.2) translate(0%,543%); -o-transform: rotate(0deg) scale(1.2) translate(0%,543%); -moz-transform: rotate(0deg) scale(1.2) translate(0%,543%); -webkit-transform: rotate(0deg) scale(1.2) translate(0%,543%); -ms-transition: All 0s ease; -o-transition: All 0s ease; -moz-transition: All 0s ease; -webkit-transition: All 0s ease; } 
-.wx-text_MWTyqb{transition: All 0s ease; margin-right:  80px; margin-left:  80px; transform: rotate(0deg) scale(1.2) translate(0%,652%); -ms-transform: rotate(0deg) scale(1.2) translate(0%,652%); -o-transform: rotate(0deg) scale(1.2) translate(0%,652%); -moz-transform: rotate(0deg) scale(1.2) translate(0%,652%); -webkit-transform: rotate(0deg) scale(1.2) translate(0%,652%); -ms-transition: All 0s ease; -o-transition: All 0s ease; -moz-transition: All 0s ease; -webkit-transition: All 0s ease; } 
-<<<<<<< Updated upstream
-.wx-text_123{transition: All 0s ease; margin-right:  80px; margin-left:  80px; transform: rotate(0deg) scale(1.2) translate(0%,761%); -ms-transform: rotate(0deg) scale(1.2) translate(0%,761%); -o-transform: rotate(0deg) scale(1.2) translate(0%,761%); -moz-transform: rotate(0deg) scale(1.2) translate(0%,761%); -webkit-transform: rotate(0deg) scale(1.2) translate(0%,761%); -ms-transition: All 0s ease; -o-transition: All 0s ease; -moz-transition: All 0s ease; -webkit-transition: All 0s ease; } 
-.wx-text_456{transition: All 0s ease; margin-right:  80px; margin-left:  80px; transform: rotate(0deg) scale(1.2) translate(0%,870%); -ms-transform: rotate(0deg) scale(1.2) translate(0%,870%); -o-transform: rotate(0deg) scale(1.2) translate(0%,870%); -moz-transform: rotate(0deg) scale(1.2) translate(0%,870%); -webkit-transform: rotate(0deg) scale(1.2) translate(0%,870%); -ms-transition: All 0s ease; -o-transition: All 0s ease; -moz-transition: All 0s ease; -webkit-transition: All 0s ease; } 
-=======
+.wx-1{transition: All 0s ease; margin-right:  80px; margin-left:  80px; transform: rotate(0deg) scale(1.2) translate(0%,434%); -ms-transform: rotate(0deg) scale(1.2) translate(0%,434%); -o-transform: rotate(0deg) scale(1.2) translate(0%,434%); -moz-transform: rotate(0deg) scale(1.2) translate(0%,434%); -webkit-transform: rotate(0deg) scale(1.2) translate(0%,434%); -ms-transition: All 0s ease; -o-transition: All 0s ease; -moz-transition: All 0s ease; -webkit-transition: All 0s ease; } 
+.wx-2{transition: All 0s ease; margin-right:  80px; margin-left:  80px; transform: rotate(0deg) scale(1.2) translate(0%,543%); -ms-transform: rotate(0deg) scale(1.2) translate(0%,543%); -o-transform: rotate(0deg) scale(1.2) translate(0%,543%); -moz-transform: rotate(0deg) scale(1.2) translate(0%,543%); -webkit-transform: rotate(0deg) scale(1.2) translate(0%,543%); -ms-transition: All 0s ease; -o-transition: All 0s ease; -moz-transition: All 0s ease; -webkit-transition: All 0s ease; } 
+.wx-3{transition: All 0s ease; margin-right:  80px; margin-left:  80px; transform: rotate(0deg) scale(1.2) translate(0%,652%); -ms-transform: rotate(0deg) scale(1.2) translate(0%,652%); -o-transform: rotate(0deg) scale(1.2) translate(0%,652%); -moz-transform: rotate(0deg) scale(1.2) translate(0%,652%); -webkit-transform: rotate(0deg) scale(1.2) translate(0%,652%); -ms-transition: All 0s ease; -o-transition: All 0s ease; -moz-transition: All 0s ease; -webkit-transition: All 0s ease; } 
+
+.wx-4{transition: All 0s ease; margin-right:  80px; margin-left:  80px; transform: rotate(0deg) scale(1.2) translate(0%,761%); -ms-transform: rotate(0deg) scale(1.2) translate(0%,761%); -o-transform: rotate(0deg) scale(1.2) translate(0%,761%); -moz-transform: rotate(0deg) scale(1.2) translate(0%,761%); -webkit-transform: rotate(0deg) scale(1.2) translate(0%,761%); -ms-transition: All 0s ease; -o-transition: All 0s ease; -moz-transition: All 0s ease; -webkit-transition: All 0s ease; } 
+.wx-5{transition: All 0s ease; margin-right:  80px; margin-left:  80px; transform: rotate(0deg) scale(1.2) translate(0%,870%); -ms-transform: rotate(0deg) scale(1.2) translate(0%,870%); -o-transform: rotate(0deg) scale(1.2) translate(0%,870%); -moz-transform: rotate(0deg) scale(1.2) translate(0%,870%); -webkit-transform: rotate(0deg) scale(1.2) translate(0%,870%); -ms-transition: All 0s ease; -o-transition: All 0s ease; -moz-transition: All 0s ease; -webkit-transition: All 0s ease; } 
+
 .borrow{
   width: 50%;
   margin-top: 100rpx;
@@ -96,4 +96,4 @@ radio-group{
   width: 40%;
   margin-top: 10px;
 }
->>>>>>> Stashed changes
+