diff --git a/pages/index/newindex.vue b/pages/index/newindex.vue index b7ea0ce..1297511 100644 --- a/pages/index/newindex.vue +++ b/pages/index/newindex.vue @@ -198,6 +198,7 @@ export default { ping: [], dateStr: '', week: '', + time:'', is_mandatory: false, url: 'http://159.75.168.143:88/apk/lanan.apk', title: '版本升级', @@ -230,22 +231,26 @@ export default { this.getWarnCount() this.getAppointAndPickNum() - // // 初始化时间 - // this.timeWeekFormat(); let that = this - that.timeWeekFormat(); this.timer = setInterval(function () { that.getappointment() }, 10000); + this.setTime = setInterval(() => { + this.timeWeekFormat(); + }, 1000); }, onHide() { clearInterval(this.timer); this.timer = null + clearInterval(this.setTime); + this.setTime = null }, onUnload() { clearInterval(this.timer); this.timer = null; + clearInterval(this.setTime); + this.setTime = null; }, onLoad() { this.partnerId = uni.getStorageSync('partnerId') @@ -260,8 +265,6 @@ export default { this.getappointment() }, 1000) // this.getappointment() - // 初始化时间 - this.timeWeekFormat(); }, onPullDownRefresh() { @@ -563,30 +566,25 @@ export default { } }, timeWeekFormat() { - let dateTime = new Date(); - let year = dateTime.getFullYear(); - let month = dateTime.getMonth() + 1; - let day = dateTime.getDate(); - let hours = dateTime.getHours(); - let minutes = dateTime.getMinutes(); - let second = dateTime.getSeconds(); - let dayCycleArray = ["日", "一", "二", "三", "四", "五", "六"]; - let dayCycle = dayCycleArray[dateTime.getDay()]; + const now = new Date(); + const year = now.getFullYear(); + const month = String(now.getMonth() + 1).padStart(2, "0"); + const day = String(now.getDate()).padStart(2, "0"); + const hours = String(now.getHours()).padStart(2, "0"); + const minutes = String(now.getMinutes()).padStart(2, "0"); + const seconds = String(now.getSeconds()).padStart(2, "0"); + const dayCycleArray = ["日", "一", "二", "三", "四", "五", "六"]; + const dayCycle = dayCycleArray[now.getDay()]; - // 补零 - month = month < 10 ? "0" + month : month; - day = day < 10 ? "0" + day : day; - hours = hours < 10 ? "0" + hours : hours; - minutes = minutes < 10 ? "0" + minutes : minutes; - second = second < 10 ? "0" + second : second; - - this.$nextTick(() => { - this.dateStr = `${year}-${month}-${day}`; - this.week = `星期${dayCycle}`; - this.time = `${hours}:${minutes}:${second}`; - }); + const dateStr = `${year}-${month}-${day}`; + const week = `星期${dayCycle}`; + const time = `${hours}:${minutes}:${seconds}`; + this.dateStr = dateStr; + this.week = week; + this.time = time; } + } } diff --git a/pages/index/orderdetails.vue b/pages/index/orderdetails.vue index 483b620..dd81e28 100644 --- a/pages/index/orderdetails.vue +++ b/pages/index/orderdetails.vue @@ -194,14 +194,13 @@ 备注： - 施工图片： - - + 是否合格 @@ -397,11 +396,11 @@ export default { if (option.type == 'staff') { this.isShowClient = false } - }, - onShow() { // 在组件挂载后启动定时器 this.timer = setInterval(this.getindex, 10000); }, + onShow() { + }, onHide() { clearInterval(this.timer); this.timer = null @@ -694,62 +693,67 @@ export default { } }, async getindex() { + try { - let res = await request({ - url: '/partnerOwn/partner/inspectionDetail', - method: 'get', - params: { - inspectionInfoId: this.inspectionInfoId + + let res = await request({ + url: '/partnerOwn/partner/inspectionDetail', + method: 'get', + params: { + inspectionInfoId: this.inspectionInfoId + } + }) + this.detailData = res.data + + this.detailData.stepInfos.forEach(item => { + // 检查 item.images 是否为有效的字符串 + if (typeof item.images === 'string' && item.images.trim() !== '') { + // 将里面的images转为数组 + item.images = item.images.split(','); + // 使用map方法处理每个图片路径，转换为对象格式 + item.images = item.images.map(image => this.baseImageUrl + "/" + image); + + // 将处理后的图片列表赋值给imageList + item.imageList = item.images; + } else { + // 如果 item.images 不是有效的字符串，设置为空数组 + item.images = []; + item.imageList = []; + } + + // 输出最终结果 + }); + + + this.inspectionId = res.data.inspectionId + this.isOnline = res.data.isOnline + this.orderStatus = res.data.orderStatus + this.payMoney = res.data.goodsPrice / 100 + + + let she = await request({ + url: '/rescue/dict/data/type/pay_type', + method: 'get', + }) + this.shelist = she.data + + + let bankRes = await request({ + url: '/partnerOwn/partner/getBankAccountList', + method: 'get', + }) + if (bankRes.code == 200) { + let tempList = [] + this.bankList = [] + if (bankRes.data && bankRes.data.length > 0) { + bankRes.data.forEach(it => { + tempList.push((it.remark) + it.label) + }) + } + this.bankList.push(tempList) } - }) - this.detailData = res.data - - this.detailData.stepInfos.forEach(item => { - // 检查 item.images 是否为有效的字符串 - if (typeof item.images === 'string' && item.images.trim() !== '') { - // 将里面的images转为数组 - item.images = item.images.split(','); - // 使用map方法处理每个图片路径，转换为对象格式 - item.images = item.images.map(image => this.baseImageUrl + "/" + image); - - // 将处理后的图片列表赋值给imageList - item.imageList = item.images; - } else { - // 如果 item.images 不是有效的字符串，设置为空数组 - item.images = []; - item.imageList = []; - } - - // 输出最终结果 - }); - - - this.inspectionId = res.data.inspectionId - this.isOnline = res.data.isOnline - this.orderStatus = res.data.orderStatus - this.payMoney = res.data.goodsPrice / 100 - - - let she = await request({ - url: '/rescue/dict/data/type/pay_type', - method: 'get', - }) - this.shelist = she.data - - - let bankRes = await request({ - url: '/partnerOwn/partner/getBankAccountList', - method: 'get', - }) - if (bankRes.code == 200) { - let tempList = [] - this.bankList = [] - if (bankRes.data && bankRes.data.length > 0) { - bankRes.data.forEach(it => { - tempList.push((it.remark) + it.label) - }) - } - this.bankList.push(tempList) + }catch (e) { + console.log(e,'查询错误') } }, @@ -798,7 +802,6 @@ export default { lists.map((item) => { this[`fileList${event.name}`].push({ ...item, - }) }) for (let i = 0; i < lists.length; i++) { diff --git a/pages/staff/staff.vue b/pages/staff/staff.vue index c00a05c..abb11fd 100644 --- a/pages/staff/staff.vue +++ b/pages/staff/staff.vue @@ -7,8 +7,8 @@ --> - - + + @@ -157,6 +157,7 @@ import request from '../../utils/request'; import tabBar from '../../components/staffTabBer/tabBar.vue' import {type} from "../../uni_modules/uni-forms/components/uni-forms/utils"; import upload from "@/utils/upload"; +import USearch from "@/uni_modules/uview-ui/components/u-search/u-search.vue"; export default { data() { @@ -271,6 +272,7 @@ export default { } }, components: { + USearch, tabBar, }, methods: { @@ -607,14 +609,14 @@ export default { } .t-input { - width: 75%; - height: 36px; - background: #F0F0F0; - border-radius: 50px; - box-sizing: border-box; + width: 85%; + //height: 36px; + //background: #F0F0F0; + //border-radius: 50px; + //box-sizing: border-box; padding: 0 15px; - display: flex; - align-items: center; + //display: flex; + //align-items: center; } @@ -776,7 +778,7 @@ export default { justify-content: space-between; /* 控制子元素之间的间距，可以改为 center/space-around */ transform: translate(-50%); left: 50%; - z-index: 999998; + z-index: 10074; } .lanniu-container2 {