From 17d43463a102635dfaf72d4c9799efd5a27a9b79 Mon Sep 17 00:00:00 2001 From: wangxia <779219182@qq.com> Date: Thu, 18 Jan 2024 16:04:03 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=8C=E6=AD=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/FirstJob/detail.vue | 5 ++--- src/components/FirstJob/joblist.vue | 4 ++-- src/components/userinfo/usercenter/components/mybill.vue | 9 ++++++++- src/router/index.js | 2 -- src/views/main.vue | 8 ++++---- 5 files changed, 16 insertions(+), 12 deletions(-) diff --git a/src/components/FirstJob/detail.vue b/src/components/FirstJob/detail.vue index 7ce5cd3..c14e70d 100644 --- a/src/components/FirstJob/detail.vue +++ b/src/components/FirstJob/detail.vue @@ -552,13 +552,12 @@ 客户经理 -

{{managerInfo.workPhone}}

{{managerInfo.name}} - +

@@ -2886,7 +2886,7 @@ export default { position: absolute; width: 100%; font-size: 20px; - color: #ff4400; + color: #333; font-weight: 600; top: 75%; left: 50%; diff --git a/src/components/userinfo/usercenter/components/mybill.vue b/src/components/userinfo/usercenter/components/mybill.vue index 3e22249..ce27294 100644 --- a/src/components/userinfo/usercenter/components/mybill.vue +++ b/src/components/userinfo/usercenter/components/mybill.vue @@ -622,11 +622,18 @@ export default { // if (Math.abs(that.rotateNum / 90) % 2 !== 0) { // imgbox.style.transformOrigin = `${e.offsetY}px ${e.offsetX}px`; // 设置图片的缩放中心,保证跟随鼠标的位置进行图片的缩放 // } else { - imgbox.style.transformOrigin = `${e.offsetX}px ${e.offsetY}px` // 设置图片的缩放中心,保证跟随鼠标的位置进行图片的缩放 + if (that.scaleNum < 1) { + imgbox.style.transformOrigin = `50% 50%` // 设置图片的缩放中心,保证跟随鼠标的位置进行图片的缩放 + } else { + imgbox.style.transformOrigin = `${e.offsetX}px ${e.offsetY}px` // 设置图片的缩放中心,保证跟随鼠标的位置进行图片的缩放 + } // } var handle = function (delta) { // let + console.log('delta', delta) + console.log('scaleNum', that.scaleNum) let scaleNum = (that.scaleNum += delta / 15) + console.log('scaleNum1', that.scaleNum) if (delta < 0) { //向下滚动 console.log(that.scaleNum) diff --git a/src/router/index.js b/src/router/index.js index 7e4149e..565a2ff 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -70,9 +70,7 @@ const routes = [ { path: "/login", name: "login", - // component: () => import("../components/Login/login.vue"), component: () => import("../views/login.vue"), - // redirect: "/login", children: [ { diff --git a/src/views/main.vue b/src/views/main.vue index 7aa650c..734a78b 100644 --- a/src/views/main.vue +++ b/src/views/main.vue @@ -89,7 +89,7 @@ -
{{ userbaseInfo.userName || '-' }}
+
{{ userbaseInfo.userName || userbaseInfo.nickName || '-' }}
@@ -619,7 +619,7 @@ export default { console.log(JSON.stringify(obj.user)) if (window.location.hostname == 'localhost') { // 测试环境，通过URL获取token - window.open('http://localhost:3000/#/merchantManagement/homePage?token=' + obj.token + '&username=' + (obj.user.userName ? obj.user.userName : obj.user.nickName) + '&avatar=' + obj.imgSrc + '&roleid=' + obj.user.agencyRoleId + '&agencyid=' + obj.user.agencyId + '&userInfo=' + JSON.stringify(obj)) + window.open('http://localhost:3000/#/main?token=' + obj.token + '&username=' + (obj.user.userName ? obj.user.userName : obj.user.nickName) + '&avatar=' + obj.imgSrc + '&roleid=' + obj.user.agencyRoleId + '&agencyid=' + obj.user.agencyId + '&userInfo=' + JSON.stringify(obj)) } else { // 正式环境，通过缓存获取 localStorage.setItem('daotian_to_admin', JSON.stringify(obj)) @@ -629,9 +629,9 @@ export default { localStorage.setItem('daotian_to_admin_roleid', obj.user.agencyRoleId) localStorage.setItem('daotian_to_admin_agencyid', obj.user.agencyId) if (window.location.origin.indexOf('www') > -1) { - window.open('http://www.idaotian.com/dist2.0.0/#/merchantManagement/homePage') + window.open('http://www.idaotian.com/dist2.0.0/#/main') } else { - window.open('http://idaotian.com/dist2.0.0/#/merchantManagement/homePage') + window.open('http://idaotian.com/dist2.0.0/#/main') } } },