diff --git a/public/favicon.png b/public/favicon.png index 562f6dcb..d7c39c34 100644 Binary files a/public/favicon.png and b/public/favicon.png differ diff --git a/public/faviconaa.png b/public/faviconaa.png new file mode 100644 index 00000000..562f6dcb Binary files /dev/null and b/public/faviconaa.png differ diff --git a/public/img/Qrewm.png b/public/img/Qrewm.png index 920d1fae..2b23f05c 100644 Binary files a/public/img/Qrewm.png and b/public/img/Qrewm.png differ diff --git a/public/img/bg/img-logo.png b/public/img/bg/img-logo.png index ae65ba16..d7c39c34 100644 Binary files a/public/img/bg/img-logo.png and b/public/img/bg/img-logo.png differ diff --git a/public/img/bg/img-logoa.png b/public/img/bg/img-logoa.png new file mode 100644 index 00000000..ae65ba16 Binary files /dev/null and b/public/img/bg/img-logoa.png differ diff --git a/public/img/p-logo.png b/public/img/p-logo.png index b4da7bc1..d7c39c34 100644 Binary files a/public/img/p-logo.png and b/public/img/p-logo.png differ diff --git a/public/img/p-logoa.png b/public/img/p-logoa.png new file mode 100644 index 00000000..b4da7bc1 Binary files /dev/null and b/public/img/p-logoa.png differ diff --git a/src/page/index/logo.vue b/src/page/index/logo.vue index 0c8e67d4..edcff613 100644 --- a/src/page/index/logo.vue +++ b/src/page/index/logo.vue @@ -15,7 +15,7 @@ {{ website.indexTitle }} - + @@ -28,7 +28,7 @@ export default { data() { return {}; }, - created() {}, + created() { }, computed: { ...mapGetters(['isCollapse']), }, @@ -37,13 +37,22 @@ export default { diff --git a/src/page/login/userlogin.vue b/src/page/login/userlogin.vue index 4887dcd1..105f0cba 100644 --- a/src/page/login/userlogin.vue +++ b/src/page/login/userlogin.vue @@ -361,7 +361,7 @@ export default { } .login-logo { position: absolute; - right: 70px; + right: 60px; top: 66px; img { width: 60px; diff --git a/src/views/aftersales/aftersalesWorkOrderend.vue b/src/views/aftersales/aftersalesWorkOrderend.vue index 7991f5fc..00928002 100644 --- a/src/views/aftersales/aftersalesWorkOrderend.vue +++ b/src/views/aftersales/aftersalesWorkOrderend.vue @@ -490,14 +490,14 @@ identifyingC3: item.difference == '3', 'mx-1': true, }" effect="dark">{{ - item.difference == '1' - ? ' 调查记录' - : item.difference == '2' - ? '指定记录' - : item.difference == '3' - ? '操作记录' - : '' - }} + item.difference == '1' + ? ' 调查记录' + : item.difference == '2' + ? '指定记录' + : item.difference == '3' + ? '操作记录' + : '' + }} @@ -582,10 +582,10 @@ /> --> - + { }; // 下一条跳转 const Nextjump = res => { - console.log(res); + console.log(res); + + if (res.data) { + if (res.data.data.records.length) { let dataInfo = res.data.data.records[0]; - + const workOrderInfoPath_end = '/aftersales/aftersalesWorkOrderend'; //跳转路径 const queryParams = { id: dataInfo.id, //异常工单ID @@ -2190,18 +2193,8 @@ const Nextjump = res => { RouteIndexs: '2', //当前菜单编号 workOrderStatus: dataInfo.workOrderStatus, //工单状态 }; - - if (res.data.data.total > Nextpage.value) { - Nextpage.value = Nextpage.value - 1; - ElMessage({ - type: 'warning', - message: '没有更多数据了', - }) - onLoad() - } else { - $router.push({ path: workOrderInfoPath_end, query: { ...queryParams } }); - onLoad() - } + $router.push({ path: workOrderInfoPath_end, query: { ...queryParams } }); + onLoad() $useStore.commit('DEL_ONCE_TAG', '/aftersales/aftersalesWorkOrderend'); } else { Nextpage.value = Nextpage.value - 1; diff --git a/src/views/distribution/signfor/distributionSignforedt.vue b/src/views/distribution/signfor/distributionSignforedt.vue index c5d712f5..8ed035e8 100644 --- a/src/views/distribution/signfor/distributionSignforedt.vue +++ b/src/views/distribution/signfor/distributionSignforedt.vue @@ -66,8 +66,8 @@
- 实际配送时间: - + 配送时间: +
@@ -165,17 +165,17 @@
计划件数: - +
装车件数: - +
签收件数: - +