miniprogram / appui · 提交

转到一个项目

作者 刘晓艳
提交 9228c76b4f905dadebf02f9e8b6df6d8953162f8 2 个父辈 dc6d3cae 25436cb1

Merge branch 'master' of http://114.215.101.231:8099/miniprogram/appui into wj 

# Conflicts:
#	app.json
内嵌 并排对比
正在显示 27 个修改的文件 包含 1211 行增加 和 83 行删除
... ... @@ -40,6 +40,12 @@ App({
let day = date.getDate();
return date.getFullYear() + '年' + (month > 9 ? month : ('0' + month)) + '月' + (day > 9 ? day : ('0' + day)) + '日';
},
qiendate(){
let date = new Date();
let month = date.getMonth() + 1;
let day = date.getDate()+1;
return date.getFullYear() + '年' + (month > 9 ? month : ('0' + month)) + '月' + (day > 9 ? day : ('0' + day)) + '日';
},
newnowDate() {
let date = new Date();
... ...

815 字节

1002 字节
... ... @@ -226,10 +226,9 @@ Page({
}
},
onload() {
onLoad: function (options) {
console.log(4383489489)
},
//跳转得分页面
godefen() {
wx.navigateTo({
... ...
... ... @@ -12,10 +12,11 @@ function initChart1(canvas, width, height) {
var option = {
title: {
text: '开平机01每日开工时间',
left: 'center'
left: 'center',
textStyle: {
fontSize: 13
},
},
toolbox: {
},
... ... @@ -27,8 +28,6 @@ function initChart1(canvas, width, height) {
interval: 1,
},
name: '日期'
},
yAxis: {
type: 'value',
... ... @@ -84,7 +83,10 @@ function initChart2(canvas, width, height) {
var option = {
title: {
text: '开平机02每日开工时间',
left: 'center'
left: 'center',
textStyle: {
fontSize: 13
},
},
... ... @@ -156,7 +158,10 @@ function initChart3(canvas, width, height) {
var option = {
title: {
text: '企业开工月累计时间',
left: 'center'
left: 'center',
textStyle: {
fontSize: 13
},
},
... ... @@ -216,6 +221,7 @@ function initChart3(canvas, width, height) {
chart.setOption(option);
return chart;
}
// 半年度开工时间对比
function initChart4(canvas, width, height) {
const chart = echarts.init(canvas, null, {
... ... @@ -225,23 +231,48 @@ function initChart4(canvas, width, height) {
canvas.setChart(chart);
var option = {
title: {
text: '半年度企业电耗对比',
textStyle: {
fontSize: 13
},
left: 'center'
},
xAxis: {
type: 'category',
data: ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun']
data: ['2018-11', '2018-12', '2019-01', '2019-02', '2019-03', '2019-04'],
axisLabel: {
interval: 0,
textStyle: {
fontSize: 12
}
},
name: '日期'
},
yAxis: {
type: 'value'
type: 'value',
min: 0,
max: 500,
splitNumber: 5,
name: '小时（h）',
// textStyle: {
// fontSize: 14
// }
},
series: [{
data: [120, 200, 150, 80, 70, 110, 130],
type: 'bar'
data: [120, 200, 150, 80, 70, 110],
type: 'bar',
color: '#3CDACD',
barWidth: '55%',
}]
};
chart.setOption(option);
return chart;
}
// 企业每日电耗
// 企业月开工率
function initChart5(canvas, width, height) {
const chart = echarts.init(canvas, null, {
width: width,
... ... @@ -252,63 +283,107 @@ function initChart5(canvas, width, height) {
var option = {
title: {
text: '企业月开工率',
left: 'center'
subtext: '',
left: 'center',
textStyle: {
fontSize: 13
},
},
textStyle: {
fontSize: 12
},
tooltip: {
trigger: 'axis'
},
toolbox: {
},
xAxis: {
type: 'category',
boundaryGap: false,
data: ['1', '2', '3', '4', '5', '6', '7', '8', '9', '10', '11', '12', '13', '14', '15', '16', '17', '18', '19', '20', '21', '22', '23', '24', '25', '26', '27', '28', '29', '30', '31'],
data: ['1', '2', '3', '4', '5', '6', '7', '8', '9', '10', '11', '12', '13', '14', '15', '16', '17', '18', '19', '20', '21', '22', '23', '24', '25', '26', '27', '28', '29', '30','31'],
axisLabel: {
interval: 1,
},
name: '日期'
name:"日期"
},
yAxis: {
type: 'value',
min:0,
max: 100,
splitNumber: 10,
axisLabel: {
formatter: '{value}'
},
min: 1,
max: 24,
splitNumber: 24,
name: '小时(h)'
name:'百分比'
},
series: [
{
series: [{
name: '',
type: 'line',
smooth: true,
color: '#6495F8',
data: [11, 11, 15, 13, 12, 13, 10],
color: '#FA9C03',
data: [11, 11, 15, 13, 12, 13, 10,23,45,67],
markPoint: {
data: [
{ type: 'max', name: '最大值' },
{ type: 'min', name: '最小值' }
data: [{
type: 'max',
name: '最大值'
},
{
type: 'min',
name: '最小值'
}
]
},
markLine: {
data: [
{ type: 'average', name: '平均值' }
]
data: [{
type: 'average',
name: '平均值'
}]
}
},
// areaStyle: {
// // normal: {
// // color: '#F8E9DD' //改变区域颜色
// // }
// },
{
name: '',
type: 'line',
color: '#95D602',
data: [78, 18, 44, 33, 25, 45, 67,89,34,45],
markPoint: {
data: [{
name: '周最低',
value: 10,
xAxis: 1,
yAxis: 10
}]
},
markLine: {
data: [{
type: 'average',
name: '平均值'
},
[{
symbol: 'none',
x: '90%',
yAxis: 'max'
}, {
symbol: 'circle',
label: {
normal: {
position: 'start',
formatter: '最大值'
}
},
type: 'max',
name: '最高点'
}]
]
}
}
]
};
chart.setOption(option);
return chart;
}
... ... @@ -323,7 +398,10 @@ function initChart6(canvas, width, height) {
var option = {
title: {
text: '企业月开工率',
left: 'center'
left: 'center',
textStyle: {
fontSize: 13
},
},
... ... @@ -392,16 +470,40 @@ function initChart7(canvas, width, height) {
canvas.setChart(chart);
var option = {
title: {
text: '半年度企业电耗对比',
textStyle:{
fontSize:13
},
left: 'center'
},
xAxis: {
type: 'category',
data: ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun']
data: ['2018-11', '2018-12', '2019-01', '2019-02', '2019-03', '2019-04'],
axisLabel: {
interval: 0,
textStyle: {
fontSize:12
}
},
name: '日期'
},
yAxis: {
type: 'value'
type: 'value',
min:0,
max:500,
splitNumber: 5,
name:'小时（h）',
// textStyle: {
// fontSize: 14
// }
},
series: [{
data: [120, 200, 150, 80, 70, 110, 130],
type: 'bar'
data: [120, 200, 150, 80, 70, 110],
type: 'bar',
color:'#3CDACD',
barWidth: '55%',
}]
};
... ... @@ -540,6 +642,7 @@ Page({
*/
data: {
statedate:"",
state:1,
ec1: {
onInit: initChart1
... ... @@ -579,6 +682,12 @@ Page({
})
},
// 顶部tab切换
selectshebei(e){
this.setData({
state:e.currentTarget.dataset.id
})
},
// 选择日期
bindstateDateChange(e) {
... ...
... ... @@ -4,28 +4,41 @@
<image src="/img/whiterow.png"></image>
</view>
<view class="datetime">
<view class="datesel">
<picker mode="date" value="{{date}}" start="" end="" bindchange="bindstateDateChange" fields="month">
<view class="datesel">
<view class="picker">
{{statedate}}
</view>
</picker>
</view>
<view class="datepic">
<image src="/img/whiterow.png"></image>
</view>
</view>
</picker>
</view>
<view class="dateright">
<image src="/img/whiterow.png"></image>
</view>
</view>
<!-- 顶部tab切换 -->
<view class="detailhead">
<view class="detailname {{state==1?'selactive':''}}" bindtap="selectshebei" data-id="1">生产总评</view>
<view class="detailname {{state==2?'selactive':''}}" bindtap="selectshebei" data-id="2">客观信息</view>
<view class="detailname {{state==3?'selactive':''}}" bindtap="selectshebei" data-id="3">生产预警</view>
</view>
<!-- 客观信息 -->
<view class="keguaninfo" wx:if="{{index==0}}">
<view class="keguaninfo" wx:if="{{state==1}}">
<!-- 企业开工时间 -->
<view class="worktime">
<!-- 头部日期 -->
... ... @@ -57,14 +70,14 @@
<view class="companybox">
<view class="boxhead">
<view class="boxtopitem">企业名称</view>
<view class="boxtopitem">生产平稳性</view>
<view class="boxtopitem">生产趋势</view>
<view class="boxtopitem">生产状态</view>
<view class="boxtopitem">综合评分</view>
<view class="boxtopitem ">企业名称</view>
<view class="boxtopitem ">生产平稳性</view>
<view class="boxtopitem ">生产趋势</view>
<view class="boxtopitem ">生产状态</view>
<view class="boxtopitem ">综合评分</view>
</view>
<view class="boxhead">
<view class="boxbottomitem">无锡市好事达人供 应链管理有限公司
<view class="boxbottomitem ">无锡市好事达人供 应链管理有限公司
</view>
<view class="boxbottomitem common">较平稳</view>
<view class="boxbottomitem common">下降</view>
... ... @@ -173,7 +186,7 @@
<!-- 生产总评 -->
<view class="shengchanzog" wx:if="{{index==0}}">
<view class="shengchanzog" wx:if="{{state==2}}">
<!-- 企业生产总评-->
<view class="shebeinum">
... ... @@ -214,7 +227,7 @@
</view>
<!-- 生产预警 -->
<view class="yujing">
<view class="yujing" wx:if="{{state==3}}">
<view class="yujinghead">
<view class="yuitem xuhao">序号</view>
<view class="yuitem time">生产预警时间</view>
... ...
... ... @@ -6,6 +6,8 @@
.datesel {
color: #fff;
display:flex;
align-items: center
}
.containerzhe {
... ... @@ -156,7 +158,7 @@ word-break: break-all;
}
.time{
/* width:116rpx; */
margin-left:40rpx;
margin-left:52rpx;
}
.reason{
margin-left:49rpx;
... ... @@ -187,3 +189,34 @@ word-break: break-all;
width:56%;
text-align: left
}
.detailhead {
display: flex;
align-items: center;
justify-content: space-around;
padding: 20rpx 69rpx;
box-sizing: border-box;
border-bottom: 1rpx solid #f5f5f5;
}
.detailname {
color: #999;
font-size: 28rpx;
}
.selactive {
position: relative;
}
.selactive::after {
display: block;
content: '';
width: 60rpx;
border: 1rpx solid #ff9400;
position: absolute;
left: 50%;
right: 50%;
transform: translate(-50%);
bottom: -20rpx;
}
\ No newline at end of file
... ...
// pages/mine/changemima/changemima.js
Page({
/**
* 页面的初始数据
*/
data: {
sure: true,
oldpassword: '',
newpassword: '',
surepassword: ''
},
/**
* 生命周期函数--监听页面加载
*/
onLoad: function(options) {
},
//输入旧密码
enterold(e) {
let that=this;
console.log(e.detail.value)
this.setData({
oldpassword: e.detail.value
})
this.panduan()
},
//输入新密码
enternew(e) {
this.setData({
newpassword: e.detail.value
})
this.panduan()
},
//确认密码
quenew(e) {
this.setData({
surepassword: e.detail.value
})
this.panduan()
},
// 判断
panduan() {
let that=this
if (this.data.oldpassword.length>0&&this.data.newpassword.length>0&&this.data.surepassword.length>0){
this.setData({
sure:false
})
}else{
this.setData({
sure: true
})
}
},
/**
* 生命周期函数--监听页面初次渲染完成
*/
onReady: function() {
},
/**
* 生命周期函数--监听页面显示
*/
onShow: function() {
},
/**
* 生命周期函数--监听页面隐藏
*/
onHide: function() {
},
/**
* 生命周期函数--监听页面卸载
*/
onUnload: function() {
},
/**
* 页面相关事件处理函数--监听用户下拉动作
*/
onPullDownRefresh: function() {
},
/**
* 页面上拉触底事件的处理函数
*/
onReachBottom: function() {
},
/**
* 用户点击右上角分享
*/
onShareAppMessage: function() {
}
})
\ No newline at end of file
... ...
{
"navigationBarTitleText": "修改密码",
"usingComponents": {}
}
\ No newline at end of file
... ...
<view class="mimabox">
<view class="mimaitem">
<input placeholder='旧密码' placeholder-class='mimaword' value="{{oldpassword}}" bindinput="enterold" type="password"/>
</view>
<view class="mimaitem">
<input placeholder='新密码' placeholder-class='mimaword' value="{{newpassword}}" bindinput="enternew" type="password"/>
</view>
<view class="mimaitem">
<input placeholder='请确认' placeholder-class='mimaword' value="{{surepassword}}" bindinput="quenew" type="password"/>
</view>
</view>
<view class="tijiao" wx:if="{{sure}}">确认</view>
<view class="tijiao queti" wx:else>确认</view>
... ...
page{
background: #F4F4F4
}
.mimabox{
margin-top:82rpx;
}
.mimaitem{
width:580rpx;
height:80rpx;
background: #fff;
padding: 20rpx 36rpx;
box-sizing: border-box;
margin:0 auto;
border-radius: 4rpx;
margin-top:30rpx;
}
.mimaitem input{
color:#999999;
font-size: 28rpx;
}
.mimaword{
color:#999999;
font-size: 28rpx;
}
.tijiao {
width: 580rpx;
height: 80rpx;
background: rgba(255, 206, 139, 1);
opacity: 1;
border-radius: 12rpx;
color: #fff;
font-size: 32rpx;
text-align: center;
line-height: 80rpx;
margin: 40rpx auto 0;
}
.queti {
background: #ff9400;
}
\ No newline at end of file
... ...
<!--pages/mine/mine.wxml-->
<text>pages/mine/mine.wxml</text>
<view class="minhead">
<image src="/img/minbac.png"></image>
<view class='myword'>我的</view>
<view class="myinfo">
<view class="myname">你的名字</view>
<view class="number">工号：7789008</view>
<view class="jigou">所属机构：华翰科技技术有限公司</view>
</view>
</view>
<!-- 列表 -->
<view class="mylist">
<navigator url="/pages/mine/changemima/changemima" hover-class="none">
<view class="mylistitem">
<view class="left">
<view class="itemleft">
<image src="/img/suo.png"></image>
</view>
<view class="itemname">修改密码</view>
</view>
<view class="myrow">
<image src="/img/row.png"></image>
</view>
</view>
</navigator>
<navigator url="/pages/mine/yijianfankui/yijianfankui" hover-class="none">
<view class="mylistitem">
<view class="left">
<view class="itemleft">
<image src="/img/fankui.png"></image>
</view>
<view class="itemname">意见反馈</view>
</view>
<view class="myrow">
<image src="/img/row.png"></image>
</view>
</view>
</navigator>
<view class="mylistitem">
<view class="left">
<view class="itemleft">
<image src="/img/tuichu.png"></image>
</view>
<view class="itemname">退出登录</view>
</view>
</view>
<view class="mylistitem">
<view class="left">
<view class="itemleft">
<image src="/img/banben.png"></image>
</view>
<view class="itemname">版本号 v5.6</view>
</view>
</view>
</view>
\ No newline at end of file
... ...
/* pages/mine/mine.wxss */
\ No newline at end of file
.minhead {
width: 750rpx;
height: 348rpx;
font-size: 0;
position: relative;
}
.myinfo {
position: absolute;
top: 129rpx;
left: 30rpx;
width: 690rpx;
height: 305rpx;
background: rgba(255, 255, 255, 1);
opacity: 1;
border-radius: 10rpx;
box-shadow: 5rpx 6rpx 50rpx #FFEBAE;
padding: 30rpx;
box-sizing: border-box
}
.myword{
color:#fff;
font-size: 36rpx;
position: absolute;
top:30rpx;
left:30rpx;
font-weight: bold
}
.myname{
color:#333333;
font-size: 32rpx;
margin-top:70rpx;
text-align: center;
font-weight: bold;
}
.number{
color:#333333;
font-size: 28rpx;
margin-top:30rpx;
text-align: center
}
.jigou{
color:#333333;
font-size: 28rpx;
margin-top:10rpx;
text-align: center;
}
.mylist{
margin-top:191rpx;
}
.mylistitem{
display:flex;
align-items: center;
padding: 32rpx;
box-sizing: border-box;
border-bottom:1rpx solid #f5f5f5;
justify-content: space-between
}
.itemleft{
width:38rpx;
height:42rpx;
font-size:0;
}
.myrow{
width:27rpx;
height:27rpx;
font-size: 0
}
.left{
display:flex;
align-items: center;
}
.itemname{
color:#333333;
font-size: 28rpx;
margin-left:23rpx;
}
\ No newline at end of file
... ...
// pages/mine/yijianfankui/yijianfankui.js
Page({
/**
* 页面的初始数据
*/
data: {
tijiao:true,
fankui:false
},
/**
* 生命周期函数--监听页面加载
*/
onLoad: function (options) {
},
enterword(e){
console.log(e.detail.value.length)
if(e.detail.value.length>0){
this.setData({
tijiao:false
})
}
},
// 提交
sub(){
this.setData({
fankui:true
})
},
// 返回
fanhui(){
this.setData({
fankui:false
})
},
/**
* 生命周期函数--监听页面初次渲染完成
*/
onReady: function () {
},
/**
* 生命周期函数--监听页面显示
*/
onShow: function () {
},
/**
* 生命周期函数--监听页面隐藏
*/
onHide: function () {
},
/**
* 生命周期函数--监听页面卸载
*/
onUnload: function () {
},
/**
* 页面相关事件处理函数--监听用户下拉动作
*/
onPullDownRefresh: function () {
},
/**
* 页面上拉触底事件的处理函数
*/
onReachBottom: function () {
},
/**
* 用户点击右上角分享
*/
onShareAppMessage: function () {
}
})
\ No newline at end of file
... ...
{
"navigationBarTitleText": "意见反馈",
"usingComponents": {}
}
\ No newline at end of file
... ...
<view class="fankuibox" >
<view class="yijianfan">
<textarea placeholder="感谢您使用感知智能，使用过程中有任何意见或意见请反馈给我们" placeholder-class='entersugges' bindinput="enterword" />
</view>
<view class="tijiao" wx:if="{{tijiao==true}}">提交</view>
<view class="tijiao queti" wx:else bindtap="sub">提交</view>
</view>
<!-- 反馈成功 -->
<view class="register" wx:if="{{fankui}}">
<view class="fanimg">
<image src="/img/success.png"></image>
</view>
<view class="fancheng">反馈成功</view>
<view class="content">
<view class="contentitem">感谢您的反馈，我们会认真处理，
</view>
<view class="contentitem">尽快修复和完善相关功能。</view>
</view>
<view class="back" bindtap="fanhui">返回</view>
</view>
\ No newline at end of file
... ...
page {
background: #f4f4f4;
}
.yijianfan {
width: 690rpx;
height: 450rpx;
margin: 50rpx auto 0;
background: #fff;
padding: 30rpx;
box-sizing: border-box;
border-radius: 10rpx;
}
.yijianfan textarea {
width: 690rpx;
height: 450rpx;
padding: 30rpx;
box-sizing: border-box;
color: #b1b1b1;
font-size: 28rpx;
line-height: 1.5;
}
.entersugges {
color: #b1b1b1;
font-size: 28rpx;
line-height: 1.5;
}
.tijiao {
width: 690rpx;
height: 80rpx;
background: rgba(255, 206, 139, 1);
opacity: 1;
border-radius: 12rpx;
color: #fff;
font-size: 32rpx;
text-align: center;
line-height: 80rpx;
margin: 40rpx auto 0;
}
.queti {
background: #ff9400;
}
.register {
background: #fff;
}
/* 反馈成功 */
.fanimg {
width: 185rpx;
height: 185rpx;
font-size: 0;
margin: 108rpx auto 0;
}
.fancheng {
color: #333;
font-size: 36rpx;
margin-top: 47rpx;
text-align: center;
}
.content {
color: #666;
font-size: 28rpx;
margin-top: 30rpx;
}
.contentitem {
text-align: center;
}
.back {
width: 260rpx;
height: 80rpx;
background: rgba(255, 148, 0, 1);
opacity: 1;
border-radius: 10rpx;
font-size: 30rpx;
color:#fff;
text-align: center;
line-height: 80rpx;
margin:425rpx auto 0;
}
... ...
... ... @@ -14,7 +14,7 @@
.souimg {
width: 80rpx;
height: 64rpx;
background: #ff9400ff;
background: #ff9400;
border-radius: 8rpx;
display: flex;
align-items: center;
... ... @@ -35,7 +35,7 @@
}
.qiname {
color: #333333ff;
color: #333333;
font-size: 36rpx;
font-weight: bold;
}
... ... @@ -44,13 +44,13 @@
width: 368rpx;
height: 64rpx;
margin-left: 26rpx;
background: #f7f8faff;
color: #ccccccff;
background: #f7f8fa;
color: #cccccc;
font-size: 24rpx;
}
.qiword {
color: #ccccccff;
color: #cccccc;
font-size: 24rpx;
}
... ... @@ -71,7 +71,7 @@
padding: 20rpx 26rpx 20rpx 40rpx;
box-sizing: border-box;
justify-content: space-between;
background: #f7f8faff;
background: #f7f8fa;
}
.ping {
... ... @@ -80,7 +80,7 @@
}
.branditem {
color: #666666ff;
color: #666666;
font-size: 28rpx;
/* margin-right:73rpx; */
}
... ... @@ -121,12 +121,12 @@
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
color: #333333ff;
color: #333333;
font-size: 28rpx;
}
.hangname {
color: #333333ff;
color: #333333;
font-size: 28rpx;
width: 112rpx;
overflow: hidden;
... ... @@ -135,12 +135,12 @@
}
.fenshu {
color: #ff3038ff;
color: #ff3038;
font-size: 28rpx;
}
.creattime {
color: #999999ff;
color: #999999;
font-size: 24rpx;
}
... ... @@ -169,13 +169,13 @@
}
.hangfen {
color: #777777ff;
color: #777777;
font-size: 24rpx;
margin-top: 64rpx;
}
.gaojisearch {
color: #161616ff;
color: #161616;
font-size: 36rpx;
font-weight: bold;
margin-top: 86rpx;
... ... @@ -184,7 +184,7 @@
.fenlist {
width: 464rpx;
height: 64rpx;
background: #f7f8faff;
background: #f7f8fa;
padding: 13rpx 16rpx;
box-sizing: border-box;
margin-top: 22rpx;
... ... @@ -195,7 +195,7 @@
}
.fenleft {
color: #ccccccff;
color: #cccccc;
font-size: 27rpx;
width: 350rpx;
height:64rpx;
... ... @@ -206,7 +206,7 @@
line-height: 64rpx;
}
.entershuzi{
color: #ccccccff;
color: #cccccc;
font-size: 27rpx;
}
... ... @@ -225,14 +225,14 @@
.fenleft {
width: 224rpx;
height: 64rpx;
background: #f7f8faff;
background: #f7f8fa;
border-radius: 10rpx;
text-align: center;
line-height: 64rpx;
}
.fenheng {
color: #777777ff;
color: #777777;
margin-right: 2rpx;
margin-left: 2rpx;
}
... ...
// pages/yujing/yujingsearch/yujingsearch.js
const app=getApp()
Page({
/**
* 页面的初始数据
*/
data: {
datechu:false,
currentdate:false,
startdate:'',
enddate:'',
datePickerValue: ['', '', ''],
timesel:1,
chaxun:true,
reset:true,
// 显示企业信息搜索还是查询列表
qiyexinxi:false
},
/**
* 生命周期函数--监听页面加载
*/
onLoad: function (options) {
this.setData({
startdate: app.nowDate(),
enddate: app.qiendate()
})
},
//输入企业姓名
enterqiyename(e){
this.setData({
qiyename:e.detail.value
})
if(this.data.qiyename.length>0){
this.setData({
chaxun: false,
reset: false
})
}
},
// 显示时间弹出层
begintime(){
this.setData({
datechu: true,
currentdate: true,
})
this.datexianshi()
},
//开始时间和结束时间切换
xuanshijan(e) {
this.setData({
timesel:e.currentTarget.dataset.time,
currentdate: true
})
this.datexianshi()
},
// 显示日期
datexianshi() {
this.setData({
datechu: true,
currentdate: true
})
//获取年
var date = new Date();
var obj = {}
var year = date.getFullYear();
var month = date.getMonth() + 1;
if (month < 10) {
month = '0' + month
}
var day = date.getDate();
if (day < 10) {
day = "0" + day
}
console.log()
if (typeof (day) == 'number') {
day = day.toString()
}
console.log(typeof (day))
this.setData({
datePickerValue: [year, month, day],
})
},
//确定选择时间
datePickerOnSureClick: function (e) {
console.log('datePickerOnSureClick');
if (this.data.timesel == 1) {
console.log(e);
this.setData({
date: `${e.detail.value[0]}年${e.detail.value[1]}月${e.detail.value[2]}日`,
datePickerValue: e.detail.value,
datePickerIsShow: false,
currentdate: false,
state: 2,
startdate: e.detail.value[0] + '年' + e.detail.value[1] + "月" + e.detail.value[2]+'日'
});
} else {
console.log(e);
this.setData({
date: `${e.detail.value[0]}年${e.detail.value[1]}月${e.detail.value[2]}日`,
datePickerValue: e.detail.value,
datePickerIsShow: false,
currentdate: false,
state: 2,
enddate: e.detail.value[0] + '年' + e.detail.value[1] + "月" + e.detail.value[2]+'日'
});
}
},
// 取消选择时间
datePickerOnCancelClick: function (event) {
console.log('datePickerOnCancelClick');
console.log(event);
this.setData({
datePickerIsShow: false,
currentdate: false,
state: 2
});
},
//确定选择开始日期和结束日期
qudingxuandate() {
this.setData({
datechu: false,
watertime: this.data.startdate + '-' + this.data.enddate
})
},
/**
* 生命周期函数--监听页面初次渲染完成
*/
onReady: function () {
},
/**
* 生命周期函数--监听页面显示
*/
onShow: function () {
},
/**
* 生命周期函数--监听页面隐藏
*/
onHide: function () {
},
/**
* 生命周期函数--监听页面卸载
*/
onUnload: function () {
},
/**
* 页面相关事件处理函数--监听用户下拉动作
*/
onPullDownRefresh: function () {
},
/**
* 页面上拉触底事件的处理函数
*/
onReachBottom: function () {
},
/**
* 用户点击右上角分享
*/
onShareAppMessage: function () {
}
})
\ No newline at end of file
... ...
{
"navigationBarTitleText": "",
"usingComponents": {
"date-picker": "../../../components/date-picker/date-picker"
}
}
\ No newline at end of file
... ...
<!-- 日期弹出层 -->
<view class="register" wx:if="{{datechu}}">
<view class="timewrap">
<!-- 开始时间和结束时间 -->
<view class="timetwo">
<view class="timebetin" bindtap="xuanshijan" data-time="1">
<view class="timetop {{timesel==1?'seltimeactive':''}}">开始时间</view>
<view class="timebottom {{timesel==1?'selnameactive':''}}">{{startdate}}</view>
</view>
<view class="timebetin" bindtap="xuanshijan" data-time="2">
<view class="timetop {{timesel==2?'seltimeactive':''}}">结束时间</view>
<view class="timebottom {{timesel==2?'selnameactive':''}}">{{enddate}}</view>
</view>
</view>
<view class="timebox" wx:if="{{currentdate}}">
<view class="timeboxitem {{sel==index?'timeboxactive':''}}" wx:for="{{timearr}}" wx:key="">
<view class="itemcontent">{{item.year}}</view>
<view class="itemcontent">{{item.month}}</view>
<view class="itemcontent">{{item.day}}</view>
</view>
</view>
<view class="qudingdate" wx:else bindtap='qudingxuandate'>确定</view>
<view wx:if="{{currentdate}}">
<date-picker id="date-picker" value="{{datePickerValue}}" isShow="{{datePickerIsShow}}" bindsureclick="datePickerOnSureClick" bindcancelclick="datePickerOnCancelClick" />
</view>
</view>
</view>
<!-- 企业信息输入 -->
<view class="qiyexinxi" wx:if="{{qiyexinxi}}">
<view class="search">
<view class="searchinput">
<input placeholder='输入企业信息' placeholder-class='qiyeinfo' placeholder-class='enterqiname' />
</view>
<view class="quxiao">
取消
</view>
</view>
<!-- 企业列表 -->
<view class="qiyebox">
<view class="qiyeitem">
<view class="qiyename">企业名称</view>
<view class="qiyeshuru">
<input placeholder='请输入企业姓名' value="{{qiyename}}" bindinput="enterqiyename" />
</view>
</view>
<view class="qiyetime" bindtap="begintime">
<view class="qiyetimeleft">
<view class='qiyetimeleft'>开始时间</view>
<view class="starttime">{{startdate}}</view>
</view>
<view class="qiyerowimg">
<image src="/img/qiyerow.png"></image>
</view>
</view>
<view class="qiyetime" bindtap="begintime">
<view class="qiyetimeleft">
<view class='qiyetimeleft'>结束时间</view>
<view class="starttime">{{enddate}}</view>
</view>
<view class="qiyerowimg">
<image src="/img/qiyerow.png"></image>
</view>
</view>
</view>
<view class="chaxun" wx:if="{{chaxun}}">查询</view>
<view class="chaxun cha" wx:else>查询</view>
<view class="reset" wx:if="{{reset}}">重置</view>
<view class="reset re" wx:else>重置</view>
</view>
<!-- 企业列表 -->
<view class="qiyelsit">
<view class="qiyeitem"></view>
</view>
\ No newline at end of file
... ...
@import '../../companybox/zhishudetail/member/member.wxss';
page {
background: #f4f4f4;
}
.search {
display: flex;
align-items: center;
justify-content: space-between;
background: #fff;
padding: 14rpx 44rpx;
box-sizing: border-box;
background: #fff;
}
.searchinput {
width: 575rpx;
padding: 10rpx 20rpx 10rpx 74rpx;
box-sizing: border-box;
background: #ebecee;
border-radius: 30rpx;
color: #a4a4a4;
font-size: 28rpx;
}
searchinput input {
width: 575rpx;
padding: 10rpx 20rpx 10rpx 74rpx;
box-sizing: border-box;
}
.quxiao {
color: #ff9400;
margin-left: 30rpx;
}
.qiyeinfo {
color: #a4a4a4;
font-size: 28rpx;
}
.qiyeitem {
display: flex;
align-items: center;
padding: 40rpx 0 40rpx 0;
box-sizing: border-box;
border-bottom: 1rpx solid #f5f5f5;
}
.qiyebox {
width: 690rpx;
background: #fff;
border-radius: 10rpx;
margin: 67rpx auto 0;
padding: 0 30rpx;
box-sizing: border-box;
}
.qiyename {
color: #333;
font-size: 32rpx;
}
.qiyeshuru {
color: #999;
font-size: 30rpx;
margin-left: 20rpx;
}
.qiyeshuru input {
height: 50rpx;
line-height: 50rpx;
}
.qiyetime {
display: flex;
align-items: center;
justify-content: space-between;
padding: 40rpx 0 40rpx 0;
box-sizing: border-box;
border-bottom: 1rpx solid #f5f5f5;
}
.qiyetimeleft{
display:flex;
align-items: center;
}
.qiyerowimg {
width: 30rpx;
height: 30rpx;
font-size: 0;
}
.enterqiname {
color: #999;
font-size: 28rpx;
}
.chaxun {
width: 600rpx;
height: 80rpx;
background: rgba(255, 206, 139, 1);
opacity: 1;
border-radius: 12rpx;
color: #fff;
font-size: 28rpx;
text-align: center;
line-height: 80rpx;
margin: 120rpx auto 0;
}
.cha{
background: #FF9400
}
.reset {
width: 600rpx;
height: 80rpx;
border: 2rpx solid rgba(186, 186, 186, 1);
opacity: 1;
border-radius: 12rpx;
color:#999999;
font-size: 28rpx;
margin:24rpx auto 0;
text-align: center;
line-height: 80rpx;
}
.re{
border:1rpx solid #FF9400;
color:#FF9400;
}
.starttime{
color:#333333;
font-size: 32rpx;
margin-left:25rpx;
}
\ No newline at end of file
... ...