miniprogram / appui · 提交

转到一个项目

作者 李洪娟
提交 14371862177cf76da040da16d158b1f0a05ee1fc 2 个父辈 fca99a4b ec7f5fbb

合并分支 'lhj' 到 'master' 

Lhj



查看合并请求 !19
内嵌 并排对比
正在显示 5 个修改的文件 包含 267 行增加 和 16 行删除
... ... @@ -131,12 +131,12 @@
.timetop {
color: #999;
font-size: 24rpx;
font-size: 26rpx;
}
.timebottom {
color: #999;
font-size: 32rpx;
font-size: 30rpx;
margin-top: 10rpx;
}
... ...
... ... @@ -15,7 +15,30 @@ Page({
chaxun:true,
reset:true,
// 显示企业信息搜索还是查询列表
qiyexinxi:false
qiyexinxi:false,
qiyeinfoname:'',
list: [
{
date: "2019/06/15 16:23:00",
title: "连续不开工预警",
name: "深圳华翰技术有限公司",
time: "2019-06-15 13:00:32",
des: "企业连续三天不开工",
type: 1
},
{
date: "2019/06/15 16:23:00",
title: "连续不开工预警",
name: "深圳华翰技术有限公司",
time: "2019-06-15 13:00:32",
des: "企业连续三天不开工",
type: 1
}
],
historylist: ['华翰技术', '华翰技术', '华翰技术', '华翰技术','深圳华翰技术有限公司'],
//显示企业信息还是企业列表
qiyexinxi:true,
historyshow:false
},
/**
... ... @@ -27,7 +50,27 @@ Page({
enddate: app.qiendate()
})
},
// 清除企业信息
clear(){
this.setData({
qiyeinfoname:''
})
},
//查询企业列表
chauxn(){
this.setData({
qiyexinxi:false
})
},
//企业列表取消
cancellist(){
this.setData({
qiyexinxi:true,
qiyeinfoname:''
})
},
//输入企业姓名
enterqiyename(e){
this.setData({
... ... @@ -41,6 +84,27 @@ Page({
})
}
},
//企业信息查询
enterqiye(){
this.setData({
historyshow:true
})
},
//取消企业信息
cancelqisinxi(){
this.setData({
historyshow:false
})
},
golist(){
this.setData({
historyshow:false,
qiyexinxi:false
})
},
// 显示时间弹出层
begintime(){
this.setData({
... ... @@ -139,6 +203,13 @@ Page({
})
},
//跳转企业详情页面
toDetail(){
wx.navigateTo({
url: '/pages/yujing/yujingDetail/yujingDetail',
})
},
/**
* 生命周期函数--监听页面初次渲染完成
... ...
... ... @@ -40,15 +40,25 @@
</view>
</view>
<!-- 搜索弹出层 -->
<view class="register searchregister" wx:if="{{historyshow}}">
<view class="searchname">搜素历史</view>
<view class="historybox">
<view class='historyitem' bindtap="golist" wx:for="{{historylist}}" wx:key="">{{item}}</view>
</view>
</view>
<!-- 企业信息输入 -->
<view class="qiyexinxi" wx:if="{{qiyexinxi}}">
<view class="search">
<view class="searchbox">
<view class="searchinput">
<input placeholder='输入企业信息' placeholder-class='qiyeinfo' placeholder-class='enterqiname' />
<input placeholder='输入企业信息' placeholder-class='qiyeinfo' placeholder-class='enterqiname' bindconfirm="enterqiye" value="{{qiyeinfoname}}" />
</view>
<view class="quxiao">
<view class="quxiao" bindtap="cancelqisinxi">
取消
</view>
</view>
... ... @@ -93,7 +103,7 @@
<view class="chaxun" wx:if="{{chaxun}}">查询</view>
<view class="chaxun cha" wx:else>查询</view>
<view class="chaxun cha" wx:else bindtap="chauxn">查询</view>
<view class="reset" wx:if="{{reset}}">重置</view>
<view class="reset re" wx:else>重置</view>
... ... @@ -101,6 +111,42 @@
<!-- 企业列表 -->
<view class="qiyelsit">
<view class="qiyeitem"></view>
<view class="qiyecontent" wx:else>
<view class="searchbox">
<view class="searchinput">
<input placeholder='输入企业信息' placeholder-class='qiyeinfo' placeholder-class='enterqiname' bindconfirm="enterqiye" value="{{qiyeinfoname}}" />
<view class="quxiaoimg" wx:if="{{qiyexinxi==false}}" bindtap="clear">
<image src="/img/chahao.png"></image>
</view>
</view>
<view class="quxiao" bindtap="cancellist">
取消
</view>
</view>
<view class="qiyelsit">
<view class="warn_msg" wx:for="{{list}}" wx:key="">
<view class="msg_detail">
<view class="msg_box">
<view class="detail_single detail_title">
<view class="{{item.type == 1?'detail_symbol':''}}"></view>
<view>{{item.title}}</view>
</view>
<view class="detail_single">企业名称：{{item.name}}</view>
<view class="detail_single">报警时间：{{item.time}}</view>
<view class="detail_single">报警描述：{{item.des}}</view>
<view class="watch_detail" bindtap='toDetail' data-item="{{item}}">
查看详情
<view class="watch_icon">
<image src='/img/demo25.png'></image>
</view>
</view>
</view>
</view>
</view>
</view>
</view>
\ No newline at end of file
... ...
... ... @@ -3,7 +3,7 @@ page {
background: #f4f4f4;
}
.search {
.searchbox {
display: flex;
align-items: center;
justify-content: space-between;
... ... @@ -11,27 +11,37 @@ page {
padding: 14rpx 44rpx;
box-sizing: border-box;
background: #fff;
}
.searchinput {
width: 575rpx;
width: 85%;
padding: 10rpx 20rpx 10rpx 74rpx;
box-sizing: border-box;
background: #ebecee;
border-radius: 30rpx;
color: #a4a4a4;
font-size: 28rpx;
position: relative;
}
searchinput input {
width: 575rpx;
padding: 10rpx 20rpx 10rpx 74rpx;
.searchinput input {
width: 415rpx;
box-sizing: border-box;
}
.quxiaoimg{
width:33rpx;
height:33rpx;
font-size: 0;
position: absolute;
top:16rpx;
right:28rpx;
}
.quxiao {
color: #ff9400;
margin-left: 30rpx;
margin-bottom:8rpx;
}
.qiyeinfo {
... ... @@ -133,4 +143,128 @@ searchinput input {
color:#333333;
font-size: 32rpx;
margin-left:25rpx;
}
.search {
background-color: #fff;
padding: 19rpx 30rpx;
display: flex;
flex-direction: row;
align-items: center;
justify-content: space-between;
font-size: 36rpx;
color: #333;
}
.search_icon {
width: 42rpx;
height: 42rpx;
}
.warn_msg {
padding: 40rpx 30rpx 0;
display: flex;
flex-direction: column;
align-items: center;
}
.warn_time {
padding: 7rpx 21rpx;
background: rgba(214, 216, 218, 1);
border-radius: 26rpx;
color: #fff;
font-size: 24rpx;
margin-bottom: 30rpx;
}
.msg_detail {
background-color: #fff;
width: 100%;
border-radius: 10px;
border: 1rpx solid #c5c5c5;
}
.msg_box {
padding: 0 30rpx;
}
.detail_single {
padding: 20rpx 0;
border-bottom: 1rpx solid #f5f5f5;
font-size: 24rpx;
color: #666;
width: 100%;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
}
.detail_title {
display: flex;
flex-direction: row;
justify-content: flex-start;
align-items: center;
font-size: 32rpx;
color: #333;
}
.detail_symbol {
width: 20rpx;
height: 20rpx;
background: rgba(255, 48, 56, 1);
border-radius: 50%;
margin-right: 10rpx;
}
.watch_detail {
display: flex;
flex-direction: row;
justify-content: space-between;
align-items: center;
padding: 20rpx 0;
color: #ff9400;
}
.watch_icon {
width: 30rpx;
height: 30rpx;
}
.qiyeboxhead{
display:flex;
align-items: center;
}
.quxiaoimg{
width:30rpx;
height:30rpx;
font-size: 0;
}
.searchregister{
background: #fff;
top:85rpx;
}
/* 搜索弹出层 */
.searchname{
color:#A4A4A4;
font-size: 28rpx;
padding: 40rpx 40rpx 35rpx 31rpx;
box-sizing: border-box
}
.historybox{
display:flex;
align-items: center;
padding: 0 31rpx;
flex-wrap: wrap
}
.historyitem{
padding: 10rpx 18rpx;
box-sizing: border-box;
color:#666666;
font-size: 28rpx;
background: #F4F4F4;
border-radius: 6rpx;
margin-right:20rpx;
margin-top:20rpx;
}
\ No newline at end of file
... ...