Commit Graph

Select branches

Hide Pull Requests

cmx

gyh

lxb

master

qxf

xbx

zhy

zmr

#1

#10

#100

#101

#102

#103

#104

#105

#106

#107

#108

#109

#11

#110

#111

#112

#113

#114

#115

#116

#12

#13

#14

#15

#16

#17

#18

#19

#2

#20

#21

#22

#23

#24

#25

#26

#27

#28

#29

#3

#30

#31

#32

#33

#34

#35

#36

#37

#38

#39

#4

#40

#41

#42

#43

#44

#45

#46

#47

#48

#49

#5

#50

#51

#52

#53

#54

#55

#56

#57

#58

#59

#6

#60

#61

#62

#63

#64

#65

#66

#67

#68

#69

#7

#70

#71

#72

#73

#74

#75

#76

#77

#78

#79

#8

#80

#81

#82

#83

#84

#85

#86

#87

#88

#89

#9

#90

#91

#92

#93

#94

#95

#96

#97

#98

#99

Mono Color

• f58cc207c4 Merge branch 'master' into xbx luyuan 2020-08-12 15:02:41 +0800
• 192bd462d4
  
  修改了图片 luyuan 2020-08-12 15:01:25 +0800
• efde545104 Merge pull request '更换图片' (#41) from xbx into master luyuan 2020-08-12 11:34:02 +0800
• b1e5b24319
  
  更换图片 luyuan 2020-08-12 11:31:57 +0800
• 2ea72995a9 Merge pull request 'fixed bug' (#40) from cmx into master cmx 2020-08-11 20:39:12 +0800
• 26c2e044dc fixed bug cmxdd 2020-08-11 20:37:54 +0800
• 5500dc9f73 Merge pull request 'xbx' (#39) from xbx into master luyuan 2020-08-11 18:28:33 +0800
• d97b749a0a
  
  文本 luyuan 2020-08-11 18:27:31 +0800
• cf76518bc9
  
  time luyuan 2020-08-11 14:31:45 +0800
• 8d7e4b2ce4
  
  消息 luyuan 2020-08-11 11:25:44 +0800
• 7bfce17816 Merge pull request 'fixed bug adout publish shop' (#38) from cmx into master cmx 2020-08-11 09:41:52 +0800
• 7cf5577cb0 fixed bug adout publish shop cmxdd 2020-08-11 09:41:12 +0800
• e33e07178d Merge pull request 'cmx' (#37) from cmx into master cmx 2020-08-10 20:26:57 +0800
• 9fac4e8a2e fixed bug adout shop cmxdd 2020-08-10 20:24:58 +0800
• e223fd5ff9 Merge branch 'master' of http://git.luyuan.tk/luyuan/demingshangjia into cmx cmxdd 2020-08-10 19:06:34 +0800
• d7c6625416 Merge pull request 'GDPAO' (#36) from gyh into master gyh 2020-08-10 19:04:54 +0800
• 0a8f2f815d GDPAO Gdpao 2020-08-10 19:03:44 +0800
• 42a08e07ba Merge pull request '防止多次点击' (#35) from xbx into master luyuan 2020-08-10 17:38:51 +0800
• 4e350f4dd0 Merge branch 'master' into xbx luyuan 2020-08-10 17:38:46 +0800
• e946b98abf
  
  防止多次点击 luyuan 2020-08-10 17:31:56 +0800
• 2759972de6 Merge branch 'master' of http://git.luyuan.tk/luyuan/demingshangjia into cmx cmxdd 2020-08-10 16:55:34 +0800
• bee3ab9fba Merge pull request 'xbx' (#34) from xbx into master luyuan 2020-08-10 16:48:34 +0800
• a318ea9f84
  
  Merge branch 'master' of http://git.luyuan.tk/luyuan/demingshangjia into xbx luyuan 2020-08-10 16:47:52 +0800
• 3eaee9009a
  
  聊天 luyuan 2020-08-10 16:47:27 +0800
• 2ab2d1c38e fixed bug cmxdd 2020-08-10 15:55:21 +0800
• d8840edb30 Merge pull request 'gdpao' (#33) from gyh into master gyh 2020-08-10 14:48:10 +0800
• 1d98624753 gdpao Gdpao 2020-08-10 14:47:20 +0800
• 75a4bbedbe
  
  Merge branch 'master' of http://git.luyuan.tk/luyuan/demingshangjia into xbx luyuan 2020-08-10 14:45:35 +0800
• d4a9b38f99 Merge pull request 'cmx' (#32) from cmx into master cmx 2020-08-10 12:08:34 +0800
• 3b9e429c80 Merge branch 'cmx' of http://git.luyuan.tk/luyuan/demingshangjia into cmx cmxdd 2020-08-10 12:07:30 +0800
• a9d4708d2c fixe bug about image cmxdd 2020-08-10 12:04:09 +0800
• 7206d00afc Merge pull request 'master' (#31) from master into cmx cmx 2020-08-10 11:32:18 +0800
• 798f499263 Merge pull request 'cmx' (#30) from cmx into master cmx 2020-08-10 11:31:51 +0800
• 64da585bd7 add login out cmxdd 2020-08-10 11:31:03 +0800
• 959afc776a fixed bg adout login cmxdd 2020-08-10 11:27:06 +0800
• f89803cf9b
  
  消息 luyuan 2020-08-10 10:41:20 +0800
• 795726bdb8 Merge pull request 'cmx' (#29) from cmx into master cmx 2020-08-10 10:25:18 +0800
• de2b7fe26d uopdate about conflict cmxdd 2020-08-10 10:24:36 +0800
• a0e780d05b update adout color of tag cmxdd 2020-08-10 10:01:10 +0800
• 0b5fa511bf update adout tag color cmxdd 2020-08-10 09:56:01 +0800
• a1cba0a7fd Merge pull request 'meiyan' (#26) from xbx into master luyuan 2020-08-09 18:37:34 +0800
• 1b03d1be7e Merge branch 'master' into xbx luyuan 2020-08-09 18:37:26 +0800
• 55695f164b
  
  meiyan luyuan 2020-08-09 18:36:37 +0800
• 084826e144 Merge pull request 'xbx' (#25) from xbx into master luyuan 2020-08-08 18:35:18 +0800
• ab4b418c8f Merge branch 'master' into xbx luyuan 2020-08-08 18:35:11 +0800
• 56eb7e551c
  
  Merge branch 'xbx' of http://git.luyuan.tk/luyuan/demingshangjia into xbx luyuan 2020-08-08 18:34:45 +0800
• 0279128637
  
  解决了不出现的问题 luyuan 2020-08-08 18:34:43 +0800
• d78b787967 Merge pull request 'xbx' (#24) from xbx into master luyuan 2020-08-08 17:30:06 +0800
• 242f22d2ce Merge branch 'master' into xbx luyuan 2020-08-08 17:29:58 +0800
• 427442f50a
  
  关闭 luyuan 2020-08-08 17:28:34 +0800
• 641cb4a4a2
  
  选中颜色 luyuan 2020-08-08 16:53:44 +0800
• 78d60bd9ac
  
  消息提示 luyuan 2020-08-08 16:32:37 +0800
• 217e8b51ed
  
  临时测试 luyuan 2020-08-08 15:17:36 +0800
• 74a9778a62
  
  最初版本 合并 luyuan 2020-08-08 15:09:56 +0800
• e83b5b1311 Merge pull request 'xbx' (#23) from xbx into master luyuan 2020-08-07 18:03:55 +0800
• ceb2b8084d
  
  聊天完成 luyuan 2020-08-07 16:55:00 +0800
• 4453742f3c
  
  删除聊天搜索 luyuan 2020-08-07 15:07:45 +0800
• 93c412a515
  
  聊天完成 luyuan 2020-08-07 14:44:11 +0800
• 71a25fd11d fixed bug cmxdd 2020-08-06 17:02:11 +0800
• 6ec2318d0c update photo adout publish cmxdd 2020-08-06 14:40:11 +0800
• 04a4ed523f update bug cmxdd 2020-08-06 11:48:45 +0800
• e67e2fe701 update code adout order cmxdd 2020-08-06 10:04:38 +0800
• 7d82d8d156 Merge pull request 'Merge pull request 'cmx' (#21) from cmx into master' (#22) from master into cmx cmx 2020-08-05 20:12:03 +0800
• c1a3a11781 Merge pull request 'cmx' (#21) from cmx into master zmr cmx 2020-08-05 20:11:36 +0800
• 80e3a721a1 formatted style cmxdd 2020-08-05 20:10:55 +0800
• 31474f482f update api cmxdd 2020-08-05 20:03:53 +0800
• df1bad0a31 update other api cmxdd 2020-08-05 17:42:06 +0800
• ec2bbcdc29 Merge pull request 'master' (#20) from master into cmx cmx 2020-08-05 09:16:39 +0800
• e9f0b1ba78 Merge pull request 'cmx' (#19) from cmx into master cmx 2020-08-05 09:16:07 +0800
• 61756ac875 update publish cmxdd 2020-08-05 09:15:02 +0800
• c5e16abbc2 Merge pull request 'xbx' (#18) from xbx into master luyuan 2020-08-03 17:44:23 +0800
• 2d7ed292c0
  
  Merge branch 'xbx' of http://git.luyuan.tk/luyuan/demingshangjia into xbx luyuan 2020-08-03 17:43:01 +0800
• 30451e2767
  
  宽度 luyuan 2020-08-03 17:42:58 +0800
• cde4e7db87 Merge pull request '直播' (#17) from xbx into master luyuan 2020-08-03 16:51:03 +0800
• 59df1ed10f Merge branch 'master' into xbx luyuan 2020-08-03 16:50:56 +0800
• 385653d391
  
  直播 luyuan 2020-08-03 16:47:46 +0800
• 3e45c9350a 图文视频发布，文章选择删除逻辑没有处理完，需要继续处理 cmxdd 2020-07-31 10:14:46 +0800
• 2ed7b6798b Merge pull request 'master' (#16) from master into cmx cmx 2020-07-31 08:33:13 +0800
• f6e4562ce2 Merge pull request 'cmx' (#15) from cmx into master cmx 2020-07-30 19:52:16 +0800
• 22ea59f5c5 update about api cmxdd 2020-07-30 19:49:12 +0800
• b9e15c1b02 Merge pull request 'xbx' (#14) from xbx into master luyuan 2020-07-30 15:56:03 +0800
• 5520e7ab7c
  
  添加进度条 luyuan 2020-07-30 15:55:16 +0800
• 1d9edefd7f
  
  直播完成 luyuan 2020-07-30 15:54:32 +0800
• 5094efd41e fixed v-toast cmxdd 2020-07-30 10:12:27 +0800
• 70e848cbbb update api abput mine cmxdd 2020-07-30 09:41:08 +0800
• b605f68e72
  
  Merge branch 'master' of http://git.luyuan.tk/luyuan/demingshangjia into xbx luyuan 2020-07-30 09:33:13 +0800
• 2525db391c Merge pull request 'update api' (#13) from cmx into master luyuan 2020-07-30 09:32:16 +0800
• dbffca53c8 Merge branch 'master' into cmx luyuan 2020-07-30 09:32:11 +0800
• 519ec0abe8
  
  直播修改 luyuan 2020-07-30 08:46:35 +0800
• 243e1f93bd update api cmxdd 2020-07-29 20:35:33 +0800
• 74fbd629d6
  
  Merge branch 'master' of http://git.luyuan.tk/luyuan/demingshangjia into xbx luyuan 2020-07-29 15:28:31 +0800
• e71a43eb85 Merge pull request 'cmx' (#12) from cmx into master cmx 2020-07-29 15:26:56 +0800
• fef56d1b52 update two login style cmxdd 2020-07-29 15:21:40 +0800
• cc7a293e18 update cmxdd 2020-07-29 10:42:37 +0800
• 8660e95d02 test cmxdd 2020-07-29 10:40:55 +0800
• 96adf9e6a9
  
  修正了错误弹窗 luyuan 2020-07-29 09:37:59 +0800
• 742952453c 1 lxb lxb 2020-07-27 08:58:46 +0800
• 7245d83dcd Merge pull request 'xbx' (#11) from xbx into master luyuan 2020-07-25 14:54:05 +0800
• 49e80c48c0
  
  引入融云 luyuan 2020-07-25 14:53:19 +0800
• 7b8ddc734c
  
  直播选择商品 luyuan 2020-07-25 08:57:32 +0800