diff --git a/src/components/FirstJob/detail.vue b/src/components/FirstJob/detail.vue
index 20cbaaf..2cb334f 100644
--- a/src/components/FirstJob/detail.vue
+++ b/src/components/FirstJob/detail.vue
@@ -665,8 +665,8 @@
- 结算日
- {{'(结算时间)'}}
+ 结算说明
+
{{ jobDetail.settlementTime || "-" }}
diff --git a/src/views/main.vue b/src/views/main.vue
index 8229bb8..9838e2d 100644
--- a/src/views/main.vue
+++ b/src/views/main.vue
@@ -58,7 +58,7 @@
+ -->
@@ -102,15 +102,15 @@
-
+
+ -->
+
@@ -670,13 +670,13 @@ export default {
let obj = JSON.parse(localStorage.getItem('LOGIN_DATA'))
if (window.location.hostname == 'localhost') {
// 测试环境,通过URL获取token
- window.location.href = '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;
+ window.location.href = '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
} else {
// 正式环境,通过缓存获取
localStorage.setItem('daotian_to_admin_token', obj.token)
localStorage.setItem('daotian_to_admin_avatar', obj.imgSrc)
localStorage.setItem('daotian_to_admin_username', obj.user.userName ? obj.user.userName : obj.user.nickName)
- localStorage.setItem('daotian_to_admin_roleid', obj.user.agencyRoleId)
+ localStorage.setItem('daotian_to_admin_roleid', obj.user.agencyRoleId)
window.location.href = 'http://idaotian.com/dist2.0.0/#/merchantManagement/homePage'
}
},
@@ -1121,8 +1121,8 @@ export default {
}
}
-.user-box:hover{
- cursor: pointer;
- color: #ff4400 !important;
+.user-box:hover {
+ cursor: pointer;
+ color: #ff4400 !important;
}