miniprogram / appui · 提交

转到一个项目

作者 王军
提交 9f318c588172819ac90597ebd0dee6bb2ca4fc34 2 个父辈 90c091b1 d49d0139

合并分支 'wj' 到 'master' 

首页



查看合并请求 !14
内嵌 并排对比
正在显示 14 个修改的文件 包含 428 行增加 和 9 行删除
... ... @@ -27,13 +27,12 @@
"pages/logs/logs",
"pages/yujing/yujing/yujing",
"pages/companybox/zhishudetail/qiyeyongdian/qyyd/qyyd",
"pages/companybox/zhishudetail/member/member",
"pages/companybox/zhishudetail/chengpin/chengpin",
"pages/companybox/zhishudetail/yuanliaomsg/yuanliaoDetail/yuanliaoDetail",
"pages/yujing/yujingSet/yujingSet/yujingSet",
"pages/yujing/yujingSet/yujingAdd/yujingAdd",
"pages/yujing/yujingSet/yujingType/yujingType",
"pages/yujing/yujingSet/yujingPerson/yujingPerson"
"pages/yujing/yujingSet/yujingPerson/yujingPerson",
"pages/yujing/yujingDetail/yujingDetail",
"pages/yujing/yujingDetail/yujingRemark/yujingRemark"
],
"window": {
"backgroundTextStyle": "light",
... ...

657 字节
... ... @@ -5,9 +5,30 @@ Page({
* 页面的初始数据
*/
data: {
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: 0
}
]
},
toDetail(){
wx.navigateTo({
url: '/pages/yujing/yujingDetail/yujingDetail',
})
},
/**
* 生命周期函数--监听页面加载
*/
... ...
<!--pages/yujing/yujing/yujing.wxml-->
<text>pages/yujing/yujing/yujing.wxml</text>
<view class="search">
<view>预警信息</view>
<view class="search_icon">
<image src='/img/search.png'></image>
</view>
</view>
<view class="warn_msg" wx:for="{{list}}" wx:key="">
<view class="warn_time">{{item.date}}</view>
<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>
... ...
/* pages/yujing/yujing/yujing.wxss */
\ No newline at end of file
/* pages/yujing/yujing/yujing.wxss */
page {
background-color: #f5f5f5;
}
.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: 30rpx 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;
}
... ...
// pages/yujing/yujingDetail/yujingDetail.js
Page({
/**
* 页面的初始数据
*/
data: {
},
toRemark(){
wx.navigateTo({
url: '/pages/yujing/yujingDetail/yujingRemark/yujingRemark',
})
},
/**
* 生命周期函数--监听页面加载
*/
onLoad: function (options) {
},
/**
* 生命周期函数--监听页面初次渲染完成
*/
onReady: function () {
},
/**
* 生命周期函数--监听页面显示
*/
onShow: function () {
},
/**
* 生命周期函数--监听页面隐藏
*/
onHide: function () {
},
/**
* 生命周期函数--监听页面卸载
*/
onUnload: function () {
},
/**
* 页面相关事件处理函数--监听用户下拉动作
*/
onPullDownRefresh: function () {
},
/**
* 页面上拉触底事件的处理函数
*/
onReachBottom: function () {
},
/**
* 用户点击右上角分享
*/
onShareAppMessage: function () {
}
})
\ No newline at end of file
... ...
{
"navigationBarTextStyle": "black",
"navigationBarTitleText": "详情",
"usingComponents": {}
}
\ No newline at end of file
... ...
<!--pages/yujing/yujingDetail/yujingDetail.wxml-->
<view class="detail_top">
<view class="top_box">
<view class="top_title">连续不开工预警</view>
<view class="top_name">
企业名称：
<view class="top_msg">深圳华翰技术有限公司</view>
</view>
<view class="top_name">
报警时间：
<view class="top_msg">2019-06-15 13:00:32</view>
</view>
</view>
</view>
<view class="detail_center">
<view class="top_box">
<view class="center_title">报警描述</view>
<view class="top_msg">企业连续三天不开工</view>
</view>
</view>
<view class="detail_bot">
<view class="top_box">
<view class="bot_msg">
<view class="bot_name">用户名：张七盖</view>
<view class="bot_name">时间：2019-07-01 17:00:03</view>
<view class="remark" bindtap='toRemark'>
<view class="remark_title">备注：</view>
<view class="remark_content">这个情况属实需要严重注意免得日后节外生枝 啦啦啦啦啦</view>
</view>
<view class="bot_btn">删除</view>
</view>
</view>
</view>
<view class="detail_bot">
<view class="top_box">
<view class="bot_msg">
<view class="bot_name">用户名：张七盖</view>
<view class="bot_name">时间：2019-07-01 17:00:03</view>
<view class="remark" bindtap='toRemark'>
<view class="remark_title">备注：</view>
<view class="remark_content">这个情况属实需要严重</view>
</view>
</view>
</view>
</view>
\ No newline at end of file
... ...
/* pages/yujing/yujingDetail/yujingDetail.wxss */
.detail_top{
padding: 50rpx 30rpx 0;
border: 1rpx solid #f5f5f5;
border-right: none;
border-left: none;
}
.top_box{
width: 100%;
}
.top_title{
padding-bottom: 40rpx;
color: #333333;
font-size: 34rpx;
}
.top_name{
display: flex;
flex-direction: row;
justify-content: flex-start;
align-items: center;
padding-bottom: 20rpx;
font-size: 28rpx;
}
.top_msg{
color: #5797F5
}
.detail_center{
padding: 30rpx;
border-bottom: 20rpx solid #f5f5f5;
}
.center_title{
padding-bottom: 22rpx;
color: #333333;
font-size: 34rpx;
}
.detail_bot{
padding: 40rpx 30rpx 0;
}
.bot_msg{
padding: 30rpx;
background-color: #f5f5f5;
border-radius: 10rpx;
font-size: 28rpx;
color: #666;
}
.bot_name{
margin-bottom: 10rpx;
}
.remark{
color: #333;
margin-top: 20rpx;
overflow: hidden;
zoom: 1;
}
.remark_title,.remark_content{
float: left
}
.remark_content{
width: 85%;
}
.bot_btn{
color: #FF3038;
display: flex;
justify-content: flex-end;
}
\ No newline at end of file
... ...
// pages/yujing/yujingDetail/yujingRemark/yujingRemark.js
Page({
/**
* 页面的初始数据
*/
data: {
},
/**
* 生命周期函数--监听页面加载
*/
onLoad: function (options) {
},
/**
* 生命周期函数--监听页面初次渲染完成
*/
onReady: function () {
},
/**
* 生命周期函数--监听页面显示
*/
onShow: function () {
},
/**
* 生命周期函数--监听页面隐藏
*/
onHide: function () {
},
/**
* 生命周期函数--监听页面卸载
*/
onUnload: function () {
},
/**
* 页面相关事件处理函数--监听用户下拉动作
*/
onPullDownRefresh: function () {
},
/**
* 页面上拉触底事件的处理函数
*/
onReachBottom: function () {
},
/**
* 用户点击右上角分享
*/
onShareAppMessage: function () {
}
})
\ No newline at end of file
... ...
{
"navigationBarTextStyle": "black",
"navigationBarTitleText": "备注",
"usingComponents": {}
}
\ No newline at end of file
... ...
<!--pages/yujing/yujingDetail/yujingRemark/yujingRemark.wxml-->
<view class="ramark_area">
<textarea></textarea>
</view>
... ...
/* pages/yujing/yujingDetail/yujingRemark/yujingRemark.wxss */
page{
background-color: #f5f5f5
}
.ramark_area{
padding: 50rpx 30rpx;
}
textarea{
background-color:#fff;
width: 100%;
border-radius: 10rpx;
}
\ No newline at end of file
... ...
... ... @@ -39,7 +39,7 @@
"list": []
},
"miniprogram": {
"current": 9,
"current": 11,
"list": [
{
"id": -1,
... ... @@ -110,6 +110,19 @@
"pathName": "pages/yujing/yujingSet/yujingPerson/yujingPerson",
"query": "",
"scene": null
},
{
"id": -1,
"name": "预警详情",
"pathName": "pages/yujing/yujingDetail/yujingDetail",
"query": "",
"scene": null
},
{
"id": -1,
"name": "预警详情备注",
"pathName": "pages/yujing/yujingDetail/yujingRemark/yujingRemark",
"scene": null
}
]
}
... ...