miniprogram / appui · 提交

转到一个项目

作者 lihongjuan
提交 e1cabbfa323eb7f897b97bba855576f23e62e578 1 个父辈 beac1830

234123523

内嵌 并排对比
正在显示 6 个修改的文件 包含 267 行增加 和 17 行删除
@@ -14,7 +14,6 @@ @@ -14,7 +14,6 @@
14 "pages/companybox/zhishudetail/shebei/shebeidetail/shebeidetail", 14 "pages/companybox/zhishudetail/shebei/shebeidetail/shebeidetail",
15 "pages/companybox/zhishudetail/shebei/shebeilist/shebeilist", 15 "pages/companybox/zhishudetail/shebei/shebeilist/shebeilist",
16 "pages/companybox/qiyedetail/qiyedetail", 16 "pages/companybox/qiyedetail/qiyedetail",
17 -  
18 "pages/companybox/zhishudetail/car/car", 17 "pages/companybox/zhishudetail/car/car",
19 "pages/companybox/zhishudetail/yuanliaomsg/yuanliao/yuanliao", 18 "pages/companybox/zhishudetail/yuanliaomsg/yuanliao/yuanliao",
20 "pages/qiye/qiye", 19 "pages/qiye/qiye",
@@ -131,12 +131,12 @@ @@ -131,12 +131,12 @@
131 131
132 .timetop { 132 .timetop {
133 color: #999; 133 color: #999;
134 - font-size: 24rpx; 134 + font-size: 26rpx;
135 } 135 }
136 136
137 .timebottom { 137 .timebottom {
138 color: #999; 138 color: #999;
139 - font-size: 32rpx; 139 + font-size: 30rpx;
140 margin-top: 10rpx; 140 margin-top: 10rpx;
141 } 141 }
142 142
@@ -15,7 +15,30 @@ Page({ @@ -15,7 +15,30 @@ Page({
15 chaxun:true, 15 chaxun:true,
16 reset:true, 16 reset:true,
17 // 显示企业信息搜索还是查询列表 17 // 显示企业信息搜索还是查询列表
18 - qiyexinxi:false 18 + qiyexinxi:false,
  19 + qiyeinfoname:'',
  20 + list: [
  21 + {
  22 + date: "2019/06/15 16:23:00",
  23 + title: "连续不开工预警",
  24 + name: "深圳华翰技术有限公司",
  25 + time: "2019-06-15 13:00:32",
  26 + des: "企业连续三天不开工",
  27 + type: 1
  28 + },
  29 + {
  30 + date: "2019/06/15 16:23:00",
  31 + title: "连续不开工预警",
  32 + name: "深圳华翰技术有限公司",
  33 + time: "2019-06-15 13:00:32",
  34 + des: "企业连续三天不开工",
  35 + type: 1
  36 + }
  37 + ],
  38 + historylist: ['华翰技术', '华翰技术', '华翰技术', '华翰技术','深圳华翰技术有限公司'],
  39 + //显示企业信息还是企业列表
  40 + qiyexinxi:true,
  41 + historyshow:false
19 }, 42 },
20 43
21 /** 44 /**
@@ -27,6 +50,26 @@ Page({ @@ -27,6 +50,26 @@ Page({
27 enddate: app.qiendate() 50 enddate: app.qiendate()
28 }) 51 })
29 }, 52 },
  53 + // 清除企业信息
  54 + clear(){
  55 + this.setData({
  56 + qiyeinfoname:''
  57 + })
  58 + },
  59 + //查询企业列表
  60 + chauxn(){
  61 + this.setData({
  62 + qiyexinxi:false
  63 + })
  64 + },
  65 + //企业列表取消
  66 + cancellist(){
  67 + this.setData({
  68 + qiyexinxi:true,
  69 + qiyeinfoname:''
  70 + })
  71 + },
  72 +
30 73
31 //输入企业姓名 74 //输入企业姓名
32 enterqiyename(e){ 75 enterqiyename(e){
@@ -41,6 +84,27 @@ Page({ @@ -41,6 +84,27 @@ Page({
41 }) 84 })
42 } 85 }
43 }, 86 },
  87 +
  88 + //企业信息查询
  89 +
  90 + enterqiye(){
  91 + this.setData({
  92 + historyshow:true
  93 + })
  94 + },
  95 +
  96 + //取消企业信息
  97 + cancelqisinxi(){
  98 + this.setData({
  99 + historyshow:false
  100 + })
  101 + },
  102 + golist(){
  103 + this.setData({
  104 + historyshow:false,
  105 + qiyexinxi:false
  106 + })
  107 + },
44 // 显示时间弹出层 108 // 显示时间弹出层
45 begintime(){ 109 begintime(){
46 this.setData({ 110 this.setData({
@@ -139,6 +203,13 @@ Page({ @@ -139,6 +203,13 @@ Page({
139 }) 203 })
140 }, 204 },
141 205
  206 + //跳转企业详情页面
  207 + toDetail(){
  208 + wx.navigateTo({
  209 + url: '/pages/yujing/yujingDetail/yujingDetail',
  210 + })
  211 + },
  212 +
142 213
143 /** 214 /**
144 * 生命周期函数--监听页面初次渲染完成 215 * 生命周期函数--监听页面初次渲染完成
@@ -40,15 +40,25 @@ @@ -40,15 +40,25 @@
40 </view> 40 </view>
41 </view> 41 </view>
42 42
  43 +<!-- 搜索弹出层 -->
  44 +
  45 +<view class="register searchregister" wx:if="{{historyshow}}">
  46 + <view class="searchname">搜素历史</view>
  47 + <view class="historybox">
  48 + <view class='historyitem' bindtap="golist" wx:for="{{historylist}}" wx:key="">{{item}}</view>
  49 +
  50 + </view>
  51 +</view>
  52 +
43 <!-- 企业信息输入 --> 53 <!-- 企业信息输入 -->
44 <view class="qiyexinxi" wx:if="{{qiyexinxi}}"> 54 <view class="qiyexinxi" wx:if="{{qiyexinxi}}">
45 55
46 - <view class="search"> 56 + <view class="searchbox">
  57 +
47 <view class="searchinput"> 58 <view class="searchinput">
48 - <input placeholder='输入企业信息' placeholder-class='qiyeinfo' placeholder-class='enterqiname' /> 59 + <input placeholder='输入企业信息' placeholder-class='qiyeinfo' placeholder-class='enterqiname' bindconfirm="enterqiye" value="{{qiyeinfoname}}" />
49 </view> 60 </view>
50 -  
51 - <view class="quxiao"> 61 + <view class="quxiao" bindtap="cancelqisinxi">
52 取消 62 取消
53 </view> 63 </view>
54 </view> 64 </view>
@@ -93,7 +103,7 @@ @@ -93,7 +103,7 @@
93 103
94 <view class="chaxun" wx:if="{{chaxun}}">查询</view> 104 <view class="chaxun" wx:if="{{chaxun}}">查询</view>
95 105
96 - <view class="chaxun cha" wx:else>查询</view> 106 + <view class="chaxun cha" wx:else bindtap="chauxn">查询</view>
97 107
98 <view class="reset" wx:if="{{reset}}">重置</view> 108 <view class="reset" wx:if="{{reset}}">重置</view>
99 <view class="reset re" wx:else>重置</view> 109 <view class="reset re" wx:else>重置</view>
@@ -101,6 +111,42 @@ @@ -101,6 +111,42 @@
101 111
102 <!-- 企业列表 --> 112 <!-- 企业列表 -->
103 113
104 -<view class="qiyelsit">  
105 - <view class="qiyeitem"></view> 114 +<view class="qiyecontent" wx:else>
  115 + <view class="searchbox">
  116 +
  117 + <view class="searchinput">
  118 + <input placeholder='输入企业信息' placeholder-class='qiyeinfo' placeholder-class='enterqiname' bindconfirm="enterqiye" value="{{qiyeinfoname}}" />
  119 +
  120 + <view class="quxiaoimg" wx:if="{{qiyexinxi==false}}" bindtap="clear">
  121 + <image src="/img/chahao.png"></image>
  122 + </view>
  123 + </view>
  124 + <view class="quxiao" bindtap="cancellist">
  125 + 取消
  126 + </view>
  127 + </view>
  128 +
  129 +
  130 + <view class="qiyelsit">
  131 + <view class="warn_msg" wx:for="{{list}}" wx:key="">
  132 +
  133 + <view class="msg_detail">
  134 + <view class="msg_box">
  135 + <view class="detail_single detail_title">
  136 + <view class="{{item.type == 1?'detail_symbol':''}}"></view>
  137 + <view>{{item.title}}</view>
  138 + </view>
  139 + <view class="detail_single">企业名称：{{item.name}}</view>
  140 + <view class="detail_single">报警时间：{{item.time}}</view>
  141 + <view class="detail_single">报警描述：{{item.des}}</view>
  142 + <view class="watch_detail" bindtap='toDetail' data-item="{{item}}">
  143 + 查看详情
  144 + <view class="watch_icon">
  145 + <image src='/img/demo25.png'></image>
  146 + </view>
  147 + </view>
  148 + </view>
  149 + </view>
  150 + </view>
  151 + </view>
106 </view> 152 </view>
@@ -3,7 +3,7 @@ page { @@ -3,7 +3,7 @@ page {
3 background: #f4f4f4; 3 background: #f4f4f4;
4 } 4 }
5 5
6 -.search { 6 +.searchbox {
7 display: flex; 7 display: flex;
8 align-items: center; 8 align-items: center;
9 justify-content: space-between; 9 justify-content: space-between;
@@ -11,27 +11,37 @@ page { @@ -11,27 +11,37 @@ page {
11 padding: 14rpx 44rpx; 11 padding: 14rpx 44rpx;
12 box-sizing: border-box; 12 box-sizing: border-box;
13 background: #fff; 13 background: #fff;
  14 +
14 } 15 }
15 16
16 .searchinput { 17 .searchinput {
17 - width: 575rpx; 18 + width: 85%;
18 padding: 10rpx 20rpx 10rpx 74rpx; 19 padding: 10rpx 20rpx 10rpx 74rpx;
19 box-sizing: border-box; 20 box-sizing: border-box;
20 background: #ebecee; 21 background: #ebecee;
21 border-radius: 30rpx; 22 border-radius: 30rpx;
22 color: #a4a4a4; 23 color: #a4a4a4;
23 font-size: 28rpx; 24 font-size: 28rpx;
  25 + position: relative;
24 } 26 }
25 27
26 -searchinput input {  
27 - width: 575rpx;  
28 - padding: 10rpx 20rpx 10rpx 74rpx; 28 +.searchinput input {
  29 + width: 415rpx;
  30 +
29 box-sizing: border-box; 31 box-sizing: border-box;
30 } 32 }
31 - 33 +.quxiaoimg{
  34 + width:33rpx;
  35 + height:33rpx;
  36 + font-size: 0;
  37 + position: absolute;
  38 + top:16rpx;
  39 + right:28rpx;
  40 +}
32 .quxiao { 41 .quxiao {
33 color: #ff9400; 42 color: #ff9400;
34 margin-left: 30rpx; 43 margin-left: 30rpx;
  44 + margin-bottom:8rpx;
35 } 45 }
36 46
37 .qiyeinfo { 47 .qiyeinfo {
@@ -134,3 +144,127 @@ searchinput input { @@ -134,3 +144,127 @@ searchinput input {
134 font-size: 32rpx; 144 font-size: 32rpx;
135 margin-left:25rpx; 145 margin-left:25rpx;
136 } 146 }
  147 +
  148 +.search {
  149 + background-color: #fff;
  150 + padding: 19rpx 30rpx;
  151 + display: flex;
  152 + flex-direction: row;
  153 + align-items: center;
  154 + justify-content: space-between;
  155 + font-size: 36rpx;
  156 + color: #333;
  157 +}
  158 +
  159 +.search_icon {
  160 + width: 42rpx;
  161 + height: 42rpx;
  162 +}
  163 +
  164 +.warn_msg {
  165 + padding: 40rpx 30rpx 0;
  166 + display: flex;
  167 + flex-direction: column;
  168 + align-items: center;
  169 +}
  170 +
  171 +.warn_time {
  172 + padding: 7rpx 21rpx;
  173 + background: rgba(214, 216, 218, 1);
  174 + border-radius: 26rpx;
  175 + color: #fff;
  176 + font-size: 24rpx;
  177 + margin-bottom: 30rpx;
  178 +}
  179 +
  180 +.msg_detail {
  181 + background-color: #fff;
  182 + width: 100%;
  183 + border-radius: 10px;
  184 + border: 1rpx solid #c5c5c5;
  185 +}
  186 +
  187 +.msg_box {
  188 + padding: 0 30rpx;
  189 +}
  190 +
  191 +.detail_single {
  192 + padding: 20rpx 0;
  193 + border-bottom: 1rpx solid #f5f5f5;
  194 + font-size: 24rpx;
  195 + color: #666;
  196 + width: 100%;
  197 + white-space: nowrap;
  198 + overflow: hidden;
  199 + text-overflow: ellipsis;
  200 +}
  201 +
  202 +.detail_title {
  203 + display: flex;
  204 + flex-direction: row;
  205 + justify-content: flex-start;
  206 + align-items: center;
  207 + font-size: 32rpx;
  208 + color: #333;
  209 +}
  210 +
  211 +.detail_symbol {
  212 + width: 20rpx;
  213 + height: 20rpx;
  214 + background: rgba(255, 48, 56, 1);
  215 + border-radius: 50%;
  216 + margin-right: 10rpx;
  217 +}
  218 +
  219 +.watch_detail {
  220 + display: flex;
  221 + flex-direction: row;
  222 + justify-content: space-between;
  223 + align-items: center;
  224 + padding: 20rpx 0;
  225 + color: #ff9400;
  226 +}
  227 +
  228 +.watch_icon {
  229 + width: 30rpx;
  230 + height: 30rpx;
  231 +}
  232 +.qiyeboxhead{
  233 + display:flex;
  234 + align-items: center;
  235 +
  236 +}
  237 +.quxiaoimg{
  238 + width:30rpx;
  239 + height:30rpx;
  240 + font-size: 0;
  241 +}
  242 +.searchregister{
  243 + background: #fff;
  244 + top:85rpx;
  245 +}
  246 +
  247 +/* 搜索弹出层 */
  248 +.searchname{
  249 + color:#A4A4A4;
  250 + font-size: 28rpx;
  251 + padding: 40rpx 40rpx 35rpx 31rpx;
  252 + box-sizing: border-box
  253 +}
  254 +.historybox{
  255 + display:flex;
  256 + align-items: center;
  257 + padding: 0 31rpx;
  258 + flex-wrap: wrap
  259 +}
  260 +.historyitem{
  261 + padding: 10rpx 18rpx;
  262 + box-sizing: border-box;
  263 + color:#666666;
  264 + font-size: 28rpx;
  265 + background: #F4F4F4;
  266 + border-radius: 6rpx;
  267 + margin-right:20rpx;
  268 + margin-top:20rpx;
  269 +
  270 +}