diff --git a/.cursorrule b/.cursorrule index c5360b4..6ff2925 100644 --- a/.cursorrule +++ b/.cursorrule @@ -17,7 +17,12 @@ store封装到src/store目录下。 注册侧边栏在/config/menus.js文件中。 +新添加要求: +在遇到用户id需要填写和修改的弹窗将其修改为可预览样式 +关于填写表单为推荐人id的需要使用组件AvatarSelector展示,如果是文件id或者是封面id 的也需要预览展示需要向头像列表组件一样,可以弄个文件组件/api/v1/admin/file/list这个是文件列表接口 +规则: +1.只要涉及弹窗添加和修改xxxid类型的就需要生成一个弹窗组件并使用到页面中 ## 1. 基础布局规范 ```css diff --git a/src/components/UserSelector/index.vue b/src/components/UserSelector/index.vue index 6be488f..c7f19f6 100644 --- a/src/components/UserSelector/index.vue +++ b/src/components/UserSelector/index.vue @@ -37,9 +37,9 @@ :height="400" > - - - + + + diff --git a/src/components/admin/DiscountCodeSelector.vue b/src/components/admin/DiscountCodeSelector.vue new file mode 100644 index 0000000..fdffc8d --- /dev/null +++ b/src/components/admin/DiscountCodeSelector.vue @@ -0,0 +1,392 @@ + + + + + + + + + + + + + + + + + + + + 搜索 + + + 重置 + + + + + + + + + + + + + {{ row.code }} + + + + + + {{ row.percentage > 0 ? '折扣' : '固定金额' }} + + + + + + {{ row.percentage }}% + ¥{{ (row.amount / 100).toFixed(2) }} + + + + + ¥{{ (row.minAmount / 100).toFixed(2) }} + 无限制 + + + + + {{ row.userTimes || 0 }} / {{ row.maxTimes || '∞' }} + + + + + + {{ formatDate(row.endTime) }} + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/components/admin/ProductSelector.vue b/src/components/admin/ProductSelector.vue new file mode 100644 index 0000000..1305dc5 --- /dev/null +++ b/src/components/admin/ProductSelector.vue @@ -0,0 +1,385 @@ + + + + + + + + + + + + + + + + + + 搜索 + + + 重置 + + + + + + + + + + + + + + + + + + + ¥{{ (row.price / 100).toFixed(2) }} + + + + + + {{ row.inventory }} + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/components/admin/UserGroupSelector.vue b/src/components/admin/UserGroupSelector.vue new file mode 100644 index 0000000..7f7cb0a --- /dev/null +++ b/src/components/admin/UserGroupSelector.vue @@ -0,0 +1,408 @@ + + + + + + + + + + + + + + + + + + + + 搜索 + + + 重置 + + + + + + + + + + + {{ row.group_id || row.GroupId || row.id || row.Id }} + + + + + {{ row.group_name || row.name || row.Name }} + + + + + + ¥{{ row.floor_price || row.FloorPrice }} + + - + + + + + {{ row.higher_level_id || row.HigherLevelId || '-' }} + + + + + + {{ (row.fixed || row.Fixed) ? '固定' : '可升级' }} + + + + + + + {{ row.member_count || row.MemberCount || 0 }} + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/components/admin/UserListSelector.vue b/src/components/admin/UserListSelector.vue new file mode 100644 index 0000000..a0f565c --- /dev/null +++ b/src/components/admin/UserListSelector.vue @@ -0,0 +1,567 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + 搜索 + + + 重置 + + + 添加新用户 + + + + + + + + + + + + + + + + {{ row.user_name }} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 立即创建 + + + + 重置表单 + + + + + + + + + + + + + + + + + diff --git a/src/components/admin/VoucherSelector.vue b/src/components/admin/VoucherSelector.vue new file mode 100644 index 0000000..86f41ce --- /dev/null +++ b/src/components/admin/VoucherSelector.vue @@ -0,0 +1,389 @@ + + + + + + + + + + + + + + + + + + + + 搜索 + + + 重置 + + + + + + + + + + + + + {{ row.code }} + + + + + + {{ row.percentage > 0 ? '折扣' : '固定金额' }} + + + + + + {{ row.percentage }}% + ¥{{ (row.amount / 100).toFixed(2) }} + + + + + ¥{{ (row.minAmount / 100).toFixed(2) }} + 无限制 + + + + + {{ row.userTimes || 0 }} / {{ row.maxTimes || '∞' }} + + + + + + {{ formatDate(row.endTime) }} + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/views/order/OrderList.vue b/src/views/order/OrderList.vue index c8ebd41..f2e0349 100644 --- a/src/views/order/OrderList.vue +++ b/src/views/order/OrderList.vue @@ -186,10 +186,36 @@ - + + + + ID: {{ orderForm.user_id }} - {{ selectedUserInfo.user_name }} + + + + + + {{ orderForm.user_id ? '更换用户' : '选择用户' }} + + 清除 + + - + + + + ID: {{ orderForm.commodity_id }} - {{ selectedProductInfo.name }} + + + + + + {{ orderForm.commodity_id ? '更换商品' : '选择商品' }} + + 清除 + + @@ -204,10 +230,36 @@ - + + + + ID: {{ orderForm.discount_code_id }} - {{ selectedDiscountCodeInfo.name || selectedDiscountCodeInfo.code }} + + + + + + {{ orderForm.discount_code_id ? '更换优惠码' : '选择优惠码' }} + + 清除 + + - + + + + ID: {{ orderForm.coupon_id }} - {{ selectedVoucherInfo.name || selectedVoucherInfo.code }} + + + + + + {{ orderForm.coupon_id ? '更换代金券' : '选择代金券' }} + + 清除 + + @@ -233,14 +285,46 @@ + + + + + + + + + + + +