Skip to content
项目
群组
代码片段
帮助
正在加载...
帮助
为 GitLab 提交贡献
登录
切换导航
U
UbainsMeeting
项目
项目
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
分枝图
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
计划
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
分枝图
统计图
创建新议题
作业
提交
议题看板
打开侧边栏
郑礼德
UbainsMeeting
Commits
ae9155bf
提交
ae9155bf
authored
6 年前
作者:
曾美红
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
修改bug
上级
e8d36ccd
展开全部
显示空白字符变更
内嵌
并排
正在显示
19 个修改的文件
包含
533 行增加
和
452 行删除
+533
-452
app.js
app.js
+1
-1
addmeeting.axml
pages/conference/addmeeting/addmeeting.axml
+6
-2
addmeeting.js
pages/conference/addmeeting/addmeeting.js
+298
-282
details.axml
pages/conference/details/details.axml
+2
-2
details.js
pages/conference/details/details.js
+13
-5
ex_visitor.axml
pages/conference/ex_visitor/ex_visitor.axml
+2
-2
ex_visitor.js
pages/conference/ex_visitor/ex_visitor.js
+65
-24
index.acss
pages/conference/index/index.acss
+1
-1
index.js
pages/conference/index/index.js
+1
-1
modifymeeting.axml
pages/conference/modifymeeting/modifymeeting.axml
+10
-10
modifymeeting.js
pages/conference/modifymeeting/modifymeeting.js
+37
-2
visitor.js
pages/conference/visitor/visitor.js
+4
-88
details.js
pages/meeting/details/details.js
+5
-3
record.axml
pages/meeting/record/record.axml
+4
-4
record.js
pages/meeting/record/record.js
+55
-12
recording.axml
pages/meeting/recording/recording.axml
+2
-2
recording.js
pages/meeting/recording/recording.js
+16
-6
opinion.axml
pages/mine/opinion/opinion.axml
+1
-1
opinion.js
pages/mine/opinion/opinion.js
+10
-4
没有找到文件。
app.js
浏览文件 @
ae9155bf
This diff is collapsed.
Click to expand it.
pages/conference/addmeeting/addmeeting.axml
浏览文件 @
ae9155bf
...
@@ -27,6 +27,10 @@
...
@@ -27,6 +27,10 @@
<image src='../../../resource/images/off.png' onTap='delTopic'></image>
<image src='../../../resource/images/off.png' onTap='delTopic'></image>
</view>
</view>
</view>
</view>
<!-- <view class='item-avatar-xs'>
<text>会议密码:</text>
<input type='password' value="{{message.messagePassword}}" placeholder='请输入会议密码' name="messagePassword" />
</view> -->
<view class='item-avatar-xs'>
<view class='item-avatar-xs'>
<text>会议信息:</text>
<text>会议信息:</text>
<textarea placeholder='输入内容' value="{{message.messageContent}}" name="messageContent"></textarea>
<textarea placeholder='输入内容' value="{{message.messageContent}}" name="messageContent"></textarea>
...
@@ -58,7 +62,7 @@
...
@@ -58,7 +62,7 @@
<text class="hour">{{hindex}}:00</text>
<text class="hour">{{hindex}}:00</text>
<view class="scroll-view-item_H" a:for="{{time}}" a:for-item="t" a:for-index="mindex">
<view class="scroll-view-item_H" a:for="{{time}}" a:for-item="t" a:for-index="mindex">
<view data-hour="{{t.hour}}" data-unclick="{{t.unclick}}" data-minute="{{t.minute}}" data-hour-index="{{hindex}}" data-min-index="{{mindex}}" style="background-color:{{t.color}}" class="time-block" onTap="selTime"></view>
<view data-hour="{{t.hour}}" data-
max-book-time="{{maxBookTime}}" data-
unclick="{{t.unclick}}" data-minute="{{t.minute}}" data-hour-index="{{hindex}}" data-min-index="{{mindex}}" style="background-color:{{t.color}}" class="time-block" onTap="selTime"></view>
</view>
</view>
</view>
</view>
</scroll-view >
</scroll-view >
...
@@ -67,7 +71,7 @@
...
@@ -67,7 +71,7 @@
<text>公司参与人员</text>
<text>公司参与人员</text>
<text class='left'>〉</text>
<text class='left'>〉</text>
</navigator>
</navigator>
<navigator url="../ex_visitor/ex_visitor?mid={{mid}}" open-type="navigate" class='item-avatar-xs'>
<navigator url="../ex_visitor/ex_visitor?mid={{mid}}
&truntype={{truntype}}
" open-type="navigate" class='item-avatar-xs'>
<text>邀请外部人员</text>
<text>邀请外部人员</text>
<text class='left'>〉</text>
<text class='left'>〉</text>
</navigator>
</navigator>
...
...
This diff is collapsed.
Click to expand it.
pages/conference/addmeeting/addmeeting.js
浏览文件 @
ae9155bf
此差异已折叠。
点击以展开。
pages/conference/details/details.axml
浏览文件 @
ae9155bf
...
@@ -7,7 +7,7 @@
...
@@ -7,7 +7,7 @@
</text></label> <label>人数:{{conference.maxPerson}}人 </label> <label>地点:{{conference.area.areaName}} |{{conference.nextArea.areaName}}</label>
</text></label> <label>人数:{{conference.maxPerson}}人 </label> <label>地点:{{conference.area.areaName}} |{{conference.nextArea.areaName}}</label>
</view>
</view>
<view class='de_bg'>
<view class='de_bg'>
<view class='de_title2'>当天会议</vie
w>
<view class='de_title2'>当天会议</vie
<view class='de_border'></view>
<view class='de_border'></view>
</view>
</view>
<view class='de_time'>{{date}}</view>
<view class='de_time'>{{date}}</view>
...
@@ -30,6 +30,6 @@
...
@@ -30,6 +30,6 @@
</view>
</view>
</view>
</view>
<view class='de_btn' data-cnum="{{conference.conferenceNumber}}" onTap="goto">
<view class='de_btn' data-
max-book-time="{{conference.maxBookTime}}" data-max-book-day="{{conference.maxBookDay}}" data-
cnum="{{conference.conferenceNumber}}" onTap="goto">
<button class='de_btn2' >添加预定</button>
<button class='de_btn2' >添加预定</button>
</view>
</view>
\ No newline at end of file
This diff is collapsed.
Click to expand it.
pages/conference/details/details.js
浏览文件 @
ae9155bf
...
@@ -12,13 +12,16 @@ Page({
...
@@ -12,13 +12,16 @@ Page({
date
:
dateFtt
(
"yyyy-MM-dd"
,
new
Date
())
date
:
dateFtt
(
"yyyy-MM-dd"
,
new
Date
())
},
},
goto
:
function
(
e
){
goto
:
function
(
e
){
var
cnum
=
e
.
currentTarget
.
dataset
.
cnum
;
var
cnum
=
e
.
currentTarget
.
dataset
.
cnum
;
var
maxBookTime
=
e
.
currentTarget
.
dataset
.
maxBookTime
;
var
maxBookDay
=
e
.
currentTarget
.
dataset
.
maxBookDay
;
dd
.
navigateTo
({
dd
.
navigateTo
({
url
:
'../addmeeting/addmeeting?cnum='
+
cnum
url
:
'../addmeeting/addmeeting?cnum='
+
cnum
+
'&maxBookTime='
+
maxBookTime
+
'&maxBookDay='
+
maxBookDay
})
})
},
},
setImageUrl
:
function
(
e
)
{
setImageUrl
:
function
(
e
)
{
console
.
log
(
"图片加载错误detail"
);
//
console.log("图片加载错误detail");
var
index
=
e
.
currentTarget
.
dataset
.
index
;
var
index
=
e
.
currentTarget
.
dataset
.
index
;
// document.getElementById(id).src = "../../../resource/images/list-room.png";
// document.getElementById(id).src = "../../../resource/images/list-room.png";
...
@@ -35,8 +38,10 @@ Page({
...
@@ -35,8 +38,10 @@ Page({
// 生命周期函数--监听页面加载
// 生命周期函数--监听页面加载
console
.
log
(
"load会议室编号"
,
query
);
console
.
log
(
"load会议室编号"
,
query
);
var
_this
=
this
;
var
_this
=
this
;
_this
.
setData
({
_this
.
setData
({
conference
:
null
conference
:
null
})
})
dd
.
httpRequest
({
dd
.
httpRequest
({
...
@@ -48,10 +53,13 @@ Page({
...
@@ -48,10 +53,13 @@ Page({
dataType
:
'json'
,
dataType
:
'json'
,
success
:
function
(
res
)
{
success
:
function
(
res
)
{
console
.
log
(
'success----'
,
res
)
console
.
log
(
'success----'
,
res
)
//var maxBookTime= _this.data.result;
_this
.
setData
({
_this
.
setData
({
conference
:
res
.
data
.
result
conference
:
res
.
data
.
result
,
//maxBookTime
})
})
//console.log('maxbooktime',maxBookTime);
},
},
fail
:
function
(
res
)
{
fail
:
function
(
res
)
{
console
.
log
(
"httpRequestFail---"
,
res
)
console
.
log
(
"httpRequestFail---"
,
res
)
...
@@ -68,12 +76,12 @@ Page({
...
@@ -68,12 +76,12 @@ Page({
onReady
(
query
)
{
onReady
(
query
)
{
// 页面加载完成
// 页面加载完成
console
.
log
(
"ready会议室编号"
,
query
)
//
console.log("ready会议室编号",query)
},
},
onShow
(
query
)
{
onShow
(
query
)
{
// 页面显示
// 页面显示
console
.
log
(
"show会议室编号"
,
query
)
//
console.log("show会议室编号",query)
},
},
onHide
()
{
onHide
()
{
// 页面隐藏
// 页面隐藏
...
...
This diff is collapsed.
Click to expand it.
pages/conference/ex_visitor/ex_visitor.axml
浏览文件 @
ae9155bf
This diff is collapsed.
Click to expand it.
pages/conference/ex_visitor/ex_visitor.js
浏览文件 @
ae9155bf
...
@@ -3,13 +3,12 @@ let domain = app.globalData.domain;
...
@@ -3,13 +3,12 @@ let domain = app.globalData.domain;
//获取用户信息的url
//获取用户信息的url
let
addExSignUrl
=
domain
+
"/dingding/addExSign"
;
let
addExSignUrl
=
domain
+
"/dingding/addExSign"
;
let
delExSignUrl
=
domain
+
"/dingding/delExSign"
let
delExSignUrl
=
domain
+
"/dingding/delExSign"
;
Page
({
Page
({
data
:
{
data
:
{
employeeList
:[
employeeList
:[],
],
mid
:
null
,
mid
:
null
,
personNum
:
0
personNum
:
0
},
},
...
@@ -18,8 +17,6 @@ Page({
...
@@ -18,8 +17,6 @@ Page({
formSubmit
:
function
(
e
){
formSubmit
:
function
(
e
){
console
.
log
(
'form发生了submit事件,携带数据为:'
,
e
.
detail
.
value
);
console
.
log
(
'form发生了submit事件,携带数据为:'
,
e
.
detail
.
value
);
var
_this
=
this
;
var
_this
=
this
;
if
(
e
.
detail
.
value
.
signName
.
length
==
0
){
if
(
e
.
detail
.
value
.
signName
.
length
==
0
){
dd
.
alert
({
dd
.
alert
({
...
@@ -28,6 +25,7 @@ Page({
...
@@ -28,6 +25,7 @@ Page({
})
})
return
false
;
return
false
;
}
}
// if (e.detail.value.signMobile.length != 0) {
// if (e.detail.value.signMobile.length != 0) {
// var phoneReg = /(^1[3|4|5|7|8]\d{9}$)|(^09\d{8}$)/;
// var phoneReg = /(^1[3|4|5|7|8]\d{9}$)|(^09\d{8}$)/;
// var phone = e.detail.value.signMobile;
// var phone = e.detail.value.signMobile;
...
@@ -86,10 +84,10 @@ Page({
...
@@ -86,10 +84,10 @@ Page({
},
},
dataType
:
'json'
,
dataType
:
'json'
,
success
:
function
(
res
)
{
// console.log('success----', res)
success
:
function
(
res
)
{
console
.
log
(
'success----'
,
res
)
if
(
res
.
data
.
success
)
{
if
(
res
.
data
.
success
)
{
//console.log("预定成功");
//console.log("预定成功");
dd
.
alert
({
dd
.
alert
({
...
@@ -97,9 +95,8 @@ Page({
...
@@ -97,9 +95,8 @@ Page({
content
:
'添加成功'
,
content
:
'添加成功'
,
buttonText
:
'确定'
,
buttonText
:
'确定'
,
success
:
()
=>
{
success
:
()
=>
{
var
employeeList
=
_this
.
data
.
employeeList
;
var
employeeList
=
_this
.
data
.
employeeList
;
var
emp
=
{};
var
emp
=
{};
emp
[
'name'
]
=
res
.
data
.
result
.
signName
;
emp
[
'name'
]
=
res
.
data
.
result
.
signName
;
emp
[
'id'
]
=
res
.
data
.
result
.
signId
;
emp
[
'id'
]
=
res
.
data
.
result
.
signId
;
...
@@ -108,13 +105,26 @@ Page({
...
@@ -108,13 +105,26 @@ Page({
_this
.
setData
({
_this
.
setData
({
personNum
:
_this
.
data
.
personNum
+
1
,
personNum
:
_this
.
data
.
personNum
+
1
,
employeeList
employeeList
,
});
});
//console.log('employeeList---',_this.data.employeeList);
},
},
});
});
// var employeeList= _this.data.employeeList;
// if(getCurrentPages().length !=2){
// // let pages = getCurrentPages(); //当前页面栈
// // let curPage = pages[pages.length - 3];
// // let data = curPage.data;
// employeeList = [];
// _this.setData({
// employeeList:employeeList
// })
// }
}
else
{
}
else
{
dd
.
showToast
({
dd
.
showToast
({
type
:
'fail'
,
type
:
'fail'
,
...
@@ -177,7 +187,7 @@ Page({
...
@@ -177,7 +187,7 @@ Page({
},
},
fail
:
function
(
res
)
{
fail
:
function
(
res
)
{
console
.
log
(
"httpRequestFail---"
,
res
)
console
.
log
(
"httpRequestFail---"
,
res
)
dd
.
alert
({
content
:
JSON
.
stringify
(
res
)
});
//
dd.alert({ content: JSON.stringify(res) });
},
},
complete
:
function
(
res
)
{
complete
:
function
(
res
)
{
dd
.
hideLoading
();
dd
.
hideLoading
();
...
@@ -188,25 +198,56 @@ Page({
...
@@ -188,25 +198,56 @@ Page({
},
},
onLoad
:
function
(
query
)
{
onLoad
:
function
(
query
)
{
// 生命周期函数--监听页面加载
this
.
setData
({
//var _this = this;
mid
:
query
.
mid
})
},
// if(getCurrentPages().length !=2){
// // let pages = getCurrentPages(); //当前页面栈
// // let curPage = pages[pages.length - 3];
// // let data = curPage.data;
// employeeList = [];
// _this.setData({
// isshowvisitor=0,
// employeeList:employeeList
// })
// }
},
onReady
()
{
onReady
(
query
)
{
// 页面加载完成
// 页面加载完成
},
},
onShow
()
{
onShow
()
{
// 页面显示
// 页面显示
// this.onLoad()
if
(
getCurrentPages
().
length
>=
3
){
console
.
log
(
'执行执行-----'
);
this
.
setData
({
//currentPage: 1,
employeeList
:[]
})
this
.
onLoad
()
}
},
},
onHide
()
{
onHide
()
{
// 页面隐藏
// 页面隐藏
},
},
onUnload
()
{
onUnload
()
{
// 页面被关闭
// 页面被关闭
// var _this = this;
// var employeeList= _this.data.employeeList;
// var pages = getCurrentPages(); //当前页面栈
// if(pages.length >=3){
// var beforePage = pages[pages.length - 3]; //获取上一个页面的实例对象
// //_this.data.employeeList = [];
// employeeList = [];
// _this.setData({
// employeeList
// })
// }
// console.log('employeeList---', _this.data.employeeList);
},
},
onTitleClick
()
{
onTitleClick
()
{
// 标题被点击
// 标题被点击
...
...
This diff is collapsed.
Click to expand it.
pages/conference/index/index.acss
浏览文件 @
ae9155bf
...
@@ -38,7 +38,7 @@ white-space: nowrap;
...
@@ -38,7 +38,7 @@ white-space: nowrap;
background: none;
background: none;
font-size: 0.3rem;
font-size: 0.3rem;
position: absolute;
position: absolute;
/* margin-top: 5rpx; */
margin-top: 5rpx;
}
}
.list_box{
.list_box{
margin-top: 30rpx;
margin-top: 30rpx;
...
...
This diff is collapsed.
Click to expand it.
pages/conference/index/index.js
浏览文件 @
ae9155bf
...
@@ -67,7 +67,7 @@ Page({
...
@@ -67,7 +67,7 @@ Page({
_this
.
setData
({
_this
.
setData
({
authCode
:
res
.
authCode
authCode
:
res
.
authCode
})
})
console
.
log
(
"authCode"
,
res
.
authCode
)
dd
.
httpRequest
({
dd
.
httpRequest
({
url
:
url
,
url
:
url
,
...
...
This diff is collapsed.
Click to expand it.
pages/conference/modifymeeting/modifymeeting.axml
浏览文件 @
ae9155bf
...
@@ -11,15 +11,15 @@
...
@@ -11,15 +11,15 @@
</view>
</view>
<view class='item-avatar-xs'>
<view class='item-avatar-xs'>
<text>添加议题:</text>
<text>添加议题:</text>
<input type='text' placeholder='输入议题' name="messageTheme" />
<input type='text' placeholder='输入议题' onInput="inputTopic" value="{{topicList[0]}}" data-index="{{0}}" name="topicList[0]" />
<image src='../../../resource/images/add.png' onTap='addList'></image>
<image src='../../../resource/images/add.png' onTap='addTopic'></image>
</view>
</view>
<view class="item-avatar-xs" a:for="{{lists}}" a:key="{{index}}">
<view class="item-avatar-xs" a:for="{{topicList.length-1}}" a:for-item="i" a:key="{{index}}" >
<view class='add'>
<view class='add' >
<input type='text' placeholder='输入议题' name="messageTheme" />
<input type='text' placeholder='输入议题' value="{{topicList[i]}}" onInput="inputTopic" data-index="{{index+1}}" name="topicList[{{index+1}}]" />
<image src='../../../resource/images/off.png' onTap='delList'></image>
<image src='../../../resource/images/off.png' onTap='delTopic'></image>
</view>
</view>
</view>
</view>
<view class='item-avatar-xs'>
<view class='item-avatar-xs'>
<text>会议信息:</text>
<text>会议信息:</text>
<textarea placeholder='输入内容' value="{{messageContent}}" name="messageContent"></textarea>
<textarea placeholder='输入内容' value="{{messageContent}}" name="messageContent"></textarea>
...
...
This diff is collapsed.
Click to expand it.
pages/conference/modifymeeting/modifymeeting.js
浏览文件 @
ae9155bf
...
@@ -19,7 +19,7 @@ Page({
...
@@ -19,7 +19,7 @@ Page({
//msgArray: ['无提醒', '提前十分钟', '提前半小时', '提前一小时'],
//msgArray: ['无提醒', '提前十分钟', '提前半小时', '提前一小时'],
showView
:
false
,
showView
:
false
,
dates
:
dateFtt
(
"yyyy-MM-dd"
,
new
Date
()),
dates
:
dateFtt
(
"yyyy-MM-dd"
,
new
Date
()),
lists
:
[{}
],
topicList
:
[
],
text
:
''
,
text
:
''
,
cnum
:
''
,
cnum
:
''
,
allTime
:
{
allTime
:
{
...
@@ -37,6 +37,33 @@ Page({
...
@@ -37,6 +37,33 @@ Page({
min
:
0
,
min
:
0
,
}
}
},
//添加议题
addTopic
:
function
()
{
var
topicList
=
this
.
data
.
topicList
;
var
newData
=
""
;
topicList
.
push
(
newData
);
//实质是添加lists数组内容,使for循环多一次
this
.
setData
({
topicList
:
topicList
,
})
},
//删除议题
delTopic
:
function
()
{
var
topicList
=
this
.
data
.
topicList
;
topicList
.
pop
();
//实质是删除lists数组内容,使for循环少一次
this
.
setData
({
topicList
:
topicList
,
})
},
inputTopic
:
function
(
e
){
// console.log(e);
var
topicList
=
this
.
data
.
topicList
;
var
index
=
e
.
currentTarget
.
dataset
.
index
;
topicList
[
index
]
=
e
.
detail
.
value
;
this
.
setData
({
topicList
})
console
.
log
(
this
.
data
.
topicList
)
},
},
//方式选项点击
//方式选项点击
clicks
:
function
(
e
)
{
clicks
:
function
(
e
)
{
...
@@ -583,11 +610,19 @@ console.log(e.currentTarget.dataset.hour);
...
@@ -583,11 +610,19 @@ console.log(e.currentTarget.dataset.hour);
dataType
:
'json'
,
dataType
:
'json'
,
success
:
function
(
res
)
{
success
:
function
(
res
)
{
console
.
log
(
'success----'
,
res
);
console
.
log
(
'success----'
,
res
);
var
list
=
res
.
data
.
result
.
topicList
;
var
topicList
=
[];
for
(
var
t
in
list
){
topicList
.
push
(
list
[
t
].
topicName
);
}
console
.
log
(
"topicList"
,
topicList
)
_this
.
setData
({
_this
.
setData
({
message
:
res
.
data
.
result
,
message
:
res
.
data
.
result
,
messageContent
:
res
.
data
.
result
.
messageContent
,
messageContent
:
res
.
data
.
result
.
messageContent
,
topicList
:
topicList
});
});
var
noticeList
=
_this
.
data
.
noticeList
;
var
noticeList
=
_this
.
data
.
noticeList
;
var
cnum
=
res
.
data
.
result
.
cnum
;
var
cnum
=
res
.
data
.
result
.
cnum
;
...
...
This diff is collapsed.
Click to expand it.
pages/conference/visitor/visitor.js
浏览文件 @
ae9155bf
...
@@ -46,18 +46,7 @@ Page({
...
@@ -46,18 +46,7 @@ Page({
method
:
'POST'
,
method
:
'POST'
,
success
:
function
(
res
){
success
:
function
(
res
){
console
.
log
(
'res----'
,
res
.
data
)
console
.
log
(
'res----'
,
res
.
data
)
// if(keyword == ""){
// this.setData({
// departmentList: res.data
// })
// return;
// }
// var departmentList= _this.data.departmentList;
// departmentList=[];
// _this.setData({
// departmentList
// });
var
departmentList
=
_this
.
data
.
departmentList
;
var
departmentList
=
_this
.
data
.
departmentList
;
departmentList
=
res
.
data
.
result
;
departmentList
=
res
.
data
.
result
;
for
(
var
i
=
0
;
i
<
departmentList
.
length
;
i
++
){
for
(
var
i
=
0
;
i
<
departmentList
.
length
;
i
++
){
...
@@ -75,17 +64,7 @@ Page({
...
@@ -75,17 +64,7 @@ Page({
_this
.
setData
({
_this
.
setData
({
departmentList
departmentList
})
})
// var userList= res.data.result;
// for(let i in userList){
// var department =userList[i].department;
// department['isColpand']=false;
// department['checked'] = false;
// department.uList=[];
// department.uList.push(userList[i]);
// department.uList[0]['checked']=true;
// departmentList.push(department);
// }
that
.
setData
({
that
.
setData
({
departmentList
departmentList
});
});
...
@@ -105,69 +84,6 @@ Page({
...
@@ -105,69 +84,6 @@ Page({
}
}
})
})
// var that = this;
// dd.httpRequest({
// url: "getStaffUrl" + this.data.inputValue,
// data: {
// inputValue: this.data.inputValue
// },
// method: 'POST',
// success: function(res){
// console.log('res----', res.data)
// var searchData = res.data
// that.setData({
// searchData
// })
// //缓存
// dd.setStorage({
// key: 'departmentList',
// data: {
// inputValue: this.data.inputValue,
// departmentList: res.data
// }
// })
// if(!that.data.inputValue){
// dd.showToast({
// title: '请重新输入',
// duration: 2000,
// })
// } else if (searchData.search.length == 0){
// dd.showToast({
// title: '关键词不存在',
// duration: 2000,
// })
// } else {
// var searchIndex = searchData.search.length;
// var d = 0;
// for (var i = 0; i <= searchIndex -1; i++){
// var searchTitle = searchData.search[d].title;
// console.log(searchTitle);
// d = d + 1;
// for (var x = 0; x <= searchTitle.length; x++){
// for ( var y = 0; y <= searchTitle.length; y++){
// var keyWord = searchTitle.substring(x,y);
// console.log('keyword----', keyWord)
// }
// }
// }
// }
// },
// fail: function(res) {
// console.log("httpRequestFail---", res)
// dd.alert({ content: JSON.stringify(res) });
// },
// complete: function(res) {
// dd.hideLoading();
// }
// })
},
},
...
@@ -344,7 +260,7 @@ Page({
...
@@ -344,7 +260,7 @@ Page({
cnum
:
query
.
cnum
cnum
:
query
.
cnum
})
})
dd
.
httpRequest
({
dd
.
httpRequest
({
url
:
get
Department
Url
,
url
:
get
Staff
Url
,
method
:
'POST'
,
method
:
'POST'
,
data
:
{
data
:
{
userId
:
userId
,
userId
:
userId
,
...
...
This diff is collapsed.
Click to expand it.
pages/meeting/details/details.js
浏览文件 @
ae9155bf
...
@@ -40,10 +40,12 @@ Page({
...
@@ -40,10 +40,12 @@ Page({
console
.
log
(
'success----议题'
,
res
)
console
.
log
(
'success----议题'
,
res
)
var
topicStr
=
_this
.
data
.
topicStr
;
var
topicStr
=
_this
.
data
.
topicStr
;
var
topicList
=
res
.
data
.
result
;
var
topicList
=
res
.
data
.
result
;
for
(
var
i
=
0
;
i
<
topicList
.
length
;
i
++
){
for
(
var
i
=
0
;
i
<
topicList
.
length
;
i
++
){
topicStr
+=
topicList
[
i
].
topicName
+
" "
//for( var j=1; j<topicList.length; j++ ){
topicStr
+=
" "
+
'('
+
(
i
+
1
)
+
')、'
+
topicList
[
i
].
topicName
+
" "
//}
}
}
console
.
log
(
'topicStr'
,
topicStr
);
_this
.
setData
({
_this
.
setData
({
topicStr
topicStr
...
...
This diff is collapsed.
Click to expand it.
pages/meeting/record/record.axml
浏览文件 @
ae9155bf
...
@@ -34,12 +34,12 @@
...
@@ -34,12 +34,12 @@
</view>
</view>
<view class="tr">
<view class="tr">
<view class="td td1">会议时间:{{message.startTimeFormat}} - {{message.endTimeFormat}}</view>
<view class="td td1">会议时间:{{message.startTimeFormat}} - {{message.endTimeFormat}}</view>
<view class="td td2">
会议范围
:{{message.department}}</view>
<view class="td td2">
部门
:{{message.department}}</view>
</view>
</view>
<view class="tr btn">
<view class="tr btn">
<view class="td td1">
<view class="td td1">
<text>会议操作:</text>
<text>会议操作:</text>
<button class="btn1" size='mini' type='primary' data-mid="{{message.messageId}}" onTap="modify">修改会议</button>
<button class="btn1" size='mini' type='primary' data-mid="{{message.messageId}}"
data-config-value-id="{{message.configValueId}}"
onTap="modify">修改会议</button>
<button class="btn2" size='mini' type='warn' data-mid="{{message.messageId}}" data-config-value-id="{{message.configValueId}}" onTap="cancelmeeting">取消会议</button>
<button class="btn2" size='mini' type='warn' data-mid="{{message.messageId}}" data-config-value-id="{{message.configValueId}}" onTap="cancelmeeting">取消会议</button>
</view>
</view>
</view>
</view>
...
@@ -60,7 +60,7 @@
...
@@ -60,7 +60,7 @@
</view>
</view>
<view class="tr">
<view class="tr">
<view class="td td1">会议时间:{{mymessage.startTimeFormat}} - {{mymessage.endTimeFormat}}</view>
<view class="td td1">会议时间:{{mymessage.startTimeFormat}} - {{mymessage.endTimeFormat}}</view>
<view class="td td2">
会议范围
:{{mymessage.department}}</view>
<view class="td td2">
部门
:{{mymessage.department}}</view>
</view>
</view>
<view class="tr btn">
<view class="tr btn">
<view class="td td1">
<view class="td td1">
...
@@ -69,7 +69,7 @@
...
@@ -69,7 +69,7 @@
<button class="btn1" a:if="{{mymessage.configValueId == 1}}" size='mini' type='primary'>正在会议</button>
<button class="btn1" a:if="{{mymessage.configValueId == 1}}" size='mini' type='primary'>正在会议</button>
<button class="btn1" a:if="{{mymessage.configValueId == 3}}" size='mini' type='warn'>暂停</button>
<button class="btn1" a:if="{{mymessage.configValueId == 3}}" size='mini' type='warn'>暂停</button>
<button class="btn1" a:if="{{mymessage.configValueId == 2}}" size='mini' type='default'>未开始</button>
<button class="btn1" a:if="{{mymessage.configValueId == 2}}" size='mini' type='default'>未开始</button>
<button class="btn2" size='mini' data-date="{{dates}}" data-conference-name="{{mymessage.conference.conferenceName}}"
data-mid="{{mymessage.messageId}}"
type='primary' onTap="meetjy">会议纪要</button>
<button class="btn2" size='mini' data-date="{{dates}}" data-conference-name="{{mymessage.conference.conferenceName}}"
data-message-password="{{mymessage.messagePassword}}" data-mid="{{mymessage.messageId}}" data-minutesCode="{{conference.minutesCode}}"
type='primary' onTap="meetjy">会议纪要</button>
</view>
</view>
</view>
</view>
<view class="tr">
<view class="tr">
...
...
This diff is collapsed.
Click to expand it.
pages/meeting/record/record.js
浏览文件 @
ae9155bf
...
@@ -76,10 +76,20 @@ Page({
...
@@ -76,10 +76,20 @@ Page({
},
},
meetjy
:
function
(
e
){
meetjy
:
function
(
e
){
var
mid
=
e
.
currentTarget
.
dataset
.
mid
;
var
mid
=
e
.
currentTarget
.
dataset
.
mid
;
// console.log("conferenceName", e.currentTarget.dataset.conferenceName);
let
minutesCode
=
e
.
currentTarget
.
dataset
.
minutesCode
;
let
messagePassword
=
e
.
currentTarget
.
dataset
.
messagePassword
;
console
.
log
(
"minutesCode"
,
minutesCode
);
if
(
minutesCode
!=
""
&&
minutesCode
!=
null
){
dd
.
navigateTo
({
dd
.
navigateTo
({
url
:
'../summary/summary?mid='
+
mid
+
'&conferenceName='
+
e
.
currentTarget
.
dataset
.
conferenceName
+
"&date="
+
e
.
currentTarget
.
dataset
.
date
url
:
'../summary/summary?mid='
+
mid
+
'&conferenceName='
+
e
.
currentTarget
.
dataset
.
conferenceName
+
"&date="
+
e
.
currentTarget
.
dataset
.
date
})
})
}
else
{
dd
.
alert
({
content
:
'没有授权码,无法查看'
,
buttonText
:
'我知道了'
,
})
}
},
},
onReady
()
{
onReady
()
{
// 页面加载完成
// 页面加载完成
...
@@ -107,7 +117,7 @@ Page({
...
@@ -107,7 +117,7 @@ Page({
that
.
setData
({
that
.
setData
({
messageList
,
messageList
});
});
console
.
log
(
'会议列表-----'
,
that
.
data
.
messageList
);
console
.
log
(
'会议列表-----'
,
that
.
data
.
messageList
);
},
},
...
@@ -182,20 +192,53 @@ Page({
...
@@ -182,20 +192,53 @@ Page({
},
},
modify
:
function
(
e
){
modify
:
function
(
e
){
//var mid= e.currentTarget.dataset.mid;
let
configValueId
=
e
.
currentTarget
.
dataset
.
configValueId
;
if
(
configValueId
===
1
){
dd
.
alert
({
content
:
'会议进行中,不可修改'
,
buttonText
:
'确定'
,
})
}
else
if
(
configValueId
===
4
){
dd
.
alert
({
content
:
'会议已结束,不可修改'
,
buttonText
:
'确定'
,
})
}
else
{
dd
.
navigateTo
({
dd
.
navigateTo
({
url
:
'../../conference/modifymeeting/modifymeeting?mid='
+
e
.
currentTarget
.
dataset
.
mid
url
:
'../../conference/modifymeeting/modifymeeting?mid='
+
e
.
currentTarget
.
dataset
.
mid
})
})
}
},
},
cancelmeeting
:
function
(
e
){
cancelmeeting
:
function
(
e
){
var
mid
=
e
.
currentTarget
.
dataset
.
mid
;
var
mid
=
e
.
currentTarget
.
dataset
.
mid
;
let
configValueId
=
e
.
currentTarget
.
dataset
.
configValueId
;
let
configValueId
=
e
.
currentTarget
.
dataset
.
configValueId
;
if
(
configValueId
===
1
||
configValueId
===
4
||
configValueId
===
3
){
// if( configValueId === 1 || configValueId === 4 || configValueId === 3 ){
// dd.alert({
// content: '会议结束或进行中,不可取消',
// buttonText: '确定',
// })
// }
if
(
configValueId
===
1
){
dd
.
alert
({
content
:
'会议进行中,不可取消'
,
buttonText
:
'确定'
,
})
}
else
if
(
configValueId
===
4
){
dd
.
alert
({
dd
.
alert
({
content
:
'会议
结束或进行中
,不可取消'
,
content
:
'会议
已结束
,不可取消'
,
buttonText
:
'确定'
,
buttonText
:
'确定'
,
})
})
}
else
{
}
else
if
(
configValueId
===
3
){
dd
.
alert
({
content
:
'会议暂停中,不可取消'
,
buttonText
:
'确定'
,
})
}
else
{
dd
.
httpRequest
({
dd
.
httpRequest
({
url
:
canclemeetingUrl
,
url
:
canclemeetingUrl
,
method
:
'POST'
,
method
:
'POST'
,
...
...
This diff is collapsed.
Click to expand it.
pages/meeting/recording/recording.axml
浏览文件 @
ae9155bf
...
@@ -13,7 +13,7 @@
...
@@ -13,7 +13,7 @@
</view>
</view>
<view class="tr">
<view class="tr">
<view class="td td1">会议时间:{{history.startTimeFormat}} - {{history.endTimeFormat}}</view>
<view class="td td1">会议时间:{{history.startTimeFormat}} - {{history.endTimeFormat}}</view>
<view class="td td2">
会议范围
:{{history.department}}</view>
<view class="td td2">
部门
:{{history.department}}</view>
</view>
</view>
<view class="tr">
<view class="tr">
<view class="td td2">地点:{{history.conference.conferenceName}}</view>
<view class="td td2">地点:{{history.conference.conferenceName}}</view>
...
@@ -24,7 +24,7 @@
...
@@ -24,7 +24,7 @@
<view class="tr btn">
<view class="tr btn">
<view class="td td1">
<view class="td td1">
<text>会议操作:</text>
<text>会议操作:</text>
<button class="btn1" size='mini' data-mid="{{history.messageId}}" type='primary' onTap="summary">会议纪要</button>
<button class="btn1" size='mini' data-mid="{{history.messageId}}"
data-minutesCode="{{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}}"
<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-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>
data-department="{{history.department}}" data-message-content="{{history.messageContent}}" data-config-value-id-string="{{history.configValueIdString}}" type='default' onTap="details">详细信息</button>
...
...
This diff is collapsed.
Click to expand it.
pages/meeting/recording/recording.js
浏览文件 @
ae9155bf
...
@@ -33,7 +33,7 @@ Page({
...
@@ -33,7 +33,7 @@ Page({
historyList
historyList
});
});
console
.
log
(
that
.
data
.
historyList
);
//
console.log(that.data.historyList);
},
},
fail
:
function
(
res
)
{
fail
:
function
(
res
)
{
console
.
log
(
"httpRequestFail---"
,
res
)
console
.
log
(
"httpRequestFail---"
,
res
)
...
@@ -49,11 +49,21 @@ Page({
...
@@ -49,11 +49,21 @@ Page({
summary
(
e
){
summary
(
e
){
var
mid
=
e
.
currentTarget
.
dataset
.
mid
;
var
mid
=
e
.
currentTarget
.
dataset
.
mid
;
console
.
log
(
e
)
let
minutesCode
=
e
.
currentTarget
.
dataset
.
minutesCode
;
console
.
log
(
"minutesCode"
,
minutesCode
);
//console.log(e)
if
(
minutesCode
!=
""
&&
minutesCode
!=
null
){
dd
.
navigateTo
({
dd
.
navigateTo
({
url
:
'/pages/meeting/summary/summary?mid='
+
mid
,
url
:
'/pages/meeting/summary/summary?mid='
+
mid
,
type
:
'redirect'
type
:
'redirect'
})
})
}
else
{
dd
.
alert
({
content
:
'没有授权,无法查看'
,
buttonText
:
'我知道了'
,
})
}
},
},
destine
(
e
){
destine
(
e
){
console
.
log
(
e
.
currentTarget
.
dataset
.
cnum
);
console
.
log
(
e
.
currentTarget
.
dataset
.
cnum
);
...
...
This diff is collapsed.
Click to expand it.
pages/mine/opinion/opinion.axml
浏览文件 @
ae9155bf
...
@@ -15,6 +15,6 @@
...
@@ -15,6 +15,6 @@
<view class="contact">
<view class="contact">
联系方式<input type="text" placeholder="留下联系方式,我们将尽快与您联系" name="" />
联系方式<input type="text" placeholder="留下联系方式,我们将尽快与您联系" name="" />
</view>
</view>
<button class="btn" type="primary" >提交</button>
<button class="btn" type="primary"
onTap="sumit"
>提交</button>
</form>
</form>
</view>
</view>
\ No newline at end of file
This diff is collapsed.
Click to expand it.
pages/mine/opinion/opinion.js
浏览文件 @
ae9155bf
...
@@ -56,11 +56,17 @@ Page({
...
@@ -56,11 +56,17 @@ Page({
});
});
},
},
sumit
(){
dd
.
alert
({
content
:
'提交成功'
,
buttonText
:
'我知道了'
,
})
},
onReady
()
{
onReady
()
{
// 页面加载完成
// 页面加载完成
opinion
({
})
},
},
onShow
()
{
onShow
()
{
...
...
This diff is collapsed.
Click to expand it.
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论