Skip to content

U
UbainsMeeting
提交 66836b67 authored 作者: 曾美红's avatar 曾美红
浏览文件
操作

修改样式，密码框

上级 5e1bf3b8
隐藏空白字符变更
内嵌 并排
正在显示 包含 397 行增加 和 67 行删除
pages/conference/addmeeting/addmeeting.acss
浏览文件 @ 66836b67
......@@ -7,8 +7,8 @@
display: flex;
padding: 20rpx;
border-bottom: 1rpx solid #eee;
cursor: pointer;
position:relative;
/*cursor: pointer;
position:relative; */
}
.item-avatar-xs input{
width: 60%;
......@@ -35,6 +35,23 @@
float: right;
margin-right: 50rpx;
}
.radio_password{
display: flex;
width: 100%;
}
.radio{
margin-top: 18rpx;
margin-left: 50rpx;
}
.passwordshow{
display: flex;
}
.passwordshow input{
margin-top: 13rpx;
}
.passwordhidden{
display: none;
}
.item-avatar-xs textarea{
width: 70%;
height: 80rpx;
......@@ -147,7 +164,7 @@
}
.modaltime2{
width: 80%;
height: 520rpx;
height: 400rpx;
position: fixed;
top: 50%;
left: 0;
......@@ -161,7 +178,7 @@
padding-top: 10rpx;
padding-bottom: 20rpx;
}
.radio-group{
/* .radio-group{
width: 100%;
height: 100rpx;
margin-top: 20rpx;
......@@ -170,7 +187,7 @@
.radio{
line-height: 80rpx;
margin-left: 100rpx;
}
} */
.checkbox-group{
width: 100%;
......
pages/conference/addmeeting/addmeeting.axml
浏览文件 @ 66836b67
......@@ -27,10 +27,27 @@
<image src='../../../resource/images/off.png' onTap='delTopic'></image>
</view>
</view>
<!-- <view class='item-avatar-xs'>
<text>会议密码：</text>
<input type='password' value="{{message.messagePassword}}" placeholder='请输入会议密码' name="messagePassword" />
</view> -->
<view class='section'>
<view class="radio_password">
<text>是否保密：</text>
<radio-group onChange="radiopass">
<label class="radio">
<radio name="changgui" value="0" checked="checked" />
常规
</label>
<label class="radio">
<radio name="baomi" value="1" />
保密
</label>
</radio-group>
</view>
<view class="{{Checkval==1?'passwordshow':'passwordhidden'}}">
<text>会议密码：</text>
<input type='password' value="{{message.messagePassword}}" placeholder='请输入会议密码' name="messagePassword" />
</view>
</view>
<view class='item-avatar-xs'>
<text>会议信息：</text>
<textarea placeholder='输入内容' value="{{message.messageContent}}" name="messageContent"></textarea>
......
pages/conference/addmeeting/addmeeting.js
浏览文件 @ 66836b67
......@@ -11,12 +11,14 @@ Page({
data: {
showModal: false,
showView: true,
// showView: true,
conferenceList: [],
mid:null,
//msgArray: ['无提醒', '提前十分钟', '提前半小时', '提前一小时'],
noticeList: [{ name: 'dingding', value: '钉钉' }, { name: 'wechat', value: '微信' }, { name: 'mailbox', value: '邮箱' }, { name: 'note', value: '短信' }],
password: [{name: 'changgui', value: '常规', checked: true},{name: 'baomi', value: '保密'}],
showView: false,
Checkval: 0,
dates: dateFtt("yyyy-MM-dd", new Date()),
topicList: [""],
text: '',
......@@ -41,6 +43,13 @@ Page({
maxBookDay: '',
maxBookTime: ''
},
//密码
radiopass: function(e){
//console.log('res',e.detail.value);
this.setData({
Checkval:e.detail.value
})
},
//方式选项点击
clicks: function(e) {
let index = e.currentTarget.dataset.index;
......
pages/conference/details/details.acss
浏览文件 @ 66836b67
......@@ -49,7 +49,11 @@ page{
}
.td{
width: 100%;
padding-right: 0.2rem;
text-align: left;
overflow:hidden;
text-overflow:ellipsis;
white-space: nowrap;
}
.de_btn{
width: 100%;
......
pages/conference/ex_visitor/ex_visitor.js
浏览文件 @ 66836b67
......@@ -13,7 +13,6 @@ Page({
personNum:0
},
formSubmit: function(e){
console.log('form发生了submit事件，携带数据为：', e.detail.value);
......@@ -25,6 +24,27 @@ Page({
})
return false;
}
var signMobile = e.detail.value.signMobile;
if(!(/^1[34578]\d{9}$/.test(signMobile))){
if (signMobile.length > 0 && signMobile.length < 11) {
dd.alert({
content: '手机号码格式有误',
buttonText: '我知道了',
});
return false;
}
}
var signEmail = e.detail.value.signEmail;
let str = /^[a-zA-Z0-9_.-]+@[a-zA-Z0-9-]+(\.[a-zA-Z0-9-]+)*\.[a-zA-Z0-9]{2,6}$/
if(!(str.test(signEmail)) && signEmail.length > 0){
dd.alert({
content: '邮箱格式有误',
buttonText: '我知道了',
});
return false;
}
var sign ={'signName':e.detail.value.signName ,'signEmail':e.detail.value.signEmail ,"signMobile" : e.detail.value.signMobile};
var signList;
......
pages/conference/visitor/visitor.js
浏览文件 @ 66836b67
......@@ -200,9 +200,9 @@ Page({
content: '添加成功',
buttonText: '确定',
success: () => {
dd.navigateBack({
delta: 1
})
dd.navigateTo({
url: '../addmeeting/addmeeting'
});
},
});
} else {
......
pages/meeting/record/record.acss
浏览文件 @ 66836b67
......@@ -25,6 +25,7 @@ page{
color: #156EF3;
}
.swiper-item{
width: 50%;
height: 100%;
}
.swiper{
......@@ -56,17 +57,17 @@ page{
}
.td{
width: 100%;
padding-right: 0.2rem;
text-align: left;
overflow:hidden;
text-overflow:ellipsis;
white-space: nowrap;
}
.btn text{
font-size: 26rpx;
position: relative;
top: -15rpx;
}
/* .td button{
margin-left: 140rpx;
margin-top: 5rpx;
} */
.box1 .dateBox{
width: 100%;
......@@ -119,4 +120,70 @@ color: #fff;
text-align: center;
background: #156EF3;
color: #fff;
}
.modal{
width: 100%;
height: 100%;
position: fixed;
top: 0;
left: 0;
background: #000;
opacity: 0.2;
overflow: hidden;
z-index: 0;
color: #fff;
}
.modal-content {
width: 540rpx;
overflow: hidden;
position: fixed;
top: 50%;
left: 0;
z-index: 1;
background: #fff;
margin: -180rpx 105rpx;
/* border-radius: 36rpx; */
}
.modal-title {
padding-top: 30rpx;
padding-bottom: 30rpx;
font-size: 36rpx;
color: #030303;
text-align: center;
}
.modal-input {
display: flex;
/* border-top: 2rpx solid #eee;
border-bottom: 2rpx solid #eee; */
margin-bottom: 20rpx;
font-size: 28rpx;
}
.modal-input input{
width: 100%;
height: 82rpx;
font-size: 28rpx;
line-height: 28rpx;
padding: 0 20rpx;
box-sizing: border-box;
color: #333;
}
.modal-footer {
display: flex;
flex-direction: row;
height: 86rpx;
/* border-top: 2rpx solid #eee; */
font-size: 34rpx;
line-height: 86rpx;
}
.btn-cancel {
width: 50%;
color: #666;
text-align: center;
/* border-right: 2rpx solid #eee; */
}
.btn-confirm {
width: 50%;
background: #156EF3;
color: #fff;
text-align: center;
}
\ No newline at end of file
pages/meeting/record/record.axml
浏览文件 @ 66836b67
......@@ -50,10 +50,10 @@
</view>
</scroll-view>
</swiper-item>
<swiper-item>
<swiper-item class="swiper-item">
<scroll-view class='swiper_con' scroll-y="{{true}}" onScrollToUpper="upper" onScrollToLower="lower" onScroll="scroll" scroll-into-view="{{toView}}" scroll-top="{{scrollTop}}">
<view class='de_bg' a:for="{{mymessageList}}" a:for-item="mymessage">
<view class="table">
<view>
<view class="tr">
<view class="td td1">会议名称：{{mymessage.messageName}}</view>
<view class="td td2">主持人：{{mymessage.messageCompere}}</view>
......@@ -82,4 +82,17 @@
</scroll-view>
</swiper-item>
</swiper>
</view>
<view class="modal" onTap="hidemodal" a:if="{{showModal}}"></view>
<view class="modal-content" a:if="{{showModal}}">
<view class="modal-title">纪要密码</view>
<form onSubmit="onConfirm" onReset="">
<view class="modal-input">
<input password type="text" name="messagePassword" placeholder="请输入会议纪要密码" />
</view>
<view class="modal-footer">
<button class="btn-cancel" onTap="onCancel" data-status="cancel">取消</button>
<button class="btn-confirm" formType="submit" data-status="confirm">确定</button>
</view>
</form>
</view>
\ No newline at end of file
pages/meeting/record/record.js
浏览文件 @ 66836b67
......@@ -22,8 +22,10 @@ Page({
winHeight: "",//窗口高度
dates: dateFtt("yyyy-MM-dd", new Date()),
messsageList:[],
mymessageList:[]
mymessageList:[],
messagePassword:'',
mid:null,
conferenceName:''
},
// 点击时间组件确定事件
......@@ -78,19 +80,66 @@ Page({
var mid = e.currentTarget.dataset.mid;
let minutesCode = e.currentTarget.dataset.minutesCode;
let messagePassword = e.currentTarget.dataset.messagePassword;
console.log("minutesCode" ,minutesCode);
//console.log('messagePassword', e.currentTarget.dataset.messagePassword);
// console.log("minutesCode" ,minutesCode);
if(minutesCode != "" && minutesCode!=null ){
dd.navigateTo({
url: '../summary/summary?mid=' + mid + '&conferenceName=' + e.currentTarget.dataset.conferenceName + "&date=" + e.currentTarget.dataset.date
if(messagePassword.length != 0){
this.setData({
showModal: true,
messagePassword:messagePassword,
mid:mid
})
}else if(messagePassword == '' ){
dd.navigateTo({
url: '../summary/summary?mid=' + mid + '&conferenceName=' + e.currentTarget.dataset.conferenceName + "&date=" + e.currentTarget.dataset.date
})
}
}else{
dd.alert({
content: '没有授权码，无法查看',
buttonText: '我知道了',
})
}
},
/**
* 隐藏模态对话框
*/
hideModal:function(){
this.setData({
showModal: false
});
},
/**
* 对话框取消按钮点击事件
*/
onCancel: function () {
this.hideModal();
},
/**
* 对话框确认按钮点击事件
*/
onConfirm: function (e) {
console.log("提交")
var inputPassword =e.detail.value.messagePassword;
var messagePassword= this.data.messagePassword;
var mid= this.data.mid;
if(inputPassword===messagePassword){
this.hideModal();
dd.navigateTo({
url: '../summary/summary?mid=' + mid
})
}else{
dd.showToast({
content: '密码输入错误',
duration: 2000,
})
}
},
onReady() {
// 页面加载完成
......
pages/meeting/recording/recording.acss
浏览文件 @ 66836b67
......@@ -22,7 +22,11 @@ page{
}
.td{
width: 100%;
padding-right: 0.2rem;
text-align: left;
overflow:hidden;
text-overflow:ellipsis;
white-space: nowrap;
}
.btn text{
font-size: 26rpx;
......@@ -47,4 +51,70 @@ page{
text-align: center;
background: #156EF3;
color: #fff;
}
.modal{
width: 100%;
height: 100%;
position: fixed;
top: 0;
left: 0;
background: #000;
opacity: 0.2;
overflow: hidden;
z-index: 0;
color: #fff;
}
.modal-content {
width: 540rpx;
overflow: hidden;
position: fixed;
top: 50%;
left: 0;
z-index: 1;
background: #fff;
margin: -180rpx 105rpx;
/* border-radius: 36rpx; */
}
.modal-title {
padding-top: 30rpx;
padding-bottom: 30rpx;
font-size: 36rpx;
color: #030303;
text-align: center;
}
.modal-input {
display: flex;
/* border-top: 2rpx solid #eee;
border-bottom: 2rpx solid #eee; */
margin-bottom: 20rpx;
font-size: 28rpx;
}
.modal-input input{
width: 100%;
height: 82rpx;
font-size: 28rpx;
line-height: 28rpx;
padding: 0 20rpx;
box-sizing: border-box;
color: #333;
}
.modal-footer {
display: flex;
flex-direction: row;
height: 86rpx;
/* border-top: 2rpx solid #eee; */
font-size: 34rpx;
line-height: 86rpx;
}
.btn-cancel {
width: 50%;
color: #666;
text-align: center;
/* border-right: 2rpx solid #eee; */
}
.btn-confirm {
width: 50%;
background: #156EF3;
color: #fff;
text-align: center;
}
\ No newline at end of file
pages/meeting/recording/recording.axml
浏览文件 @ 66836b67
......@@ -4,36 +4,49 @@
<text class="picker">日期： {{dates}}</text>
</picker>
</view>
<scroll-view class='swiper_con' scroll-y="{{true}}" onScrollToUpper="upper" onScrollToLower="lower" onScroll="scroll" scroll-into-view="{{toView}}" scroll-top="{{scrollTop}}">
<view class='de_bg' a:for="{{historyList}}" a:for-item="history">
<view>
<view class="tr">
<view class="td td1">会议名称：{{history.messageName}}</view>
<view class="td td2">发起人：{{history.messageCompere}}</view>
</view>
<view class="tr">
<view class="td td1">会议时间：{{history.startTimeFormat}} - {{history.endTimeFormat}}</view>
<view class="td td2">部门：{{history.department}}</view>
</view>
<view class="tr">
<view class="td td2">地点：{{history.conference.conferenceName}}</view>
</view>
<!-- <view class="tr">
<view class="td td2">地点：{{history.conference.conferenceNumber}}</view>
</view> -->
<view class="tr btn">
<view class="td td1">
<text>会议操作：</text>
<button class="btn1" size='mini' data-mid="{{history.messageId}}" data-minutes-code="{{history.conference.minutesCode}}" type='primary' onTap="summary">会议纪要</button>
<button class="btn3" size='mini' data-mid="{{history.messageId}}" data-message-name="{{history.messageName}}" data-conference-name="{{history.conference.conferenceName}}"
data-message-compere="{{history.messageCompere}}" data-topic-list="{{history.topicList}}" data-start-time="{{history.startTimeFormat}}" data-end-time="{{history.endTimeFormat}}"
data-department="{{history.department}}" data-message-content="{{history.messageContent}}" data-config-value-id-string="{{history.configValueIdString}}" type='default' onTap="details">详细信息</button>
<button class="btn2" size='mini' type='default' data-message-name="{{history.messageName}}" data-message-compere="{{history.messageCompere}}" data-topic-list="{{history.topicList}}"
data-message-content="{{history.messageContent}}" data-department="{{history.department}}" data-remind-method="{{history.remindMethod}}" data-remind-time="{{history.remindTime}}"
data-cnum="{{history.cnum}}" data-conference-name="{{history.conference.conferenceName}}" onTap="destine">再次预定 </button>
</view>
<scroll-view class='swiper_con' scroll-y="{{true}}" onScrollToUpper="upper" onScrollToLower="lower" onScroll="scroll" scroll-into-view="{{toView}}" scroll-top="{{scrollTop}}">
<view class='de_bg' a:for="{{historyList}}" a:for-item="history">
<view>
<view class="tr">
<view class="td td1">会议名称：{{history.messageName}}</view>
<view class="td td2">发起人：{{history.messageCompere}}</view>
</view>
<view class="tr">
<view class="td td1">会议时间：{{history.startTimeFormat}} - {{history.endTimeFormat}}</view>
<view class="td td2">部门：{{history.department}}</view>
</view>
<view class="tr">
<view class="td td2">地点：{{history.conference.conferenceName}}</view>
</view>
<!-- <view class="tr">
<view class="td td2">地点：{{history.conference.conferenceNumber}}</view>
</view> -->
<view class="tr btn">
<view class="td td1">
<text>会议操作：</text>
<button class="btn1" size='mini' data-mid="{{history.messageId}}" data-minutes-code="{{history.conference.minutesCode}}" data-message-password="{{history.messagePassword}}" type='primary' onTap="summary">会议纪要</button>
<button class="btn3" size='mini' data-mid="{{history.messageId}}" data-message-name="{{history.messageName}}" data-conference-name="{{history.conference.conferenceName}}"
data-message-compere="{{history.messageCompere}}" data-topic-list="{{history.topicList}}" data-start-time="{{history.startTimeFormat}}" data-end-time="{{history.endTimeFormat}}"
data-department="{{history.department}}" data-message-content="{{history.messageContent}}" data-config-value-id-string="{{history.configValueIdString}}" type='default' onTap="details">详细信息</button>
<button class="btn2" size='mini' type='default' data-message-name="{{history.messageName}}" data-message-compere="{{history.messageCompere}}" data-topic-list="{{history.topicList}}"
data-message-content="{{history.messageContent}}" data-department="{{history.department}}" data-remind-method="{{history.remindMethod}}" data-remind-time="{{history.remindTime}}"
data-cnum="{{history.cnum}}" data-conference-name="{{history.conference.conferenceName}}" onTap="destine">再次预定 </button>
</view>
</view>
</view>
</view>
</scroll-view>
</view>
<view class="modal" onTap="hidemodal" a:if="{{showModal}}"></view>
<view class="modal-content" a:if="{{showModal}}">
<view class="modal-title">纪要密码</view>
<form onSubmit="onConfirm" onReset="">
<view class="modal-input">
<input password type="text" name="messagePassword" placeholder="请输入会议纪要密码" />
</view>
<view class="modal-footer">
<button class="btn-cancel" onTap="onCancel" data-status="cancel">取消</button>
<button class="btn-confirm" formType="submit" data-status="confirm">确定</button>
</view>
</scroll-view>
</view>
\ No newline at end of file
</form>
</view>
\ No newline at end of file
pages/meeting/recording/recording.js
浏览文件 @ 66836b67
......@@ -4,16 +4,22 @@ let domain = app.globalData.domain;
let myhistoryUrl = domain + "/dingding/myhistory";
Page({
data: {
dates: null,
historyList:[]
dates: dateFtt("yyyy-MM-dd", new Date()),
historyList:[],
messagePassword:''
},
// 点击时间组件确定事件
bindDateChange(e) {
this.setData({
dates: e.detail.value
})
// this.setData({
// dates: e.detail.value
// })
var that = this;
dd.datePicker({
success: (res) => {
that.setData({
dates: res.date
});
var userId = app.globalData.userId;
......@@ -42,21 +48,33 @@ Page({
complete: function(res) {
dd.hideLoading();
}
})
});
}
})
},
summary(e){
var mid= e.currentTarget.dataset.mid;
let minutesCode = e.currentTarget.dataset.minutesCode;
let messagePassword = e.currentTarget.dataset.messagePassword;
console.log("minutesCode" ,minutesCode);
//console.log(e)
if(minutesCode != "" && minutesCode !=null ){
dd.navigateTo({
if(messagePassword.length != 0){
this.setData({
showModal: true,
messagePassword:messagePassword,
mid:mid
})
}else if(messagePassword == '' ){
dd.navigateTo({
url: '/pages/meeting/summary/summary?mid='+mid ,
type:'redirect'
})
})
}
}else{
dd.alert({
content: '没有授权,无法查看',
......@@ -84,6 +102,41 @@ Page({
+ "&configValueIdString=" + e.currentTarget.dataset.configValueIdString
})
},
/**
* 隐藏模态对话框
*/
hideModal:function(){
this.setData({
showModal: false
});
},
/**
* 对话框取消按钮点击事件
*/
onCancel: function () {
this.hideModal();
},
/**
* 对话框确认按钮点击事件
*/
onConfirm: function (e) {
//console.log("提交")
var inputPassword =e.detail.value.messagePassword;
var messagePassword= this.data.messagePassword;
var mid= this.data.mid;
if(inputPassword===messagePassword){
this.hideModal();
dd.navigateTo({
url: '/pages/meeting/summary/summary?mid='+mid ,
})
}else{
dd.showToast({
content: '密码输入错误',
duration: 2000,
})
}
},
onLoad: function(options) {
......@@ -91,8 +144,6 @@ Page({
//高度自适应
var userId = app.globalData.userId;
},
onReady() {
// 页面加载完成
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论