Commit Graph
159 Commits
Author SHA1 Message Date
weiwei 9e9c1f1bac 分页修改 2025-04-10 11:22:43 +08:00
weiwei b29031a5df 1 2025-04-09 12:50:07 +08:00
weiwei 65b2b4acba 修复 2025-04-09 11:10:42 +08:00
dzc aedca7f627 fix:领导权限控制 2025-04-07 10:32:02 +08:00
weiwei 30716afea5 Merge branch 'master' of http://gitea.zianxin.com/zianxin-tec/biz-pc-cloud 2025-04-03 19:18:17 +08:00
weiwei 520e07aaff 钱包类型选择权限 2025-04-03 19:18:10 +08:00
dzc 95fec064e6 fix:转账上线修改 2025-04-03 17:37:40 +08:00
dzc e823349e20 11 2025-04-03 17:12:07 +08:00
dzc 6e56d167de feat:智能柜商品 2025-04-03 15:05:03 +08:00
dzc 229950f075 11 2025-04-01 19:55:01 +08:00
dzc 438bfba46a feat:转账权限 2025-04-01 19:45:10 +08:00
dzc ca94dbafa9 11 2025-04-01 19:02:15 +08:00
dzc d25e92460a Merge branch 'master' of http://gitea.zianxin.com/zianxin-tec/biz-pc-cloud 2025-04-01 18:29:40 +08:00
dzc 8824440446 feat:转账退款完成 2025-04-01 18:29:33 +08:00
weiwei a7a910b2f3 Merge branch 'master' of http://gitea.zianxin.com/zianxin-tec/biz-pc-cloud 2025-04-01 15:37:18 +08:00
weiwei 7fa9d6adbd 钱包充值钱包类型可选 2025-04-01 15:37:03 +08:00
dzc f3cf7a5054 feat:默认选中 2025-04-01 12:56:51 +08:00
dzc 1a7ee59be7 feat:钱包转账记录页面 2025-03-30 20:23:16 +08:00
dzc 0bb6a90c9a feat:钱包规则 2025-03-30 19:52:09 +08:00
dzc d8cf18efb7 feat:商户规则绑定 2025-03-29 18:05:09 +08:00
dzc 7da1bb9a05 封装钱包规则下拉框 2025-03-29 11:49:20 +08:00
weiwei 4f40fcae93 商户二级 2025-03-28 20:48:51 +08:00
dzc 192f8b8dca Merge branch 'master' of http://gitea.zianxin.com/zianxin-tec/biz-pc-cloud
# Conflicts:
#	src/views/wallet/mch-manage/form.vue
#	src/views/wallet/mch-manage/index.vue
2025-03-28 19:59:17 +08:00
weiwei a6952ce49f Merge branch 'master' of http://gitea.zianxin.com/zianxin-tec/biz-pc-cloud 2025-03-28 19:54:43 +08:00
weiwei 4d637a6b2b 商户二级信息表单 2025-03-28 19:53:31 +08:00
dzc 26da8b8306 feat:钱包规则 2025-03-28 18:49:53 +08:00
weiwei 256238c571 1 2025-03-28 15:29:07 +08:00
dzc f308b3c669 11 2025-03-28 14:48:56 +08:00
dzc e924c989b1 Merge branch 'master' of http://gitea.zianxin.com/zianxin-tec/biz-pc-cloud 2025-03-28 13:51:36 +08:00
dzc a8ecca14ed 11 2025-03-28 13:51:14 +08:00
weiwei b8f94fd25b 商户收款二维码下载 2025-03-27 20:26:30 +08:00
dzc c636a03d1b 111 2025-03-27 18:24:52 +08:00
dzc 29eb383e2c 11 2025-03-27 14:53:06 +08:00
dzc 52ea4d3410 feat:订单搜索条件 2025-03-26 18:40:53 +08:00
dzc 0b8be8a363 feat:钱包规则页面 2025-03-26 15:17:15 +08:00
dzc f0cc250b98 feat:商户增加搜索条件 2025-03-26 09:46:27 +08:00
dzc 4026400ffc feat:设备交易记录 2025-03-24 19:30:39 +08:00
dzc 4b2c247082 fix:是否同步到正元权限 2025-03-24 18:57:07 +08:00
dzc 854deda9b4 11 2025-03-24 18:55:04 +08:00
dzc d6c0c52885 feat:h5增加是否显示店铺 2025-03-24 11:31:57 +08:00
dzc 5bb6c9731b 11 2025-03-22 14:54:16 +08:00
weiwei fe3054d814 修改 2025-03-21 17:41:44 +08:00
weiwei 7bfc398c59 添加正元同步表单项 2025-03-21 17:29:51 +08:00
dzc 39bfeb1fde create:支付方式交易记录 2025-03-21 15:08:55 +08:00
dzc a7544976af feat:钱包记账扣款记录 2025-03-21 11:28:30 +08:00
weiwei f00170ba5c bug修复 2025-03-17 16:09:35 +08:00
weiwei e999023c83 饭卡充值钱包类型选择暂时禁用 2025-03-14 16:50:50 +08:00
weiwei 37c775b7ab Merge branch 'master' of http://gitea.zianxin.com/zianxin-tec/biz-pc-cloud 2025-03-14 14:32:12 +08:00
weiwei 796c4cb04e 修改 2025-03-14 14:31:53 +08:00
dzc 06bc2d695a feat:样式修改 2025-03-14 11:39:00 +08:00