diff --git a/store/user/memberList.vue b/store/user/memberList.vue
new file mode 100644
index 0000000..39aea9b
--- /dev/null
+++ b/store/user/memberList.vue
@@ -0,0 +1,298 @@
+
+
+
+
+
+
+
+
+
+ 新增等级
+ 页面配置
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ member.name }} ￥{{ member.price }}
+
+
+
+ 消费：{{ member.money }}
+ 元
+ {{ member.growth }} 成长值
+
+
+
+
+
+
+
+
+
+ {{ user.name }}
+
+ 折扣 {{ user.discount }}
+
+
+
+
+
+ 状态：
+ 开启
+ 关闭
+
+ 折扣商品：{{ user?.goods_list?.length || 0 }}
+
+
+
+
+
+ 优惠时间：
+ {{ utils.dateFormat(user.start_time * 1000) }} - {{
+ utils.dateFormat(user.end_time * 1000) }}
+
+
+
+
+
+
+
+
+ 编辑
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/store/user/setUp.vue b/store/user/setUp.vue
new file mode 100644
index 0000000..932db4b
--- /dev/null
+++ b/store/user/setUp.vue
@@ -0,0 +1,156 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 保存
+
+
+
+
+
+
+
+
+
+
+
diff --git a/uni_modules/wot-design-uni/changelog.md b/uni_modules/wot-design-uni/changelog.md
index 638fdcc..e9fc741 100644
--- a/uni_modules/wot-design-uni/changelog.md
+++ b/uni_modules/wot-design-uni/changelog.md
@@ -1,15 +1,79 @@
-## 0.2.5（2023-12-28）
-## [0.2.5](https://github.com/Moonofweisheng/wot-design-uni/compare/v0.2.4...v0.2.5) (2023-12-28)
+## 0.2.11（2024-01-09）
+### [0.2.11](https://github.com/Moonofweisheng/wot-design-uni/compare/v0.2.10...v0.2.11) (2024-01-09)
### Bug Fixes | Bug 修复
-* 修复 Form 导入FormRules、ErrorMessage时未指定为type的问题 ([c88c84e](https://github.com/Moonofweisheng/wot-design-uni/commit/c88c84e8b71fc2404643a623c28f4953ffe36e71))
-* 修复 SwipeAction 组件在H5端导致页面无法上下滚动的问题 ([1f68ce1](https://github.com/Moonofweisheng/wot-design-uni/commit/1f68ce13c8109dd92ca4bf055f66aa8dff24c83d)), closes [#149](https://github.com/Moonofweisheng/wot-design-uni/issues/149)
+* 修复 Overlay 类型声明错误的问题 ([930e59a](https://github.com/Moonofweisheng/wot-design-uni/commit/930e59a9b09aee535ec4c316e44ed3c0e31be628))
+
+
+### Documentation | 文档
+
+* 提供托管在Giteee上的文档网站 ([6d62e9e](https://github.com/Moonofweisheng/wot-design-uni/commit/6d62e9e7ddda0bd9f51f2ad9e2893f1ed3709c63))
# 更新日志
+### [0.2.11](https://github.com/Moonofweisheng/wot-design-uni/compare/v0.2.10...v0.2.11) (2024-01-09)
+
+
+### 🐛 Bug Fixes | Bug 修复
+
+* 🐛 修复 Overlay 类型声明错误的问题 ([930e59a](https://github.com/Moonofweisheng/wot-design-uni/commit/930e59a9b09aee535ec4c316e44ed3c0e31be628))
+
+
+### ✏️ Documentation | 文档
+
+* ✏️ 提供托管在Giteee上的文档网站 ([6d62e9e](https://github.com/Moonofweisheng/wot-design-uni/commit/6d62e9e7ddda0bd9f51f2ad9e2893f1ed3709c63))
+
+### [0.2.10](https://github.com/Moonofweisheng/wot-design-uni/compare/v0.2.9...v0.2.10) (2024-01-08)
+
+
+### 🐛 Bug Fixes | Bug 修复
+
+* 🐛 修复 col-picker 暗黑模式下标题文字颜色不清楚的问题 ([217ffb7](https://github.com/Moonofweisheng/wot-design-uni/commit/217ffb7dacb66b2017145c6e43fc8c873a6e9dd2))
+* 🐛 修复 steps 组件自定义图标显示异常的问题 ([0300f63](https://github.com/Moonofweisheng/wot-design-uni/commit/0300f63f35a5afcd278aba3b4ab721f498716d94))
+* 🐛 修复支付宝小程序暗黑模式下 Input、Textarea 组件显示异常的问题 ([8a9c344](https://github.com/Moonofweisheng/wot-design-uni/commit/8a9c344872bfcd81a73f71520f51b6b849f516d5))
+
+### [0.2.9](https://github.com/Moonofweisheng/wot-design-uni/compare/v0.2.8...v0.2.9) (2024-01-07)
+
+
+### 🐛 Bug Fixes | Bug 修复
+
+* 🐛 修复 col-picker 组件首次打开指示线位置异常的问题 ([323fb00](https://github.com/Moonofweisheng/wot-design-uni/commit/323fb00942b7032b678d92ab03360dc7bb8faae8))
+
+### [0.2.8](https://github.com/Moonofweisheng/wot-design-uni/compare/v0.2.7...v0.2.8) (2024-01-06)
+
+
+### ✏️ Documentation | 文档
+
+* ✏️ 展示netlify支持 ([410b180](https://github.com/Moonofweisheng/wot-design-uni/commit/410b180ec9c660ab9c49d6eb203d53c35919c512))
+
+### [0.2.7](https://github.com/Moonofweisheng/wot-design-uni/compare/v0.2.5...v0.2.7) (2024-01-06)
+
+
+### ✨ Features | 新功能
+
+* ✨ 优化provide/inject的使用方式 ([892f467](https://github.com/Moonofweisheng/wot-design-uni/commit/892f4675a848ee3d4c965c36d5c4034aa5806b6d))
+
+
+### ✏️ Documentation | 文档
+
+* ✏️ 文档网站增加自定义footer ([dd8bc00](https://github.com/Moonofweisheng/wot-design-uni/commit/dd8bc003eedcdc43cdd60bb896c897d108dd4a51))
+* ✏️ 修复vitepress自定义footer展示错误的问题 ([c0701d5](https://github.com/Moonofweisheng/wot-design-uni/commit/c0701d584e5d9b84e6d913dd23666b80d803407b))
+
+### [0.2.6](https://github.com/Moonofweisheng/wot-design-uni/compare/v0.2.5...v0.2.6) (2024-01-06)
+
+
+### ✨ Features | 新功能
+
+* ✨ 优化provide/inject的使用方式 ([892f467](https://github.com/Moonofweisheng/wot-design-uni/commit/892f4675a848ee3d4c965c36d5c4034aa5806b6d))
+
+
+### ✏️ Documentation | 文档
+
+* ✏️ 文档网站增加自定义footer ([dd8bc00](https://github.com/Moonofweisheng/wot-design-uni/commit/dd8bc003eedcdc43cdd60bb896c897d108dd4a51))
+
### [0.2.5](https://github.com/Moonofweisheng/wot-design-uni/compare/v0.2.4...v0.2.5) (2023-12-28)
diff --git a/uni_modules/wot-design-uni/components/common/abstracts/variable.scss b/uni_modules/wot-design-uni/components/common/abstracts/variable.scss
index d45a767..0417fb4 100644
--- a/uni_modules/wot-design-uni/components/common/abstracts/variable.scss
+++ b/uni_modules/wot-design-uni/components/common/abstracts/variable.scss
@@ -83,8 +83,8 @@ $-color-icon: var(--wot-color-icon, #d9d9d9) !default; // icon颜色
$-color-icon-active: var(--wot-color-icon-active, #eee) !default; // icon颜色hover
$-color-icon-disabled: var(--wot-color-icon-disabled, #a7a7a7) !default; // icon颜色disabled
/* overlay */
-$-overlay-bg: rgba(0, 0, 0, 0.65) !default;
-$-overlay-bg-dark: rgba(0, 0, 0, 0.75) !default;
+$-overlay-bg: var(--wot-overlay-bg, rgba(0, 0, 0, 0.65)) !default;
+$-overlay-bg-dark: var(--wot-overlay-bg-dark, rgba(0, 0, 0, 0.75)) !default;
/*----------------------------------------- Theme color. end -------------------------------------------*/
diff --git a/uni_modules/wot-design-uni/components/composables/useCell.ts b/uni_modules/wot-design-uni/components/composables/useCell.ts
index e5d4f60..d245312 100644
--- a/uni_modules/wot-design-uni/components/composables/useCell.ts
+++ b/uni_modules/wot-design-uni/components/composables/useCell.ts
@@ -1,45 +1,13 @@
-import { getCurrentInstance, inject, onBeforeMount, ref, watch } from 'vue'
+import { computed } from 'vue'
+import { useParent } from './useParent'
+import { CELL_GROUP_KEY } from '../wd-cell-group/types'
export function useCell() {
- const border = ref
(false) // 是否展示边框
- const cellGroup: any = inject('cell-group', null) || {}
- const cellList: any = inject('cell-list', null) || ref([])
- const { proxy } = getCurrentInstance() as any
+ const { parent: cellGroup, index } = useParent(CELL_GROUP_KEY)
- watch(
- () => cellGroup.border,
- (newVal) => {
- setIndexAndStatus(Boolean(newVal), proxy.$.uid)
- },
- {
- deep: true,
- immediate: true
- }
- )
-
- onBeforeMount(() => {
- cellList.value = [...cellList.value.concat([{ uid: proxy.$.uid }])]
- setIndexAndStatus(cellGroup.border, proxy.$.uid)
+ const border = computed(() => {
+ return cellGroup && cellGroup.props.border && index.value
})
- /**
- * @description 从cellGroup获取此组件的索引
- * @return {Number} 此组件的索引
- */
- function getIndex(uuid: string) {
- if (!cellList || !cellList.value) return
- return cellList.value.findIndex((cell) => {
- return cell.uid === uuid
- })
- }
-
- /**
- * @description 为所有索引非0的组件设置刘海线，此方法由cellGroup调用
- */
- function setIndexAndStatus(isBorder: boolean, uuid: string) {
- const index = getIndex(uuid)
- border.value = isBorder && index
- }
-
- return { border, cellGroup, cellList, setIndexAndStatus, getIndex }
+ return { border }
}
diff --git a/uni_modules/wot-design-uni/components/wd-calendar-view/types.ts b/uni_modules/wot-design-uni/components/wd-calendar-view/types.ts
new file mode 100644
index 0000000..7e1170c
--- /dev/null
+++ b/uni_modules/wot-design-uni/components/wd-calendar-view/types.ts
@@ -0,0 +1,5 @@
+import type { ComponentPublicInstance } from 'vue'
+
+export type CalendarViewInstance = ComponentPublicInstance<{
+ scrollIntoView: () => void
+}>
diff --git a/uni_modules/wot-design-uni/components/wd-calendar/wd-calendar.vue b/uni_modules/wot-design-uni/components/wd-calendar/wd-calendar.vue
index 6e41888..6b13416 100644
--- a/uni_modules/wot-design-uni/components/wd-calendar/wd-calendar.vue
+++ b/uni_modules/wot-design-uni/components/wd-calendar/wd-calendar.vue
@@ -353,8 +353,8 @@ const errorMessage = computed(() => {
// 是否展示必填
const isRequired = computed(() => {
let formRequired = false
- if (form && form.rules) {
- const rules = form.rules
+ if (form && form.props.rules) {
+ const rules = form.props.rules
for (const key in rules) {
if (Object.prototype.hasOwnProperty.call(rules, key) && key === props.prop && Array.isArray(rules[key])) {
formRequired = rules[key].some((rule: FormItemRule) => rule.required)
diff --git a/uni_modules/wot-design-uni/components/wd-cell-group/types.ts b/uni_modules/wot-design-uni/components/wd-cell-group/types.ts
new file mode 100644
index 0000000..8590fa2
--- /dev/null
+++ b/uni_modules/wot-design-uni/components/wd-cell-group/types.ts
@@ -0,0 +1,18 @@
+/*
+ * @Author: weisheng
+ * @Date: 2023-12-14 11:21:58
+ * @LastEditTime: 2024-01-03 21:51:36
+ * @LastEditors: weisheng
+ * @Description:
+ * @FilePath: /wot-design-uni/src/uni_modules/wot-design-uni/components/wd-cell-group/types.ts
+ * 记得注释
+ */
+import { type InjectionKey } from 'vue'
+
+export type CelllGroupProvide = {
+ props: {
+ border?: boolean
+ }
+}
+
+export const CELL_GROUP_KEY: InjectionKey = Symbol('wd-cell-group')
diff --git a/uni_modules/wot-design-uni/components/wd-cell-group/wd-cell-group.vue b/uni_modules/wot-design-uni/components/wd-cell-group/wd-cell-group.vue
index 1658b57..f0dd56b 100644
--- a/uni_modules/wot-design-uni/components/wd-cell-group/wd-cell-group.vue
+++ b/uni_modules/wot-design-uni/components/wd-cell-group/wd-cell-group.vue
@@ -30,7 +30,8 @@ export default {
diff --git a/uni_modules/wot-design-uni/components/wd-tabs/types.ts b/uni_modules/wot-design-uni/components/wd-tabs/types.ts
new file mode 100644
index 0000000..6517746
--- /dev/null
+++ b/uni_modules/wot-design-uni/components/wd-tabs/types.ts
@@ -0,0 +1,9 @@
+import { type InjectionKey } from 'vue'
+
+export type TabsProvide = {
+ state: {
+ activeIndex: number
+ }
+}
+
+export const TABS_KEY: InjectionKey = Symbol('wd-tabs')
diff --git a/uni_modules/wot-design-uni/components/wd-tabs/wd-tabs.vue b/uni_modules/wot-design-uni/components/wd-tabs/wd-tabs.vue
index f1fd302..6e340ca 100644
--- a/uni_modules/wot-design-uni/components/wd-tabs/wd-tabs.vue
+++ b/uni_modules/wot-design-uni/components/wd-tabs/wd-tabs.vue
@@ -15,8 +15,8 @@
@click="handleSelect(index)"
v-for="(item, index) in items"
:key="index"
- :class="`wd-tabs__nav-item ${activeIndex === index ? 'is-active' : ''} ${item.disabled ? 'is-disabled' : ''}`"
- :style="activeIndex === index ? (color ? 'color:' + color : '') : inactiveColor ? 'color:' + inactiveColor : ''"
+ :class="`wd-tabs__nav-item ${state.activeIndex === index ? 'is-active' : ''} ${item.disabled ? 'is-disabled' : ''}`"
+ :style="state.activeIndex === index ? (color ? 'color:' + color : '') : inactiveColor ? 'color:' + inactiveColor : ''"
>
{{ item.title }}
@@ -36,9 +36,9 @@
{{ item.title }}
@@ -100,7 +100,7 @@
-
+
{{ item.title }}
@@ -131,9 +131,11 @@ export default {
}
-
+
diff --git a/store/order/index.vue b/store/order/index.vue
index 5fef050..7255306 100644
--- a/store/order/index.vue
+++ b/store/order/index.vue
@@ -136,14 +136,14 @@
-
+
应付: {{ (Number(item.total_price) + Number(item.delivery_money)).toFixed(2) }} 元
余额支付: {{ item.pay_balance }} 元
优惠: {{ ((Number(item.total_price) + Number(item.delivery_money)) -
item.pay_price).toFixed(2) }} 元
-
+ 占位
实付: {{ item.pay_price }} 元
diff --git a/store/setup/index.vue b/store/setup/index.vue
index e18741e..4c1bfde 100644
--- a/store/setup/index.vue
+++ b/store/setup/index.vue
@@ -36,9 +36,9 @@
+ text: 'name',
+ value: 'id',
+ }" v-model="storeData.district" @change="select">
@@ -279,6 +279,9 @@ export default {
-
diff --git a/store/shop/list.vue b/store/shop/list.vue
index d39975b..83b7972 100644
--- a/store/shop/list.vue
+++ b/store/shop/list.vue
@@ -48,9 +48,10 @@