diff --git a/pages.json b/pages.json index 39cfb403a814cb51c8798de4c7ba4bdab70313e5..d91a9db5fc59f3ee2556811365bf8af6ed14c1dd 100644 --- a/pages.json +++ b/pages.json @@ -212,6 +212,18 @@ "style": { "navigationStyle": "custom" } + }, + { + "path": "pages/wx_xq", + "style": { + "navigationStyle": "custom" + } + }, + { + "path": "pages/wx_lsgd", + "style": { + "navigationStyle": "custom" + } } ] } @@ -220,7 +232,10 @@ "navigationBarTextStyle": "black", "navigationBarTitleText": "uni-app", "navigationBarBackgroundColor": "#FFFFFF", - "backgroundColor": "#FFFFFF" + "backgroundColor": "#FFFFFF", + "app-plus": { + "bounce": "none" + } }, /* 底部菜单 */ "tabBar": { diff --git a/pages/wy-bmfw.vue b/pages/wy-bmfw.vue index 96eb4d89f0922d49973fea8f055cbcc36999949b..8dea1814f823186c43b097b2ea2a6c7c2c1f9216 100644 --- a/pages/wy-bmfw.vue +++ b/pages/wy-bmfw.vue @@ -3,11 +3,11 @@ - - 利达物业中心 - + {{address}} + @@ -44,21 +44,20 @@ export default { data() { return { - + address: '请选择', }; }, onLoad(options) { - + //获取小区信息 + const addressItem = uni.getStorageSync("addressItem") + this.address = addressItem.communityName }, methods: { - open() { - // console.log('open'); + onClick(inder) { + this.$wskj.toast('敬请期待') }, - close() { - this.show = false - // console.log('close'); - } + } }; diff --git a/pages/wy-home.vue b/pages/wy-home.vue index beaf3e37f9dcdd4c2d4555e0b28174ae03aac7f5..d4f0ef460cc8c05dc94b0159e0a3c25980abc600 100644 --- a/pages/wy-home.vue +++ b/pages/wy-home.vue @@ -3,11 +3,11 @@ - {{address}} - + diff --git a/pages/wy-mine.vue b/pages/wy-mine.vue index 25f1927362eb5e259e4115d18a7afcdd1f263fc3..64cb66adc3b0d825ec16e67d1bab86aaf481dc87 100644 --- a/pages/wy-mine.vue +++ b/pages/wy-mine.vue @@ -96,7 +96,11 @@ return } if (index == 2) { - this.$wskj.to("/pagesMine/pages/yg_login") + if (this.$wskj.isNull(uni.getStorageSync('userInfo_yg'))) { + this.$wskj.to("/pagesMine/pages/yg_login") + } else { + this.$wskj.to("/pagesMine/pages/ygzy") + } return } } diff --git a/pagesMain/pages/bxxq.vue b/pagesMain/pages/bxxq.vue index f25bb510d6ab5e20b3e60deeb7143e72211fee43..9c88457551db60fc2db05f02cd4341bc6169653a 100644 --- a/pagesMain/pages/bxxq.vue +++ b/pagesMain/pages/bxxq.vue @@ -53,12 +53,12 @@ - - 报修时间: - {{data.repairsTime}} - - - 关闭报修 + + 报修时间: + {{data.repairsTime}} + + + 关闭报修 diff --git a/pagesMain/pages/fkdj.vue b/pagesMain/pages/fkdj.vue index 198b64163d55288e5a0191f1c7b23e87cdf93e6d..1953cff704f60c1669cda471ac15126df86ab160 100644 --- a/pagesMain/pages/fkdj.vue +++ b/pagesMain/pages/fkdj.vue @@ -150,7 +150,6 @@ listAll() { const params = { url: '/api/community/listAll', - loadingTip: '', method: 'GET', data: {} } @@ -180,7 +179,6 @@ if (this.$refs.uCode.canGetCode) { const params = { url: '/api/login/sendSmsCode', - loadingTip: '', method: 'GET', data: { mobile: this.data.guestPhone diff --git a/pagesMain/pages/jnzd_wyfmx.vue b/pagesMain/pages/jnzd_wyfmx.vue index 7e9b05facc193be3af6394349bf9b8140e51b499..81b6138a76959d4979091ba1a0685999d6294a78 100644 --- a/pagesMain/pages/jnzd_wyfmx.vue +++ b/pagesMain/pages/jnzd_wyfmx.vue @@ -23,11 +23,11 @@ - + 2025年01月 - ￥108.23 + ￥{{item.payAmount}} @@ -36,18 +36,18 @@ 缴费项目：物业管理费 房屋面积：72.15 单价/平米：￥1.3 - 金额：93.8 + 金额：{{item.payAmount}} - + - 2024年6月 + {{item.month}} 缴费渠道：线上缴费 - 1355.04 + {{item.payAmount}} - 06-06 14:29 + {{item.month}} @@ -64,12 +64,16 @@ indexNumber: 0, type: 0, userinfo: '', + jfjlList: [], + djList: [], }; }, onLoad(options) { this.type = options.type this.userinfo = uni.getStorageSync("userInfo") + this.getDjList() + this.getJfjlList() }, methods: { @@ -82,7 +86,27 @@ }, onClick(index) { this.indexNumber = index - } + }, + //类型（1电费 2水费 3物业费 4车位管理费 5车位出租费 6储藏室出租 7其他费用） + getDjList() { + const params = { + url: '/api/liveBill/listAll?type=1', + method: 'GET', + } + this.$request(params).then(res => { + this.djList = res.data + }) + }, + getJfjlList() { + const params = { + url: '/api/payRecord/listAll?type=1', + method: 'GET', + } + this.$request(params).then(res => { + this.jfjlList = res.data + }) + }, + } }; diff --git a/pagesMain/pages/tsby_xq.vue b/pagesMain/pages/tsby_xq.vue index ad752a8e76f58750e59d3729c6d6bb0b09b82185..5127b42380582991adf42194715acc49b977e938 100644 --- a/pagesMain/pages/tsby_xq.vue +++ b/pagesMain/pages/tsby_xq.vue @@ -53,7 +53,7 @@ - + {{data.type==1?'投诉时间:':'表扬时间:'}} {{data.createTime}} diff --git a/pagesMine/pages/dk_submit.vue b/pagesMine/pages/dk_submit.vue index f54371d4e2e944ce77d7cd5f6ef632ab82c4216f..4cca9e6893b9c272deddb095dd100178e2f19707 100644 --- a/pagesMine/pages/dk_submit.vue +++ b/pagesMine/pages/dk_submit.vue @@ -5,25 +5,25 @@ 基本信息 职业 - 安保 + {{userInfo.accountType==1?'保洁':userInfo.accountType==2?'保安':userInfo.accountType==3?'维修':''}} 姓名 - 张三 + {{userInfo.accountName}} 性别 - 男 + {{userInfo.sex==1?'女':'男'}} 手机号 - 199****8989 + {{userInfo.accountMobile}} 我的位置 - 请定位当前位置 + {{address==''?'请定位当前位置':address}} 重新定位 @@ -32,7 +32,7 @@ 拍照 - + @@ -40,16 +40,6 @@ 提交打卡 - - - - - - 确认提交？ - - - @@ -61,75 +51,99 @@ type: 0, reason: '', submitShow: false, - images: '', + userInfo: '', + address: '', + image: '/static/icon_upload.png' }; }, onLoad(e) { + this.userInfo = uni.getStorageSync('userInfo_yg') this.type = e.type if (e.type == 0) { this.title = "安保打卡" } else { this.title = "保洁打卡" } + this.onDw() + }, + onShow() { + // uni.$once('imageSrc', function(data) { + // console.log('监听到事件来自 update ，携带参数 msg 为：' + data); + // this.image = data + // }) + }, + mounted() { + // 监听一次性事件 + uni.$once('imageSrc', (data) => { + // 确保数据变化是响应式的 + this.image = data // 直接赋值会触发更新 + }); }, methods: { + onPz() { + this.$wskj.to("/pagesMine/pages/dkpz") + }, onDw() { + const _this = this; uni.getLocation({ type: 'gcj02', success: function(res) { const latitude = res.latitude; const longitude = res.longitude; - uni.openLocation({ - latitude: latitude, - longitude: longitude, - success: function(res) { - console.log(res); - } - }); + _this.reverseGeocode(latitude, longitude) } }); }, - onSubmit() { - this.$wskj.to("/pagesMain/pages/tjsq?type=" + this.type) - // if (!this.reason) { - // return this.$u.toast('请输入内容') - // } - // if (!this.images) { - // return this.$u.toast('请至少上传一张照片') - // } - // if (this.reason.length < 10) { - // return this.$u.toast('文字描述最低10个字') - // } - // this.submitShow = true + async onSubmit() { + if (!this.address) { + return this.$u.toast('请先定位当前位置') + } + if (!this.image) { + return this.$u.toast('请拍照上传照片') + } + const imgData = await this.$wskj.uploadImg(this.image) + console.log(imgData) + const params = { + url: '/api/clock/add', + loadingTip: '', + data: { + clockAddress: this.address, + clockImg: imgData.url + }, + } + this.$request(params).then(res => { + this.$wskj.toast('提交成功') + setTimeout(() => { + this.$wskj.goBack(1) + }, 600) + }) }, // 提交 onConfirmSubmit() { - // const params = { - // url: '/api/user/yijian', - // loadingTip: '', - // data: { - // content: this.reason, - // images: this.images - // } - // } - // // console.log(params); - // this.$request(params).then(res => { - // // console.log(res) - // this.submitShow = false - // if (res.code === 1) { - // this.$u.toast(res.msg || '提交成功') - // this.reason = '' - // this.images = '' - // } else { - // this.$u.toast(res.msg || '提交失败') - // } - // }).catch(err => { - // this.submitShow = false - // this.$u.toast(err.msg || '提交失败') - // }) + }, + // 根据经纬度逆向解析为中文地址 + reverseGeocode(latitude, longitude) { + const key = 'cc4f24cc4928169e0d623573e4e0687e'; // 替换为你的高德API Key + const url = + `https://restapi.amap.com/v3/geocode/regeo?key=${key}&location=${longitude},${latitude}&radius=1000&extensions=all`; + + uni.request({ + url: url, + success: (res) => { + if (res.data.status === '1') { + this.address = res.data.regeocode.formatted_address; // 获取中文地址 + console.log('当前位置中文地址:', this.address); + } else { + console.error('地址解析失败：', res.data.info); + } + }, + fail: (err) => { + console.error('请求失败：', err); + } + }); } }, }; diff --git a/pagesMine/pages/dkjl.vue b/pagesMine/pages/dkjl.vue index b0a99483ad0b239f9784aa0b223cdcebaf42ba7a..3d5fea7f135a591d76811b3edc78473eb60bdaa3 100644 --- a/pagesMine/pages/dkjl.vue +++ b/pagesMine/pages/dkjl.vue @@ -7,25 +7,25 @@ - + 打卡天数： - 25天 + {{data.clockDay}}天 缺卡天数： - 1天 + {{data.noRecordDay}}天 - + 打卡时间： - 2025-04-03 10:32:31 + {{item.clockTime}} @@ -39,28 +39,47 @@ return { show: false, sex: '', - columns: [ - ['男', '女'] - ], + lateddates: [], + truancyeddates: [], + data: '', + todayList: [] }; }, onLoad(options) { - + this.getList(); + const time = this.$wskj.timeFormat(new Date().getTime(), "yyyy-mm-dd").replace(/(^|\D)0+/g, '\$1') + this.getTodayList(time) }, methods: { - open() { - this.show = true + onclick(date) { + this.getTodayList(date) }, - close() { - this.show = false + getList() { + const params = { + url: '/api/clock/listAll', + method: 'GET', + } + this.$request(params).then(res => { + this.data = res.data + res.data.clockRecordList.forEach(item => { + if (item.clockState == 1) { + this.lateddates.push(item.date.replace(/(^|\D)0+/g, '\$1')) + } + }) + console.log(this.lateddates) + }) }, - confirm(e) { - this.show = false - this.sex = e.value[0] - console.log("LMG", e.value[0]) - } + getTodayList(date) { + const params = { + url: '/api/clock/record/' + date, + method: 'GET', + } + this.$request(params).then(res => { + this.todayList = res.data + }) + } } }; diff --git a/pagesMine/pages/dkpz.vue b/pagesMine/pages/dkpz.vue index 50c3f44eaba79b574dc0367a8ea1b45af8ab65d7..01b9aad8a35690dd172a15fbb3e2469f793c9f6c 100644 --- a/pagesMine/pages/dkpz.vue +++ b/pagesMine/pages/dkpz.vue @@ -154,7 +154,6 @@ console.log('拍照成功', res.tempImagePath) that.imageSrc = res.tempImagePath //原图 that.takeCanvas(res.tempImagePath) //画图 - } }) }, @@ -219,6 +218,11 @@ success: res1 => { that.imageSrc = res1.tempFilePath that.isshow = false + //通过 eventChannel 发送数据 + uni.$emit('imageSrc', that.imageSrc) + setTimeout(() => { + this.$wskj.goBack(1) + }, 600) }, fail: (err) => { console.log('导出图片失败', err) diff --git a/pagesMine/pages/wx_lsgd.vue b/pagesMine/pages/wx_lsgd.vue new file mode 100644 index 0000000000000000000000000000000000000000..08ce5a908eb3dd8e2f7607626778bed8bafaf174 --- /dev/null +++ b/pagesMine/pages/wx_lsgd.vue @@ -0,0 +1,146 @@ + + + + + \ No newline at end of file diff --git a/pagesMine/pages/wx_xq.vue b/pagesMine/pages/wx_xq.vue new file mode 100644 index 0000000000000000000000000000000000000000..cadda48d3a1ccb1ab9af522cc0c8b60387219c99 --- /dev/null +++ b/pagesMine/pages/wx_xq.vue @@ -0,0 +1,172 @@ + + + + + \ No newline at end of file diff --git a/pagesMine/pages/yg_login.vue b/pagesMine/pages/yg_login.vue index dff83115d16747896c492717f9fbb3673c99d7aa..54a375a9d53f493632a8437ccd3f1a50c6779fac 100644 --- a/pagesMine/pages/yg_login.vue +++ b/pagesMine/pages/yg_login.vue @@ -6,8 +6,10 @@ Hello!\n请登录员工账号 - - + + 立即登录 @@ -21,7 +23,8 @@ export default { data() { return { - + account: '', + password: '' }; }, onLoad(options) { @@ -29,7 +32,15 @@ }, methods: { login() { - this.$wskj.to("/pagesMine/pages/ygzy") + const params = { + url: '/api/login/accountLogin/' + this.account + '/' + this.password, + loadingTip: '', + method: 'GET', + } + this.$request(params).then(res => { + uni.setStorageSync('userInfo_yg', res.data) + this.$wskj.to("/pagesMine/pages/ygzy") + }) } } }; diff --git a/pagesMine/pages/ygzy.vue b/pagesMine/pages/ygzy.vue index b46e7f800f07b22b3879428fac3e23402d387db7..9e41fc212d79393511fbbd6b45cee61d20780e55 100644 --- a/pagesMine/pages/ygzy.vue +++ b/pagesMine/pages/ygzy.vue @@ -1,10 +1,15 @@