bonus
/
Zlpt_Portal
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
484 Commits 11 Branches 0 Tags 90 MiB
Commit Graph

438 Commits

Author SHA1 Message Date
wlikett b617b8bd00 需求修改 2023-12-10 02:44:01 +08:00
songyang ed526ece95 更新 2023-12-10 01:53:08 +08:00
songyang cc39ee8869 1223 2023-12-10 01:43:50 +08:00
songyang dbf31c9cb1 Merge branch 'dev-songyang' 2023-12-09 22:59:13 +08:00
songyang 84f2b56ece 更新 2023-12-09 22:58:48 +08:00
13218645326 74d44e2965 初始化 2023-12-09 22:32:31 +08:00
13218645326 f5232f86b2 Merge branch 'main' of http://192.168.0.56:3000/bonus/Zlpt_Portal 2023-12-09 22:32:17 +08:00
wlikett bb6b47ba84 Merge branch 'dev-wangyiming' 2023-12-09 22:30:42 +08:00
13218645326 ebdadba43e Merge branch 'dev-sjf-2023-12-5' 2023-12-09 22:30:20 +08:00
13218645326 91da4dae26 自定义指令auth 封装 2023-12-09 22:29:54 +08:00
wlikett 0d31a3c58f 需求修改 2023-12-09 22:29:42 +08:00
songyang ca409fdb84 Merge branch 'dev-songyang' 2023-12-09 21:55:09 +08:00
songyang df7a0a03ab 商品上下架 2023-12-09 21:54:44 +08:00
wlikett 52186bd619 需求修改 2023-12-09 21:53:41 +08:00
wlikett ea5cc974cf 需求修改 2023-12-09 18:34:56 +08:00
wlikett 1ac52e029e Merge branch 'dev-wangyiming' 2023-12-09 17:03:53 +08:00
wlikett bc4e671005 需求修改 2023-12-09 17:03:25 +08:00
songyang ee2ec71591 Merge branch 'dev-songyang' 2023-12-09 17:01:21 +08:00
songyang 61dd5b8968 更新个人中心认证 2023-12-09 17:00:58 +08:00
wlikett eb94d506df Merge branch 'dev-wangyiming' 
# Conflicts:
#	src/views/equip/detail.vue
 2023-12-09 15:38:29 +08:00
wlikett b941f3f81a bug修改 2023-12-09 15:37:20 +08:00
wlikett 4f927df3f4 Merge branch 'dev-wangyiming' 
# Conflicts:
#	src/views/equip/detail.vue
 2023-12-09 11:47:37 +08:00
wlikett 84c5d75ee5 bug修改 2023-12-09 11:46:09 +08:00
wlikett 66c40cfb4c 测试修改 2023-12-08 21:12:47 +08:00
wlikett 3de81a1272 Merge branch 'dev-wangyiming' 
# Conflicts:
#	src/views/user/orderManagement/index.vue
 2023-12-08 20:32:13 +08:00
wlikett fdfd6ad203 测试修改 2023-12-08 20:30:52 +08:00
songyang 43b8e1182d Merge branch 'dev-songyang' 2023-12-08 20:30:06 +08:00
songyang 1a2819b023 个人中心修改 2023-12-08 20:29:37 +08:00
13218645326 8a20f51f23 环境配置 合并代码 2023-12-08 19:59:01 +08:00
songyang 7aed73fbbf 冲突合并 2023-12-08 19:10:39 +08:00
songyang 25eb983c91 更新 2023-12-08 19:09:37 +08:00
13218645326 94e0fb8ced no message 2023-12-08 18:46:09 +08:00
wlikett b93e5520dc Merge branch 'dev-wangyiming' 2023-12-08 17:53:18 +08:00
13218645326 7d2e8c236f 合并冲突 2023-12-08 17:50:38 +08:00
wlikett 0300adf7d0 提交申请增加动态省市区 2023-12-08 17:49:22 +08:00
13218645326 223f796e30 上传文件 2023-12-08 17:49:14 +08:00
songyang 9b644b01e9 冲突提交 2023-12-08 17:41:16 +08:00
songyang 852539478b 订单管理优化 2023-12-08 17:38:59 +08:00
13218645326 61a041c474 页面优化 2023-12-08 17:37:49 +08:00
13218645326 c00958a1f8 合并代码 2023-12-08 17:36:39 +08:00
13218645326 eb07ba7eab 函数优化 2023-12-08 17:33:41 +08:00
13218645326 d9cd44e4a9 状态值修改 2023-12-08 17:31:40 +08:00
wlikett 211c6eed0e Merge branch 'main' into dev-wangyiming 2023-12-08 17:08:31 +08:00
wlikett 56f7748f3b 打包前修改 2023-12-08 17:04:34 +08:00
13218645326 ab3d43f629 接口调用，打包配置 2023-12-08 17:03:26 +08:00
songyang 3ee01f9594 冲突合并 2023-12-08 15:31:51 +08:00
songyang ba14cd12e5 123 2023-12-08 15:30:26 +08:00
wlikett b527b37517 Merge branch 'main' into dev-wangyiming 2023-12-08 15:19:10 +08:00
wlikett ce5beac1d1 获取地址列表 和 类型列表 2023-12-08 15:18:34 +08:00
13218645326 ad5d31ccbc 合并代码 2023-12-08 15:18:01 +08:00
13218645326 ccd9f60a79 合并冲突 2023-12-08 15:09:00 +08:00
songyang 88b4dde528 订单列表字段更新 2023-12-08 15:05:47 +08:00
13218645326 22fc1dc911 接口调试 2023-12-08 15:04:24 +08:00
songyang 6b88074abd Merge branch 'dev-songyang' 2023-12-08 13:27:59 +08:00
songyang 114f3bd4ce 添加服务协议 隐私协议跳转 2023-12-08 13:27:28 +08:00
wlikett 5691c044ad Merge branch 'dev-wangyiming' 2023-12-08 13:25:01 +08:00
wlikett ea028383df 获取地址列表 和 类型列表 2023-12-08 13:24:09 +08:00
songyang 93e280d3a0 Merge branch 'main' of http://192.168.0.56:3000/bonus/Zlpt_Portal 2023-12-08 13:13:20 +08:00
songyang 74ffade539 热搜装备获取 2023-12-08 13:13:00 +08:00
wlikett 124b2aa4ec Merge branch 'dev-wangyiming' 2023-12-08 13:12:12 +08:00
songyang be333962e8 接口对接 2023-12-08 12:09:54 +08:00
wlikett 40ab96b520 Merge branch 'main' into dev-wangyiming 
# Conflicts:
#	src/http/api/equip.ts
 2023-12-08 10:13:56 +08:00
