Toggle navigation
Toggle navigation
This project
Loading...
Sign in
Fedex
/
iClear-Connect-Pre-Clearance
Go to a project
Toggle navigation
Toggle navigation pinning
Projects
Groups
Snippets
Help
Project
Activity
Repository
Pipelines
Graphs
Issues
0
Merge Requests
0
Wiki
Snippets
Network
Create a new issue
Builds
Commits
Issue Boards
Authored by
jinhui.wang
2024-11-14 13:17:36 +0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
e745262389394b1056cbc8ed90b534b40320ed97
e7452623
1 parent
91e9f899
样式修改,文本修改
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
24 additions
and
28 deletions
web/src/layout/components/Navbar.vue
web/src/layout/components/viewOption.vue
web/src/views/login.vue
web/src/views/redjrectLogin.vue
web/src/layout/components/Navbar.vue
View file @
e745262
...
...
@@ -67,11 +67,11 @@
{{ $t("layout.registerNumber") }}
</span>
</el-dropdown-item> -->
<el-dropdown-item @click.native="login('fedexRegister')">
<
!-- <
el-dropdown-item @click.native="login('fedexRegister')">
<span>
{{ $t("layout.fedexRegister") }}
</span>
</el-dropdown-item>
</el-dropdown-item>
-->
<el-dropdown-item>
<span>
{{ $t("layout.registerNumber") }}
...
...
web/src/layout/components/viewOption.vue
View file @
e745262
<template>
<div class="view-option">
<div class="menu-info">
<span
class="info"
v-if="
activeRoute.name == 'WaybillInquiry' ||
activeRoute.name == 'UploadDetail'
"
>
{{ $t("fillIn.number") }}
<!-- : {{ deliveryNo || "" }} -->
</span>
<span class="info" v-else>
{{ activeRoute.meta.title }}
<span class="info" v-if="activeRoute.meta">
{{ titleCase(activeRoute.meta.title.toLowerCase()) }}
</span>
</div>
</div>
...
...
web/src/views/login.vue
View file @
e745262
...
...
@@ -3,14 +3,14 @@
<Navbar style="z-index: 22; width: 100%" @login="navberOption" />
<template v-if="!login">
<div class="main-bg">
<p class="title">FedEx
online declaration p
latform</p>
<p class="title">FedEx
Online Declaration P
latform</p>
<div class="login-background-button">
<a :href="fclLoginAddr">
<div class="buttonItem">
<div class="buttonItem-icon">
<svg-icon class="el-icon-user-solid" icon-class="fedex-fcl" />
</div>
<div class="buttonItem-title">fedex.com user
log
in</div>
<div class="buttonItem-title">fedex.com user
account log
in</div>
<div class="textCenter">
<svg-icon
class="el-icon-user-solid"
...
...
@@ -20,13 +20,13 @@
</div>
</a>
<el-divider
<
!-- <
el-divider
direction="vertical"
v-if="
appEnv == 'development' || appEnv == 'staging' || appEnv == 'uat'
"
></el-divider>
<div
></el-divider>
-->
<
!-- <
div
class="buttonItem"
@click="(login = true), (loginType = 'login')"
v-if="
...
...
@@ -43,7 +43,7 @@
icon-class="fedex-circleRight"
/>
</div>
</div>
</div>
-->
</div>
</div>
<div class="content">
...
...
@@ -84,9 +84,9 @@
</div>
<div class="guide-box">
<div>
<div class="guide">U
ser Guide
</div>
<div class="guide">U
SER GUIDE
</div>
<div class="guides">
<a @click="openGuidePdf">
Graphic version user g
uide</a>
<a @click="openGuidePdf">
User G
uide</a>
<a @click="openPrivacy">privacy policy</a>
</div>
</div>
...
...
@@ -102,8 +102,8 @@
<span>FedEx Online Declaration Platform</span>
<div class="clause">
<a :href="linkList.termsOfUse">Terms of use</a>
<a :href="linkList.businessLicense">business license</a>
<a :href="linkList.businessPermit">Express delivery business license</a>
<
!-- <
a :href="linkList.businessLicense">business license</a>
<a :href="linkList.businessPermit">Express delivery business license</a>
-->
</div>
<!-- <p class="mark">{{ $t("login.mark") }}</p> -->
<span v-show="false">{{ version }}</span>
...
...
@@ -242,7 +242,13 @@ export default {
fclInit() {
fclInit().then((res) => {
if (res.code == 200) {
this.fclLoginAddr = res.data;
if (this.appEnv == "development" || this.appEnv == "staging") {
this.fclLoginAddr = `http://192.168.1.251/time.html?replaceUrl=${
location.origin
}/ImpPer/#/redjrectLogin&loginUrl=/icleartw/auth/login&d=${new Date().getTime()}`;
} else {
this.fclLoginAddr = res.data;
}
}
});
},
...
...
@@ -270,6 +276,7 @@ export default {
background-size: cover;
color: #fff;
.title {
width: max-content;
font-size: 59px;
position: absolute;
left: 50%;
...
...
@@ -317,7 +324,7 @@ export default {
.buttonItem {
padding: 5px 0;
width:
26
0px;
width:
30
0px;
text-align: center;
border: 1px solid $fedexBorder;
cursor: pointer;
...
...
web/src/views/redjrectLogin.vue
View file @
e745262
...
...
@@ -16,8 +16,7 @@ export default {
if (this.$route.query.token && this.$route.query.uid) {
setToken(decodeURI(this.$route.query.token));
setUid(decodeURI(this.$route.query.uid));
this.$router.push({ name: "declarationInput" });
this.$router.push({ name: "WaybillInquiry" });
this.loading = false;
// this.$router.push({ path: '/login',query:{changePasswordType:this.$route.query.changePasswordType,loginname:this.$route.query.loginname} })
} else {
...
...
Please
register
or
login
to post a comment