diff --git a/api/user.js b/api/user.js deleted file mode 100644 index 4f7bfa2..0000000 --- a/api/user.js +++ /dev/null @@ -1,14 +0,0 @@ -import fetch from '@/common/fetch.js'; -import BASE_URL from './base.js'; -import useNetWork from '@/common/useNetWork.js'; - -const LOGIN = BASE_URL + '/user/login'; //改 - - -export function login(code) { - useNetWork(); - const params = { - wxcode: code, - }; - return fetch.post(LOGIN, params).then(res => res); -} diff --git a/api/user.js b/api/user.js deleted file mode 100644 index 4f7bfa2..0000000 --- a/api/user.js +++ /dev/null @@ -1,14 +0,0 @@ -import fetch from '@/common/fetch.js'; -import BASE_URL from './base.js'; -import useNetWork from '@/common/useNetWork.js'; - -const LOGIN = BASE_URL + '/user/login'; //改 - - -export function login(code) { - useNetWork(); - const params = { - wxcode: code, - }; - return fetch.post(LOGIN, params).then(res => res); -} diff --git a/pages.json b/pages.json index 302ed83..a3072e2 100644 --- a/pages.json +++ b/pages.json @@ -17,7 +17,7 @@ "path" : "pages/mine/mine", "style" : { - "navigationBarTitleText": "我的", + "navigationBarTitleText": "安防平台小程序", "enablePullDownRefresh": false } }, diff --git a/api/user.js b/api/user.js deleted file mode 100644 index 4f7bfa2..0000000 --- a/api/user.js +++ /dev/null @@ -1,14 +0,0 @@ -import fetch from '@/common/fetch.js'; -import BASE_URL from './base.js'; -import useNetWork from '@/common/useNetWork.js'; - -const LOGIN = BASE_URL + '/user/login'; //改 - - -export function login(code) { - useNetWork(); - const params = { - wxcode: code, - }; - return fetch.post(LOGIN, params).then(res => res); -} diff --git a/pages.json b/pages.json index 302ed83..a3072e2 100644 --- a/pages.json +++ b/pages.json @@ -17,7 +17,7 @@ "path" : "pages/mine/mine", "style" : { - "navigationBarTitleText": "我的", + "navigationBarTitleText": "安防平台小程序", "enablePullDownRefresh": false } }, diff --git a/pages/checkMessageDetail/checkMessageDetail.vue b/pages/checkMessageDetail/checkMessageDetail.vue index 1ee3ddd..8f149d5 100644 --- a/pages/checkMessageDetail/checkMessageDetail.vue +++ b/pages/checkMessageDetail/checkMessageDetail.vue @@ -5,10 +5,21 @@ 您的访客申请{{status}} 请耐心等待管理员审核 - 申请{{item.status}} + 申请{{status}} - + + + 请联系安保人员进行确认 + + + + + 访客{{name}}可凭借身份证在{{time}}时间内进入{{place}} + + + + {{item.value}} - + + 申请通过 @@ -47,7 +59,7 @@ export default { data() { return { - isManager: true, + isManager: false, show: false, //控制模态框显隐 content: '', //模态框显示内容 list: [ @@ -108,6 +120,9 @@ }, ], status: '未通过', + name: '张三', + time: '2012', + place: '一期主楼' } }, methods: { @@ -175,12 +190,11 @@ margin-right: 60rpx; } } - .button-area { + .button-area-manager { display: flex; flex-direction: row; justify-content: center; align-items: center; - margin-top: 60rpx; .pass { width: fit-content; padding: 10rpx 20rpx; diff --git a/api/user.js b/api/user.js deleted file mode 100644 index 4f7bfa2..0000000 --- a/api/user.js +++ /dev/null @@ -1,14 +0,0 @@ -import fetch from '@/common/fetch.js'; -import BASE_URL from './base.js'; -import useNetWork from '@/common/useNetWork.js'; - -const LOGIN = BASE_URL + '/user/login'; //改 - - -export function login(code) { - useNetWork(); - const params = { - wxcode: code, - }; - return fetch.post(LOGIN, params).then(res => res); -} diff --git a/pages.json b/pages.json index 302ed83..a3072e2 100644 --- a/pages.json +++ b/pages.json @@ -17,7 +17,7 @@ "path" : "pages/mine/mine", "style" : { - "navigationBarTitleText": "我的", + "navigationBarTitleText": "安防平台小程序", "enablePullDownRefresh": false } }, diff --git a/pages/checkMessageDetail/checkMessageDetail.vue b/pages/checkMessageDetail/checkMessageDetail.vue index 1ee3ddd..8f149d5 100644 --- a/pages/checkMessageDetail/checkMessageDetail.vue +++ b/pages/checkMessageDetail/checkMessageDetail.vue @@ -5,10 +5,21 @@ 您的访客申请{{status}} 请耐心等待管理员审核 - 申请{{item.status}} + 申请{{status}} - + + + 请联系安保人员进行确认 + + + + + 访客{{name}}可凭借身份证在{{time}}时间内进入{{place}} + + + + {{item.value}} - + + 申请通过 @@ -47,7 +59,7 @@ export default { data() { return { - isManager: true, + isManager: false, show: false, //控制模态框显隐 content: '', //模态框显示内容 list: [ @@ -108,6 +120,9 @@ }, ], status: '未通过', + name: '张三', + time: '2012', + place: '一期主楼' } }, methods: { @@ -175,12 +190,11 @@ margin-right: 60rpx; } } - .button-area { + .button-area-manager { display: flex; flex-direction: row; justify-content: center; align-items: center; - margin-top: 60rpx; .pass { width: fit-content; padding: 10rpx 20rpx; diff --git a/pages/mine/mine.vue b/pages/mine/mine.vue index f90e2e4..9bba133 100644 --- a/pages/mine/mine.vue +++ b/pages/mine/mine.vue @@ -1,8 +1,20 @@ /** * 我的 */ @@ -14,22 +26,29 @@ }, data() { return { - callerInfo: { - callerNmae: '', - id: '', - contact: '', - purpose: '', - building: '', - time: '', - number: '', - name: '', - bz: '', - }, - rules: {}, - show: false, - buildingShow: false, - columns: [['商务会议', '安装维修', '其他事宜']], - buildingColumns: [['一期主楼', '二期主楼', '录制楼', '1600演播厅']], + img: '', //头像 + list: [ + { + id: 'number', + name: '员工号', + value: '111' + }, + { + id: 'name', + name: '员工姓名', + value: '张三' + }, + { + id: 'type', + name: '员工类型', + value: '111' + }, + { + id: 'phone', + name: '手机号', + value: '111' + }, + ] } }, onShow() { @@ -39,22 +58,32 @@ uni.setStorageSync('currentPagePath', this.currentPagePath) }, methods: { - //获取访问目的 - getPurpose(val) { - this.callerInfo.purpose = val.value[0] - this.show = false - }, - //获取访问楼栋 - getBuilding(val) { - this.callerInfo.building = val.value[0] - this.buildingShow = false - }, + onChooseAvatar(e) { + this.img = e.detail.avatarUrl; + + //在此，调一个接口把头像信息存上 + } }, } diff --git a/api/user.js b/api/user.js deleted file mode 100644 index 4f7bfa2..0000000 --- a/api/user.js +++ /dev/null @@ -1,14 +0,0 @@ -import fetch from '@/common/fetch.js'; -import BASE_URL from './base.js'; -import useNetWork from '@/common/useNetWork.js'; - -const LOGIN = BASE_URL + '/user/login'; //改 - - -export function login(code) { - useNetWork(); - const params = { - wxcode: code, - }; - return fetch.post(LOGIN, params).then(res => res); -} diff --git a/pages.json b/pages.json index 302ed83..a3072e2 100644 --- a/pages.json +++ b/pages.json @@ -17,7 +17,7 @@ "path" : "pages/mine/mine", "style" : { - "navigationBarTitleText": "我的", + "navigationBarTitleText": "安防平台小程序", "enablePullDownRefresh": false } }, diff --git a/pages/checkMessageDetail/checkMessageDetail.vue b/pages/checkMessageDetail/checkMessageDetail.vue index 1ee3ddd..8f149d5 100644 --- a/pages/checkMessageDetail/checkMessageDetail.vue +++ b/pages/checkMessageDetail/checkMessageDetail.vue @@ -5,10 +5,21 @@ 您的访客申请{{status}} 请耐心等待管理员审核 - 申请{{item.status}} + 申请{{status}} - + + + 请联系安保人员进行确认 + + + + + 访客{{name}}可凭借身份证在{{time}}时间内进入{{place}} + + + + {{item.value}} - + + 申请通过 @@ -47,7 +59,7 @@ export default { data() { return { - isManager: true, + isManager: false, show: false, //控制模态框显隐 content: '', //模态框显示内容 list: [ @@ -108,6 +120,9 @@ }, ], status: '未通过', + name: '张三', + time: '2012', + place: '一期主楼' } }, methods: { @@ -175,12 +190,11 @@ margin-right: 60rpx; } } - .button-area { + .button-area-manager { display: flex; flex-direction: row; justify-content: center; align-items: center; - margin-top: 60rpx; .pass { width: fit-content; padding: 10rpx 20rpx; diff --git a/pages/mine/mine.vue b/pages/mine/mine.vue index f90e2e4..9bba133 100644 --- a/pages/mine/mine.vue +++ b/pages/mine/mine.vue @@ -1,8 +1,20 @@ /** * 我的 */ @@ -14,22 +26,29 @@ }, data() { return { - callerInfo: { - callerNmae: '', - id: '', - contact: '', - purpose: '', - building: '', - time: '', - number: '', - name: '', - bz: '', - }, - rules: {}, - show: false, - buildingShow: false, - columns: [['商务会议', '安装维修', '其他事宜']], - buildingColumns: [['一期主楼', '二期主楼', '录制楼', '1600演播厅']], + img: '', //头像 + list: [ + { + id: 'number', + name: '员工号', + value: '111' + }, + { + id: 'name', + name: '员工姓名', + value: '张三' + }, + { + id: 'type', + name: '员工类型', + value: '111' + }, + { + id: 'phone', + name: '手机号', + value: '111' + }, + ] } }, onShow() { @@ -39,22 +58,32 @@ uni.setStorageSync('currentPagePath', this.currentPagePath) }, methods: { - //获取访问目的 - getPurpose(val) { - this.callerInfo.purpose = val.value[0] - this.show = false - }, - //获取访问楼栋 - getBuilding(val) { - this.callerInfo.building = val.value[0] - this.buildingShow = false - }, + onChooseAvatar(e) { + this.img = e.detail.avatarUrl; + + //在此，调一个接口把头像信息存上 + } }, } diff --git a/store/user.js b/store/user.js new file mode 100644 index 0000000..4f7bfa2 --- /dev/null +++ b/store/user.js @@ -0,0 +1,14 @@ +import fetch from '@/common/fetch.js'; +import BASE_URL from './base.js'; +import useNetWork from '@/common/useNetWork.js'; + +const LOGIN = BASE_URL + '/user/login'; //改 + + +export function login(code) { + useNetWork(); + const params = { + wxcode: code, + }; + return fetch.post(LOGIN, params).then(res => res); +}