From df53ea3259db439d219db4e592714d6cb98eecb0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=88=B1=7E=E6=B5=B7=7E=E7=88=B1=E6=B5=B7=E7=88=B1?= =?UTF-8?q?=E6=B5=B7=7E=E5=8F=B3?= <1828712314@qq.com> Date: Tue, 11 Mar 2025 15:16:14 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api/jobinfo/index.js | 86 ++-- config.js | 4 +- pages/enterprise.vue | 46 +- pages/index.vue | 9 +- pages/owner.vue | 156 ++++--- static/scss/global.scss | 1 + sub/invite/index.vue | 2 +- sub/owner/edit.vue | 24 +- sub/owner/jobInfo.vue | 109 +++-- sub/owner/notice-detail.vue | 0 sub/task/detail.vue | 10 +- sub/task/locate.vue | 7 +- sub/task/record.vue | 2 +- uni_modules/s-components/s-tabber/index.vue | 2 +- .../uview-ui/components/u-modal/props.js | 174 +++---- .../uview-ui/components/u-modal/u-modal.vue | 427 +++++++++--------- wxcomponents/vant/dropdown-item/index.wxss | 1 + wxcomponents/vant/dropdown-menu/index.wxss | 1 - wxcomponents/vant/search/index.js | 200 ++++---- wxcomponents/vant/search/index.wxss | 54 ++- 20 files changed, 749 insertions(+), 566 deletions(-) delete mode 100644 sub/owner/notice-detail.vue diff --git a/api/jobinfo/index.js b/api/jobinfo/index.js index 5bfcf89..02c6ee8 100644 --- a/api/jobinfo/index.js +++ b/api/jobinfo/index.js @@ -3,36 +3,56 @@ import request from '@/utils/request' // 工作汇报 API export const JobInfoApi = { - // 查询工作汇报分页 - getJobInfoPage: (params) => { - return request({ url: `/system/job-info/page`, params ,method: 'get'}) - - }, - - // 查询工作汇报详情 - getJobInfo: (id) => { - return request({ url: `/system/job-info/get?id=` + id, method: 'get' }) - }, - - // 模板信息 - jobDetail: (id) => { - return request({ url: `/system/job-info/jobDetail?id=` + id,method: 'get' }) - }, - - // 新增工作汇报 - createJobInfo: (data) => { - return request({ url: `/system/job-info/create`, data, method: 'post' }) - }, - - // 修改工作汇报 - updateJobInfo: (data) => { - return request({ url: `/system/job-info/update`, data , method: 'put'}) - }, - - // 删除工作汇报 - deleteJobInfo: (id) => { - return request({ url: `/system/job-info/delete?id=` + id , method: 'delete' }) - } - - -} + // 查询工作汇报分页 + getJobInfoPage: (params) => { + return request({ + url: `/system/job-info/page`, + params, + method: 'get' + }) + + }, + // 查询工作汇报详情 + getJobInfo: (id) => { + return request({ + url: `/system/job-info/get?id=` + id, + method: 'get' + }) + }, + + // 模板信息 + jobDetail: (id) => { + return request({ + url: `/system/job-info/jobDetail?id=` + id, + method: 'get' + }) + }, + + // 新增工作汇报 + createJobInfo: (data) => { + return request({ + url: `/system/job-info/create`, + data, + method: 'post' + }) + }, + + // 修改工作汇报 + updateJobInfo: (data) => { + return request({ + url: `/system/job-info/update`, + data, + method: 'put' + }) + }, + + // 删除工作汇报 + deleteJobInfo: (id) => { + return request({ + url: `/system/job-info/delete?id=` + id, + method: 'delete' + }) + } + + +} \ No newline at end of file diff --git a/config.js b/config.js index d098f7a..34dae4f 100644 --- a/config.js +++ b/config.js @@ -1,8 +1,8 @@ // 应用全局配置 module.exports = { // baseUrl: 'http://188.188.5.188:48080', - // baseUrl: 'https://hb.jzce.com', - baseUrl: 'http://188.188.3.232:48080', + baseUrl: 'https://hb.jzce.com', + // baseUrl: 'http://188.188.3.232:48080', // baseUrl: 'http://localhost:48080', baseApi: '/admin-api', imgUrl: 'https://hb.jzce.com', diff --git a/pages/enterprise.vue b/pages/enterprise.vue index 2372504..b7b6766 100644 --- a/pages/enterprise.vue +++ b/pages/enterprise.vue @@ -173,18 +173,29 @@ export default { methods: { getPageHeight() { const query = uni.createSelectorQuery().in(this) - query - .select('#sreach') - .boundingClientRect(data => { - this.sreachHeight = data.height - }) - .exec() + // query + // .select('#sreach') + // .boundingClientRect(data => { + // this.sreachHeight = data.height + // }) + // .exec() + // query + // .select('#page') + // .boundingClientRect(data => { + // this.listHeight = data.height - 35 - 25 + // }) + // .exec() query .select('#page') - .boundingClientRect(data => { - this.listHeight = data.height - 35 - 25 + .boundingClientRect() + .select('.drop-box') + .boundingClientRect() + .select('#sreach') + .boundingClientRect() + .exec(data => { + this.listHeight = + data[0].height - data[1].height - data[2].height - 25 }) - .exec() }, async getList() { uni.showToast({ @@ -373,7 +384,22 @@ export default { box-shadow: none; height: fit-content !important; font-size: 26rpx; - padding: 12rpx 24rpx; + justify-content: space-between; + // padding: 12rpx 24rpx; + } +} +::v-deep .van-search { + padding-bottom: 0; + .van-search__content { + height: 44px; + border-radius: 16rpx; + align-items: center; + .van-icon { + font-size: 40rpx; + } + .van-field__body { + height: 100%; + } } } ::v-deep .u-list { diff --git a/pages/index.vue b/pages/index.vue index d918329..a75ae73 100644 --- a/pages/index.vue +++ b/pages/index.vue @@ -203,7 +203,7 @@ export default { return { dictMap: {}, queryParams: { - selectWeek: '3', + selectWeek: '', deptId: '', type: 1 }, @@ -294,6 +294,10 @@ export default { } this.dropOption.select_week = [ + { + value: '', + text: '全部' + }, ...dict.data.select_week.map(i => { return { value: i.value, @@ -484,6 +488,9 @@ export default { height: fit-content !important; font-size: 26rpx; padding: 8rpx 24rpx; + .select-title { + color: #17c653; + } } ::v-deep .van-dropdown-item { margin-bottom: 64rpx; diff --git a/pages/owner.vue b/pages/owner.vue index d3d9189..817989e 100644 --- a/pages/owner.vue +++ b/pages/owner.vue @@ -5,39 +5,39 @@ class="section wd-flex wd-flex-row wd-justify-between wd-items-center" @tap="edit" > - + - {{ user.realName }} - + + {{ user.realName }} + + + {{ user.dept.name }} {{ user.mobile }} - - - + + + - + - 消息通知 + 消息通知 - - - + + + + + + @@ -50,7 +51,7 @@ class="section wd-flex wd-flex-row wd-justify-between wd-items-center" @click="showPicker('system_user_sex', 'sex')" > - 性别 + 性别 {{ @@ -61,23 +62,27 @@ }} 请选择性别 - + - 手机号码 - + 手机号码 + - + @@ -160,7 +165,6 @@ export default { } }, init() { - console.log('登录信息', this.$store.getters) if (this.$store.getters.userId) { getUserProfile().then(res => { this.form = res.data @@ -313,7 +317,7 @@ export default { } } .placeholder { - color: $uni-text-color-grey; + color: #99a1b7; } button { padding-left: 0; diff --git a/sub/owner/jobInfo.vue b/sub/owner/jobInfo.vue index 4c1dbc8..aa21bd6 100644 --- a/sub/owner/jobInfo.vue +++ b/sub/owner/jobInfo.vue @@ -2,21 +2,41 @@ - + - - + + {{ item.title }} 汇报日期：{{ item.jobDate }} - - + + @@ -35,7 +55,6 @@ import { formatDate } from '@/utils/ruoyi.js' import config from '@/config' import { JobInfoApi } from '@/api/jobinfo/index.js' - export default { data() { return { @@ -46,8 +65,10 @@ export default { pageNum: 1, // 当前页码 pageSize: 10, // 每页显示条数 total: 0, // 总数据条数 - loadMoreStatus: 'more',// 加载更多状态：more-加载前 loading-加载中 noMore-没有更多 - itemImgUrl: config.imgUrl + '/miniohb/c103c92335bdd30d33ff8a062c219ead0626bf0a1898536bd7590285ca11c9db.png' + loadMoreStatus: 'more', // 加载更多状态：more-加载前 loading-加载中 noMore-没有更多 + itemImgUrl: + config.imgUrl + + '/miniohb/c103c92335bdd30d33ff8a062c219ead0626bf0a1898536bd7590285ca11c9db.png' } }, // 页面加载时获取列表数据 @@ -56,7 +77,6 @@ export default { this.getjobInfoList() }, - methods: { handleAdd() { uni.navigateTo({ @@ -71,27 +91,27 @@ export default { // 替换为你的PDF文件URL url: url, success: function (res) { - const filePath = res.tempFilePath; + const filePath = res.tempFilePath wx.openDocument({ filePath: filePath, fileType: 'pdf', // 指定文件类型为PDF success: function (res) { - console.log('打开文档成功'); + console.log('打开文档成功') }, fail: function (err) { - console.error('打开文档失败', err); + console.error('打开文档失败', err) } - }); + }) }, fail: function (err) { - console.error('下载文件失败', err); + console.error('下载文件失败', err) } - }); + }) }, btnShare(item) { let url = item.pdfUrl - let fileName = item.title+".pdf" + let fileName = item.title + '.pdf' // 示例代码 wx.downloadFile({ url: url, // 文件的下载链接 @@ -101,19 +121,18 @@ export default { filePath: res.tempFilePath, // 下载后的文件临时路径 fileName: fileName, // 可选，自定义文件名 success() { - console.log('文件分享成功'); + console.log('文件分享成功') }, fail(err) { - console.error('文件分享失败', err); + console.error('文件分享失败', err) } - }); + }) } }, fail(err) { - console.error('文件下载失败', err); + console.error('文件下载失败', err) } - }); - + }) }, // 下拉刷新 @@ -127,7 +146,6 @@ export default { if (this.jobInfoList.length < this.total) { this.pageNum++ this.getjobInfoList() - } }, // 获取政策法规列表数据 @@ -145,7 +163,10 @@ export default { // 限制标题长度，超出显示省略号 const formattedData = res.data.list.map(item => ({ ...item, - title: item.title.length > 15 ? item.title.slice(0, 15) + '...' : item.title, + title: + item.title.length > 15 + ? item.title.slice(0, 15) + '...' + : item.title, jobDate: formatDate(item.jobDate, 'YYYY年MM月DD日') })) @@ -158,7 +179,8 @@ export default { console.log('列表信息', res) this.total = res.data.total // 更新加载状态 - this.loadMoreStatus = this.jobInfoList.length >= this.total ? 'noMore' : 'more' + this.loadMoreStatus = + this.jobInfoList.length >= this.total ? 'noMore' : 'more' } } catch (error) { console.error(error) @@ -167,14 +189,14 @@ export default { title: '获取列表失败', icon: 'none' }) - } - finally { - this.loadMoreStatus = this.jobInfoList.length >= this.total ? 'noMore' : 'more' + } finally { + this.loadMoreStatus = + this.jobInfoList.length >= this.total ? 'noMore' : 'more' // 无论成功失败都关闭刷新状态 // 确保在数据加载完成后关闭刷新状态 setTimeout(() => { this.isRefreshing = false - }, 300) // 添加短暂延时，确保动画效果完整 + }, 300) // 添加短暂延时，确保动画效果完整 } }, // 搜索事件处理 @@ -184,7 +206,6 @@ export default { this.searchValue = e.detail // 更新搜索关键字 this.getjobInfoList() } - }, // 清除搜索事件处理 handleClear() { @@ -203,7 +224,7 @@ export default { \ No newline at end of file + diff --git a/sub/owner/notice-detail.vue b/sub/owner/notice-detail.vue deleted file mode 100644 index e69de29..0000000 diff --git a/sub/task/detail.vue b/sub/task/detail.vue index 737a6fc..f4ee1d0 100644 --- a/sub/task/detail.vue +++ b/sub/task/detail.vue @@ -169,7 +169,12 @@ 已选择({{ isSelect.length }}) - + @@ -714,4 +719,7 @@ export default { margin: 12px 0; border-radius: 0px; } +::v-deep .u-popup__content { + border-radius: 32rpx; +} diff --git a/sub/task/locate.vue b/sub/task/locate.vue index b934103..6b9b69c 100644 --- a/sub/task/locate.vue +++ b/sub/task/locate.vue @@ -187,8 +187,7 @@ export default { this.share = { title: '', path: `/sub/task/locate?inspectionsId=${this.inspectionsId}&enterpriseId=${this.enterpriseId}`, - imageUrl: - 'http://82.156.141.150:9001/api/v1/download-shared-object/aHR0cDovL2xvY2FsaG9zdDo5MDAwL2h1YW5iYW8vbWluaWFwcC9pbnZhdGUucG5nP1gtQW16LUFsZ29yaXRobT1BV1M0LUhNQUMtU0hBMjU2JlgtQW16LUNyZWRlbnRpYWw9QUQxODY1RVA2NEczMEdEUUhDVTglMkYyMDI1MDIxOCUyRnVzLWVhc3QtMSUyRnMzJTJGYXdzNF9yZXF1ZXN0JlgtQW16LURhdGU9MjAyNTAyMThUMDcyMDI0WiZYLUFtei1FeHBpcmVzPTQzMTk5JlgtQW16LVNlY3VyaXR5LVRva2VuPWV5SmhiR2NpT2lKSVV6VXhNaUlzSW5SNWNDSTZJa3BYVkNKOS5leUpoWTJObGMzTkxaWGtpT2lKQlJERTROalZGVURZMFJ6TXdSMFJSU0VOVk9DSXNJbVY0Y0NJNk1UY3pPVGt3TmpJME55d2ljR0Z5Wlc1MElqb2lZV1J0YVc0aWZRLmp6djBhdEY5QVBYXzVjYWg4c18yeXhVV3oxek9BekFzSVdzemVrUmZwcXlHd0RPWkptazlUSGJRUnBDdVNmLVMyU0otWTI1cldUd2hpNUlrY0xBSThRJlgtQW16LVNpZ25lZEhlYWRlcnM9aG9zdCZ2ZXJzaW9uSWQ9bnVsbCZYLUFtei1TaWduYXR1cmU9MjcxZTkzOTE1MDkwYzUzYmRjYTg0MjQ1MTJhYjk3ZWQxZWMyN2QzM2MwM2U3NGUwYmRhNTBmYjQyNWI0N2MyOQ' + imageUrl: 'https://hb.jzce.com/fx_zfqd.png' } await this.init() }, @@ -230,7 +229,9 @@ export default { scene: `aId=${this.inspectionsId}&bId=${this.enterpriseId}`, path: 'sub/task/locate', checkPath: false, - envVersion: 'develop', + // envVersion: 'develop', + // envVersion:'release', + envVersion: 'trial', isHyaline: true }) this.miniCode = `data:image/jpeg;base64,${res.data}` diff --git a/sub/task/record.vue b/sub/task/record.vue index 26410c4..eba19b4 100644 --- a/sub/task/record.vue +++ b/sub/task/record.vue @@ -364,7 +364,7 @@ export default { position: absolute; right: 0; top: 0; - transform: translateX(60rpx) translateY(16rpx) rotateZ(45deg); + transform: translateX(68rpx) translateY(19rpx) rotateZ(45deg); transform-origin: 50% 50%; } } diff --git a/uni_modules/s-components/s-tabber/index.vue b/uni_modules/s-components/s-tabber/index.vue index 49de782..c9f17c4 100644 --- a/uni_modules/s-components/s-tabber/index.vue +++ b/uni_modules/s-components/s-tabber/index.vue @@ -112,7 +112,7 @@ export default { align-items: center; justify-content: space-around; border-top: 2rpx solid #f1f1f4; - padding: 24rpx 48rpx 0px 48rpx; + padding: 24rpx 32rpx 0px 32rpx; .tab { display: flex; flex-flow: column nowrap; diff --git a/uni_modules/uview-ui/components/u-modal/props.js b/uni_modules/uview-ui/components/u-modal/props.js index 94b3078..c6f80f0 100644 --- a/uni_modules/uview-ui/components/u-modal/props.js +++ b/uni_modules/uview-ui/components/u-modal/props.js @@ -1,89 +1,93 @@ export default { - props: { - // 是否展示modal - show: { - type: Boolean, - default: uni.$u.props.modal.show - }, - // 标题 - title: { - type: [String], - default: uni.$u.props.modal.title - }, - // 弹窗内容 - content: { - type: String, - default: uni.$u.props.modal.content - }, - // 确认文案 - confirmText: { - type: String, - default: uni.$u.props.modal.confirmText - }, - // 取消文案 - cancelText: { - type: String, - default: uni.$u.props.modal.cancelText - }, - // 是否显示确认按钮 - showConfirmButton: { - type: Boolean, - default: uni.$u.props.modal.showConfirmButton - }, - // 是否显示取消按钮 - showCancelButton: { - type: Boolean, - default: uni.$u.props.modal.showCancelButton - }, - // 确认按钮颜色 - confirmColor: { - type: String, - default: uni.$u.props.modal.confirmColor - }, - // 取消文字颜色 - cancelColor: { - type: String, - default: uni.$u.props.modal.cancelColor - }, - // 对调确认和取消的位置 - buttonReverse: { - type: Boolean, - default: uni.$u.props.modal.buttonReverse - }, - // 是否开启缩放效果 - zoom: { - type: Boolean, - default: uni.$u.props.modal.zoom - }, - // 是否异步关闭，只对确定按钮有效 - asyncClose: { - type: Boolean, - default: uni.$u.props.modal.asyncClose - }, - // 是否允许点击遮罩关闭modal - closeOnClickOverlay: { - type: Boolean, - default: uni.$u.props.modal.closeOnClickOverlay - }, - // 给一个负的margin-top，往上偏移，避免和键盘重合的情况 - negativeTop: { - type: [String, Number], - default: uni.$u.props.modal.negativeTop - }, - // modal宽度，不支持百分比，可以数值，px，rpx单位 - width: { - type: [String, Number], - default: uni.$u.props.modal.width - }, - // 确认按钮的样式，circle-圆形，square-方形，如设置，将不会显示取消按钮 - confirmButtonShape: { - type: String, - default: uni.$u.props.modal.confirmButtonShape - }, + props: { + // 是否展示modal + show: { + type: Boolean, + default: uni.$u.props.modal.show + }, + // 标题 + title: { + type: [String], + default: uni.$u.props.modal.title + }, + // 弹窗内容 + content: { + type: String, + default: uni.$u.props.modal.content + }, + // 确认文案 + confirmText: { + type: String, + default: uni.$u.props.modal.confirmText + }, + // 取消文案 + cancelText: { + type: String, + default: uni.$u.props.modal.cancelText + }, + // 是否显示确认按钮 + showConfirmButton: { + type: Boolean, + default: uni.$u.props.modal.showConfirmButton + }, + // 是否显示取消按钮 + showCancelButton: { + type: Boolean, + default: uni.$u.props.modal.showCancelButton + }, + // 确认按钮颜色 + confirmColor: { + type: String, + default: uni.$u.props.modal.confirmColor + }, + // 取消文字颜色 + cancelColor: { + type: String, + default: uni.$u.props.modal.cancelColor + }, + // 对调确认和取消的位置 + buttonReverse: { + type: Boolean, + default: uni.$u.props.modal.buttonReverse + }, + // 是否开启缩放效果 + zoom: { + type: Boolean, + default: uni.$u.props.modal.zoom + }, + // 是否异步关闭，只对确定按钮有效 + asyncClose: { + type: Boolean, + default: uni.$u.props.modal.asyncClose + }, + // 是否允许点击遮罩关闭modal + closeOnClickOverlay: { + type: Boolean, + default: uni.$u.props.modal.closeOnClickOverlay + }, + // 给一个负的margin-top，往上偏移，避免和键盘重合的情况 + negativeTop: { + type: [String, Number], + default: uni.$u.props.modal.negativeTop + }, + // modal宽度，不支持百分比，可以数值，px，rpx单位 + width: { + type: [String, Number], + default: uni.$u.props.modal.width + }, + // 确认按钮的样式，circle-圆形，square-方形，如设置，将不会显示取消按钮 + confirmButtonShape: { + type: String, + default: uni.$u.props.modal.confirmButtonShape + }, + borderRadius: { + type: String, + default: '6px' + }, // 弹窗动画过度时间 - duration:{ - type:String | Number, + duration: { + type: String | Number, default: uni.$u.props.modal.duration } - } -} + } +} \ No newline at end of file diff --git a/uni_modules/uview-ui/components/u-modal/u-modal.vue b/uni_modules/uview-ui/components/u-modal/u-modal.vue index 72e1ed2..462ee3b 100644 --- a/uni_modules/uview-ui/components/u-modal/u-modal.vue +++ b/uni_modules/uview-ui/components/u-modal/u-modal.vue @@ -1,228 +1,237 @@ diff --git a/wxcomponents/vant/dropdown-item/index.wxss b/wxcomponents/vant/dropdown-item/index.wxss index d234c59..cf59ca3 100644 --- a/wxcomponents/vant/dropdown-item/index.wxss +++ b/wxcomponents/vant/dropdown-item/index.wxss @@ -23,6 +23,7 @@ .van-dropdown-item--down { /* bottom: 48rpx */ bottom: 0; + margin-top: 24rpx; margin-bottom: 48rpx; } diff --git a/wxcomponents/vant/dropdown-menu/index.wxss b/wxcomponents/vant/dropdown-menu/index.wxss index 87021fa..aa83b10 100644 --- a/wxcomponents/vant/dropdown-menu/index.wxss +++ b/wxcomponents/vant/dropdown-menu/index.wxss @@ -63,7 +63,6 @@ } .select-title { - font-weight: bold; transition: .2s all; color: #071437; } diff --git a/wxcomponents/vant/search/index.js b/wxcomponents/vant/search/index.js index d3c1bcd..90ad3bf 100644 --- a/wxcomponents/vant/search/index.js +++ b/wxcomponents/vant/search/index.js @@ -1,97 +1,105 @@ -import { VantComponent } from '../common/component'; -import { canIUseModel } from '../common/version'; +import { + VantComponent +} from '../common/component'; +import { + canIUseModel +} from '../common/version'; VantComponent({ - field: true, - classes: ['field-class', 'input-class', 'cancel-class'], - props: { - value: { - type: String, - value: '', - }, - label: String, - focus: Boolean, - error: Boolean, - disabled: Boolean, - readonly: Boolean, - inputAlign: String, - showAction: Boolean, - useActionSlot: Boolean, - useLeftIconSlot: Boolean, - useRightIconSlot: Boolean, - leftIcon: { - type: String, - value: 'search', - }, - rightIcon: String, - placeholder: String, - placeholderStyle: String, - actionText: { - type: String, - value: '取消', - }, - background: { - type: String, - value: '#ffffff', - }, - maxlength: { - type: Number, - value: -1, - }, - shape: { - type: String, - value: 'square', - }, - clearable: { - type: Boolean, - value: true, - }, - clearTrigger: { - type: String, - value: 'focus', - }, - clearIcon: { - type: String, - value: 'clear', - }, - cursorSpacing: { - type: Number, - value: 0, - }, - }, - methods: { - onChange(event) { - if (canIUseModel()) { - this.setData({ value: event.detail }); - } - this.$emit('change', event.detail); - }, - onCancel() { - /** - * 修复修改输入框值时，输入框失焦和赋值同时触发，赋值失效 - * https://github.com/youzan/vant-weapp/issues/1768 - */ - setTimeout(() => { - if (canIUseModel()) { - this.setData({ value: '' }); - } - this.$emit('cancel'); - this.$emit('change', ''); - }, 200); - }, - onSearch(event) { - this.$emit('search', event.detail); - }, - onFocus(event) { - this.$emit('focus', event.detail); - }, - onBlur(event) { - this.$emit('blur', event.detail); - }, - onClear(event) { - this.$emit('clear', event.detail); - }, - onClickInput(event) { - this.$emit('click-input', event.detail); - }, - }, -}); + field: true, + classes: ['field-class', 'input-class', 'cancel-class'], + props: { + value: { + type: String, + value: '', + }, + label: String, + focus: Boolean, + error: Boolean, + disabled: Boolean, + readonly: Boolean, + inputAlign: String, + showAction: Boolean, + useActionSlot: Boolean, + useLeftIconSlot: Boolean, + useRightIconSlot: Boolean, + leftIcon: { + type: String, + value: 'search', + }, + rightIcon: String, + placeholder: String, + placeholderStyle: String, + actionText: { + type: String, + value: '取消', + }, + background: { + type: String, + value: '#ffffff', + }, + maxlength: { + type: Number, + value: -1, + }, + shape: { + type: String, + value: 'square', + }, + clearable: { + type: Boolean, + value: true, + }, + clearTrigger: { + type: String, + value: 'focus', + }, + clearIcon: { + type: String, + value: 'clear', + }, + cursorSpacing: { + type: Number, + value: 0, + }, + }, + methods: { + onChange(event) { + if (canIUseModel()) { + this.setData({ + value: event.detail + }); + } + this.$emit('change', event.detail); + }, + onCancel() { + /** + * 修复修改输入框值时，输入框失焦和赋值同时触发，赋值失效 + * https://github.com/youzan/vant-weapp/issues/1768 + */ + setTimeout(() => { + if (canIUseModel()) { + this.setData({ + value: '' + }); + } + this.$emit('cancel'); + this.$emit('change', ''); + }, 200); + }, + onSearch(event) { + this.$emit('search', event.detail); + }, + onFocus(event) { + this.$emit('focus', event.detail); + }, + onBlur(event) { + this.$emit('blur', event.detail); + }, + onClear(event) { + this.$emit('clear', event.detail); + }, + onClickInput(event) { + this.$emit('click-input', event.detail); + }, + }, +}); \ No newline at end of file diff --git a/wxcomponents/vant/search/index.wxss b/wxcomponents/vant/search/index.wxss index 4f306b0..033cace 100644 --- a/wxcomponents/vant/search/index.wxss +++ b/wxcomponents/vant/search/index.wxss @@ -1 +1,53 @@ -@import '../common/index.wxss';.van-search{align-items:center;box-sizing:border-box;display:flex;padding:var(--search-padding,10px 12px)}.van-search__content{background-color:var(--search-background-color,#f7f8fa);border-radius:2px;display:flex;flex:1;padding-left:var(--padding-sm,12px)}.van-search__content--round{border-radius:999px}.van-search__label{color:var(--search-label-color,#323233);font-size:var(--search-label-font-size,14px);line-height:var(--search-input-height,34px);padding:var(--search-label-padding,0 5px)}.van-search__field{flex:1}.van-search__field__left-icon{color:var(--search-left-icon-color,#969799)}.van-search--withaction{padding-right:0}.van-search__action{color:var(--search-action-text-color,#323233);font-size:var(--search-action-font-size,14px);line-height:var(--search-input-height,34px)}.van-search__action--hover{background-color:#f2f3f5}.van-search__action-button{padding:var(--search-action-padding,0 8px)} \ No newline at end of file +@import '../common/index.wxss'; + +.van-search { + align-items: center; + box-sizing: border-box; + display: flex; + padding: var(--search-padding, 10px 12px) +} + +.van-search__content { + background-color: var(--search-background-color, #f7f8fa); + border-radius: 2px; + display: flex; + flex: 1; + padding-left: var(--padding-sm, 12px) +} + +.van-search__content--round { + border-radius: 999px +} + +.van-search__label { + color: var(--search-label-color, #323233); + font-size: var(--search-label-font-size, 14px); + line-height: var(--search-input-height, 34px); + padding: var(--search-label-padding, 0 5px) +} + +.van-search__field { + flex: 1 +} + +.van-search__field__left-icon { + color: var(--search-left-icon-color, #969799) +} + +.van-search--withaction { + padding-right: 0 +} + +.van-search__action { + color: var(--search-action-text-color, #323233); + font-size: var(--search-action-font-size, 14px); + line-height: var(--search-input-height, 34px) +} + +.van-search__action--hover { + background-color: #f2f3f5 +} + +.van-search__action-button { + padding: var(--search-action-padding, 0 8px) +} \ No newline at end of file