Browse Source

修改手写颜色和搜索提示语

Reviewed-on: https://git.1000my.com/project-jiaxinglcpy/jxlcpy_base_daoshi_vue_ts/pulls/7
test
张耀 3 years ago
parent
commit
4bf9a57259
  1. 7
      CHANGELOG.md
  2. 4
      package-lock.json
  3. 2
      package.json
  4. 2
      src/components/SearchKeyboard/SearchKeyboard.vue
  5. 7
      src/components/TypeBtnList/TypeBtnList.vue
  6. 4
      src/components/Written/Written.vue
  7. 3
      src/i18n/lang/en.json
  8. 3
      src/i18n/lang/tw.json
  9. 3
      src/i18n/lang/zh.json
  10. 24
      src/views/Search/Search.vue

7
CHANGELOG.md

@ -2,6 +2,13 @@
All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
## [1.0.0-B.6](https://git.1000my.com/project-jiaxinglcpy/jxlcpy_base_daoshi_vue_ts/compare/v1.0.0-B.5...v1.0.0-B.6) (2023-06-15)
### Bug Fixes
* 修改手写颜色和搜索提示语 ([8465415](https://git.1000my.com/project-jiaxinglcpy/jxlcpy_base_daoshi_vue_ts/commit/8465415d55c8b7ad0affa85a83e911275495fd54))
## [1.0.0-B.5](https://git.1000my.com/project-jiaxinglcpy/jxlcpy_base_daoshi_vue_ts/compare/v1.0.0-B.4...v1.0.0-B.5) (2023-06-15)

4
package-lock.json

@ -1,12 +1,12 @@
{
"name": "vue_cli_ts",
"version": "1.0.0-B.5",
"version": "1.0.0-B.6",
"lockfileVersion": 2,
"requires": true,
"packages": {
"": {
"name": "vue_cli_ts",
"version": "1.0.0-B.5",
"version": "1.0.0-B.6",
"dependencies": {
"@better-scroll/core": "^2.5.0",
"@better-scroll/observe-image": "^2.5.0",

2
package.json

@ -1,6 +1,6 @@
{
"name": "vue_cli_ts",
"version": "1.0.0-B.5",
"version": "1.0.0-B.6",
"private": true,
"scripts": {
"serve": "vue-cli-service serve",

2
src/components/SearchKeyboard/SearchKeyboard.vue

@ -62,7 +62,7 @@
background-color="#fff"
border-radius="12px"
stroke-style="#D8B78A"
fill-style="#fff"
fill-style="rgba(0, 0, 0, 0.03)"
:width="700"
:height="214"
@result="result"

7
src/components/TypeBtnList/TypeBtnList.vue

@ -53,7 +53,7 @@ function changeType(item: TypeItem, index: number) {
padding-bottom: 18px;
font-size: 32px;
font-family: 'font_bold';
color: rgb(0 0 0 / 60%);
color: rgb(0 0 0 / 40%);
line-height: 57px;
font-style: normal;
font-weight: 400;
@ -73,10 +73,9 @@ function changeType(item: TypeItem, index: number) {
}
}
&.active {
font-size: 40px;
color: rgb(0 0 0 / 80%);
h4 {
font-size: 40px;
color: rgb(0 0 0 / 80%);
border-bottom: 6px solid #d7ba92;
}
}

4
src/components/Written/Written.vue

@ -39,9 +39,9 @@ const props = withDefaults(defineProps<Props>(), {
lang: 'CN',
backgroundColor: '#f2f2f2',
borderRadius: '10px',
fillText: '手写区域',
fillText: '手写输入区域',
fillFontSize: '100px',
strokeStyle: '#000',
strokeStyle: 'rgba(0, 0, 0, 0.3)',
fillStyle: 'rgba(85, 73, 54, 0.1)'
})

3
src/i18n/lang/en.json

@ -26,7 +26,8 @@
},
"search": {
"title": "全局搜索",
"valueTip": "Search",
"valueTip": "Please enter initial letters in English and Chinese",
"valueTipHand": "Please enter your Chinese name by hand",
"act": "Activity",
"brand": "Brand",
"num": "Result"

3
src/i18n/lang/tw.json

@ -26,7 +26,8 @@
},
"search": {
"title": "全局搜索",
"valueTip": "搜索",
"valueTip": "請輸入中英文首字母,例如XBK(星巴克)",
"valueTipHand": "請手寫輸入中文名查詢",
"act": "活動",
"brand": "品牌",
"num": "搜索結果"

3
src/i18n/lang/zh.json

@ -26,7 +26,8 @@
},
"search": {
"title": "全局搜索",
"valueTip": "搜索",
"valueTip": "请输入中英文首字母,例如 XBK(星巴克)",
"valueTipHand": "请手写输入中文名查询",
"act": "活动",
"brand": "品牌",
"num": "搜索结果"

24
src/views/Search/Search.vue

@ -40,13 +40,9 @@
<!-- <img src="@/assets/images/search/searchSecondIcon.svg" class="second-icon" /> -->
</div>
<div v-if="input.length" class="saw" v-text="input"></div>
<input
v-model="input"
readonly
type="text"
:placeholder="mode === 'hand' ? '' : $t('search.valueTip')"
:class="{ istip: input.length === 0 }"
/>
<!-- :placeholder="" -->
<input v-model="input" readonly type="text" :class="{ istip: input.length === 0 }" />
<h4 v-if="input.length === 0" class="search-tip">{{ mode === 'hand' ? $t('search.valueTipHand') : $t('search.valueTip') }}</h4>
<div v-if="input.length" class="close" @click="del">
<svg width="22" class="icon" height="22" viewBox="0 0 22 22" fill="none" xmlns="http://www.w3.org/2000/svg">
<path
@ -521,7 +517,8 @@ function closeActivityDetail() {
height: 40px;
margin-top: 10px;
}
//&::-webkit-input-placeholder
&::input-placeholder,
&::input-placeholder {
position: absolute;
top: 45%;
@ -531,10 +528,19 @@ function closeActivityDetail() {
font-family: 'font_regular';
/* placeholder颜色 */
color: rgb(0 0 0 / 40%);
color: rgb(0 0 0 / 20%);
transform: translateY(-50%);
}
}
.search-tip {
position: absolute;
top: 50%;
left: 96px;
font-size: 20px;
font-family: 'font_regular';
color: rgb(0 0 0 / 20%);
transform: translateY(-50%);
}
.close {
position: relative;
width: 56px;

Loading…
Cancel
Save