diff --git a/pages/index/Neworder.vue b/pages/index/Neworder.vue index 7d14d99..f0a64b3 100644 --- a/pages/index/Neworder.vue +++ b/pages/index/Neworder.vue @@ -261,9 +261,10 @@ import upload from '@/utils/upload.js' import {getToken, getTenantId} from '@/utils/auth' import {formatDate} from "@/utils/utils"; import headersVue from "@/components/header/headers.vue"; +import USwitch from "@/uni_modules/uview-ui/components/u-switch/u-switch.vue"; export default { - components: {headersVue}, + components: {USwitch, headersVue}, data() { return { imagePath: '', @@ -508,6 +509,11 @@ export default { //goodsId this.goodsId = res.data.goodsId this.goodstext = this.findItemById(this.columnData, this.skuId).label + //车辆注册日期 + this.carRegisterDate = res.data.carRegisterDate + this.carRegisterDateStr = formatDate(res.data.carRegisterDate) + //地址 + this.userAddress = res.data.address //触发change变化的方法 // 模拟change事件 const mockEvent = { @@ -616,9 +622,9 @@ export default { }) }, async getgoodes() { - if (this.carNum == '' || this.customerSource == "" || this.skuId == '' || this.leadManId == undefined || this.carRegisterDate == '') { + if (this.carNum == '' || this.customerSource == "" || this.skuId == '' || this.leadManId == undefined || this.carRegisterDate == '' || this.meetManId == undefined || this.meetManId == undefined) { uni.showToast({ - title: '车牌号 客户来源 商品 引车员 必填!', + title: '车牌号 客户来源 商品 引车员 车辆注册日期 接车人 必填!', icon: 'none' }) return diff --git a/pages/index/newindex.vue b/pages/index/newindex.vue index 0f9a723..b7ea0ce 100644 --- a/pages/index/newindex.vue +++ b/pages/index/newindex.vue @@ -811,6 +811,7 @@ image { .box_ds { display: flex; align-items: center; + width: 80%; } .box_bd { @@ -835,6 +836,9 @@ image { font-size: 32rpx; color: #101A3E; margin-right: 10rpx; + white-space: nowrap; /* 禁止换行 */ + overflow: hidden; /* 超出部分隐藏 */ + text-overflow: ellipsis; /* 超出部分显示省略号 */ } .size_ { diff --git a/pages/index/orderdetails.vue b/pages/index/orderdetails.vue index 91263e3..b64d822 100644 --- a/pages/index/orderdetails.vue +++ b/pages/index/orderdetails.vue @@ -171,7 +171,7 @@ + @click="hge = true;getProject();cancelInterval()"> 结束检测 - + @@ -55,9 +55,9 @@ {{ '1' }} 预览 - 编辑 + 编辑 历史 - 删除 + 删除 @@ -119,6 +119,7 @@ export default { drawerData: [], isLoading: false, imageUrl: config.baseImageUrl + '/', + isHasRole:false } }, @@ -131,7 +132,7 @@ export default { }, onShow() { this.getlist() - + this.ifHasRole() }, onBackPress(options) { // 点击虚拟键或者侧滑的时候触发(不允许返回) @@ -183,6 +184,15 @@ export default { this.isLoading = false // this.getCountByDirectory() }, + ifHasRole() { + request({ + url: '/partnerOwn/partner/ifHasRole', + method: 'get', + params: {dictType: 'ins_file_role'} + }).then((res) => { + this.isHasRole = res.data + }) + }, showHistory(id) { this.isShow = true this.isShow = true diff --git a/pages/staff/goRoyalty.vue b/pages/staff/goRoyalty.vue index 355a59e..7bb59d1 100644 --- a/pages/staff/goRoyalty.vue +++ b/pages/staff/goRoyalty.vue @@ -65,6 +65,11 @@ export default { if (this.page < this.pages) { this.page++; this.getRoyalty(); + }else if (this.page === this.pages) { + uni.showToast({ + title: '没有更多数据了', + icon: 'none' + }); } }, methods: { diff --git a/pages/staff/staff-my.vue b/pages/staff/staff-my.vue index d14eb2a..830ef58 100644 --- a/pages/staff/staff-my.vue +++ b/pages/staff/staff-my.vue @@ -15,7 +15,7 @@ - + 修改密码 编辑信息 @@ -82,19 +82,19 @@ - - - - - - - - - - - - - + + + + + + + + + + + + +