Lei OT
|
27aeb82fb5
|
Merge remote-tracking branch 'origin/feature/price_manager' into feature/price_manager
|
2 years ago |
|
Lei OT
|
42cb1d583f
|
style: products Audit
|
2 years ago |
Jimmy Liow
|
e9026eb103
|
Merge tag 'feat-RBAC-0.9.1' into feature/price_manager
|
2 years ago |
黄文强@HWQ-PC
|
acea97d3e5
|
Merge branch 'feature/price_manager' of github.com:hainatravel/GHHub into feature/price_manager
|
2 years ago |
|
黄文强@HWQ-PC
|
90f84fa874
|
优化显示界面，多语种逻辑
|
2 years ago |
|
Jimmy Liow
|
579689f3e0
|
feat: 删除 GA JS；菜单显示用户姓名；用户信息增加姓名和角色；Auth 增加初始指，统一登陆和超时接口
|
2 years ago |
|
Lei OT
|
d01684b1c2
|
Merge remote-tracking branch 'origin/feature/price_manager' into feature/price_manager
|
2 years ago |
|
Lei OT
|
80c1b98671
|
产品管理: 附加项目 添加/删除接口
|
2 years ago |
|
Jimmy Liow
|
2adeb31e73
|
Merge tag 'feat-RBAC-0.9' into feature/price_manager
# Conflicts:
# src/main.jsx
# src/stores/Auth.js
|
2 years ago |
|
Jimmy Liow
|
9304c4735d
|
feat: 新增账号使用空对象；重命名 lifecycleware
|
2 years ago |
YCC
|
e5407d6fa0
|
fix
|
2 years ago |
|
黄文强@HWQ-PC
|
40e8d97aa8
|
Merge branch 'feature/price_manager' of github.com:hainatravel/GHHub into feature/price_manager
|
2 years ago |
|
黄文强@HWQ-PC
|
64f690801e
|
1.优化界面显示
2.对接供应商编辑接口
|
2 years ago |
|
YCC
|
cbf99e2718
|
改为modal编辑表单
|
2 years ago |
|
Jimmy Liow
|
ce60237b3d
|
feat: 统一登陆和刷新页面逻辑代码
|
2 years ago |
|
Lei OT
|
07b196fc66
|
test: 调整antd间距
|
2 years ago |
|
Lei OT
|
2ad323edbb
|
客服审核价格: 超公里+公里数列
|
2 years ago |
|
Jimmy Liow
|
e3a28ebf25
|
权限增加不同角色不同默认首页
|
2 years ago |
|
Lei OT
|
ff6071cd2f
|
wu_id 改 lmi_sn
|
2 years ago |
|
Lei OT
|
cc2bf23bf5
|
feat: 产品管理: `餐` 类型使用`R` ; 优化审核页面价格表; 附加项目表显示类型; 超公里Ultra Service
|
2 years ago |
|
Jimmy Liow
|
09726a51bf
|
feat: 增加账号状态和启用和禁用功能
|
2 years ago |
|
Lei OT
|
f440b08fad
|
Merge remote-tracking branch 'origin/feature/price_manager' into feature/price_manager
|
2 years ago |
|
Lei OT
|
1534ce6979
|
debug: 搜索可以绑定的附加项目; 价格value改为adult_cost;
|
2 years ago |
|
Jimmy Liow
|
16a21aae43
|
Merge tag 'feat-RBAC-0.8.1' into feature/price_manager
# Conflicts:
# src/main.jsx
|
2 years ago |
|
Jimmy Liow
|
81f1c9cea9
|
fix: wu_id -> lmi_sn
|
2 years ago |
|
Lei OT
|
4b77aa689e
|
产品缺少英文名称时, 使用语种表中文名称
|
2 years ago |
|
Jimmy Liow
|
d8b141cda8
|
feat: 使用通知作为默认首页；删除 GA 数据收集；
|
2 years ago |
|
Jimmy Liow
|
fcef4c486b
|
feat: 账号角色管理增加中文；统一 userId；
|
2 years ago |
|
Lei OT
|
bebb8c0a09
|
feat: 从页面语言获取默认的HT语种编码
|
2 years ago |
|
Lei OT
|
461263839b
|
产品管理: 客服首页: 核对搜索结果字段
|
2 years ago |
|
Lei OT
|
545bee21cb
|
Merge remote-tracking branch 'origin/feature/price_manager' into feature/price_manager
|
2 years ago |
|
Lei OT
|
d0a4453ce6
|
产品信息属性的 i8n
|
2 years ago |
|
Jimmy Liow
|
6f446d852a
|
feat: 登陆超时刷新要重新登陆
|
2 years ago |
|
Lei OT
|
1084db4b96
|
搜索表单自定义排序
|
2 years ago |
|
Jimmy Liow
|
a3d02f4caf
|
统一应用初始化
|
2 years ago |
|
Jimmy Liow
|
51aa59abe1
|
Merge branch 'feature/price_manager' of github.com:hainatravel/GHHub into feature/price_manager
|
2 years ago |
|
Jimmy Liow
|
a5b82e245b
|
Merge tag 'feat-RBAC-0.8' into feature/price_manager
# Conflicts:
# src/main.jsx
# src/views/App.jsx
|
2 years ago |
|
黄文强@HWQ-PC
|
c843fab969
|
1.完善表格显示内容
2.修改供应商报价表格的对应字段
|
2 years ago |
|
Jimmy Liow
|
37c3b5aa45
|
使用Lifecycle回调权限初始化
|
2 years ago |
|
黄文强@HWQ-PC
|
51834fbc97
|
1.完善界面显示效果
2.修改表单对应的接口字段
|
2 years ago |
|
Lei OT
|
cbdb737163
|
feat: 客服首页: 搜索: 供应商多选
|
2 years ago |
|
Lei OT
|
65064937f0
|
feat: 复制供应商产品
|
2 years ago |
|
Lei OT
|
e4cc07eefe
|
feat: 附加项目: 搜索供应商的产品, 已审核发布的
|
2 years ago |
|
Lei OT
|
056a006847
|
增加审核页面跳转`编辑`; style:
|
2 years ago |
|
Lei OT
|
2bdf22c140
|
feat: 产品: 附加项目: 新增; 删除; 读取
|
2 years ago |
|
Jimmy Liow
|
f2177a9e8e
|
fix: 修复供应商ID错误
feat: 底部增加公司名字和版本
|
2 years ago |
|
Jimmy Liow
|
752bd729eb
|
fix: 修复初始化错误
|
2 years ago |
|
Jimmy Liow
|
702d7876c0
|
feat: 初始化账号权限、系统开始判断权限
|
2 years ago |
|
Lei OT
|
ad10ef9313
|
Merge remote-tracking branch 'origin/feature/price_manager' into feature/price_manager
# Conflicts:
# public/locales/en/products.json
# src/main.jsx
|
2 years ago |
|
Lei OT
|
3c533c96b4
|
style:
|
2 years ago |
|
黄文强@HWQ-PC
|
040fdb9d3a
|
Merge branch 'feature/price_manager' of github.com:hainatravel/GHHub into feature/price_manager
# Conflicts:
# public/locales/en/products.json
# public/locales/zh/products.json
# src/main.jsx
|
2 years ago |
|
黄文强@HWQ-PC
|
261849fa5f
|
1.修改供应商报价页面字段
2.增加日期组件到components
3.国际化
|
2 years ago |
|
Lei OT
|
7409ec1c16
|
获取指定产品的附加项目
|
2 years ago |
|
Lei OT
|
079b74c3b4
|
产品管理权限
|
2 years ago |
|
Lei OT
|
b0d4943f09
|
有效期; 有效的周X; style:
|
2 years ago |
|
Jimmy Liow
|
efad9d8697
|
feat: 完成新增/编辑账号选择供应商
|
2 years ago |
|
Jimmy Liow
|
4afb1d4371
|
增加权限类别名称，初始化数据 SQL
|
2 years ago |
|
Lei OT
|
697fa00be3
|
产品管理的权限
|
2 years ago |
|
Jimmy Liow
|
e9289bbe80
|
导航和菜单增加权限判断
|
2 years ago |
|
Jimmy Liow
|
3ec9a43833
|
完成权限新增、编辑、分配角色权限
|
2 years ago |
|
Lei OT
|
86242addab
|
删除 Mobx 相关的引入
|
2 years ago |
|
Lei OT
|
219372c06e
|
新增HT产品类型: J 车费, Q 导游
|
2 years ago |
|
Lei OT
|
240697a42d
|
Merge remote-tracking branch 'origin/feature/price_manager' into feature/price_manager
|
2 years ago |
|
Jimmy Liow
|
5c236defd1
|
Merge branch 'feature/price_manager' of github.com:hainatravel/GHHub into feature/price_manager
# Conflicts:
# src/views/App.jsx
|
2 years ago |
|
Lei OT
|
ce345c7347
|
HT语种; 当前语种
|
2 years ago |
|
Jimmy Liow
|
4987b7bcd8
|
合并权限管理v0.6
# Conflicts:
# src/components/SearchForm.jsx
# src/main.jsx
# src/views/App.jsx
|
2 years ago |
|
Jimmy Liow
|
c4145a13df
|
feat: 更新价格编辑界面；完成编辑角色；新增角色；重置账号密码
|
2 years ago |
|
Lei OT
|
bf1d668301
|
Merge remote-tracking branch 'origin/feature/price_manager' into feature/price_manager
# Conflicts:
# src/main.jsx
|
2 years ago |
|
Lei OT
|
cacc4832c5
|
feat: 产品管理: 搜索: 多选
|
2 years ago |
|
黄文强@HWQ-PC
|
1194cc84a0
|
Merge branch 'feature/price_manager' of github.com:hainatravel/GHHub into feature/price_manager
# Conflicts:
# src/main.jsx
|
2 years ago |
|
Lei OT
|
e9b7aec521
|
feat: 产品管理: 搜索+年份,状态; 产品类型排序; 审核页: 成人,儿童价; 语种列表
|
2 years ago |
|
黄文强@HWQ-PC
|
7b2c836e91
|
增加供应商价格管理页面
|
2 years ago |
|
Lei OT
|
a61ef8882b
|
增加默认参数: wu_id
|
2 years ago |
|
Lei OT
|
a7c87170a0
|
feat: 产品管理: 客服首页, 审核产品: 核对接口字段
|
2 years ago |
|
YCC
|
2a8dcabdec
|
Merge branch 'main' of github.com:hainatravel/GHHub
|
2 years ago |
|
YCC
|
e3dc13bc6c
|
机票计划显示
|
2 years ago |
|
Lei OT
|
f8ffaf899d
|
feat: 产品管理: 客服审核产品, 价格
|
2 years ago |
|
Jimmy Liow
|
32b097c5b7
|
feat: 新增角色管理界面
|
2 years ago |
|
Lei OT
|
d24c34d4ac
|
feat: 产品管理: 客服首页
|
2 years ago |
|
Lei OT
|
a579ee4ee5
|
默认参数: lgc
|
2 years ago |
|
Lei OT
|
232a8f85c8
|
审核产品页面: 表格, 数据结构
|
2 years ago |
|
Jimmy Liow
|
2cb059cc06
|
feat: postForm 增加业务错误校验，搜索帐号，新增、编辑账号
|
2 years ago |
|
Lei OT
|
f323f0b511
|
审核状态
|
2 years ago |
|
Jimmy Liow
|
f22c9eb497
|
bug: 修复 ThemeContext 导入错误
|
2 years ago |
|
Jimmy Liow
|
74a68d705c
|
feat: 增加 ThemeContext
|
2 years ago |
|
Jimmy Liow
|
c352581f98
|
feat: Mobx-Zustand迁移完成，删除依赖和相关代码
|
2 years ago |
|
Lei OT
|
fa0550dfdb
|
客服审核页面
|
2 years ago |
|
Jimmy Liow
|
5d4b5cc8f1
|
Merge branch 'main' of github.com:hainatravel/GHHub
# Conflicts:
# src/main.jsx
|
2 years ago |
|
Jimmy Liow
|
bfc994cd12
|
feat: 更新价格界面原型；所有海外供应商路由加上权证验证
|
2 years ago |
|
YCC
|
aa501c7f3a
|
Merge branch 'main' of github.com:hainatravel/GHHub
|
2 years ago |
|
YCC
|
a7f3faac13
|
机票计划详细页
|
2 years ago |
|
Lei OT
|
1142a1a893
|
供应商搜索产品页面
|
2 years ago |
|
Jimmy Liow
|
849e6ceef0
|
feat: 增加权限控制组件方式
|
2 years ago |
|
Jimmy Liow
|
043c02f8a8
|
Merge branch 'main' of github.com:hainatravel/GHHub
|
2 years ago |
|
Jimmy Liow
|
749084f0aa
|
feat: 增加权限路由组件，还有账号管理常量
|
2 years ago |
|
Lei OT
|
ca0edbd63a
|
refactor: 从hooks/usingStorage 获取登录信息
|
2 years ago |
|
Lei OT
|
30012ae37e
|
feat: invoice 迁移zustand
|
2 years ago |
|
YCC
|
b62bba8587
|
Merge branch 'main' of github.com:hainatravel/GHHub
|
2 years ago |
|
YCC
|
e2766501ca
|
添加机票计划搜索和列表显示
|
2 years ago |
|
Jimmy Liow
|
bff5197765
|
feat:完成团计划全部迁移 zustand；
增加分页中英文；
|
2 years ago |
|
Jimmy Liow
|
5913970154
|
feat:合并编辑产品界面原型
增加账号权限管理导航
|
2 years ago |
|
Jimmy Liow
|
680364eae3
|
feat:增加权限表设计，增加禁用、重置密码操作
|
2 years ago |
|
Jimmy Liow
|
0c91e88674
|
feat: 更新权限选择样式；删除 Table Column Key
|
2 years ago |
|
Jimmy Liow
|
1e439621a5
|
feat: 初步完成账号权限管理界面
|
2 years ago |
|
Jimmy Liow
|
8e07c82614
|
fix: 修改检查 TOKEN 频率
|
2 years ago |
|
Jimmy Liow
|
5412b872a0
|
Merge branch 'main' of github.com:hainatravel/GHHub
|
2 years ago |
|
Jimmy Liow
|
3465c7f575
|
feat: Profile 更换 zustand
|
2 years ago |
|
Lei OT
|
af2ce43b2a
|
Merge remote-tracking branch 'origin/main'
|
2 years ago |
|
Jimmy Liow
|
8d3649da9d
|
feat: 国际化修改密码界面
|
2 years ago |
|
Jimmy Liow
|
63a32f5412
|
feat: AuthStore 完成所有方法转换成 zustand
|
2 years ago |
|
Lei OT
|
9522fece90
|
fix: SearchForm style
|
2 years ago |
|
Jimmy Liow
|
600ba44d8d
|
feat:
增加 ErrorBoundary
useStorage->usingStorage
|
2 years ago |
|
Jimmy Liow
|
322646a9dc
|
feat:WebStorage 增加 JSON 格式
|
2 years ago |
|
Jimmy Liow
|
e60be41b98
|
feat:增加会话超时使用的 username
|
2 years ago |
|
Jimmy Liow
|
428e8f4aa4
|
bug:代码提交错误
|
2 years ago |
|
Jimmy Liow
|
a1890df323
|
fix:解决刷新页面没有 Token
|
2 years ago |
|
Lei OT
|
9fef49263b
|
perf: 搜索组件: 修改属性名: fieldsConfig
|
2 years ago |
|
Jimmy Liow
|
e31a20e92d
|
feat: 完成 useStorage
|
2 years ago |
|
Jimmy Liow
|
3235e7e574
|
reservation.Detail 错误
|
2 years ago |
|
Jimmy Liow
|
9071e87bc7
|
Merge branch 'main' of github.com:hainatravel/GHHub
# Conflicts:
# src/views/reservation/Detail.jsx
|
2 years ago |
|
Jimmy Liow
|
83d08dd099
|
完成 useStorage
|
2 years ago |
|
Lei OT
|
b682fcb9cb
|
#
|
2 years ago |
|
Lei OT
|
96c8017271
|
refactor: Component/BackBtn
|
2 years ago |
|
Lei OT
|
733c1c0fec
|
refactor: Invoice/index, Detail, 读取authstore; 使用搜索组件
|
2 years ago |
|
Lei OT
|
2c8da99712
|
refactor: Invoice/Paid, PaidDetail, 读取authstore; 使用搜索组件
|
2 years ago |
|
Lei OT
|
30a8301329
|
refactor: Invoice/index, Detail, 读取authstore; 使用搜索组件
|
2 years ago |
|
Lei OT
|
6b2d3d2b04
|
i18n: + vendor.json
|
2 years ago |
|
Lei OT
|
877a020dc0
|
perf: report loading
|
2 years ago |
|
Lei OT
|
5ef8c9a72f
|
搜索: invoice status
|
2 years ago |
|
Lei OT
|
d8bc4d2ff4
|
perf(i18n): 检测使用设备语言
|
2 years ago |
|
Lei OT
|
b5c13f238d
|
perf: 搜索框, 自定义配置
|
2 years ago |
|
Lei OT
|
bf8c45033b
|
refactor: Notice 读取userId
|
2 years ago |
|
Lei OT
|
5b30aec3e5
|
refactor: Report
|
2 years ago |
|
Lei OT
|
6e66a31bb0
|
refactor: Feedback 状态管理
|
2 years ago |
|
Lei OT
|
844ad99bbd
|
refactor: Feedback Detail
|
2 years ago |
|
Lei OT
|
a608c457b8
|
Merge remote-tracking branch 'origin/main'
|
2 years ago |
|
Lei OT
|
6ad342cb2e
|
refactor: Feedback CustomerDetail
|
2 years ago |
|
Jimmy Liow
|
bc18a05254
|
feat:完成分页调用新接口
|
2 years ago |
|
Lei OT
|
c7f29f4999
|
Merge remote-tracking branch 'origin/main'
|
2 years ago |
|
Lei OT
|
65eaf11d42
|
refactor: Feedback index
|
2 years ago |
|
Jimmy Liow
|
bf50e29ed7
|
使用 SearchForm 搜索计划
|
2 years ago |
|
Lei OT
|
66c7ba9574
|
搜索框: 不删除空字段
|
2 years ago |
|
Lei OT
|
b568379f41
|
搜索框时间增加转换格式: YYYY-MM-DD 23:59
|
2 years ago |
|
Lei OT
|
887b47a55a
|
feat: 搜索框
|
2 years ago |
|
Jimmy Liow
|
d443f21805
|
完成团计划搜索使用 Zustand
|
2 years ago |
|
Jimmy Liow
|
8d3a7354c7
|
初步完成使用 Zustand 管理登陆
|
2 years ago |
|
Jimmy Liow
|
4fff1229fd
|
Merge branch 'main' of github.com:hainatravel/GHHub
# Conflicts:
# src/stores/Root.js
# src/views/Login.jsx
|
2 years ago |
|
Jimmy Liow
|
abf527a53d
|
登陆验证使用 Zustand
|
2 years ago |
|
Lei OT
|
3a6ce1d366
|
#
|
2 years ago |
|
Lei OT
|
ceb397a895
|
fix: antd 更新install之后 cssinjs 的hash值更新;
|
2 years ago |