Commit Graph

96 Commits

Author SHA1 Message Date
79e959f3a5 1.默认查询20条 2024-08-21 09:03:18 +08:00
747e595108 1.关闭分账 2024-08-19 10:16:02 +08:00
154320976e Merge branch 'tx'
# Conflicts:
#	src/components/Map/location/LocationMap.vue
2024-08-17 13:49:40 +08:00
8ec0cf4b9a 1.调整 2024-08-17 13:47:37 +08:00
tx
cfe309c965 设备地图bug修改 2024-08-17 13:43:51 +08:00
tx
345a9cee1b 地图设备页面bug修改 2024-08-17 13:42:10 +08:00
tx
21081b8618 11 2024-08-16 18:05:45 +08:00
5bd18b982a 1.调整 2024-08-16 14:42:20 +08:00
89da984101 Merge branch 'tx'
# Conflicts:
#	.env.development
2024-08-16 14:22:42 +08:00
8285fbde6e 1.调整 2024-08-16 14:15:00 +08:00
tx
f95e1aceff 范围 2024-08-14 18:05:34 +08:00
tx
550ebddfff 收费方式 2024-08-12 17:51:52 +08:00
c3904cf7d0 1.调整 2024-08-12 17:31:04 +08:00
9eadcec906 1.运营商搜索和运营区 快速搜索可选可搜索 2024-08-09 20:40:55 +08:00
5517c4179f Merge branch 'coupon' 2024-08-09 17:44:46 +08:00
289f64deff 1.优惠券 2024-08-09 17:44:26 +08:00
01cf668d7c 1.运营区页面调整 2024-08-08 14:34:23 +08:00
95d0022fd2 Merge branch 'coupon' 2024-08-08 14:30:36 +08:00
5170ee7572 1.领取优惠券 2024-08-08 14:29:43 +08:00
89ffb63be2 1.调整 2024-08-08 10:07:36 +08:00
a727fd7286 1.优化 2024-08-05 22:26:01 +08:00
bb055e971f 1.优化 2024-08-05 22:25:24 +08:00
d20531cc3d 1.默认分页50条 2024-08-02 15:21:17 +08:00
b4f9b6596d 1.微调 2024-08-02 15:16:40 +08:00
d0a43d7479 1.微调 2024-08-02 11:10:33 +08:00
ad270f9297 Merge remote-tracking branch 'origin/tx' 2024-08-02 11:07:42 +08:00
a4c71feb8c 1.管理员列表中-绑定app用户 2024-08-02 11:06:15 +08:00
tx
62549c4042 运营期修改 2024-08-02 10:59:17 +08:00
tx
6f722d6849 运营期修改 2024-08-01 18:05:08 +08:00
e4c9da15a6 1.调整 2024-08-01 17:44:39 +08:00
950ddb3a0d Merge remote-tracking branch 'origin/tx'
# Conflicts:
#	.env.development
#	src/views/system/area/index.vue
2024-08-01 17:24:14 +08:00
58ae26029f 1.调整 2024-08-01 17:22:15 +08:00
e18d24e3f4 1.调整 2024-07-31 10:00:53 +08:00
196be50eaa 运营区设置修改 2024-07-28 14:23:36 +08:00
907f0f8361 1.调整 2024-07-27 21:29:53 +08:00
a124450fcf 运营区设置修改 2024-07-27 18:03:05 +08:00
08c516f28c 冲突解决 2024-07-27 11:29:54 +08:00
aaebfc583d 订单详情修改 2024-07-27 11:23:25 +08:00
c75308b390 内容修改 2024-07-27 10:20:09 +08:00
238229ecec 1.调整 2024-07-27 10:06:04 +08:00
f52b62144b 1.调整 2024-07-26 17:39:51 +08:00
99a2950e53 1.调整 2024-07-24 18:17:13 +08:00
23ea8a9c71 地图修改 2024-07-24 18:00:08 +08:00
74be13b534 修改 2024-07-24 10:11:17 +08:00
727ca3cc69 Merge branch 'master' of http://61.174.243.28:15863/chuangte/bick_back into tx 2024-07-24 10:10:45 +08:00
d753972aeb 11 2024-07-24 10:10:26 +08:00
c341347a6a 1.调整 2024-07-24 10:09:51 +08:00
0edaeb9761 1.硬件版本
2.软件版本
2024-07-22 17:18:28 +08:00
3038670ad8 Merge remote-tracking branch 'origin/tx' 2024-07-22 10:29:50 +08:00
8f056bbdaa 1.调整 2024-07-22 10:29:30 +08:00