From c8d6116f34cac94ba696034d70b42c0078cdab87 Mon Sep 17 00:00:00 2001
From: 劉鈞霖 <benson@gmail.com>
Date: 星期四, 09 十二月 2021 15:31:43 +0800
Subject: [PATCH] [ Update ] : #Todo: 132092 && #Todo: 132135 safari and chrome 籃框問題修正 ， #Todo:132137 顧問所在地區 input 增加 readonly 不需打開鍵盤
---
PAMapp/components/NavBar.vue | 4 +-
PAMapp/assets/scss/vendors/elementUI/_input.scss | 3 +
PAMapp/pages/recommendConsultant/index.vue | 7 ++-
PAMapp/assets/scss/vendors/_elementUI.scss | 1
PAMapp/assets/scss/vendors/elementUI/_rate.scss | 9 ++--
PAMapp/assets/scss/utilities/_heading.scss | 1
PAMapp/assets/scss/utilities/_utilities.scss | 1
PAMapp/components/AddressPicker.vue | 35 +++++++++--------
PAMapp/components/multiSelectBtn.vue | 3 +
9 files changed, 36 insertions(+), 28 deletions(-)
diff --git a/PAMapp/assets/scss/utilities/_heading.scss b/PAMapp/assets/scss/utilities/_heading.scss
index 04201f1..933e0d7 100644
--- a/PAMapp/assets/scss/utilities/_heading.scss
+++ b/PAMapp/assets/scss/utilities/_heading.scss
@@ -79,6 +79,7 @@
font-size: 20px;
}
.fix-chrome-click--issue{
+ outline: none;
-webkit-tap-highlight-color: transparent;
}
.hint{
diff --git a/PAMapp/assets/scss/utilities/_utilities.scss b/PAMapp/assets/scss/utilities/_utilities.scss
index 877b5dc..42f6c90 100644
--- a/PAMapp/assets/scss/utilities/_utilities.scss
+++ b/PAMapp/assets/scss/utilities/_utilities.scss
@@ -82,6 +82,7 @@
}
.cursor--pointer {
+ @extend .fix-chrome-click--issue;
cursor: pointer;
}
diff --git a/PAMapp/assets/scss/vendors/_elementUI.scss b/PAMapp/assets/scss/vendors/_elementUI.scss
index 74d916c..df9c6ea 100644
--- a/PAMapp/assets/scss/vendors/_elementUI.scss
+++ b/PAMapp/assets/scss/vendors/_elementUI.scss
@@ -11,3 +11,4 @@
@import './elementUI/pagination';
@import './elementUI/dialog';
@import './elementUI/messageBox';
+@import './elementUI/input';
diff --git a/PAMapp/assets/scss/vendors/elementUI/_input.scss b/PAMapp/assets/scss/vendors/elementUI/_input.scss
new file mode 100644
index 0000000..8f48451
--- /dev/null
+++ b/PAMapp/assets/scss/vendors/elementUI/_input.scss
@@ -0,0 +1,3 @@
+.el-input__inner:focus{
+ border-color:#DCDFE6;
+}
diff --git a/PAMapp/assets/scss/vendors/elementUI/_rate.scss b/PAMapp/assets/scss/vendors/elementUI/_rate.scss
index b51d1ef..cd069c1 100644
--- a/PAMapp/assets/scss/vendors/elementUI/_rate.scss
+++ b/PAMapp/assets/scss/vendors/elementUI/_rate.scss
@@ -3,9 +3,8 @@
margin-top: 30px;
display: flex;
justify-content: center;
-
+ @extend .fix-chrome-click--issue;
.el-rate__item {
- -webkit-tap-highlight-color: transparent;
.el-rate__icon {
font-size: 35px;
}
@@ -16,8 +15,8 @@
}
}
.pam-consultant-rate{
+ @extend .fix-chrome-click--issue;
.el-rate__item {
- -webkit-tap-highlight-color: transparent;
.el-rate__icon {
font-size: 35px;
}
@@ -31,8 +30,8 @@
.pam-myDemand-dialog__rate {
height: auto;
display: flex;
+ @extend .fix-chrome-click--issue;
.el-rate__item {
- -webkit-tap-highlight-color: transparent;
.el-rate__icon {
font-size: 35px;
}
@@ -40,4 +39,4 @@
color: $PRIMARY_BLACK !important;
}
}
-}
\ No newline at end of file
+}
diff --git a/PAMapp/components/AddressPicker.vue b/PAMapp/components/AddressPicker.vue
index f228699..0da4ff9 100644
--- a/PAMapp/components/AddressPicker.vue
+++ b/PAMapp/components/AddressPicker.vue
@@ -1,21 +1,22 @@
<template>
<div class="text--center">
- <div class="subTitle mb-10">������</div>
- <el-input
- type="text"
- class="p mt-10"
- v-model="keyWord"
- @change="searchDistrict"
- placeholder="隢撓���摮�"
- ></el-input>
- <Ui-ScrollPicker
- :options="filterOptions"
- :initValue="district"
- @change="selectDistrict"
- ></Ui-ScrollPicker>
- <div class="text--center mt-10">
- <el-button type="primary" @click="confirm">蝣箄��</el-button>
- </div>
+ <div class="subTitle mb-10">������</div>
+ <el-input
+ type="text"
+ class="p mt-10 cursor--pointer "
+ tabindex="-1"
+ v-model="keyWord"
+ @change="searchDistrict"
+ placeholder="隢撓���摮�"
+ ></el-input>
+ <Ui-ScrollPicker
+ :options="filterOptions"
+ :initValue="district"
+ @change="selectDistrict"
+ ></Ui-ScrollPicker>
+ <div class="text--center mt-10">
+ <el-button type="primary" @click="confirm">蝣箄��</el-button>
+ </div>
</div>
</template>
@@ -54,4 +55,4 @@
.cus-input {
font-size: 20px;
}
-</style>
\ No newline at end of file
+</style>
diff --git a/PAMapp/components/NavBar.vue b/PAMapp/components/NavBar.vue
index f635551..6e3d2ab 100644
--- a/PAMapp/components/NavBar.vue
+++ b/PAMapp/components/NavBar.vue
@@ -90,8 +90,8 @@
login_role = Role.NOT_LOGIN;
isOpenDropdown = false;
- get loginRole(): string {
- return this.idToken && this.currentRole ? this.currentRole : Role.NOT_LOGIN;
+ get loginRole(): Role {
+ return this.idToken && this.currentRole ? (this.currentRole as Role): Role.NOT_LOGIN;
}
routerNavigateTo(url: string): void {
diff --git a/PAMapp/components/multiSelectBtn.vue b/PAMapp/components/multiSelectBtn.vue
index 2005a1f..93faa28 100644
--- a/PAMapp/components/multiSelectBtn.vue
+++ b/PAMapp/components/multiSelectBtn.vue
@@ -14,7 +14,7 @@
</template>
<template v-if="nameOfOtherOption">
<button class="pam-selectAll-btn cursor--pointer fix-chrome-click--issue" :class="{'selected':isSelectOtherOption}" :model="isSelectOtherOption" @click="selectOther">
- <span>{{nameOfOtherOption}}</span>
+ {{nameOfOtherOption}}
</button>
<div>
<input class="pam-muti-select-other cursor--pointer " v-if="isSelectOtherOption" v-model="syncOtherSelect" placeholder="隢撓�,���20摮�">
@@ -64,6 +64,7 @@
border: 1px $LIGHT_GREY solid;
background-color: $PRIMARY_WHITE;
border-radius: 30px;
+ color: $PRIMARY_BLACK;
font-size: 20px;
margin-right: 10px;
margin-bottom: 10px;
diff --git a/PAMapp/pages/recommendConsultant/index.vue b/PAMapp/pages/recommendConsultant/index.vue
index 37598dc..43f53a7 100644
--- a/PAMapp/pages/recommendConsultant/index.vue
+++ b/PAMapp/pages/recommendConsultant/index.vue
@@ -4,11 +4,12 @@
<SingleSelectBtn :singleSelected.sync="strictQueryDto.gender" :options="genderOptions"/>
<div class="pam-paragraph">
<div class="pb-10 mdTxt required">憿批������</div>
- <div class="job-pick cursor--pointer"
+ <div class="job-pick"
@click="showAddress = true">
- <input class="text--middle input cursor--pointer pl-10"
+ <input class="text--middle cursor--pointer input pl-10"
:value="strictQueryDto.area"
- placeholder="隢���">
+ placeholder="隢���"
+ readonly>
<i class="icon-down down-icon"></i>
</div>
<PopUpFrame :isOpen.sync="showAddress"
--
Gitblit v1.8.0