From 620733ffc9dbd64081ef4dbf4ac3cc0911e0787c Mon Sep 17 00:00:00 2001 From: 1692762430 <1692762430@qq.com> Date: Thu, 29 Feb 2024 17:16:05 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9C=80=E6=96=B0=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../visitorIinvitation/visitorIinvitation.js | 20 +++ miniprogram/app.json | 4 +- .../appointmentRecord/appointmentRecord.js | 77 ++++++++++ .../appointmentRecord/appointmentRecord.json | 9 ++ .../appointmentRecord/appointmentRecord.wxml | 53 +++++++ .../appointmentRecord/appointmentRecord.wxss | 60 ++++++++ .../visitorIinvitation/indexBar/indexBar.js | 68 +++++++++ .../visitorIinvitation/indexBar/indexBar.json | 8 + .../visitorIinvitation/indexBar/indexBar.wxml | 6 + .../visitorIinvitation/indexBar/indexBar.wxss | 1 + .../visitorIinvitation/visitorIinvitation.js | 139 ++++++++++-------- .../visitorIinvitation.json | 5 +- .../visitorIinvitation.wxml | 12 +- 13 files changed, 395 insertions(+), 67 deletions(-) create mode 100644 miniprogram/api/meeting/visitorIinvitation/visitorIinvitation.js create mode 100644 miniprogram/pages/meeting/visitorIinvitation/appointmentRecord/appointmentRecord.js create mode 100644 miniprogram/pages/meeting/visitorIinvitation/appointmentRecord/appointmentRecord.json create mode 100644 miniprogram/pages/meeting/visitorIinvitation/appointmentRecord/appointmentRecord.wxml create mode 100644 miniprogram/pages/meeting/visitorIinvitation/appointmentRecord/appointmentRecord.wxss create mode 100644 miniprogram/pages/meeting/visitorIinvitation/indexBar/indexBar.js create mode 100644 miniprogram/pages/meeting/visitorIinvitation/indexBar/indexBar.json create mode 100644 miniprogram/pages/meeting/visitorIinvitation/indexBar/indexBar.wxml create mode 100644 miniprogram/pages/meeting/visitorIinvitation/indexBar/indexBar.wxss diff --git a/miniprogram/api/meeting/visitorIinvitation/visitorIinvitation.js b/miniprogram/api/meeting/visitorIinvitation/visitorIinvitation.js new file mode 100644 index 0000000..3c82bf7 --- /dev/null +++ b/miniprogram/api/meeting/visitorIinvitation/visitorIinvitation.js @@ -0,0 +1,20 @@ +import { + request +} from '../../selfRequest'; + +// 微信登录接口 +export function companyRq(data) { + return request({ + url: '/api/visitor/list', + method: "get" + }); +} + +// 注册用户 +export function registerPhone(data) { + return request({ + url: '/social_user_login/login', + method: "post", + data + }); +} \ No newline at end of file diff --git a/miniprogram/app.json b/miniprogram/app.json index 8480260..e8e1d11 100644 --- a/miniprogram/app.json +++ b/miniprogram/app.json @@ -58,7 +58,9 @@ "pages/meeting/meetingRoom/meetingCoupon/meetingCoupon", "pages/meeting/pay/waitPay/waitPay", "pages/meeting/pay/waitComplete/waitComplete", - "pages/meeting/reservationRecord/reservationRecord" + "pages/meeting/reservationRecord/reservationRecord", + "pages/meeting/visitorIinvitation/indexBar/indexBar", + "pages/meeting/visitorIinvitation/appointmentRecord/appointmentRecord" ], "window": { "backgroundTextStyle": "light", diff --git a/miniprogram/pages/meeting/visitorIinvitation/appointmentRecord/appointmentRecord.js b/miniprogram/pages/meeting/visitorIinvitation/appointmentRecord/appointmentRecord.js new file mode 100644 index 0000000..8570d08 --- /dev/null +++ b/miniprogram/pages/meeting/visitorIinvitation/appointmentRecord/appointmentRecord.js @@ -0,0 +1,77 @@ +// pages/meeting/visitorIinvitation/appointmentRecord/appointmentRecord.js +Page({ + + /** + * 页面的初始数据 + */ + data: { + active: 'a', + }, + + /** + * 生命周期函数--监听页面加载 + */ + onLoad(options) { + + }, + + /** + * 生命周期函数--监听页面初次渲染完成 + */ + onReady() { + + }, + + /** + * 生命周期函数--监听页面显示 + */ + onShow() { + + }, + + /** + * 生命周期函数--监听页面隐藏 + */ + onHide() { + + }, + + /** + * 生命周期函数--监听页面卸载 + */ + onUnload() { + + }, + + /** + * 页面相关事件处理函数--监听用户下拉动作 + */ + onPullDownRefresh() { + + }, + + /** + * 页面上拉触底事件的处理函数 + */ + onReachBottom() { + + }, + + /** + * 用户点击右上角分享 + */ + onShareAppMessage() { + + }, + onChange(event) { + wx.showToast({ + title: `切换到标签 ${event.detail.name}`, + icon: 'none', + }); + }, + toCheckFn(){ + wx.reLaunch({ + url: '/pages/meeting/visitorIinvitation/visitorIinvitation', + }) + } +}) \ No newline at end of file diff --git a/miniprogram/pages/meeting/visitorIinvitation/appointmentRecord/appointmentRecord.json b/miniprogram/pages/meeting/visitorIinvitation/appointmentRecord/appointmentRecord.json new file mode 100644 index 0000000..2fc2204 --- /dev/null +++ b/miniprogram/pages/meeting/visitorIinvitation/appointmentRecord/appointmentRecord.json @@ -0,0 +1,9 @@ +{ + "navigationBarTitleText":"预约记录", + "usingComponents": { + "van-tab": "@vant/weapp/tab/index", + "van-tabs": "@vant/weapp/tabs/index", + "van-icon": "@vant/weapp/icon/index", + "van-button": "@vant/weapp/button/index" + } +} \ No newline at end of file diff --git a/miniprogram/pages/meeting/visitorIinvitation/appointmentRecord/appointmentRecord.wxml b/miniprogram/pages/meeting/visitorIinvitation/appointmentRecord/appointmentRecord.wxml new file mode 100644 index 0000000..140cfb2 --- /dev/null +++ b/miniprogram/pages/meeting/visitorIinvitation/appointmentRecord/appointmentRecord.wxml @@ -0,0 +1,53 @@ + + + + + + + + 访客：张三 + 待审核 + + + + + + 访问事由: 拜访刘总 + + + + 2024-02-02 14:00 + + + 访客预约 + + + + + + + + + + + 访客：张三 + 待审核 + + + + + + 访问事由: 拜访刘总 + + + + 2024-02-02 14:00 + + + 去审核 + + + + + + \ No newline at end of file diff --git a/miniprogram/pages/meeting/visitorIinvitation/appointmentRecord/appointmentRecord.wxss b/miniprogram/pages/meeting/visitorIinvitation/appointmentRecord/appointmentRecord.wxss new file mode 100644 index 0000000..ff25d6e --- /dev/null +++ b/miniprogram/pages/meeting/visitorIinvitation/appointmentRecord/appointmentRecord.wxss @@ -0,0 +1,60 @@ +.container{ + width: 100%; + position: absolute; + height: 100vh; + background-color: #f6f6f6; +} +.visitorView{ + width: 100%; + background-color: #f6f7fb; +} +.visitListView{ + width: 710rpx; + margin: 0 auto; + +} +.itemView{ + width: 100%; + background-color: #ffffff; + margin-top: 20rpx; + font-size: 28rpx; + color: #666666; +} +.itemTop{ + width: 100%; + display: flex; + justify-content: space-between; + height: 80rpx; + border-bottom: 1px solid #f2f2f2; + align-items: center; + padding: 10rpx 30rpx; + box-sizing: border-box; +} +.itemBottom{ + width: 100%; + display: flex; + justify-content: space-between; + padding:20rpx 30rpx; + box-sizing: border-box; + color: #a4a4a4; + font-size: 28rpx; +} +.infoView{ + display: flex; + height: 60rpx; + align-items: baseline; + +} +.infoView view{ + margin-left: 10rpx; +} +.checkBottom{ + width: 100%; + display: flex; + justify-content: space-between; + align-items: center; + padding:20rpx 30rpx; + box-sizing: border-box; + color: #a4a4a4; + font-size: 28rpx; +} \ No newline at end of file diff --git a/miniprogram/pages/meeting/visitorIinvitation/indexBar/indexBar.js b/miniprogram/pages/meeting/visitorIinvitation/indexBar/indexBar.js new file mode 100644 index 0000000..e61f5d6 --- /dev/null +++ b/miniprogram/pages/meeting/visitorIinvitation/indexBar/indexBar.js @@ -0,0 +1,68 @@ +Page({ + data: { + type: "", + /** 索引栏*/ + indexList: ["A", "B", "C", "D"], + scrollTop: 0, + /** mock客户数据*/ + customerList: [ + { + firstLetter: "A", + list: [ + { code: "AB01", name: "A1客户" }, + { code: "AB02", name: "A2客户" }, + { code: "AB03", name: "A3客户" }, + ], + }, + { + firstLetter: "B", + list: [ + { code: "BB01", name: "B1客户" }, + { code: "BB02", name: "B2客户" }, + { code: "BB03", name: "B3客户" }, + { code: "BB04", name: "B4客户" }, + ], + }, + { + firstLetter: "C", + list: [ + { code: "CB01", name: "C1客户" }, + { code: "CB02", name: "C2客户" }, + { code: "CB03", name: "C3客户" }, + { code: "CB04", name: "C4客户" }, + { code: "CB05", name: "C5客户" }, + ], + }, + { + firstLetter: "D", + list: [ + { code: "DB01", name: "D1客户" }, + { code: "DB02", name: "D2客户" }, + { code: "DB03", name: "D3客户" }, + { code: "DB04", name: "D4客户" }, + { code: "DB05", name: "D5客户" }, + { code: "DB06", name: "D6客户" }, + ], + }, + ], + }, + + //索引栏发生变化事件 + onPageScroll(event) { + this.setData({ + scrollTop: event.scrollTop, + }); + }, + + /**选择客户发生事件 */ + getCustomer: function (event) { + console.log(event.currentTarget.dataset.id); + console.log(event.currentTarget.dataset.name); + const value = event.currentTarget.dataset.name + if(value){ + wx.reLaunch({ + url: '/pages/meeting/visitorIinvitation/visitorIinvitation?name='+value, + }) + } + }, +}); \ No newline at end of file diff --git a/miniprogram/pages/meeting/visitorIinvitation/indexBar/indexBar.json b/miniprogram/pages/meeting/visitorIinvitation/indexBar/indexBar.json new file mode 100644 index 0000000..4ac8a02 --- /dev/null +++ b/miniprogram/pages/meeting/visitorIinvitation/indexBar/indexBar.json @@ -0,0 +1,8 @@ +{ + "navigationBarTitleText":"选择被访人姓名", + "usingComponents": { + "van-cell": "@vant/weapp/cell/index", + "van-index-bar": "@vant/weapp/index-bar/index", + "van-index-anchor": "@vant/weapp/index-anchor/index" + } +} \ No newline at end of file diff --git a/miniprogram/pages/meeting/visitorIinvitation/indexBar/indexBar.wxml b/miniprogram/pages/meeting/visitorIinvitation/indexBar/indexBar.wxml new file mode 100644 index 0000000..517774a --- /dev/null +++ b/miniprogram/pages/meeting/visitorIinvitation/indexBar/indexBar.wxml @@ -0,0 +1,6 @@ + + + {{item.firstLetter}} + + + \ No newline at end of file diff --git a/miniprogram/pages/meeting/visitorIinvitation/indexBar/indexBar.wxss b/miniprogram/pages/meeting/visitorIinvitation/indexBar/indexBar.wxss new file mode 100644 index 0000000..47ba0cc --- /dev/null +++ b/miniprogram/pages/meeting/visitorIinvitation/indexBar/indexBar.wxss @@ -0,0 +1 @@ +/* pages/meeting/visitorIinvitation/indexBar/indexBar.wxss */ \ No newline at end of file diff --git a/miniprogram/pages/meeting/visitorIinvitation/visitorIinvitation.js b/miniprogram/pages/meeting/visitorIinvitation/visitorIinvitation.js index 5c07cbb..49a0823 100644 --- a/miniprogram/pages/meeting/visitorIinvitation/visitorIinvitation.js +++ b/miniprogram/pages/meeting/visitorIinvitation/visitorIinvitation.js @@ -1,10 +1,14 @@ -// pages/meeting/visitorIinvitation/visitorIinvitation.js +let app = getApp(); +import { + companyRq +} from "../../../api/meeting/visitorIinvitation/visitorIinvitation.js" Page({ /** * 页面的初始数据 */ data: { + IMG_NAME: app.IMG_NAME, value: '', companyShow:false, usernameShow:false, @@ -12,52 +16,55 @@ Page({ arriveShow:false, leaveShow:false, submitSuccesShow:false, - indexList: ["A", "B", "C", "D"], - scrollTop: 100, companyColumns:['公司1','公司2','公司3'], columns: ['身份证', '护照', '通行证'], fileList: [], currentDate: new Date().getTime(), - customerList: [ - { - firstLetter: "A", - list: [ - { code: "AB01", name: "A1客户" }, - { code: "AB02", name: "A2客户" }, - { code: "AB03", name: "A3客户" }, - ], - }, - { - firstLetter: "B", - list: [ - { code: "BB01", name: "B1客户" }, - { code: "BB02", name: "B2客户" }, - { code: "BB03", name: "B3客户" }, - { code: "BB04", name: "B4客户" }, - ], - }, - { - firstLetter: "C", - list: [ - { code: "CB01", name: "C1客户" }, - { code: "CB02", name: "C2客户" }, - { code: "CB03", name: "C3客户" }, - { code: "CB04", name: "C4客户" }, - { code: "CB05", name: "C5客户" }, - ], - }, - { - firstLetter: "D", - list: [ - { code: "DB01", name: "D1客户" }, - { code: "DB02", name: "D2客户" }, - { code: "DB03", name: "D3客户" }, - { code: "DB04", name: "D4客户" }, - { code: "DB05", name: "D5客户" }, - { code: "DB06", name: "D6客户" }, - ], - }, - ], + /** 索引栏*/ + indexList: ["A", "B", "C", "D"], + scrollTop: 0, + /** mock客户数据*/ + customerList: [ + { + firstLetter: "A", + list: [ + { code: "AB01", name: "A1客户" }, + { code: "AB02", name: "A2客户" }, + { code: "AB03", name: "A3客户" }, + ], + }, + { + firstLetter: "B", + list: [ + { code: "BB01", name: "B1客户" }, + { code: "BB02", name: "B2客户" }, + { code: "BB03", name: "B3客户" }, + { code: "BB04", name: "B4客户" }, + ], + }, + { + firstLetter: "C", + list: [ + { code: "CB01", name: "C1客户" }, + { code: "CB02", name: "C2客户" }, + { code: "CB03", name: "C3客户" }, + { code: "CB04", name: "C4客户" }, + { code: "CB05", name: "C5客户" }, + ], + }, + { + firstLetter: "D", + list: [ + { code: "DB01", name: "D1客户" }, + { code: "DB02", name: "D2客户" }, + { code: "DB03", name: "D3客户" }, + { code: "DB04", name: "D4客户" }, + { code: "DB05", name: "D5客户" }, + { code: "DB06", name: "D6客户" }, + ], + }, + ], + }, /** @@ -68,10 +75,16 @@ Page({ wx.setNavigationBarTitle({ title: options.name }) + console.log('options.goods_id',options.name) + companyRq({}).then( res =>{ + console.log('res',res) + if(res.code ==0){ + // res.row + } + + }) }, - - /** * 生命周期函数--监听页面卸载 */ @@ -104,11 +117,11 @@ Page({ }, getUsernameHandle(){ - this.setData({ - usernameShow: true - }); + // this.setData({ + // usernameShow: true + // }); wx.navigateTo({ - url: 'pages/meeting/accessControl/accessControl' + url: '/pages/meeting/visitorIinvitation/indexBar/indexBar' }) }, @@ -122,6 +135,13 @@ Page({ cardTypeShow: true }); }, + changeHandler(e){ + console.log(e) + + }, + // confirmHandle(){ + + // }, confirmHandle(){ this.setData({ companyShow:false, @@ -177,17 +197,20 @@ Page({ currentDate: event.detail, }); }, - //索引栏发生变化事件 - onPageScroll(event) { + submitFormFn(){ this.setData({ - scrollTop: event.scrollTop, + submitSuccesShow: true, }); - }, - /**选择客户发生事件 */ - getCustomer: function (event) { - console.log(event.currentTarget.dataset.id); - console.log(event.currentTarget.dataset.name); - }, + submitDialogFn(){ + this.setData({ + submitSuccesShow: false, + }); + setTimeout(() => { + wx.navigateTo({ + url: '/pages/meeting/visitorIinvitation/appointmentRecord/appointmentRecord', + }) + }, 10); + } }) \ No newline at end of file diff --git a/miniprogram/pages/meeting/visitorIinvitation/visitorIinvitation.json b/miniprogram/pages/meeting/visitorIinvitation/visitorIinvitation.json index 6c44fe3..0d17ab2 100644 --- a/miniprogram/pages/meeting/visitorIinvitation/visitorIinvitation.json +++ b/miniprogram/pages/meeting/visitorIinvitation/visitorIinvitation.json @@ -7,8 +7,9 @@ "van-button": "@vant/weapp/button/index", "van-datetime-picker": "@vant/weapp/datetime-picker/index", "van-dialog": "@vant/weapp/dialog/index", - "van-index-bar": "@vant/weapp/index-bar/index", - "van-index-anchor": "@vant/weapp/index-anchor/index" + "van-cell": "@vant/weapp/cell/index", + "van-index-bar": "@vant/weapp/index-bar/index", + "van-index-anchor": "@vant/weapp/index-anchor/index" } } diff --git a/miniprogram/pages/meeting/visitorIinvitation/visitorIinvitation.wxml b/miniprogram/pages/meeting/visitorIinvitation/visitorIinvitation.wxml index 1b2400b..57eaaf9 100644 --- a/miniprogram/pages/meeting/visitorIinvitation/visitorIinvitation.wxml +++ b/miniprogram/pages/meeting/visitorIinvitation/visitorIinvitation.wxml @@ -21,21 +21,21 @@ - 提交 + 提交 - + - - + @@ -49,6 +49,6 @@ - + \ No newline at end of file