Commit Graph

Select branches

Hide Pull Requests

account

course

dev

devMac

feat-230721

gongyingshang

master

md0726

organize

privacy

tid1509

tid1731

tid1867

tid1878

voice

voice08

v1.1.30

Mono Color

• 02f61c2d80 完成页面：平板，监控，窗帘 zmt 2021-07-26 18:18:18 +0800
• 015b59f292 add site modal 刘嘉炜 2021-07-26 18:01:37 +0800
• bcf59a77a3 fix tapd issues zmt 2021-07-22 18:50:17 +0800
• c19e623401 完成多设备定时任务及回显 zmt 2021-07-21 15:37:27 +0800
• a6169c5a70 update zmt 2021-07-16 18:15:38 +0800
• 7999dc7e68 取消核销订单分页 刘嘉炜 2021-07-16 10:13:57 +0800
• 5bce23414a 照明定时中控设置1/2 zmt 2021-07-14 18:28:54 +0800
• 1c641f053a add site 刘嘉炜 2021-07-14 18:00:44 +0800
• 84fa95c7af add st... 刘嘉炜 2021-07-13 18:08:07 +0800
• 649c472948 完成：设备主页改版&&设备定时列表查看及操作 zmt 2021-07-13 17:21:35 +0800
• 4f2ce27ddc add style 刘嘉炜 2021-07-12 18:00:29 +0800
• eeceb8207a add site 刘嘉炜 2021-07-09 18:01:44 +0800
• 237a4f6f0b v1.1.2 formal 刘嘉炜 2021-07-09 14:11:27 +0800
• 6b67662797 v1.1.2 formal 刘嘉炜 2021-07-09 14:10:27 +0800
• 32558b0e70 vtest 1.1.2 刘嘉炜 2021-07-09 14:08:55 +0800
• 715ffa70eb 租售&储物打开柜子 api 区分 刘嘉炜 2021-07-09 13:29:46 +0800
• 67d769a8eb 优化交互 zmt 2021-07-07 19:06:06 +0800
• 85ca608fb7 clean zmt 2021-07-07 18:24:22 +0800
• 0693a50607 v1.1.1 formal 刘嘉炜 2021-07-07 18:15:39 +0800
• 89cac7d610 vtest 1.1.1 刘嘉炜 2021-07-07 18:13:09 +0800
• ecc8bfb615 fix log && release token zmt 2021-07-07 18:01:46 +0800
• 5d799539b9 finish voice file async download zmt 2021-07-07 17:46:12 +0800
• a0e2b99460 分页 刘嘉炜 2021-07-07 14:59:21 +0800
• abd8106702 change locker api 刘嘉炜 2021-07-07 11:09:17 +0800
• d8b0f277b2 todo listenVoice zmt 2021-07-06 18:10:40 +0800
• ce647df7be fix order_list orderType 刘嘉炜 2021-07-06 15:03:35 +0800
• f837e0e0e9 add split order 刘嘉炜 2021-07-06 14:47:12 +0800
• 8c4c1dea97 Merge branch 'master' of https://git.ouxuan.net/liujw/ox_zhiNengZhuShou 刘嘉炜 2021-05-28 18:13:18 +0800
• e2be0fde09 Merge branch 'dev' 刘嘉炜 2021-05-28 18:12:56 +0800
• d30cee5625 v1.1.0 formal 刘嘉炜 2021-05-28 18:11:53 +0800
• d45e054e99 fix 使用中 vtest 1.1.0 刘嘉炜 2021-05-28 18:03:42 +0800
• 5c7ca9ea93 merge dev error 刘嘉炜 2021-05-27 19:15:49 +0800
• 657dbafc9b Merge branch 'new51' into dev 张家华 2021-05-26 11:19:16 +0800
• 6280fcdd67 fixed style 张家华 2021-05-26 11:18:42 +0800
• 20a416205e Merge branch 'new51' into dev 张家华 2021-05-26 10:59:27 +0800
• 920691b8d2 style change 张家华 2021-05-26 10:58:47 +0800
• e00f5aac84 Merge branch 'new51' into dev 张家华 2021-05-24 09:48:08 +0800
• 8435510019 little change 张家华 2021-05-24 09:47:31 +0800
• 376d2ee257 Merge branch 'new51' into dev 张家华 2021-05-24 09:33:55 +0800
• 07ce9eb98f add status recover 刘嘉炜 2021-05-21 17:52:53 +0800
• 7286eaeeb3 add write_off all 刘嘉炜 2021-05-21 10:20:37 +0800
• e419a6d346 add api 刘嘉炜 2021-05-20 18:00:53 +0800
• 71d1acf2a1 add api 刘嘉炜 2021-05-19 17:59:57 +0800
• e50e6b073f Merge branch 'authorization' into write_off 刘嘉炜 2021-05-19 17:55:59 +0800
• 6b4e8f9a40 add api getUserProfile 刘嘉炜 2021-05-19 14:20:33 +0800
• c36ac39eb4 add style 刘嘉炜 2021-05-18 17:04:09 +0800
• 5eef9acd50 零售出库增加支付选择 张家华 2021-05-18 10:26:14 +0800
• 170260648f 完成助手约玩订单模块新需求 zmt 2021-05-10 11:37:27 +0800
• 71db6399a1 1.0.8 正式 zmt 2021-05-06 16:37:18 +0800
• 42bf4c1ce2 Merge branch 'dev' zmt 2021-05-06 16:31:51 +0800
• 73b3fc8758 vtest 1.0.8 - 商品，修复，约玩简约版测试 zmt 2021-05-06 11:36:15 +0800
• 4fb46208a8 商家助手约玩订单简约版 zmt 2021-04-30 11:40:19 +0800
• 0732b3f963 pull code by mac && change file zmt 2021-04-29 15:45:09 +0800
• c2211f3dae fix bug 郑锦全 2021-04-29 13:54:31 +0800
• cdd0cc4b49 fix field 郑锦全 2021-04-27 10:46:56 +0800
• 71bcece580 Merge branch 'dev' of https://git.ouxuan.net/APP/ox_zhiNengZhuShou into dev 郑锦全 2021-04-27 10:29:59 +0800
• 475846cf16 fix bug 郑锦全 2021-04-27 10:29:49 +0800
• 2934857026 retail update 张家华 2021-04-23 15:45:43 +0800
• 99e0e3db63 retail fix 张家华 2021-04-23 15:28:40 +0800
• 6d8d46763b fix bug 郑锦全 2021-04-21 15:49:06 +0800
• e1a3f55696 fix order status 郑锦全 2021-04-20 18:06:22 +0800
• 5b0f63063f 增加订单管理权限 郑锦全 2021-04-20 16:57:42 +0800
• 3cee378484 Merge branch 'iteration' of https://git.ouxuan.net/APP/ox_zhiNengZhuShou into iteration 郑锦全 2021-04-20 16:16:20 +0800
• 20f470cdfb add api order 郑锦全 2021-04-20 16:14:49 +0800
• a27123878c 零售列表调整 张家华 2021-04-20 10:20:24 +0800
• 33f27dcd7a Merge branch 'dev' of https://git.ouxuan.net/liujw/ox_zhiNengZhuShou into dev 刘嘉炜 2021-04-19 16:53:49 +0800
• 576104ccc0 add 权限 刘嘉炜 2021-04-19 16:53:37 +0800
• 1fac290b54 update 张家华 2021-04-19 16:05:01 +0800
• 6b72b3bf5f update 张家华 2021-04-19 16:04:24 +0800
• 4b36fcf1cf change index icon 张家华 2021-04-19 14:32:54 +0800
• 72e393c32c Merge branch 'iteration' of https://git.ouxuan.net/APP/ox_zhiNengZhuShou into iteration 郑锦全 2021-04-19 09:37:48 +0800
• ae34e825b7 fix style 郑锦全 2021-04-19 09:37:22 +0800
• 2b9347e6bf 零售接口对接 张家华 2021-04-14 13:30:18 +0800
• 484b2ae3ce cart price check 张家华 2021-03-25 13:27:43 +0800
• f670ba4947 index header z-index 张家华 2021-03-25 09:36:55 +0800
• bbbf2ff245 cart change 张家华 2021-03-22 17:52:03 +0800
• 8760dc0e37 Merge branch 'iteration' of https://git.ouxuan.net/APP/ox_zhiNengZhuShou into iteration 郑锦全 2021-03-22 16:47:52 +0800
• 171041ea39 fix style 郑锦全 2021-03-22 16:47:40 +0800
• 02c42722ae update 张家华 2021-03-22 15:34:54 +0800
• 9b6b5fb7e3 retail update 张家华 2021-03-19 14:37:11 +0800
• 1d264e76fe 修改账户信息 张家华 2021-03-19 13:34:40 +0800
• ef68eca076 新增商品零售模块 unknown 2021-03-19 11:41:50 +0800
• 4657ec005d change style 郑锦全 2021-03-02 14:54:15 +0800
• ed338af408 v1.0.7 formal 刘嘉炜 2021-02-26 17:35:15 +0800
• f9f72cf36d vtest 1.0.7 刘嘉炜 2021-02-23 15:25:01 +0800
• 635e035b65 fix review btn 刘嘉炜 2021-02-01 11:32:05 +0800
• 1c82956165 vtest 1.0.6 刘嘉炜 2021-01-31 18:01:33 +0800
• c7b197e702 v1.0.6 formal 刘嘉炜 2021-01-31 17:58:04 +0800
• 9305d26038 add 授权后跳转首页 刘嘉炜 2021-01-31 17:56:51 +0800
• 235b095693 add login logo 刘嘉炜 2021-01-25 18:08:55 +0800
• 51cd6ef471 v1.0.5 formal 刘嘉炜 2021-01-22 17:43:02 +0800
• 541f9b90fe vtest 1.0.1 刘嘉炜 2021-01-22 17:40:00 +0800
• 242971c1b1 fix all & vtest1.0.1 刘嘉炜 2021-01-22 11:44:04 +0800
• 1bf8f91157 add account login 刘嘉炜 2021-01-21 17:48:48 +0800
• 1e9f3178f2 add login page 刘嘉炜 2021-01-20 11:53:14 +0800
• 0e58c5ba8f change login query 刘嘉炜 2021-01-14 10:13:47 +0800
• 1705c0b6f2 fix v1.0.4 刘嘉炜 2021-01-07 18:06:20 +0800
• 0347c29e7d v1.0.4 刘嘉炜 2021-01-07 18:00:11 +0800
• af2a3f0be2 fix all vtest1.0.4 刘嘉炜 2021-01-07 17:58:40 +0800
• b9e6bc334c 占用优先 刘嘉炜 2021-01-06 20:28:29 +0800