zxy19971014
/
zx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

首页背new

Browse Source
master
zjm2xzy99 6 years ago
parent 37bc9a14b7
commit 4b9b8d745f
7 changed files with 18 additions and 47 deletions
Show Stats Download Patch File Download Diff File

13
app.json
Unescape View File

@ -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",

6
chazhao/chazhao.js
Unescape View File

@ -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,
},

2
chazhao/chazhao.wxml
Unescape View File

@ -1,4 +1,4 @@
<!--chazhao/chazhao.wxml-->
<form bindsubmit="shujichzhao" >
<view class='page_row' >
<view class="search">

10
jieyue/jieyue.wxml
Unescape View File

@ -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>

2
shouye/shouye.wxss
Unescape View File

@ -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;

16
shuji/shuji.wxml
Unescape View File

@ -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

16
shuji/shuji.wxss
Unescape View File

@ -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

Write Preview
Loading…
Cancel
Save