wlikett 44b7c2420e 修改 2023-12-08 10:12:43 +08:00
songyang fb27448f50 接口统一更新 2023-12-08 10:10:04 +08:00
wlikett eaf7853193 Merge branch 'dev-wangyiming' 
# Conflicts:
#	src/views/AppMain.vue
#	src/views/equip/detail.vue
 2023-12-07 17:59:00 +08:00
songyang cc90a75d85 冲突合并 2023-12-07 17:55:09 +08:00
songyang d2bb94f70a 更新订单管理 2023-12-07 17:50:11 +08:00
wlikett 32fcf1b9a1 字段修改 2023-12-07 17:49:27 +08:00
wlikett 139e9b269b 字段修改 2023-12-07 17:49:10 +08:00
songyang 95aeb1473f 订单管理更新 2023-12-07 17:48:36 +08:00
13218645326 85cc3f6649 商城 2023-12-07 13:34:05 +08:00
13218645326 99f52f3500 页面流程 2023-12-07 13:04:50 +08:00
13218645326 caa6a9d99d 样式文件移除 2023-12-06 17:50:42 +08:00
13218645326 8c240eed96 订单样式 2023-12-06 17:47:57 +08:00
wlikett 37b1bca405 Merge branch 'main' into dev-wangyiming 2023-12-06 16:02:39 +08:00
songyang 8d3fac9a3a 代码提交 2023-12-06 15:58:21 +08:00
wlikett ea73748e17 提交租赁申请 2023-12-06 15:57:08 +08:00
songyang 0848782d52 冲突合并 2023-12-06 14:19:48 +08:00
songyang d6af74672d 商品入驻，商品上架接口正常调通 2023-12-06 14:17:22 +08:00
wlikett 212fabf998 Merge branch 'dev-wangyiming' 2023-12-06 14:13:23 +08:00
wlikett 76dd1d4095 提交申请弹窗 2023-12-06 14:12:36 +08:00
13218645326 61eba7b1c7 配置优化 2023-12-06 13:45:03 +08:00
13218645326 b2f1010624 接口调试 2023-12-06 13:40:33 +08:00
13218645326 956a84f7b1 订单确认页面搭建 2023-12-06 11:02:12 +08:00
13218645326 e44e03fb39 上传文件优化 2023-12-06 10:30:41 +08:00
13218645326 7b06004501 Merge branch 'main' of http://192.168.0.56:3000/bonus/Zlpt_Portal 2023-12-06 09:50:22 +08:00
13218645326 e398689720 进度条横向 2023-12-06 09:50:03 +08:00
songyang 79a1a6d55c Merge branch 'dev-songyang' 2023-12-06 09:38:43 +08:00
songyang 93aa763064 商品管理更新 2023-12-06 09:38:11 +08:00
13218645326 79c5923f3a Merge branch 'dev-sjf-2023-12-5' 2023-12-06 09:37:10 +08:00
13218645326 6cd6ad5f75 页面搭建 2023-12-06 09:36:45 +08:00
wlikett fba797139a 注解 2023-12-05 20:57:29 +08:00
13218645326 561fa32a42 Merge branch 'main' into dev-sjf-2023-12-5 2023-12-05 20:52:51 +08:00
13218645326 0ba301fc73 订单详情 2023-12-05 20:52:24 +08:00
wlikett 1ab6209482 change 2023-12-05 20:50:06 +08:00
songyang 74bd26c254 Merge branch 'dev-songyang' 2023-12-05 19:17:05 +08:00
songyang a86e78fa55 个人中心修改 2023-12-05 19:16:16 +08:00
wlikett 5d5333c3ed change 2023-12-05 17:25:00 +08:00
songyang 7284d749cf 个人中心 2023-12-05 17:05:54 +08:00
songyang 054edc96ff Merge branch 'dev-songyang' 2023-12-05 09:48:45 +08:00
songyang 09a7095df6 ** 2023-12-05 09:48:11 +08:00
wlikett 7a847933cf Merge branch 'dev-wangyiming' 
# Conflicts:
#	src/views/AppMain.vue
#	src/views/equip/detail.vue
#	src/views/equip/list.vue
 2023-12-05 09:47:17 +08:00
