Skip to content

U
UbainsMeeting
提交 b05e2008 authored 作者: zhenglide's avatar zhenglide
浏览文件
操作

Merge branch 'master' of http://139.159.178.92:8090/zhenglide/UbainsMeeting 

# Conflicts:
#	app.js
#	pages/conference/ex_visitor/ex_visitor.axml
#	pages/conference/ex_visitor/ex_visitor.js
上级 8fa24521 bea2d3f4
隐藏空白字符变更
内嵌 并排
正在显示 包含 306 行增加 和 53 行删除
app.js
浏览文件 @ b05e2008
...@@ -15,7 +15,9 @@ App({ ...@@ -15,7 +15,9 @@ App({
globalData: { globalData: {
//domain:'http://id24iu.natappfree.cc', //domain:'http://id24iu.natappfree.cc',
//domain:"http://dd2.ubainsyun.com", //domain:"http://dd2.ubainsyun.com",
domain: "http://zhenglide.natapp1.cc" , domain: "http://zhenglide.natapp1.cc" ,
domain:"http://dd2.ubainsyun.com",
//domain: "http://zhenglide.natapp1.cc" ,
corpId: '', corpId: '',
userId:'', userId:'',
person:'', person:'',
......
pages/conference/details/details.js
浏览文件 @ b05e2008
...@@ -43,7 +43,8 @@ Page({ ...@@ -43,7 +43,8 @@ Page({
conference: null conference: null
}) })
//获取是否已添加外部人员记录
dd.httpRequest({ dd.httpRequest({
url: conferenceUrl, url: conferenceUrl,
method: 'POST', method: 'POST',
...@@ -80,6 +81,12 @@ Page({ ...@@ -80,6 +81,12 @@ Page({
}, },
onShow(query) { onShow(query) {
dd.removeStorage({
key:'signList',
success:function(res){
console.log('清除已添加外部人员记录成功');
}
})
// 页面显示 // 页面显示
// console.log("show会议室编号",query) // console.log("show会议室编号",query)
}, },
......
pages/conference/ex_visitor/ex_visitor.axml
浏览文件 @ b05e2008
...@@ -24,12 +24,15 @@ ...@@ -24,12 +24,15 @@
</form> </form>
<scroll-view scroll-y="{{true}}"> <scroll-view scroll-y="{{true}}">
<view a:for="{{employeeList}}" a:for-item="employee" a:for-index="index" class='item-avatar-xs-a'>
<view a:for="{{signList}}" a:for-item="sign" a:for-index="index" class='item-avatar-xs-a'> <view a:for="{{signList}}" a:for-item="sign" a:for-index="index" class='item-avatar-xs-a'>
<!-- <checkbox value="{{employee.name}}" checked="{{employee.checked}}" /> --> <!-- <checkbox value="{{employee.name}}" checked="{{employee.checked}}" /> -->
<view data-index="{{index}}" data-id="{{sign.signId}}" onTap="deleteSign" class="del"> <view data-index="{{index}}" data-id="{{employee.id}}" onTap="deleteSign" class="del">
<view data-index="{{index}}" data-id="{{index }}" onTap="deleteSign" class="del">
<icon type="cancel" size="18" color="red"/> <icon type="cancel" size="18" color="red"/>
</view> </view>
<text class="checkbox-text">{{employee.name}}</text>
<text class="checkbox-text">{{sign.signName}}</text> <text class="checkbox-text">{{sign.signName}}</text>
</view> </view>
......
pages/conference/ex_visitor/ex_visitor.js
浏览文件 @ b05e2008
...@@ -8,6 +8,7 @@ let delExSignUrl = domain + "/dingding/delExSign"; ...@@ -8,6 +8,7 @@ let delExSignUrl = domain + "/dingding/delExSign";
Page({ Page({
data: { data: {
employeeList:[],
signList:[], signList:[],
mid:null, mid:null,
personNum:0 personNum:0
...@@ -25,47 +26,132 @@ Page({ ...@@ -25,47 +26,132 @@ Page({
}) })
return false; return false;
} }
var sign={};
sign['signName']=e.detail.value.signName;
sign['signEmail']=e.detail.value.signEmail;
sign['signMobile']=e.detail.value.signMobile;
var signList=new Array(); var sign ={'signName':e.detail.value.signName ,'signEmail':e.detail.value.signEmail ,"signMobile" : e.detail.value.signMobile};
var signList;
//获取缓存中的参会人员列表
dd.getStorage({ dd.getStorage({
key: 'signList', key: 'signList',
success: function(res) { success: function(res) {
signList=res.data.signList; //console.log(res.data);
sign['signId']=signList.length-1; if(res.data==null) {
signList.push(sign); signList =[];
// dd.alert({content: '获取成功：' + res.data.cityName}); }else {
signList=res.data;
}
//添加参会人员
signList.push(sign);
//将新加的参会人员加入缓存中
dd.setStorage({
key: 'signList',
data:signList,
success: function() {
//提示添加成功
dd.alert({
title: '添加成功',
content: '添加成功',
buttonText: '确定',
success: () => {
// var signList2= _this.data.signList;
// signList2=signList;
_this.setData({
signList
})
//添加一个外部人员是否添加成功标
},
});
}
});
}, },
fail: function(res){ fail: function(res){
sign['signId']=0; dd.alert({content: res.errorMessage});
signList.push(sign); }
//dd.alert({content: res.errorMessage}); });
} // dd.setStorage({
}); // key:'issavevisitor',
// data:'1',
// success:function(){
// _this.setData({
// personNum: _this.data.personNum + 1,
// employeeList,
// });
// }
// })
// dd.alert({
// title: '添加成功',
// content: '添加成功',
// buttonText: '确定',
// success: () => {
// var employeeList= _this.data.employeeList;
// var emp={};
// emp['name'] = res.data.result.signName;
// emp['id'] = res.data.result.signId;
// emp['checked'] = true;
// employeeList[employeeList.length-1]=emp;
// //添加一个外部人员是否添加成功标识
// //console.log('employeeList---',_this.data.employeeList);
// },
// });
// if (e.detail.value.signMobile.length != 0) {
// var phoneReg = /(^1[3|4|5|7|8]\d{9}$)|(^09\d{8}$)/;
// var phone = e.detail.value.signMobile;
// if (!phoneReg.test(phone)) {
// dd.alert({
// title: "添加失败",
// content: "手机格式错误",
// buttonText: '确定'
// })
// return false;
// }
// } else {
// dd.alert({
// title: "添加失败",
// content: "手机不为空",
// buttonText: '确定'
// });
// return false;
// }
// if (e.detail.value.signEmail.length!=0 ) {
// var reg = /^\w+([-+.]\w+)*@\w+([-.]\w+)*\.\w+([-.]\w+)*$/;
// var email = e.detail.value.signEmail;
// if (!reg.test(email)) {
// dd.alert({
// title: "添加失败",
// content: "邮箱格式错误",
// buttonText: '确定'
// });
// return false;
// }
// } else {
// dd.alert({
// title: "添加失败",
// content: "邮箱不为空",
// buttonText: '确定'
// });
// return false;
// }
dd.setStorage({
key: 'signList',
data: signList,
success: function() {
dd.alert({
title: '添加成功',
content: '添加成功',
buttonText: '确定',
success: () => {
_this.setData({
personNum: _this.data.personNum + 1,
signList,
});
},
});
}
});
dd.httpRequest({ dd.httpRequest({
url: addExSignUrl, url: addExSignUrl,
...@@ -75,16 +161,65 @@ Page({ ...@@ -75,16 +161,65 @@ Page({
signMobile: e.detail.value.signMobile, signMobile: e.detail.value.signMobile,
signEmail: e.detail.value.signEmail, signEmail: e.detail.value.signEmail,
signName: e.detail.value.signName, signName: e.detail.value.signName,
// dd.httpRequest({
// url: addExSignUrl,
// method: 'POST',
// data: {
// mid: _this.data.mid,
// signMobile: e.detail.value.signMobile,
// signEmail: e.detail.value.signEmail,
// signName: e.detail.value.signName,
}, },
dataType: 'json', dataType: 'json',
// },
// dataType: 'json',
success: function(res) { success: function(res) {
// success: function(res) {
console.log('success----', res) console.log('success----', res)
if (res.data.success) { if (res.data.success) {
//console.log("预定成功"); //console.log("预定成功");
dd.alert({
title: '添加成功',
content: '添加成功',
buttonText: '确定',
success: () => {
var employeeList= _this.data.employeeList;
var emp={};
emp['name'] = res.data.result.signName;
emp['id'] = res.data.result.signId;
emp['checked'] = true;
employeeList.push(emp);
// console.log('success----', res)
// if (res.data.success) {
_this.setData({
personNum: _this.data.personNum + 1,
employeeList,
});
//console.log('employeeList---',_this.data.employeeList);
},
});
// } else {
// dd.showToast({
// type: 'fail',
// content: res.data.message,
// duration: 3000,
// success: () => {
// // dd.navigateTo({
// // url: '../index/index'
// // });
// },
// });
// }
// var employeeList= _this.data.employeeList; // var employeeList= _this.data.employeeList;
...@@ -119,8 +254,17 @@ Page({ ...@@ -119,8 +254,17 @@ Page({
complete: function(res) { complete: function(res) {
dd.hideLoading(); dd.hideLoading();
} }
// },
// fail: function(res) {
// console.log("httpRequestFail---", res)
// dd.alert({ content: JSON.stringify(res) });
// },
// complete: function(res) {
// dd.hideLoading();
// }
}); });
// });
}, },
deleteSign:function (e){ deleteSign:function (e){
...@@ -134,9 +278,50 @@ Page({ ...@@ -134,9 +278,50 @@ Page({
}, },
dataType: 'json', dataType: 'json',
var index=e.currentTarget.dataset.id;
var signList;
dd.getStorage({
key: 'signList',
success: function(res) { success: function(res) {
// console.log('success----', res) // console.log('success----', res)
// console.log(res.data);
signList=res.data;
//删除参会人员
signList.splice(index,1);
// console.log("删除后的列表",signList)
//将新加的参会人员加入缓存中
dd.setStorage({
key: 'signList',
data:signList,
success: function() {
_this.setData({
signList
})
//添加一个外部人员是否添加成功标
}
});
},
fail: function(res){
dd.alert({content: res.errorMessage});
}
});
// dd.httpRequest({
// url: delExSignUrl,
// method: 'POST',
// data: {
// signId: e.currentTarget.dataset.id,
if (res.data.success) { if (res.data.success) {
//console.log("预定成功"); //console.log("预定成功");
...@@ -166,8 +351,43 @@ Page({ ...@@ -166,8 +351,43 @@ Page({
complete: function(res) { complete: function(res) {
dd.hideLoading(); dd.hideLoading();
} }
// },
// dataType: 'json',
// success: function(res) {
// // console.log('success----', res)
}); });
// if (res.data.success) {
// //console.log("预定成功");
// const index = e.currentTarget.dataset.index;
// var employeeList = _this.data.employeeList;
// employeeList = remove(employeeList, index);
// _this.setData({
// employeeList
// })
// } else {
// dd.showToast({
// type: 'fail',
// content: res.data.message,
// duration: 3000,
// success: () => {
// // dd.navigateTo({
// // url: '../index/index'
// // });
// },
// });
// }
// },
// fail: function(res) {
// console.log("httpRequestFail---", res)
// //dd.alert({ content: JSON.stringify(res) });
// },
// complete: function(res) {
// dd.hideLoading();
// }
// });
}, },
...@@ -185,6 +405,18 @@ Page({ ...@@ -185,6 +405,18 @@ Page({
// employeeList:employeeList // employeeList:employeeList
// }) // })
// } // }
var _this=this;
//获取是否已有添加外部人员记录
dd.getStorage({
key:'signList',
success:function(res){
var signList=res.data;
_this.setData({
signList
})
}
})
}, },
onReady(query) { onReady(query) {
...@@ -193,14 +425,22 @@ Page({ ...@@ -193,14 +425,22 @@ Page({
onShow() { onShow() {
// 页面显示 // 页面显示
// this.onLoad() // this.onLoad()
// if(getCurrentPages().length >=3){ if(getCurrentPages().length >=3){
// console.log('执行执行-----'); console.log('执行执行-----');
// this.setData({ this.setData({
// //currentPage: 1, //currentPage: 1,
// employeeList:[] employeeList:[]
// }) })
// this.onLoad() this.onLoad()
// } }
}, },
onHide() { onHide() {
// 页面隐藏 // 页面隐藏
......
pages/conference/index/index.js
浏览文件 @ b05e2008
...@@ -3,10 +3,10 @@ let app = getApp(); ...@@ -3,10 +3,10 @@ let app = getApp();
let domain = app.globalData.domain; let domain = app.globalData.domain;
//获取用户信息的url //获取用户信息的url
let url = domain + "/dingding/login"; let url = domain + "/dingding/login";
let conferenceUrl = domain + "/dingding/conferenceList" let conferenceUrl = domain + "/dingding/conferenceList";
let myinfoUrl = domain +"/dingding/myinfo" let myinfoUrl = domain +"/dingding/myinfo";
Page({
Page({
data: { data: {
corpId: '', corpId: '',
authCode: '', authCode: '',
......
pages/conference/visitor/visitor.js
浏览文件 @ b05e2008
...@@ -255,6 +255,7 @@ Page({ ...@@ -255,6 +255,7 @@ Page({
// 生命周期函数--监听页面加载 // 生命周期函数--监听页面加载
var _this = this; var _this = this;
var userId = app.globalData.userId var userId = app.globalData.userId
this.setData({ this.setData({
mid:query.mid, mid:query.mid,
cnum:query.cnum cnum:query.cnum
......
pages/meeting/record/record.axml
浏览文件 @ b05e2008
...@@ -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-message-password="{{mymessage.messagePassword}}" data-mid="{{mymessage.messageId}}" data-minutesCode="{{conference.minutesCode}}" 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-minutes-code="{{mymessage.conference.minutesCode}}" type='primary' onTap="meetjy">会议纪要</button>
</view> </view>
</view> </view>
<view class="tr"> <view class="tr">
......
pages/meeting/recording/recording.axml
浏览文件 @ b05e2008
...@@ -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}}" data-minutesCode="{{conference.minutesCode}}" type='primary' onTap="summary">会议纪要</button> <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}}" <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>
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论