From 297d52e5ea3ff232acdc34ea3a57fbb825ac27c7 Mon Sep 17 00:00:00 2001 From: cun-nan <19819293608@163.com> Date: Sun, 22 Sep 2024 14:16:55 +0800 Subject: [PATCH] 9.22 --- .../service/impl/LJStaffServiceImpl.java | 2 +- gasStation-uni/pages/refuel/refuel.vue | 32 +++--- gasStation-uni/pagesMy/feedback/feedback.vue | 36 ++++--- gasStation-uni/pagesMy/setup/index.vue | 98 +++++++++++++------ 4 files changed, 116 insertions(+), 52 deletions(-) diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/member/service/impl/LJStaffServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/member/service/impl/LJStaffServiceImpl.java index 70179b368..cc09851f3 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/member/service/impl/LJStaffServiceImpl.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/member/service/impl/LJStaffServiceImpl.java @@ -130,7 +130,7 @@ public class LJStaffServiceImpl extends ServiceImpl impl QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("store_id", storeId); queryWrapper.eq("status", "qy"); - queryWrapper.eq("role_id", "15"); +// queryWrapper.eq("role_id", "15"); queryWrapper.eq("if_delete", "0"); queryWrapper.eq("is_refuel", "xs"); List list = baseMapper.selectList(queryWrapper); diff --git a/gasStation-uni/pages/refuel/refuel.vue b/gasStation-uni/pages/refuel/refuel.vue index dfaca84db..8b20d730e 100644 --- a/gasStation-uni/pages/refuel/refuel.vue +++ b/gasStation-uni/pages/refuel/refuel.vue @@ -298,10 +298,10 @@ 选择员工 - - 员工名 + {{item.realName}} @@ -310,17 +310,17 @@ 选择油品油枪 - - 全部 + + {{item.oilName}} - - 1号枪 - 汽油92# + + {{item.gunName}} + {{item.oilName}} @@ -562,8 +562,16 @@ cardTypeclose() { this.cardType = false }, - setQindex() { - this.qhindex = false + setQindex(index, data) { + this.qhindex = index + this.oilGunList = data.oilGunList + if (data.oilGunList.length > 0) { + this.oilOrder.oilGunNum = data.oilGunList[0].id + this.oilPrice = data.oilPrice + this.oilUnit = data.unit + this.oilOrder.oils = data.oilNameId + uni.setStorageSync("tankId", data.oilGunList[0].tankId) + } }, ypClose() { this.selectShow = false @@ -735,6 +743,7 @@ // _this.welfare.push(res.data.welfare) // } // } + console.log(res, 738); }).catch(err => { // uni.showLoading({ // title: JSON.stringify(err) + 222 @@ -797,6 +806,7 @@ uni.setStorageSync("tankId", res.data[0].oilGunList[0].tankId) } } + console.log(res, 801); }) }, // 获取当前店铺油号对应的油枪信息 diff --git a/gasStation-uni/pagesMy/feedback/feedback.vue b/gasStation-uni/pagesMy/feedback/feedback.vue index c19f5904a..694e44099 100644 --- a/gasStation-uni/pagesMy/feedback/feedback.vue +++ b/gasStation-uni/pagesMy/feedback/feedback.vue @@ -1,19 +1,22 @@ @@ -179,15 +182,26 @@ .anniu { width: 95%; - background: #1678ff; + height: 40px; + margin: 10px auto; + margin-top: 50px; + border-radius: 4px; + background: #FA6400; display: flex; align-items: center; justify-content: center; color: white; - margin: 10px auto; - border-radius: 50px; - box-sizing: border-box; - padding: 10px 0px; } + + + .title_ { + margin: 10px 0px; + } + + .top-title { + background: rgba(255, 150, 85, 0.15); + box-sizing: border-box; + padding: 10px; + } \ No newline at end of file diff --git a/gasStation-uni/pagesMy/setup/index.vue b/gasStation-uni/pagesMy/setup/index.vue index b4eda43e1..ba45fcb3f 100644 --- a/gasStation-uni/pagesMy/setup/index.vue +++ b/gasStation-uni/pagesMy/setup/index.vue @@ -11,8 +11,9 @@ @@ -20,20 +21,29 @@ 昵称 - - 未填写 - {{user.name}} - + + 未填写 + {{user.name}} + - + + 性别 + {{user.sex}} + + + 生日 + {{user.birthday}} + + + + @@ -66,12 +79,17 @@ return { title: '', // 用户信息 - user:{ + user: { // 用户头像 - avatar:"", + avatar: "", }, // url信息 baseUrl: this.$baseUrl, + columns: [ + ['全部类型', '消费有礼', '会员充值'] + ], + show: false, + show1: false, } }, onShow() { @@ -81,19 +99,41 @@ }, methods: { + + confirm(e) { + this.show1 = false + }, + cancel() { + this.show1 = false + }, + timestampToString(timestamp) { + // 将时间戳转换为Date对象 + const date = new Date(timestamp); + // 使用toLocaleDateString和toLocaleTimeString可以根据本地格式转换日期和时间 + const dateString = date.toLocaleDateString() + const timeString = date.toLocaleTimeString(); + // 返回日期和时间的组合 + return date.getFullYear() + '-' + (date.getMonth() + 1); + }, + confirm1(e) { + this.show = false + }, + cancel1() { + this.show = false + }, // 用户选择头像 - onChooseAvatar(e){ + onChooseAvatar(e) { let _this = this; let tempFilePath = e.detail.avatarUrl //上传的图片地址 - let maxSizeInBytes = 1024*1024 //限制大小 + let maxSizeInBytes = 1024 * 1024 //限制大小 uni.getFileInfo({ - filePath:tempFilePath, + filePath: tempFilePath, success(res) { let fileSize = res.size - if (fileSize > maxSizeInBytes){ + if (fileSize > maxSizeInBytes) { uni.showToast({ - title:"请上传小于1MB的图片", - icon:"error" + title: "请上传小于1MB的图片", + icon: "error" }) return } @@ -111,17 +151,17 @@ }) }, // 用户选择头像 - onChooseAvatar1(e){ + onChooseAvatar1(e) { let _this = this; //从本地相册选择图片或使用相机拍照 uni.chooseImage({ - sourceType: ['album', 'camera'],//选择方式相册或者相机 + sourceType: ['album', 'camera'], //选择方式相册或者相机 success: (res) => { console.log('图片', res) var tempFilePath = res.tempFilePaths; var filePath = tempFilePath[0]; - console.log(filePath);//输出本地头像路径 - //调用上传下载api + console.log(filePath); //输出本地头像路径 + //调用上传下载api // 将图片上传服务器 upload({ url: '/clientApi/file/upload', @@ -135,11 +175,11 @@ }); }, // 修改用户信息 - editUser(){ + editUser() { request({ url: 'business/userManager/user/edit', method: 'put', - data:this.user, + data: this.user, }).then(res => { if (res.code == 200) { this.getUser() @@ -147,13 +187,13 @@ }) }, // 跳转修改页面 - goEdit(val){ + goEdit(val) { uni.navigateTo({ url: '/pagesMy/editUser/index?editType=' + val, }) }, // 查询当前登录用户信息 - getUser(){ + getUser() { request({ url: 'business/userManager/user/getUser', method: 'get', @@ -165,7 +205,7 @@ }, goBack() { uni.navigateTo({ - url:"/pages/my/my" + url: "/pages/my/my" }) } }