wlikett 1dc9468dbf change 2023-12-05 09:45:01 +08:00
songyang dcbe6c4037 更新个人中心 2023-12-05 09:43:57 +08:00
songyang d62ef9084e 个人中心模块更新 2023-12-04 17:42:11 +08:00
songyang bd0290dcf8 登录接口正常 2023-12-04 13:10:38 +08:00
songyang 2e4af49963 冲突合并 2023-12-04 10:37:49 +08:00
songyang 9d8fa9f63c 登录页接口调试完成 2023-12-04 10:33:27 +08:00
wlikett 51d905c7f0 http change 2023-12-04 10:26:00 +08:00
wlikett 70145bc733 list change 2023-12-04 10:20:00 +08:00
wlikett 021b63bc2a list change 2023-12-04 10:19:21 +08:00
wlikett efb48126f8 Merge branch 'main' into dev-wangyiming 
# Conflicts:
#	components.d.ts
#	src/router/index.ts
 2023-12-04 09:16:05 +08:00
wlikett 652a5b9d9d list change 2023-12-04 09:15:31 +08:00
songyang 147bb863dd 首页路由修改 2023-12-04 09:12:38 +08:00
songyang eaeae3f207 更新首页 2023-12-03 10:41:32 +08:00
songyang 6e2e4592dd 更新 2023-12-02 18:10:19 +08:00
songyang 0976efbce2 首页以及个人中心页更新 2023-12-02 18:05:58 +08:00
songyang 5a28fcd3b8 首页更新 2023-12-02 14:18:00 +08:00
songyang f6365299c1 Merge branch 'main' of http://192.168.0.56:3000/bonus/Zlpt_Portal 2023-12-01 17:02:31 +08:00
songyang 5d56b88081 商城提交 2023-12-01 17:02:05 +08:00
wlikett 60323f19e1 Merge branch 'main' into dev-wangyiming 
# Conflicts:
#	components.d.ts
 2023-12-01 16:57:48 +08:00
wlikett 9e865c1741 list change 2023-12-01 16:57:11 +08:00
songyang d5459591c6 Merge branch 'main' of http://192.168.0.56:3000/bonus/Zlpt_Portal 2023-12-01 15:02:58 +08:00
songyang fd53b0b049 更新首页 2023-12-01 15:02:27 +08:00
wlikett 69654e610a width change 2023-12-01 15:00:37 +08:00
songyang 6a998c8220 Merge branch 'main' of http://192.168.0.56:3000/bonus/Zlpt_Portal 2023-12-01 14:50:14 +08:00
songyang b89ed460b7 首页更新 2023-12-01 14:48:58 +08:00
wlikett 298f4c1c17 equipCard add 2023-12-01 14:45:16 +08:00
songyang e704f1f28b Merge branch 'dev-songyang' 2023-12-01 14:03:45 +08:00
songyang d8223d64f2 更新首页 2023-12-01 14:03:26 +08:00
songyang 497685a361 冲突合并 2023-12-01 13:02:32 +08:00
songyang 8485050ecd 提交首页 2023-12-01 13:00:16 +08:00
wlikett 64b1cb5529 Merge branch 'dev-wangyiming' 2023-12-01 12:22:03 +08:00
wlikett 0f636f2be8 icon 2023-12-01 12:21:43 +08:00
songyang 6c0409ac0a 商城首页和个人信息 2023-12-01 11:22:09 +08:00
wlikett 4ac47c8940 chang samething 2023-11-30 19:32:11 +08:00
13218645326 3e39850a22 初始化 2023-11-30 10:57:31 +08:00
13218645326 50448d9581 项目初始化 2023-11-30 10:49:45 +08:00