Haiyi
|
bd494b1759
|
✨ feat:解决冲突
|
2022-10-25 17:40:56 +08:00 |
|
Haiyi
|
bc9e43f8ea
|
✨ feat:客户管理70%
|
2022-10-25 17:39:37 +08:00 |
|
Haiyi
|
9764f9f1bc
|
✨ feat:客户管理50%
|
2022-10-24 19:10:14 +08:00 |
|
Haiyi
|
18df424f70
|
✨ feat:客户管理20%
|
2022-10-21 18:43:22 +08:00 |
|
Haiyi
|
c5b74e3dd9
|
Merge branch 'dev' of ssh://git.online.zzfzyc.com:10022/mp/spider_cloud_warehouse into 订单页
|
2022-10-20 15:12:16 +08:00 |
|
Haiyi
|
09327c7a7c
|
✨ feat:菜单组件暴露ref方法出去
|
2022-10-20 15:12:10 +08:00 |
|
Haiyi
|
a115787a02
|
Merge branch 'dev' of ssh://git.online.zzfzyc.com:10022/mp/spider_cloud_warehouse into 订单页
|
2022-10-19 17:37:31 +08:00 |
|
Haiyi
|
42c5bb0952
|
✨ feat:销售码单跳转支付
|
2022-10-19 17:37:24 +08:00 |
|
Haiyi
|
d5190ba439
|
Merge branch 'dev' of ssh://git.online.zzfzyc.com:10022/mp/spider_cloud_warehouse into 订单页
|
2022-10-17 14:07:17 +08:00 |
|
Haiyi
|
2b00271d71
|
✨ feat:h5样式问题
|
2022-10-17 14:07:11 +08:00 |
|
Haiyi
|
94b609039d
|
Merge branch 'dev' of ssh://git.online.zzfzyc.com:10022/mp/spider_cloud_warehouse into 订单页
|
2022-10-14 15:56:54 +08:00 |
|
Haiyi
|
3111f211ae
|
✨ feat:小程序角色权限控制
|
2022-10-14 15:56:49 +08:00 |
|
Haiyi
|
3f01990a35
|
✨ feat:增加退款码单
|
2022-10-13 17:14:32 +08:00 |
|
Haiyi
|
498d8515cb
|
🐞 fix:【ID1000610】
新版内部商城测试bug-2
|
2022-10-12 17:54:43 +08:00 |
|
Haiyi
|
ffa2cf377d
|
✨ feat:解决兼容性问题,和图标不显示的问题
|
2022-10-11 14:55:15 +08:00 |
|
Haiyi
|
79a3364b5f
|
✨ feat:解决一些兼容性的问题
|
2022-10-10 17:14:21 +08:00 |
|
Haiyi
|
fe16a473a2
|
✨ feat:订单状态枚举更换接口
|
2022-10-09 17:00:30 +08:00 |
|
Haiyi
|
001b709ff0
|
✨ feat:提交订单显示客户名字
|
2022-10-09 13:51:17 +08:00 |
|
Haiyi
|
f551b5a015
|
Merge branch 'dev' of ssh://git.online.zzfzyc.com:10022/mp/spider_cloud_warehouse into 订单页
|
2022-10-09 13:46:04 +08:00 |
|
Haiyi
|
14f95b880f
|
🌈 style:修改样式
|
2022-10-09 13:45:59 +08:00 |
|
Haiyi
|
0f281f93c9
|
🎈 perf:将确认收货挪出来在订单详情
|
2022-10-08 17:48:29 +08:00 |
|
Haiyi
|
7cb8cbe9d5
|
Merge branch 'dev' of ssh://git.online.zzfzyc.com:10022/mp/spider_cloud_warehouse into 订单页
|
2022-10-08 15:21:05 +08:00 |
|
Haiyi
|
81268618fd
|
🌈 style:更改部分模块的样式
|
2022-10-08 15:20:55 +08:00 |
|
Haiyi
|
b878c5ea9d
|
✨ feat(销售统计): 时间选择器组件
|
2022-09-30 10:00:08 +08:00 |
|
Haiyi
|
82c87b75d9
|
Merge branch 'dev' of ssh://git.online.zzfzyc.com:10022/mp/spider_cloud_warehouse into 订单页
|
2022-09-29 15:22:46 +08:00 |
|
Haiyi
|
232d372796
|
✨ feat:修改确认订单选择后无法渲染的问题,顶input框的高度问题
|
2022-09-29 15:22:39 +08:00 |
|
Haiyi
|
a619b24e6b
|
✨ feat:解决冲突合并
|
2022-09-28 19:21:55 +08:00 |
|
Haiyi
|
6b59d688db
|
Merge branch 'dev' of ssh://git.online.zzfzyc.com:10022/mp/spider_cloud_warehouse into 订单页
|
2022-09-28 19:16:52 +08:00 |
|
Haiyi
|
c3053f232a
|
✨ feat:状态按钮重新对接完成进度20%
|
2022-09-28 19:16:46 +08:00 |
|
Haiyi
|
7362e5bca6
|
✨ feat:解决冲突
|
2022-09-27 17:16:43 +08:00 |
|
Haiyi
|
9377ea964f
|
✨ feat(订单模块):提交订单对接
|
2022-09-27 17:14:52 +08:00 |
|
Haiyi
|
6c0ecd5ea1
|
Merge branch 'dev' of ssh://git.online.zzfzyc.com:10022/mp/spider_cloud_warehouse into 订单页
|
2022-09-27 10:14:18 +08:00 |
|
Haiyi
|
ba018b1d25
|
🌈 style:订单页搜索合成一个
|
2022-09-26 19:05:42 +08:00 |
|
Haiyi
|
113ac6b229
|
📃 docs:解决冲突问题
|
2022-09-26 14:36:03 +08:00 |
|
Haiyi
|
ccc3530aff
|
✨ feat:新建收款完成100%
|
2022-09-26 14:33:27 +08:00 |
|
Haiyi
|
5c2e3d46ac
|
✨ feat(收款):收款完成70%
|
2022-09-23 19:13:30 +08:00 |
|
Haiyi
|
d2a1441810
|
✨ feat:售后模块100%
|
2022-09-22 15:11:16 +08:00 |
|
Haiyi
|
ed77fdda0b
|
Merge branch 'dev' of ssh://git.online.zzfzyc.com:10022/mp/spider_cloud_warehouse into 售后模块
|
2022-09-22 11:19:29 +08:00 |
|
Haiyi
|
d84d60414c
|
✨ feat:申请退货100%
|
2022-09-22 11:19:24 +08:00 |
|
Haiyi
|
ff5b5a5fe2
|
✨ feat:申请退货80%
|
2022-09-21 19:14:31 +08:00 |
|
Haiyi
|
45de2e92c0
|
Merge branch 'dev' of ssh://git.online.zzfzyc.com:10022/mp/spider_cloud_warehouse into 售后模块
|
2022-09-21 10:17:38 +08:00 |
|
Haiyi
|
6757d91a03
|
🌈 style:日历组件衔接scss文件
|
2022-09-21 10:17:33 +08:00 |
|
Haiyi
|
adc7c36193
|
✨ feat(售后模块):退货页面开发完毕,剩余退款页面
|
2022-09-20 18:59:38 +08:00 |
|
Haiyi
|
fcce5d265d
|
Merge branch 'dev' of ssh://git.online.zzfzyc.com:10022/mp/spider_cloud_warehouse into 售后模块
|
2022-09-20 11:21:51 +08:00 |
|
Haiyi
|
4822150647
|
✨ feat:新增日历组件
|
2022-09-20 11:21:45 +08:00 |
|
Haiyi
|
b0d0791fcc
|
Merge branch 'dev' of ssh://git.online.zzfzyc.com:10022/mp/spider_cloud_warehouse into 售后模块
|
2022-09-19 18:01:33 +08:00 |
|
Haiyi
|
96a64f4892
|
✨ feat:售后模块
|
2022-09-19 18:01:27 +08:00 |
|
Haiyi
|
784510b8cd
|
Merge branch 'dev' of ssh://git.online.zzfzyc.com:10022/mp/spider_cloud_warehouse into 订单页
|
2022-09-19 10:28:53 +08:00 |
|
Haiyi
|
00a0dfa9d8
|
✨ feat:修改图片文件
|
2022-09-19 10:28:47 +08:00 |
|
Haiyi
|
c2fa0766aa
|
🦄 refactor:搜索页点击搜索
|
2022-09-16 18:43:14 +08:00 |
|
Haiyi
|
9342906c67
|
🦄 refactor:搜索历史加入购物车100%
|
2022-09-16 18:08:04 +08:00 |
|
Haiyi
|
7ddb3bf784
|
🦄 refactor:订单详情对接修改地址
|
2022-09-16 11:43:51 +08:00 |
|
Haiyi
|
52c4d92433
|
✨ feat:更新图片文件
|
2022-09-16 10:07:43 +08:00 |
|
Haiyi
|
8472f4c14b
|
🦄 refactor:修改冲突产生的文件路径问题
|
2022-09-14 18:57:52 +08:00 |
|
Haiyi
|
66c9a3ebe4
|
冲突合并
|
2022-09-14 18:48:34 +08:00 |
|
Haiyi
|
c07ba11595
|
🦄 refactor:订单详情对接
|
2022-09-14 18:45:00 +08:00 |
|
Haiyi
|
0ef88a4490
|
🦄 refactor:订单列表对接100%
|
2022-09-14 13:13:42 +08:00 |
|
Haiyi
|
fb8e93445b
|
Merge branch 'dev' of ssh://git.online.zzfzyc.com:10022/mp/spider_cloud_warehouse into 订单页
|
2022-09-14 11:57:41 +08:00 |
|
Haiyi
|
a208802231
|
🦄 refactor:订单列表对接100%
|
2022-09-14 11:57:35 +08:00 |
|
Haiyi
|
0de8f2060b
|
限制电话单位
|
2022-09-09 17:48:35 +08:00 |
|
Haiyi
|
f6a69a3ea6
|
🦄 refactor:新增编辑收货地址
|
2022-09-09 17:46:02 +08:00 |
|
Haiyi
|
afaad76fe3
|
🌈 style:样式问题
|
2022-09-08 18:24:57 +08:00 |
|
Haiyi
|
de46b61f9a
|
✨ feat:修改购物车样式
|
2022-09-08 17:17:32 +08:00 |
|
Haiyi
|
e35c33bc7f
|
✨ feat:yarn
|
2022-09-08 16:45:21 +08:00 |
|
Haiyi
|
f6dd3757d9
|
合并冲突
|
2022-09-08 16:20:26 +08:00 |
|
Haiyi
|
2ae58233f4
|
🦄 refactor:订单详情静态界面
|
2022-09-08 16:19:37 +08:00 |
|
Haiyi
|
caf7066663
|
🦄 refactor:购物车添加虚拟列表
|
2022-09-07 14:42:31 +08:00 |
|
Haiyi
|
d8c8c46a83
|
Merge branch 'dev' of ssh://git.online.zzfzyc.com:10022/mp/spider_cloud_warehouse into 首页选购商品
|
2022-09-05 18:10:56 +08:00 |
|
Haiyi
|
1bf5d3f69e
|
🦄 refactor:首页加入购物车
|
2022-09-05 18:09:35 +08:00 |
|
Haiyi
|
f75de04f83
|
🦄 refactor:首页购物车50%
|
2022-09-02 19:06:57 +08:00 |
|
Haiyi
|
671b94b961
|
🦄 refactor:85%
|
2022-09-02 11:24:22 +08:00 |
|
Haiyi
|
83d6b1c9d5
|
🦄 refactor:搜索80%
|
2022-09-02 11:09:42 +08:00 |
|
Haiyi
|
34dd4722c9
|
🦄 refactor(订单重构):订单重构
|
2022-09-01 14:14:18 +08:00 |
|
Haiyi
|
544a11e1e8
|
文件
|
2022-08-30 14:50:05 +08:00 |
|
Haiyi
|
b5bd2e1b21
|
暂存
|
2022-08-30 14:44:58 +08:00 |
|
Haiyi
|
6c1e1d196d
|
Merge branch 'dev' of ssh://git.online.zzfzyc.com:10022/mp/spider_cloud_warehouse into 订单页
|
2022-08-30 11:14:44 +08:00 |
|
Haiyi
|
c4ba25ac84
|
暂存
|
2022-08-30 11:14:02 +08:00 |
|
Haiyi
|
790e46a8a0
|
🔧 build:更新依赖
|
2022-08-30 10:32:44 +08:00 |
|
Haiyi
|
c30960b7ec
|
✨ feat:首页大概
|
2022-08-24 17:58:37 +08:00 |
|
Haiyi
|
9bb3690a63
|
✨ feat:更改内部商城测试环境的APPID
|
2022-08-23 11:16:27 +08:00 |
|
Haiyi
|
0d97c056cc
|
🦄 refactor:初始化
|
2022-08-19 11:41:30 +08:00 |
|
Haiyi
|
72c757dc33
|
🦄 refactor:初始化
|
2022-08-19 11:34:19 +08:00 |
|
Haiyi
|
5ad0237272
|
🦄 refactor:删除没必要的api
|
2022-08-19 11:05:03 +08:00 |
|
Haiyi
|
74144ad820
|
✨ feat:初始化
|
2022-08-19 11:01:36 +08:00 |
|
Haiyi
|
1027add14f
|
公司认证加多个参数
|
2022-07-01 17:26:22 +08:00 |
|
Haiyi
|
349d41c62d
|
fix修复重置问题
|
2022-06-29 20:09:30 +08:00 |
|
Haiyi
|
598fc7a81f
|
样品对比100%
|
2022-06-29 13:46:44 +08:00 |
|
Haiyi
|
d734720dd1
|
Merge branch 'dev' of ssh://git.online.zzfzyc.com:10022/mp/EShop into 样式对比
|
2022-06-28 20:14:32 +08:00 |
|
Haiyi
|
16e3c08f4b
|
样品对比接口对接
|
2022-06-28 20:14:25 +08:00 |
|
Haiyi
|
eb7df4b592
|
Merge branch 'dev' of ssh://git.online.zzfzyc.com:10022/mp/EShop into 样式对比
|
2022-06-28 14:17:41 +08:00 |
|
Haiyi
|
ae047bf877
|
授信前添加限制
|
2022-06-28 14:16:05 +08:00 |
|
Haiyi
|
2de447402e
|
暂存
|
2022-06-28 14:04:59 +08:00 |
|
Haiyi
|
18c9ef9b0c
|
Merge branch 'dev' of ssh://git.online.zzfzyc.com:10022/mp/EShop into 样式对比
|
2022-06-28 10:32:48 +08:00 |
|
Haiyi
|
85c591d745
|
样品对比模块
|
2022-06-28 10:31:14 +08:00 |
|
Haiyi
|
2fdb73afd6
|
修改冲突
|
2022-06-28 10:18:19 +08:00 |
|
Haiyi
|
376c87c3f6
|
调整认证规则
|
2022-06-28 10:15:49 +08:00 |
|
Haiyi
|
cafe1a6e84
|
Merge branch 'dev' of ssh://git.online.zzfzyc.com:10022/mp/EShop into 样式对比
|
2022-06-27 19:07:26 +08:00 |
|
Haiyi
|
c13539a9d4
|
暂存
|
2022-06-27 19:02:42 +08:00 |
|
Haiyi
|
9afbf267b4
|
字段修改
|
2022-06-27 18:37:42 +08:00 |
|
Haiyi
|
e86e27ed18
|
问题修改和接口对接
|
2022-06-27 18:01:18 +08:00 |
|