Skip to content

M
mingPayMobile
Commit 889a11c2 by fengzhaoyu
Options

新建dev分支，开发在dev

parent 6d50c0f3
Showing with 478 additions and 279 deletions
app.js
...@@ -15,6 +15,7 @@ App({ ...@@ -15,6 +15,7 @@ App({
globalData: { globalData: {
loadingType: 0, loadingType: 0,
// globalUrl: 'http://192.168.1.101:9999' //本地豪 // globalUrl: 'http://192.168.1.101:9999' //本地豪
// globalUrl: 'http://192.168.1.102:4000' //本地豪
// globalUrl:'http://192.168.1.110:9999' // 本地成 // globalUrl:'http://192.168.1.110:9999' // 本地成
// globalUrl:'https://gateway.mingwork.com' // globalUrl:'https://gateway.mingwork.com'
globalUrl:'https://gateway-beta.mingwork.com' globalUrl:'https://gateway-beta.mingwork.com'
......
app.json
{ {
"pages": [ "pages": [
"pages/action/action", "pages/action/action",
"pages/historyVistiors/historyVistiors",
"pages/action/action",
"pages/reservations/reservations", "pages/reservations/reservations",
"pages/visitorsDetail/visitorsDetail", "pages/visitorsDetail/visitorsDetail",
"pages/visitors/visitors", "pages/visitors/visitors",
...@@ -15,10 +17,7 @@ ...@@ -15,10 +17,7 @@
"pages/noPermission/noPermission", "pages/noPermission/noPermission",
"pages/allowanceRecordList/allowanceRecordList", "pages/allowanceRecordList/allowanceRecordList",
"pages/reTry/reTry", "pages/reTry/reTry",
"pages/example/example", "pages/example/example"
"pages/historyVistiors/historyVistiors",
"pages/externalContact/externalContact",
"pages/phoneAddressBook/phoneAddressBook"
], ],
"window": { "window": {
"enableWK": "YES", "enableWK": "YES",
......
pages/action/action.js
...@@ -3,7 +3,7 @@ import $login from './../../API/login' ...@@ -3,7 +3,7 @@ import $login from './../../API/login'
Page({ Page({
onLoad(query) { onLoad(query) {
const _that = this; const _that = this;
dd.setNavigationBar({title: ''}); dd.setNavigationBar({ title: '' });
//判断有无网络，判断是否离线 //判断有无网络，判断是否离线
dd.showLoading({ dd.showLoading({
content: '加载中...', content: '加载中...',
...@@ -14,12 +14,12 @@ Page({ ...@@ -14,12 +14,12 @@ Page({
if (res.networkAvailable) { if (res.networkAvailable) {
// 获取免登授权码 // 获取免登授权码
dd.getAuthCode({ dd.getAuthCode({
success:function(res){ success: function(res) {
// 根据免登授权码获取用户信息 // 根据免登授权码获取用户信息
_that.getUserMsg(res.authCode) _that.getUserMsg(res.authCode)
}, },
// 获取免登授权码失败 // 获取免登授权码失败
fail:function(err){ fail: function(err) {
console.log(err) console.log(err)
} }
}); });
...@@ -33,7 +33,7 @@ Page({ ...@@ -33,7 +33,7 @@ Page({
} }
else { else {
dd.hideLoading() dd.hideLoading()
dd.removeStorageSync({key:'token'}) dd.removeStorageSync({ key: 'token' })
dd.redirectTo({ dd.redirectTo({
url: '/pages/reTry/reTry' url: '/pages/reTry/reTry'
}) })
...@@ -54,10 +54,13 @@ Page({ ...@@ -54,10 +54,13 @@ Page({
method: 'POST', method: 'POST',
dataType: 'json', dataType: 'json',
success: function(res) { success: function(res) {
console.log(res,'11111111') if (res.data.resultCode == 0) {
if(res.data.resultCode == 0) {
const data = res.data.data const data = res.data.data
dd.setStorageSync({ dd.setStorageSync({
key: 'name',
data: data.oapiUser.name
})
dd.setStorageSync({
key: 'mingUserId', key: 'mingUserId',
data: data.mingUserId data: data.mingUserId
}) })
...@@ -71,7 +74,7 @@ Page({ ...@@ -71,7 +74,7 @@ Page({
}) })
$login.login() $login.login()
} }
else if(res.data.resultCode == 4003) { else if (res.data.resultCode == 4003) {
dd.alert({ dd.alert({
content: '账号已注销，请联系管理员处理', content: '账号已注销，请联系管理员处理',
buttonText: '确定' buttonText: '确定'
...@@ -79,26 +82,26 @@ Page({ ...@@ -79,26 +82,26 @@ Page({
} }
else { else {
dd.hideLoading() dd.hideLoading()
dd.removeStorageSync({key:'token'}) dd.removeStorageSync({ key: 'token' })
dd.redirectTo({ dd.redirectTo({
url:'/pages/reTry/reTry' url: '/pages/reTry/reTry'
}) })
} }
}, },
fail: function(res) { fail: function(res) {
dd.hideLoading(); dd.hideLoading();
console.log('err',res.errorMessage) console.log('err', res.errorMessage)
if(res.errorMessage == "NETWORK ERROR") { if (res.errorMessage == "NETWORK ERROR") {
dd.alert({ dd.alert({
content:'网络异常，稍后再试', content: '网络异常，稍后再试',
buttonText: '确定' buttonText: '确定'
}) })
} }
else { else {
dd.hideLoading() dd.hideLoading()
dd.removeStorageSync({key:'token'}) dd.removeStorageSync({ key: 'token' })
dd.redirectTo({ dd.redirectTo({
url:'/pages/reTry/reTry' url: '/pages/reTry/reTry'
}) })
} }
} }
......
pages/externalContact/externalContact.js deleted 100644 → 0
const app = getApp()
import create from 'dd-store'
import exampleStore from '/stores/exampleStore'
import $http from './../../API/http'
create.Page({
store: exampleStore,
useAll: true,
data: {
query: ''
},
onLoad(query) {
console.log(query.index, 'query')
this.setData({ query: query.index })
dd.setNavigationBar({
title: '外部联系人',
});
},
onReady() {
const _that = this
dd.chooseExternalUsers({
multiple: false, //是否多选 true多选，false单选，默认是单选
limitTips: "请单选",
success: function(res) {
if (_that.data.query == 0) {
_that.store.data.visitorName = res[0].name
debugger
_that.store.data.selectVisitors = false
_that.update()
}
else {
_that.store.data.visitorPeer[_that.data.query - 1].name = res[0].name
_that.store.data.selectVisitors = false
_that.update()
}
dd.navigateBack({
delta: 1
})
},
fail: function(err) {
_that.store.data.selectVisitors = false
dd.navigateBack({
delta: 1
})
}
});
},
onShow() {
// 页面显示
},
onHide() {
// 页面隐藏
},
onUnload() {
// 页面被关闭
},
onTitleClick() {
// 标题被点击
},
onReachBottom() {
},
onShareAppMessage() {
// 返回自定义分享信息
return {
title: 'My App',
desc: 'My App description',
path: 'pages/index/index',
};
},
});
pages/historyVistiors/historyVistiors.acss
@import '../../fonts/iconfont.acss';
* {
font-family: 'PingFangSC-Regular';
letter-spacing: -0.72rpx;
}
.historyVistiorsTop {
width: 750rpx;
padding: 32rpx 0;
background: white;
}
.search {
position: relative;
width: 686rpx;
height: 72rpx;
background: rgba(25, 31, 37, 0.08);
border-radius: 6rpx;
display: flex;
margin: 0 auto;
line-height: 72rpx;
}
.iconweixuan {
font-size: 40rpx;
margin: 0 16rpx 0 28rpx;
opacity: 0.32;
}
.search input {
width: 60;
height: 100%;
line-height: 72rpx;
padding: 0;
outline: none;
border: none;
font-size: 28rpx;
color: #191F25;
letter-spacing: -0.18rpx;
line-height: 38rpx;
background: #EDEDEE;
}
.searchConfirm {
background: white;
position: absolute;
right: 0;
color: #3296FA;
font-size: 28rpx;
width: 80rpx;
height: 100%;
line-height: 72rpx;
text-align: center;
}
.selectClass {
width: 750rpx;
height: 96rpx;
background: white;
display: flex
}
.selectClass view {
width: 50%;
height: 96rpx;
line-height: 96rpx;
font-size: 30rpx;
letter-spacing: -0.48rpx;
text-align: center;
border-bottom: 4rpx solid #F1F1F1;
}
.selectClass .clickTabs {
color: #3296FA;
border-bottom: 4rpx solid #3296FA;
}
.historyVistiorsBottom {
width: 686rpx;
padding: 40rpx 32rpx;
background: white;
border-bottom: 2rpx solid F1F1F1;
}
.historyVistiorsBottom>view {
display: flex;
position: relative;
}
.select {
width: 44rpx;
height: 44rpx;
border-radius: 50%;
border: 2rpx solid #DADADE;
text-align: center;
line-height: 44rpx;
color: white;
}
.selects {
width: 44rpx;
height: 44rpx;
border-radius: 50%;
border: 2rpx solid #DADADE;
text-align: center;
line-height: 44rpx;
color: white;
background: #3296FA
}
.name {
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
width: 100rpx;
height: 100%;
line-height: 44rpx;
text-align: center;
font-size: 34rpx;
color: #000000;
letter-spacing: -0.82rpx;
margin: 0 14rpx 0 20rpx;
}
.purpose {
width: 116rpx;
height: 36rpx;
border: 2rpx solid #3296FA;
color: #3296FA;
border-radius: 6rpx;
text-align: center;
line-height: 36rpx;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
margin-right: 36rpx;
font-size: 20rpx;
}
.longTime {
width: 72rpx;
height: 36rpx;
border: 2rpx solid #3296FA;
color: #3296FA;
border-radius: 6rpx;
text-align: center;
font-size: 20rpx;
line-height: 36rpx;
}
.staus {
position: absolute;
right: 32rpx;
width: 72rpx;
height: 38rpx;
float: right;
text-align: center;
line-height: 38rpx;
color: #7D8082;
font-size: 24rpx;
}
.time {
margin-left: 64rpx;
margin-top: 16rpx;
opacity: 0.8;
font-size: 24rpx;
color: #191F25;
letter-spacing: -0.38rpx;
}
.byVisitor {
position: absolute;
right: 32rpx;
top: 16rpx;
font-size: 24rpx;
color: #7D8082;
letter-spacing: -0.14rpx;
}
.button {
position: fixed;
bottom: 0;
left: 0;
right: 0;
background: white;
padding: 32rpx 32rpx;
width: 686rpx;
}
.button view {
width: 100%;
height: 96rpx;
background: #3296FA;
text-align: center;
line-height: 96rpx;
color: white;
}
\ No newline at end of file
pages/historyVistiors/historyVistiors.axml
<view> <view class="historyVistiors">
New Page <view class="historyVistiorsTop">
<view class="search">
<text class="iconfont iconweixuan"></text>
<input placeholder="搜索访客姓名" onInput="visitorInput" />
<view class="searchConfirm" onTap='serchConfirm'>搜索</view>
</view>
</view>
<view class="historyVistorsCenter">
<view class="selectClass">
<view class="{{type == '1' ? 'clickTabs' : ''}}" data-type="1" onTap="changeType">我的访客</view>
<view class="{{type !== '1' ? 'clickTabs' : ''}}" data-type="0" onTap="changeType">公司访客</view>
</view>
</view>
<view class="historyVistiorsBottom" a:for="{{dataList}}" a:for-index="index" a:for-item="item" onTap="select" data-item="{{item}}">
<view>
<view class="iconfont iconxuanze {{item.recordId==recordId?'selects':'select'}}"></view>
<view class="name ">{{item.visitorName}}</view>
<view class="purpose">{{item.purpose}}</view>
<view class="longTime" a:if='{{item.longTime}}'>长期</view>
<view class="staus">{{item.processStatus == 'invite'?'待访问':(item.processStatus == 'cancel'?"已取消":"已到访")}}</view>
</view>
<view>
<view class="time">
2019-10-27 17:41
</view>
<view class="byVisitor">被访人：王梦琳</view>
</view>
</view>
<view class="button">
<view onTap="confirm">确认选择</view>
</view>
</view> </view>
\ No newline at end of file
pages/historyVistiors/historyVistiors.js
Page({ const app = getApp()
data: {}, import $http from './../../API/http';
onLoad() {}, import create from 'dd-store';
import exampleStore from '/stores/exampleStore';
create.Page({
store: exampleStore,
useAll: true,
data: {
type: '1',
dataList: [],
currentPage: 1,
pageSize: 10,
totalCount: '',
select: '',
recordId: '',
index: '',
value: ''
},
changeType(event) {
this.setData({
type: event.target.dataset.type,
dataList: [],
currentPage: 1
})
this.visitorList(this.data.type)
},
visitorList(type) {
const _that = this
let data = {
currentPage: this.data.currentPage,
pageSize: this.data.pageSize,
type: type,
visitorName: _that.data.value
}
$http.$http('/admin/visitor/getRecordList', data, 'post').then(res => {
let dataList = res.records;
let dataListSource = _that.data.dataList;;
console.log(dataList.length)
if (dataList.length > 0) {
dataList.forEach((item, index) => {
if (new Date(item.endTime.replace(/\-/g, "/")).getTime() < new Date().getTime()) {
item.overdue = true
}
else {
item.overdue = false
}
if (new Date(item.endTime.replace(/\-/g, "/")).getTime() - new Date(item.startTime.replace(/\-/g, "/")).getTime() < 24 * 60 * 60 * 3 * 1000) {
item.longTime = false
}
else {
item.longTime = true
}
item.endTime = _that.timeToStr(item.endTime)
item.startTime = _that.timeToStr(item.startTime)
dataListSource.push(item)
})
dataList = dataListSource
let totalCount = Math.ceil(parseInt(res.total) / _that.data.pageSize)
_that.setData({
dataList: dataList,
totalCount: totalCount
})
}
})
},
timeToStr(time) {
if (/-/.test(time)) {
time = time.replace(/\-/g, "/")
}
let timeData = new Date(time)
let year = timeData.getFullYear()
let month = timeData.getMonth() + 1
let date = timeData.getDate()
let hour = timeData.getHours()
let minute = timeData.getMinutes()
return {
year: year,
month: month.toString().length > 1 ? month : '0' + month,
date: date.toString().length > 1 ? date : '0' + date,
hour: hour.toString().length > 1 ? hour : '0' + hour,
minute: minute.toString().length > 1 ? minute : '0' + minute,
yearMonthDate: `${year}年${month.toString().length > 1 ? month : '0' + month}月${date.toString().length > 1 ? date : '0' + date}日`,
hourMinute: `${hour.toString().length > 1 ? hour : '0' + hour}:${minute.toString().length > 1 ? minute : '0' + minute}`,
allTime: `${year}年${month.toString().length > 1 ? month : '0' + month}月${date.toString().length > 1 ? date : '0' + date}日 ${hour.toString().length > 1 ? hour : '0' + hour}:${minute.toString().length > 1 ? minute : '0' + minute}分`
}
},
onLoad(query) {
dd.setNavigationBar({
title: '历史访客',
});
console.log(this.store.data.visitorPeer)
this.setData({
index: query.index,
dataList: []
})
},
visitorInput(event) {
this.setData({
value: event.detail.value,
})
},
serchConfirm() {
const _that = this
this.setData({
dataList: []
})
_that.visitorList()
},
confirm() {
const _that = this
if (_that.data.index == 0) {
_that.store.data.visitorName = _that.data.select.visitorName
_that.store.data.visitorPhone = _that.data.select.mobile
_that.store.data.selectVisitors = false
_that.update()
}
else {
console.log(_that.store.data.visitorPeer)
_that.store.data.visitorPeer[_that.data.index - 1].name = _that.data.select.visitorName
_that.store.data.visitorPeer[_that.data.index - 1].phone = _that.data.select.mobile
_that.store.data.selectVisitors = false
_that.update()
}
dd.navigateBack({
delta: 1
})
},
select(event) {
console.log(event.target.dataset.item.recordId)
this.setData({
select: event.target.dataset.item,
recordId: event.target.dataset.item.recordId
})
},
onReady() {
this.visitorList(1)
},
onShow() {
// 页面显示
},
onHide() {
// 页面隐藏
},
onUnload() {
// 页面被关闭
},
onTitleClick() {
// 标题被点击
},
onReachBottom() {
let currentNum = '';
if (this.data.currentPage < this.data.totalCount) {
currentNum = this.data.currentPage + 1
this.setData({
currentPage: currentNum
})
this.visitorList(this.data.type)
}
},
onShareAppMessage() {
// 返回自定义分享信息
return {
title: 'My App',
desc: 'My App description',
path: 'pages/index/index',
};
},
}); });
pages/phoneAddressBook/phoneAddressBook.js deleted 100644 → 0
const app = getApp()
import create from 'dd-store'
import exampleStore from '/stores/exampleStore'
import $http from './../../API/http'
create.Page({
store: exampleStore,
useAll: true,
data: {
query: ''
},
onLoad(query) {
console.log(query.index, 'query')
this.setData({ query: query.index })
dd.setNavigationBar({
title: '手机通讯录',
});
},
onReady() {
const _that = this
_that.store.data.selectVisitors = false
_that.update()
dd.choosePhonebook({
multiple: false, //是否多选： true多选 false单选； 默认true
success: function(res) {
if (_that.data.query == 0) {
_that.store.data.visitorName = res[0].name
}
else {
_that.store.data.visitorPeer[_that.data.query - 1] = res[0].name
_that.store.data.selectVisitors = false
_that.update()
}
dd.navigateBack({
delta: 1
})
},
fail: function(err) {
_that.store.data.selectVisitors = false
_that.update()
dd.navigateBack({
delta: 1
})
}
});
},
onShow() {
// 页面显示
},
onHide() {
// 页面隐藏
},
onUnload() {
// 页面被关闭
},
onTitleClick() {
// 标题被点击
},
onReachBottom() {
},
onShareAppMessage() {
// 返回自定义分享信息
return {
title: 'My App',
desc: 'My App description',
path: 'pages/index/index',
};
},
});
pages/reservations/reservations.acss
...@@ -152,6 +152,9 @@ ...@@ -152,6 +152,9 @@
color: rgb(153, 153, 153); color: rgb(153, 153, 153);
font-size: 32rpx; font-size: 32rpx;
margin-left: 86rpx; margin-left: 86rpx;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
} }
.iconzhankai { .iconzhankai {
...@@ -344,6 +347,7 @@ ...@@ -344,6 +347,7 @@
display: flex; display: flex;
align-items: center; align-items: center;
} }
.ccPeople view { .ccPeople view {
position: relative; position: relative;
height: 100rpx; height: 100rpx;
...@@ -354,6 +358,7 @@ ...@@ -354,6 +358,7 @@
color: white; color: white;
text-align: center; text-align: center;
} }
.ccPeopleShanChu { .ccPeopleShanChu {
position: absolute; position: absolute;
top: -40rpx; top: -40rpx;
......
pages/reservations/reservations.js
...@@ -21,7 +21,6 @@ create.Page({ ...@@ -21,7 +21,6 @@ create.Page({
Companions: [], Companions: [],
copyPerson: [], // 周知人 copyPerson: [], // 周知人
index: '', index: '',
visitorPhone: '',// 主访客的手机号
visitorCompany: '',// 访客的单位 visitorCompany: '',// 访客的单位
visitorPurpose: '', // 访客手动输入的目的 visitorPurpose: '', // 访客手动输入的目的
visitorNode: '',// 访客的备注 visitorNode: '',// 访客的备注
...@@ -29,6 +28,7 @@ create.Page({ ...@@ -29,6 +28,7 @@ create.Page({
formValidation: false, formValidation: false,
}, },
onLoad(query) { onLoad(query) {
console.log('onload')
this.reSet() this.reSet()
dd.setNavigationBar({ dd.setNavigationBar({
title: '预约访客' title: '预约访客'
...@@ -90,7 +90,8 @@ create.Page({ ...@@ -90,7 +90,8 @@ create.Page({
_that.update() _that.update()
break; break;
case "visitorPhone": case "visitorPhone":
_that.setData({ visitorPhone: event.detail.value }) _that.store.data.visitorPhone = event.detail.value
_that.update()
break; break;
case "visitorCompany": case "visitorCompany":
_that.setData({ visitorCompany: event.detail.value }) _that.setData({ visitorCompany: event.detail.value })
...@@ -138,11 +139,13 @@ create.Page({ ...@@ -138,11 +139,13 @@ create.Page({
limitTips: "请单选", limitTips: "请单选",
success: function(res) { success: function(res) {
if (_that.data.index == 0) { if (_that.data.index == 0) {
_that.store.data.visitorPhone = ''
_that.store.data.visitorName = res[0].name _that.store.data.visitorName = res[0].name
_that.store.data.selectVisitors = false _that.store.data.selectVisitors = false
_that.update() _that.update()
} }
else { else {
_that.store.data.visitorPeer[_that.data.index - 1].phone = ''
_that.store.data.visitorPeer[_that.data.index - 1].name = res[0].name _that.store.data.visitorPeer[_that.data.index - 1].name = res[0].name
_that.store.data.selectVisitors = false _that.store.data.selectVisitors = false
_that.update() _that.update()
...@@ -154,6 +157,10 @@ create.Page({ ...@@ -154,6 +157,10 @@ create.Page({
} }
}); });
}, },
// 点击历史访客
historyVistiorsSelect(event) {
dd.navigateTo({ url: `./../historyVistiors/historyVistiors?index=${this.data.index}` });
},
// 点击手机通讯录 // 点击手机通讯录
phoneAddressBookSelect() { phoneAddressBookSelect() {
const _that = this const _that = this
...@@ -163,17 +170,13 @@ create.Page({ ...@@ -163,17 +170,13 @@ create.Page({
success: function(res) { success: function(res) {
console.log(res, 'res') console.log(res, 'res')
if (_that.data.index == 0) { if (_that.data.index == 0) {
_that.setData({ _that.store.data.visitorPhone = res[0].mobile
visitorPhone: res[0].mobile
})
_that.store.data.visitorName = res[0].name _that.store.data.visitorName = res[0].name
_that.update() _that.update()
console.log(_that.data.visitorPhone, 'visitorPhone')
console.log(res[0].mobile, 'res[0].mobile')
} }
else { else {
_that.store.data.visitorPeer[_that.data.index - 1] = res[0].name _that.store.data.visitorPeer[_that.data.index - 1].name = res[0].name
_that.store.data.visitorPeer[_that.data.index - 1].phone = res[0].mobile
_that.store.data.selectVisitors = false _that.store.data.selectVisitors = false
_that.update() _that.update()
} }
...@@ -261,7 +264,6 @@ create.Page({ ...@@ -261,7 +264,6 @@ create.Page({
// 提交预约单 // 提交预约单
confirmAppointment() { confirmAppointment() {
const _that = this const _that = this
console.log(_that.store.data.visitorPeer, 'number电话号码')
let participator = '' let participator = ''
_that.data.copyPerson.forEach((item, index) => { _that.data.copyPerson.forEach((item, index) => {
participator = participator + item.name + ':' + item.userId + ',' participator = participator + item.name + ':' + item.userId + ','
...@@ -286,14 +288,15 @@ create.Page({ ...@@ -286,14 +288,15 @@ create.Page({
let data = { let data = {
startTime: this.data.startTime + '' + ':00', startTime: this.data.startTime + '' + ':00',
endTime: this.data.endTime + '' + ':00', endTime: this.data.endTime + '' + ':00',
visitorInfo: `${this.store.data.visitorName}:${this.data.visitorPhone},${visitorPeer}`, visitorInfo: `${this.store.data.visitorName}:${this.store.data.visitorPhone},${visitorPeer}`,
companyName: this.data.visitorCompany, companyName: this.data.visitorCompany,
purpose: purpose, purpose: purpose,
visitorPurpose: this.data.visitorPurpose, visitorPurpose: this.data.visitorPurpose,
visitAddress: this.data.defaultAddress, visitAddress: this.data.defaultAddress,
visitorNode: this.data.visitorNode, remark: this.data.visitorNode,
participator: participator, participator: participator,
ddUserId: dd.getStorageSync({ key: 'userId' }).data thirdId: dd.getStorageSync({ key: 'userId' }).data,
name: dd.getStorageSync({ key: 'name' }).data
} }
if (this.data.formValidation) { if (this.data.formValidation) {
$http.$http('/admin/visitor/addRecord', data, 'post').then(res => { $http.$http('/admin/visitor/addRecord', data, 'post').then(res => {
...@@ -315,24 +318,23 @@ create.Page({ ...@@ -315,24 +318,23 @@ create.Page({
formValidation() { formValidation() {
console.log(this.store.data.visitorPeer, 'number1') console.log(this.store.data.visitorPeer, 'number1')
// 手机号码相同 // 手机号码相同
let number = [this.data.visitorPhone] let number = [this.store.data.visitorPhone]
let name = false let name = false
let mobile = false let mobile = false
this.store.data.visitorPeer.forEach((item, index) => { this.store.data.visitorPeer.forEach((item, index) => {
if (item.name == '' || item.length > 10) { if (item.name == '' || item.name.length > 10) {
name = true name = true
} }
else if (item.phone == '' || !(/^[1][3,4,5,7,8][0-9]{9}$/).test(this.data.visitorPhone)) { else if (item.phone == '' || !(/^[1][3,4,5,7,8][0-9]{9}$/).test(this.store.data.visitorPhone)) {
mobile = true mobile = true
} }
number.push(item.phone) number.push(item.phone)
}) })
let s = this.isRepeat(number);
if (this.store.data.visitorName == '' || this.store.data.visitorName.length > 10) { if (this.store.data.visitorName == '' || this.store.data.visitorName.length > 10) {
dd.alert({ content: '访客姓名不能为空且长度小于10个字符', buttonText: '确定' }) dd.alert({ content: '访客姓名不能为空且长度小于10个字符', buttonText: '确定' })
return return
} }
else if (this.data.visitorPhone == '' || !(/^[1][3,4,5,7,8][0-9]{9}$/).test(this.data.visitorPhone)) { else if (this.store.data.visitorPhone == '' || !(/^[1][3,4,5,7,8][0-9]{9}$/).test(this.store.data.visitorPhone)) {
dd.alert({ content: '请输入正确的手机号码', buttonText: '确定' }) dd.alert({ content: '请输入正确的手机号码', buttonText: '确定' })
return return
} }
...@@ -340,8 +342,8 @@ create.Page({ ...@@ -340,8 +342,8 @@ create.Page({
dd.alert({ content: '访客单位的长度小于20个字符', buttonText: '确定' }) dd.alert({ content: '访客单位的长度小于20个字符', buttonText: '确定' })
return return
} }
else if (new Date(this.data.startTime).getTime() > new Date(this.data.endTime).getTime()) { else if (new Date(this.data.startTime.replace(/\-/g, "/")).getTime() > new Date(this.data.endTime.replace(/\-/g, "/")).getTime()) {
dd.alert({ content: '开始时间不能晚于结束时间', buttonText: '确定' }) dd.alert({ content: '结束时间不能早于开始时间', buttonText: '确定' })
return return
} }
else if (this.data.visitorPurpose.length > 20) { else if (this.data.visitorPurpose.length > 20) {
...@@ -357,7 +359,10 @@ create.Page({ ...@@ -357,7 +359,10 @@ create.Page({
return return
} }
else if (mobile) { else if (mobile) {
return dd.alert({ content: '访客姓名不能为空且长度小于10个字符', buttonText: '确定' }) return dd.alert({ content: '访客手机号不能为空且长度小于10个字符', buttonText: '确定' })
}
else if (this.data.defaultAddress == '') {
return dd.alert({ content: '请选择或添加到访地址', buttonText: '确定' })
} }
this.setData({ this.setData({
formValidation: true formValidation: true
...@@ -366,11 +371,11 @@ create.Page({ ...@@ -366,11 +371,11 @@ create.Page({
// 手机号码不能重复 // 手机号码不能重复
isRepeat(ary) { isRepeat(ary) {
var number = Array.from(new Set(ary)) var number = Array.from(new Set(ary))
if (number.length != ary) { if (number.length != ary.length) {
return false return true
} }
else { else {
return true return false
} }
}, },
// 选择开始时间 // 选择开始时间
...@@ -494,6 +499,7 @@ create.Page({ ...@@ -494,6 +499,7 @@ create.Page({
onShow() { onShow() {
// 页面显示 // 页面显示
// 关闭遮照层 // 关闭遮照层
console.log('onShow')
this.store.data.selectVisitors = false; this.store.data.selectVisitors = false;
this.update() this.update()
}, },
......
pages/visitorsDetail/visitorsDetail.acss
...@@ -5,73 +5,27 @@ ...@@ -5,73 +5,27 @@
} }
.visitorsDetail { .visitorsDetail {
background: white background: white;
} }
/* .iconfont {
display: inline-block;
width: 32rpx;
height: 44rpx;
line-height: 44rpx;
font-size: 32rpx;
} */
.visitorTab { .visitorTab {
width: 686rpx;
padding: 0 32rpx;
overflow: hidden;
background: white;
position: relative; position: relative;
padding: 40rpx 32rpx 60rpx 32rpx;
display: flex;
width: 686rpx;
} }
.visitorName { .visitorTabLeft {
height: 52rpx;
line-height: 52rpx;
margin-top: 36rpx;
font-size: 34rpx;
line-height: 36rpx;
color: #000000;
font-weight: bolder;
}
.visitorNameName {
margin-right: 20rpx;
}
.visitorNumber {
height: 44rpx;
line-height: 44rpx;
margin-top: 20rpx;
font-size: 34rpx;
margin-bottom: 10rpx;
}
.call {
width: 80rpx;
height: 30rpx;
background: rgba(24, 144, 255, 0.1);
color: #1890FF;
display: inline-block;
text-align: center; text-align: center;
line-height: 30rpx; border-radius: 50%;
margin-left: 22rpx; line-height: 128rpx;
font-size: 22rpx; width: 128rpx;
border-radius: 15rpx; height: 128rpx;
margin-bottom: 7rpx; background: #1890FF;
vertical-align: middle; color: white;
} font-size: 32rpx;
letter-spacing: -0.78rpx;
.visitorCompany { margin-right: 40rpx;
height: 44rpx;
line-height: 44rpx;
margin-bottom: 20rpx;
font-size: 34rpx;
}
.visitorCompanyName {
display: inline-block;
line-height: 1.5;
font-size: 34rpx;
} }
image { image {
...@@ -132,8 +86,7 @@ image { ...@@ -132,8 +86,7 @@ image {
line-height: 44rpx; line-height: 44rpx;
} }
.noOverdue , .noOverdue, .overdue {
.overdue {
padding: 16rpx 32rpx; padding: 16rpx 32rpx;
box-shadow: inset 0 0 0 0 rgba(25, 31, 37, 0.12); box-shadow: inset 0 0 0 0 rgba(25, 31, 37, 0.12);
display: flex; display: flex;
......
pages/visitorsDetail/visitorsDetail.axml
<!--<view><view class='byVisitorDetail'><view class='name'>{{name ? name:未命名}}未命名</view><view class='phone'><view class='iconfont icondianhua'></view><view class='phoneNumber'>{{phone}}</view><view class='call'>拨打</view></view><view class='company'><view class='iconfont iconqiye'></view><view class='companyName'> {{company}}|| 未填写</view></view><image mode="scaleToFill" src="{{processStatus == 'invite'? '../../assets/await.png': (processStatus == 'cancel'? '../../assets/cancel.png':'../../assets/dao.png')}}"/></view><view class='visitorDetail'><view class='visitorTime'><view class=' visitorTimeTop'><view class='iconfont icontime'></view><view class='visitorText'>访问时间</view></view><view class=' visitorTimeBottom timers'><view class='beginTime'><view>{{startTime}}</view><view>{{startHour}}</view></view><view class='center'>~</view><view class='beginTime'><view>{{endTime}}</view><view>{{endHour}}</view></view></view></view><view class='visitorTime'><view class=' visitorTimeTop'><view class='iconfont iconbeifangren'></view><view class='visitorText'>被访人</view></view><view class=' visitorTimeBottom'><view class='beginTime'>林萍萍</view></view></view><view class='visitorTime'><view class=' visitorTimeTop'><view class='iconfont iconlaifangmudi'></view><view class='visitorText'>来访目的</view></view><view class=' visitorTimeBottom'><view class='beginTime'>商务洽谈</view></view></view><view class='visitorTime'><view class=' visitorTimeTop'><view class='iconfont icondingwei'></view><view class='visitorText'>到访地址</view></view><view class=' visitorTimeBottom'><view class='beginTime'>浙江商杭州市余杭区</view></view></view><view class='visitorTime'><view class=' visitorTimeTop'><view class='iconfont iconzhouzhiren'></view><view class='visitorText'>周知人员</view></view><view class=' visitorTimeBottom'><text>叶琴哈</text><text>叶琴哈</text><text>叶琴哈</text><text>叶琴哈</text><text>叶琴哈</text><text>叶琴哈</text></view></view></view><view class='visitorButton'><view><view class='cancel'>取消访客</view><view class='reception'>接待访客</view></view><view></view></view></view><view> -->
<view class="visitorsDetail"> <view class="visitorsDetail">
<view class="visitorTab"> <view class="visitorTab">
<view class="visitorName"> <view class='visitorTabLeft'>{{byVisitorName.substring(byVisitorName.length-2)}}</view>
<text class="visitorNameName">{{visitorName}}</text> <view class="visitorTabRight"></view>
<text class="visitorNameIcon iconfont iconzhankai">
<!--<text class="visitorHidden"><text>1111111111</text><text>1111111111</text><text>1111111111</text><text>1111111111</text><text>1111111111</text></text> -->
</text>
</view>
<view class="visitorNumber">
<text class="iconfont icondianhua visitorNumberIcon"></text>
<text class="visitorNumberNumber">{{phone}}</text>
<text class="call" onTap="call">拨打</text>
</view>
<view class="visitorCompany" a:if='{{company}}'>
<text class="visitorCompanyIcon iconfont iconqiye"></text>
<text class="visitorCompanyName">{{company}}</text>
</view>
<image mode="scaleToFill" src="{{processStatus == 'invite'? '../../assets/await.png': (processStatus == 'cancel'? '../../assets/cancel.png':'../../assets/dao.png')}}"/> <image mode="scaleToFill" src="{{processStatus == 'invite'? '../../assets/await.png': (processStatus == 'cancel'? '../../assets/cancel.png':'../../assets/dao.png')}}"/>
</view> </view>
<view class="otherInfo"> <view class="otherInfo">
......
pages/visitorsDetail/visitorsDetail.js
...@@ -56,7 +56,6 @@ Page({ ...@@ -56,7 +56,6 @@ Page({
cancelButtonText: '取消', cancelButtonText: '取消',
success: (result) => { success: (result) => {
if (result.confirm == false) { if (result.confirm == false) {
} }
else { else {
let data = { let data = {
...@@ -72,19 +71,15 @@ Page({ ...@@ -72,19 +71,15 @@ Page({
}, },
reception() { reception() {
console.log(3333333)
dd.confirm({ dd.confirm({
title: '确认已接待', title: '确认已接待',
content:'确认已接待访客',
confirmButtonText: '确认', confirmButtonText: '确认',
cancelButtonText: '取消', cancelButtonText: '取消',
success: (result) => { success: (result) => {
console.log(result) if (result.confirm == false) {
console.log(4444)
if (result.confirm == 'false') {
console.log(11111111111111)
} }
else { else {
console.log(222222)
let data = { let data = {
recordId: this.data.recordId recordId: this.data.recordId
} }
...@@ -96,7 +91,7 @@ Page({ ...@@ -96,7 +91,7 @@ Page({
}, },
fail: (err) => { fail: (err) => {
console.log(66666) console.log(JSON.stringify(err))
} }
}); });
......
stores/exampleStore.js
...@@ -3,8 +3,9 @@ class Store { ...@@ -3,8 +3,9 @@ class Store {
data = { data = {
title: '测试', title: '测试',
visitorName: '', // 主访客的姓名 visitorName: '', // 主访客的姓名
visitorPhone: '',
selectVisitors: false, //控制遮照层是否层出 selectVisitors: false, //控制遮照层是否层出
visitorPeer:[], // 同行访客 visitorPeer:[], // 同行
backgroundColor:'#fff', //预约访客页面顶部导航栏的背景色 backgroundColor:'#fff', //预约访客页面顶部导航栏的背景色
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment