Commit Graph

597 Commits (2f7e8a9f0f50b176a59162b8d5834d846eb52c8d)

Author SHA1 Message Date
Jimmy Liow 2254a09c5f Merge branch 'main' of github.com:hainatravel/GHHub 2 years ago
Jimmy Liow a186142cc0 feat: 价格使用 Form 管理 2 years ago
Lei OT ceb3690530 产品管理: 编辑: 报价数组 2 years ago
Lei OT f308b994e3 perf: 产品管理: catch 2 years ago
Lei OT 09cacf5f85 产品管理: 控制头部操作 2 years ago
Lei OT 98329e9876 产品管理: header 2 years ago
Lei OT c03a8fd1fe Revert "产品管理: 编辑: 仅信息, 多语种"
This reverts commit aae952f5e3.
2 years ago
Lei OT aae952f5e3 产品管理: 编辑: 仅信息, 多语种 2 years ago
Lei OT 86d0d175d3 产品管理: 管理: 编辑title 2 years ago
Lei OT 3040ca6220 style: 审核: 变更: 红色 2 years ago
Lei OT 88b91387e4 # 附加项目 2 years ago
Lei OT 8e6db3bf85 复制产品后, 跳转 2 years ago
Lei OT 6dce885450 Merge remote-tracking branch 'origin/main' 2 years ago
Jimmy Liow 3ec112e88b feat:增加价格对比;增加是否可编辑价格判断 2 years ago
Lei OT 1cb54dbb75 编辑页面的各操作权限: 有 `htid` 则不允许修改信息; 提交审核方法 2 years ago
Lei OT 8dfb787db5 style: 多语种信息编辑 2 years ago
Lei OT f6b0dd8d04 多语种信息编辑 2 years ago
Lei OT 2004aafa6d 多语种信息编辑 2 years ago
Jimmy Liow 16a40e6280 Merge branch 'main' of github.com:hainatravel/GHHub 2 years ago
Jimmy Liow 19dfc575b4 fix:批量设置人等取值不对
del:不用的组件
2 years ago
Lei OT e7a83df8a2 跳转链接控制: 权限, 页面 2 years ago
Lei OT c2e4b027a1 保存, 价格 2 years ago
Lei OT 4fbcc93134 可编辑状态 2 years ago
Lei OT 2692579437 Merge remote-tracking branch 'origin/main' 2 years ago
Lei OT 0647d845ba 产品管理: 审核页面调整编辑, 定位; 2 years ago
Jimmy Liow b8b679a0ec 批量设置价格后马上预览 2 years ago
Lei OT 98937960e5 Merge remote-tracking branch 'origin/main' 2 years ago
Lei OT 80a54193a5 产品管理: 审核页面调整编辑, 定位 2 years ago
Lei OT b9a2b0e6ac 产品编辑页面: 保存后更新树 2 years ago
Jimmy Liow 7f9025db5c 开发报价新增表单 2 years ago
Lei OT 2caddfd092 供应商权限: 产品管理导航 2 years ago
Lei OT 09d9cf5ec6 产品编辑页面: 保存 2 years ago
Jimmy Liow e0784eb593 合并价格表单 2 years ago
Jimmy Liow 5f4f525f45 Merge branch 'main' of github.com:hainatravel/GHHub
# Conflicts:
#	src/views/products/Detail/ProductInfoForm.jsx
2 years ago
Jimmy Liow b6e57cd4ba 开发报价新增表单 2 years ago
Lei OT 0d9a80cefd 产品编辑页面: 组件 新增 2 years ago
Lei OT ab527e36c2 产品编辑页面: 组件 editable 2 years ago
Lei OT a63887a7b6 产品编辑页面: 组件 info, form, lgc 2 years ago
Lei OT 2a193f9955 todo: 产品编辑页面: 组件 2 years ago
Lei OT 26d354e0ea Merge remote-tracking branch 'origin/main' 2 years ago
Jimmy Liow 2e68c7621d 价格设置、人等增加默认值,使用颜色表示必填 2 years ago
Lei OT 6f761a233e Merge remote-tracking branch 'origin/main'
# Conflicts:
#	src/views/products/Detail.jsx
2 years ago
Lei OT 1dfc2d23d7 todo: 产品编辑页面: 组件 2 years ago
Jimmy Liow 2b9a365c45 完成批量价格生成和预览 2 years ago
Jimmy Liow cae1a8774a 完成批量设置价格界面 2 years ago
Jimmy Liow f68370fa72 批量添加价格可以同时设置人等 2 years ago
YCC 606c54a4f9 Merge branch 'main' of github.com:hainatravel/GHHub 2 years ago
YCC 655114ab44 机票信息编辑 2 years ago
Lei OT ab50a891f2 style: 头部账户信息 2 years ago
黄文强@HWQ-PC 01e4dbbf4f 增加Header,把提交审核按钮和增加产品按钮移到Header 2 years ago
Lei OT af71ebf18e Merge remote-tracking branch 'origin/main' 2 years ago
Lei OT 71147a728d 产品管理: 审核页面: 调整Header组件 2 years ago
Jimmy Liow e6bc9b2dc2 fix: ESLint warning 2 years ago
黄文强@HWQ-PC 58fc202f69 1.增加年份选择功能
2.增加地接需要审核结果页面,查看哪些产品和价格是否通过功能
3.地接可以在审核界面跳过去修改产品价格功能
2 years ago
Lei OT 3a592a640d 审核页: 数据更新 2 years ago
Lei OT 09091eaff5 Merge remote-tracking branch 'origin/main' 2 years ago
Jimmy Liow 3544419d11 feat: SearchForm 增加时间 onMounted,解决 View 获取初始值加载数据 2 years ago
Lei OT d9c45f9962 feat: 产品管理: 审核: 切换状态 2 years ago
黄文强@HWQ-PC 83275f2d25 Merge branch 'main' of github.com:hainatravel/GHHub 2 years ago
黄文强@HWQ-PC 9cb6d187c0 1.增加代理供应商录入产品描述、价格功能
2.增加供应商提交产品审核功能
2 years ago
Lei OT fe868543ff 产品管理: 客服首页不限制审核跳转 2 years ago
黄文强@HWQ-PC 944c607c77 Merge branch 'main' of github.com:hainatravel/GHHub 2 years ago
黄文强@HWQ-PC 0db9a5429a 1.增加供应商新增产品
2.供应商保存产品
2 years ago
Lei OT 2671015b43 feat: 产品管理: 复制产品: 增加是否复制价格; 所有项目类型 2 years ago
Lei OT 6cf4f81cdf feat: 产品管理: 审核: 切换年份; 切换供应商; 2 years ago
Lei OT bc6b5cbed1 feat: 供应商选择; perf: 产品管理二级页面头部 2 years ago
Lei OT 0a391acdd0 Merge remote-tracking branch 'origin/main' 2 years ago
Lei OT 31d5db8387 产品管理: 客服首页, 审核状态 2 years ago
Jimmy Liow 2e49c01dac fix: 账号、角色保存出错不关闭表单 2 years ago
YCC d97638b843 Merge branch 'main' of github.com:hainatravel/GHHub 2 years ago
Lei OT dc87c7bdb6 绑定产品: 完毕之后更新 2 years ago
Lei OT 93572e6594 feat: 城市选择器 2 years ago
Jimmy Liow 2d9e577859 feat:账号管理界面增加中英文 2 years ago
Jimmy Liow cce861bd52 feat: 调整导航宽度,适应小屏幕 2 years ago
黄文强@HWQ-PC b22e9d2edd 修改报价报价的编辑界面 2 years ago
Lei OT b5953c5c12 style: 顶部: 账户名, 太长导致换行, 样式撑开了 2 years ago
Lei OT 9491ada91a 审核价格: 单行审核: 取消每次从后端更新数据, 仅前端响应 2 years ago
Lei OT 6ae1984b91 feat: 复制产品价格 2 years ago
Lei OT 2f2c86026a feat: 绑定项目: 搜索已发布的产品 2 years ago
Lei OT cbfb2749d0 Merge remote-tracking branch 'origin/main' 2 years ago
Jimmy Liow db2ee69edf Merge branch 'main' of github.com:hainatravel/GHHub 2 years ago
Jimmy Liow a19d787fab feat: 账号删除 realname 搜索 2 years ago
黄文强@HWQ-PC a0f81d26aa Merge branch 'main' of github.com:hainatravel/GHHub 2 years ago
黄文强@HWQ-PC 852c784f9a 1.增加新增产品功能
2.修改设置全年日期功能
2 years ago
Jimmy Liow 395e2e44db feat: 团计划增加【未确认】搜索 2 years ago
Jimmy Liow 2a20ed0f14 feat: 导航增加产品管理权限 2 years ago
Jimmy Liow b7d7c86319 增加根据供应商搜索账号 2 years ago
Lei OT 05a4106fd8 conf: 审核页面权限 2 years ago
Lei OT 67a21477c6 绑定项目只显示名称 2 years ago
Lei OT 4350f37a6a 超公里不需要公里数字段 2 years ago
Jimmy Liow 70f5332839 feat: 登陆界面增加版本号;调整界面布局 2 years ago
黄文强@HWQ-PC f77bcf4288 修改批量录入界面功能 2 years ago
黄文强@HWQ-PC f13241f262 修改批量录入界面功能 2 years ago
Lei OT 06db76ce86 合并 2 years ago
Lei OT 1a958639d5 当前编辑的产品 2 years ago
Lei OT efa3f052a6 当前编辑的产品; 价格表i18n; 2 years ago
Lei OT efc12c25a9 Merge remote-tracking branch 'origin/main' 2 years ago
Lei OT 4fb6273ed1 # 2 years ago
黄文强@HWQ-PC 8bfb9defdc Merge branch 'main' of github.com:hainatravel/GHHub 2 years ago
黄文强@HWQ-PC 71c24be596 1.怎加批量录入价格功能 2 years ago
Jimmy Liow 3f4fcc3789 feat: 把 style 转为 Tailwind CSS 2 years ago
Jimmy Liow 4940a54e13 feat: 价格编辑增加路由限制 2 years ago
Jimmy Liow e3038e0a9d fix:解决 Forget to pass form prop 2 years ago
Jimmy Liow 3bbd694dc6 Merge remote-tracking branch 'remotes/origin/feature/price_manager'
# Conflicts:
#	src/assets/global.css
#	src/main.jsx
#	src/views/App.jsx
2 years ago
Jimmy Liow e68e0ddd7d feat: 团计划使用 Tailwind CSS 2 years ago
Jimmy Liow 52fcb20dbf feat: App Layout 统一使用 Tailwind CSS 2 years ago
Jimmy Liow 8b44f5ce5c feat: 迁移类样式到 Tailwind CSS 2 years ago
黄文强@HWQ-PC 11b5a80986 增加批量添加报价界面 2 years ago
Jimmy Liow 653533e80c feat: 集成 PageSpy;统一用户信息读取 2 years ago
Jimmy Liow 0eef2cee3a feat: 增加打标签命令;删除不必要角色权限;优化 main asnyc 确保可以 build 2 years ago
黄文强@HWQ-PC e3727db78f Merge branch 'feature/price_manager' of github.com:hainatravel/GHHub into feature/price_manager 2 years ago
黄文强@HWQ-PC ed651ff3d4 1.增加搜索框
2.动态显示产品项目信息
3.修改变量名
2 years ago
Lei OT 6caa17ea4c feat: 复制供应商产品: +小组, 选择类型 2 years ago
黄文强@HWQ-PC 8fd197a3e0 Merge branch 'feature/price_manager' of github.com:hainatravel/GHHub into feature/price_manager 2 years ago
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 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 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
黄文强@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 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 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
Jimmy Liow e9289bbe80 导航和菜单增加权限判断 2 years ago
Jimmy Liow 3ec9a43833 完成权限新增、编辑、分配角色权限 2 years ago
Lei OT 86242addab 删除 Mobx 相关的引入 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
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 232a8f85c8 审核产品页面: 表格, 数据结构 2 years ago
Jimmy Liow 2cb059cc06 feat: postForm 增加业务错误校验,搜索帐号,新增、编辑账号 2 years ago
Lei OT f323f0b511 审核状态 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