From ffe6f6239bb6ed6461e8e6400b54967d1c08e993 Mon Sep 17 00:00:00 2001 From: "mayubo@gmail.com" Date: Wed, 9 Jul 2025 17:22:54 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=9C=B0=E5=8C=BA?= =?UTF-8?q?=E9=80=89=E6=8B=A9=E7=BB=84=E4=BB=B6bug=EF=BC=8C=E6=88=BF?= =?UTF-8?q?=E4=BA=A7=E6=B7=BB=E5=8A=A0=E5=88=87=E6=8D=A2=E5=9F=8E=E5=B8=82?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=E5=A2=9E=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README-zh.md | 39 +++++++++++++++++++ api/v2Community.js | 2 +- components/areaPopup/areaPopup.vue | 4 +- packages/community/choseCommunity/index.vue | 16 +++++--- packages/community/index/index.css | 9 +++++ packages/community/index/index.vue | 25 +++++++++--- pages/index/index.vue | 3 +- .../.sourcemap/mp-weixin/common/main.js.map | 2 +- .../.sourcemap/mp-weixin/common/vendor.js.map | 2 +- .../mp-weixin/kitchen/index/index.js.map | 2 +- .../mp-weixin/pages/index/index.js.map | 2 +- .../mp-weixin/reservation/index/index.js.map | 2 +- .../uview-ui/components/u-icon/u-icon.js.map | 2 +- .../u-loading-icon/u-loading-icon.js.map | 2 +- .../components/u-overlay/u-overlay.js.map | 2 +- .../components/u-popup/u-popup.js.map | 2 +- .../u-safe-bottom/u-safe-bottom.js.map | 2 +- .../u-status-bar/u-status-bar.js.map | 2 +- .../u-transition/u-transition.js.map | 2 +- unpackage/dist/dev/mp-weixin/common/vendor.js | 2 +- .../dist/dev/mp-weixin/pages/index/index.js | 2 + .../dist/dev/mp-weixin/pages/index/index.wxml | 2 +- .../dev/mp-weixin/project.private.config.json | 20 ---------- 23 files changed, 99 insertions(+), 49 deletions(-) create mode 100644 README-zh.md diff --git a/README-zh.md b/README-zh.md new file mode 100644 index 00000000..f8947de6 --- /dev/null +++ b/README-zh.md @@ -0,0 +1,39 @@ +Git 提交规范 + - feat 新增功能 + - fix 修复 Bug + - docs 文档更新(如 README、CHANGELOG 等) + - style 代码样式调整(如空格、格式化等,不涉及功能变更) + - refactor 代码重构(既不修复 Bug 也不新增功能) + - perf 性能优化 + - test 添加或修改测试代码 + - chore 构建过程或辅助工具的变动(如依赖更新、配置文件修改等) + - revert 回滚之前的提交 + + +代码规范 + - 使用v-for时必须添加:key + - 组件props必须定义类型和默认值 + - 复杂逻辑必须添加注释 + - 敏感信息不硬编码 + - 变量/函数:小驼峰式命名 (camelCase) + - 组件/类:小驼峰式命名 (pascalCase) + - 合理使用缓存 + - 避免不必要的重渲染 + - 工具函数放在/utils目录 + - 公共组件放在/components目录 + + +常见 class 命名规范 + - container 用于页面最外层容器 + - header 头部区域 + - main 主要内容区域 + - footer 底部区域 + - left 左侧区域 + - right 右侧区域 + - title 标题 + - nav 导航区域 + - banner 轮播图/广告 区域 + - tabs 标签区域 + - list 列表区域 + + diff --git a/api/v2Community.js b/api/v2Community.js index f2bed11f..d60bfd4e 100644 --- a/api/v2Community.js +++ b/api/v2Community.js @@ -14,7 +14,7 @@ export const apiArr = { navPage: '/api/v2/wechat/community-navigation-crud/page', // 小区图标导航信息分页 advPage: '/api/v2/wechat/community-advertisement-crud/page', // 小区广告信息分页 - commInfo: '//api/v2/wechat/nav-display-crud/comm/info', // 小区导航设置信息详情 + commInfo: '/api/v2/wechat/nav-display-crud/comm/info', // 小区导航设置信息详情 categoryPage: '/api/v2/wechat/announcement-category-crud/page', // 公告分类信息分页 infoPage: '/api/v2/wechat/announcement-crud/page', // 公告信息分页 diff --git a/components/areaPopup/areaPopup.vue b/components/areaPopup/areaPopup.vue index a5499a0f..868f2376 100644 --- a/components/areaPopup/areaPopup.vue +++ b/components/areaPopup/areaPopup.vue @@ -145,8 +145,8 @@ export default { // 点击确定传递当前选中省市区信息给父方法 onOk() { - const { confirmProv, confirmCity, confirmDist } = this; - this.$emit('selectArea', { confirmProv, confirmCity, confirmDist }); + const { confirmProv1, confirmProv, xsq, confirmCity, confirmDist } = this; + this.$emit('selectArea', { confirmProv: confirmProv1, confirmCity: xsq.ad_name ? xsq : confirmCity, confirmDist }); }, diff --git a/packages/community/choseCommunity/index.vue b/packages/community/choseCommunity/index.vue index 511cd137..d1606e89 100644 --- a/packages/community/choseCommunity/index.vue +++ b/packages/community/choseCommunity/index.vue @@ -1,7 +1,7 @@