Fedex / iClear-Connect-Pre-Clearance

Go to a project
Toggle navigation Toggle navigation pinning
jinhui.wang
e7452623 1 parent 91e9f899

样式修改，文本修改

Inline Side-by-side
Showing 4 changed files with 24 additions and 28 deletions
...@@ -67,11 +67,11 @@ ...@@ -67,11 +67,11 @@
67 {{ $t("layout.registerNumber") }} 67 {{ $t("layout.registerNumber") }}
68 </span> 68 </span>
69 </el-dropdown-item> --> 69 </el-dropdown-item> -->
70 - <el-dropdown-item @click.native="login('fedexRegister')"> 70 + <!-- <el-dropdown-item @click.native="login('fedexRegister')">
71 <span> 71 <span>
72 {{ $t("layout.fedexRegister") }} 72 {{ $t("layout.fedexRegister") }}
73 </span> 73 </span>
74 - </el-dropdown-item> 74 + </el-dropdown-item> -->
75 <el-dropdown-item> 75 <el-dropdown-item>
76 <span> 76 <span>
77 {{ $t("layout.registerNumber") }} 77 {{ $t("layout.registerNumber") }}
......
1 <template> 1 <template>
2 <div class="view-option"> 2 <div class="view-option">
3 <div class="menu-info"> 3 <div class="menu-info">
4 - <span 4 + <span class="info" v-if="activeRoute.meta">
5 - class="info" 5 + {{ titleCase(activeRoute.meta.title.toLowerCase()) }}
6 - v-if="
7 - activeRoute.name == 'WaybillInquiry' ||
8 - activeRoute.name == 'UploadDetail'
9 - "
10 - >
11 - {{ $t("fillIn.number") }}
12 - <!-- :&nbsp;{{ deliveryNo || "" }} -->
13 - </span>
14 - <span class="info" v-else>
15 - {{ activeRoute.meta.title }}
16 </span> 6 </span>
17 </div> 7 </div>
18 </div> 8 </div>
......
...@@ -3,14 +3,14 @@ ...@@ -3,14 +3,14 @@
3 <Navbar style="z-index: 22; width: 100%" @login="navberOption" /> 3 <Navbar style="z-index: 22; width: 100%" @login="navberOption" />
4 <template v-if="!login"> 4 <template v-if="!login">
5 <div class="main-bg"> 5 <div class="main-bg">
6 - <p class="title">FedEx online declaration platform</p> 6 + <p class="title">FedEx Online Declaration Platform</p>
7 <div class="login-background-button"> 7 <div class="login-background-button">
8 <a :href="fclLoginAddr"> 8 <a :href="fclLoginAddr">
9 <div class="buttonItem"> 9 <div class="buttonItem">
10 <div class="buttonItem-icon"> 10 <div class="buttonItem-icon">
11 <svg-icon class="el-icon-user-solid" icon-class="fedex-fcl" /> 11 <svg-icon class="el-icon-user-solid" icon-class="fedex-fcl" />
12 </div> 12 </div>
13 - <div class="buttonItem-title">fedex.com user log in</div> 13 + <div class="buttonItem-title">fedex.com user account login</div>
14 <div class="textCenter"> 14 <div class="textCenter">
15 <svg-icon 15 <svg-icon
16 class="el-icon-user-solid" 16 class="el-icon-user-solid"
...@@ -20,13 +20,13 @@ ...@@ -20,13 +20,13 @@
20 </div> 20 </div>
21 </a> 21 </a>
22 22
23 - <el-divider 23 + <!-- <el-divider
24 direction="vertical" 24 direction="vertical"
25 v-if=" 25 v-if="
26 appEnv == 'development' || appEnv == 'staging' || appEnv == 'uat' 26 appEnv == 'development' || appEnv == 'staging' || appEnv == 'uat'
27 " 27 "
28 - ></el-divider> 28 + ></el-divider> -->
29 - <div 29 + <!-- <div
30 class="buttonItem" 30 class="buttonItem"
31 @click="(login = true), (loginType = 'login')" 31 @click="(login = true), (loginType = 'login')"
32 v-if=" 32 v-if="
...@@ -43,7 +43,7 @@ ...@@ -43,7 +43,7 @@
43 icon-class="fedex-circleRight" 43 icon-class="fedex-circleRight"
44 /> 44 />
45 </div> 45 </div>
46 - </div> 46 + </div> -->
47 </div> 47 </div>
48 </div> 48 </div>
49 <div class="content"> 49 <div class="content">
...@@ -84,9 +84,9 @@ ...@@ -84,9 +84,9 @@
84 </div> 84 </div>
85 <div class="guide-box"> 85 <div class="guide-box">
86 <div> 86 <div>
87 - <div class="guide">User Guide</div> 87 + <div class="guide">USER GUIDE</div>
88 <div class="guides"> 88 <div class="guides">
89 - <a @click="openGuidePdf">Graphic version user guide</a> 89 + <a @click="openGuidePdf">User Guide</a>
90 <a @click="openPrivacy">privacy policy</a> 90 <a @click="openPrivacy">privacy policy</a>
91 </div> 91 </div>
92 </div> 92 </div>
...@@ -102,8 +102,8 @@ ...@@ -102,8 +102,8 @@
102 <span>FedEx Online Declaration Platform</span> 102 <span>FedEx Online Declaration Platform</span>
103 <div class="clause"> 103 <div class="clause">
104 <a :href="linkList.termsOfUse">Terms of use</a> 104 <a :href="linkList.termsOfUse">Terms of use</a>
105 - <a :href="linkList.businessLicense">business license</a> 105 + <!-- <a :href="linkList.businessLicense">business license</a>
106 - <a :href="linkList.businessPermit">Express delivery business license</a> 106 + <a :href="linkList.businessPermit">Express delivery business license</a> -->
107 </div> 107 </div>
108 <!-- <p class="mark">{{ $t("login.mark") }}</p> --> 108 <!-- <p class="mark">{{ $t("login.mark") }}</p> -->
109 <span v-show="false">{{ version }}</span> 109 <span v-show="false">{{ version }}</span>
...@@ -242,7 +242,13 @@ export default { ...@@ -242,7 +242,13 @@ export default {
242 fclInit() { 242 fclInit() {
243 fclInit().then((res) => { 243 fclInit().then((res) => {
244 if (res.code == 200) { 244 if (res.code == 200) {
245 - this.fclLoginAddr = res.data; 245 + if (this.appEnv == "development" || this.appEnv == "staging") {
246 + this.fclLoginAddr = `http://192.168.1.251/time.html?replaceUrl=${
247 + location.origin
248 + }/ImpPer/#/redjrectLogin&loginUrl=/icleartw/auth/login&d=${new Date().getTime()}`;
249 + } else {
250 + this.fclLoginAddr = res.data;
251 + }
246 } 252 }
247 }); 253 });
248 }, 254 },
...@@ -270,6 +276,7 @@ export default { ...@@ -270,6 +276,7 @@ export default {
270 background-size: cover; 276 background-size: cover;
271 color: #fff; 277 color: #fff;
272 .title { 278 .title {
279 + width: max-content;
273 font-size: 59px; 280 font-size: 59px;
274 position: absolute; 281 position: absolute;
275 left: 50%; 282 left: 50%;
...@@ -317,7 +324,7 @@ export default { ...@@ -317,7 +324,7 @@ export default {
317 324
318 .buttonItem { 325 .buttonItem {
319 padding: 5px 0; 326 padding: 5px 0;
320 - width: 260px; 327 + width: 300px;
321 text-align: center; 328 text-align: center;
322 border: 1px solid $fedexBorder; 329 border: 1px solid $fedexBorder;
323 cursor: pointer; 330 cursor: pointer;
......
...@@ -16,8 +16,7 @@ export default { ...@@ -16,8 +16,7 @@ export default {
16 if (this.$route.query.token && this.$route.query.uid) { 16 if (this.$route.query.token && this.$route.query.uid) {
17 setToken(decodeURI(this.$route.query.token)); 17 setToken(decodeURI(this.$route.query.token));
18 setUid(decodeURI(this.$route.query.uid)); 18 setUid(decodeURI(this.$route.query.uid));
19 - 19 + this.$router.push({ name: "WaybillInquiry" });
20 - this.$router.push({ name: "declarationInput" });
21 this.loading = false; 20 this.loading = false;
22 // this.$router.push({ path: '/login',query:{changePasswordType:this.$route.query.changePasswordType,loginname:this.$route.query.loginname} }) 21 // this.$router.push({ path: '/login',query:{changePasswordType:this.$route.query.changePasswordType,loginname:this.$route.query.loginname} })
23 } else { 22 } else {
......