Commit Graph

223 Commits

Author SHA1 Message Date
Gdpao
c2346375c8 gdpaoup 2020-08-15 19:14:12 +08:00
95c7f10f2d Merge pull request '店铺搜索' (#215) from xbx into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/215
2020-08-15 19:13:35 +08:00
c13d87a07f Merge pull request 'xbx' (#214) from xbx into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/214
2020-08-15 19:07:50 +08:00
33e8942180
店铺搜索 2020-08-15 19:04:18 +08:00
97676d75fb 达人列表 8.15 2020-08-15 18:32:46 +08:00
94dc78555a
跳转直播 2020-08-15 18:03:52 +08:00
176501939d
修改状态 2020-08-15 17:59:56 +08:00
df52535848 mine concerns 8.15 2020-08-15 17:16:11 +08:00
d79b0c5da7 goods details store route 8.14 2020-08-14 20:45:11 +08:00
gyh
da21482a81 Merge pull request 'gdpao_up' (#205) from gyh into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/205
2020-08-14 19:50:59 +08:00
Gdpao
9158f27afb gdpao_up 2020-08-14 19:49:57 +08:00
cb2e91f65a update uview 8.14 2020-08-14 17:17:16 +08:00
b266c9c775 goods default spec 8.14 2020-08-14 15:46:43 +08:00
f0c2b00a02 Merge pull request 'goods details spec 8.14' (#196) from zhy into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/196
2020-08-14 14:04:41 +08:00
9f58e1c7a2 goods details spec 8.14 2020-08-14 14:04:16 +08:00
gyh
cd0e8bbf9e Merge pull request 'gdpaoup' (#195) from gyh into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/195
2020-08-14 11:35:04 +08:00
Gdpao
ce1a8d6256 gdpaoup 2020-08-14 11:33:57 +08:00
1c3ed37983
替换了名字 2020-08-14 10:07:33 +08:00
bc2731f1f9
红点 2020-08-14 10:00:27 +08:00
Gdpao
137279b774 gdpao 2020-08-13 19:41:46 +08:00
gyh
459e7fad0f Merge pull request 'gdpao' (#178) from gyh into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/178
2020-08-13 16:20:00 +08:00
Gdpao
e8ae43c726 gdpao 2020-08-13 16:18:39 +08:00
e3c548c9b0 Merge pull request 'store article 8.13' (#174) from zhy into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/174
2020-08-13 15:41:34 +08:00
2811bf31cd store article 8.13 2020-08-13 15:41:03 +08:00
4413250c40 Merge pull request 'xbx' (#173) from xbx into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/173
2020-08-13 15:38:48 +08:00
d604351cf3
分也 2020-08-13 15:37:59 +08:00
1a3b39f31e
滑动到顶部 2020-08-13 15:06:49 +08:00
87e5515b98
高度修改 2020-08-13 15:02:00 +08:00
213a7fb9ff
搜索分也 2020-08-13 14:58:04 +08:00
1936105b1b Merge pull request 'store 8.13' (#170) from zhy into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/170
2020-08-13 11:55:13 +08:00
02639fc9e1 store 8.13 2020-08-13 11:54:44 +08:00
eb886368e9
Merge branch 'master' of http://git.luyuan.tk/luyuan/deming into xbx 2020-08-13 10:09:49 +08:00
e55aa62bcc
一部分完成 2020-08-13 10:04:50 +08:00
gyh
f9a2ada1d3 Merge pull request 'gdpaoup' (#167) from gyh into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/167
2020-08-12 22:01:05 +08:00
Gdpao
6d4d8c5675 gdpaoup 2020-08-12 22:00:01 +08:00
c03fff99e0 fixing bug 8.12 2020-08-12 18:38:14 +08:00
gyh
529325e203 Merge pull request 'GDPAO' (#164) from gyh into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/164
2020-08-12 15:36:55 +08:00
Gdpao
22812469a8 GDPAO 2020-08-12 15:35:47 +08:00
a6907f3f69 Merge pull request 'update goods price 8.12' (#163) from zhy into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/163
2020-08-12 15:24:54 +08:00
a871e050f6 update goods price 8.12 2020-08-12 15:24:13 +08:00
ab4e50a9ae
Merge branch 'master' of http://git.luyuan.tk/luyuan/deming into xbx 2020-08-12 11:33:34 +08:00
d8d3434988 show price 8.12 2020-08-12 10:16:14 +08:00
d19771b182 show price 8.12 2020-08-12 10:10:59 +08:00
a45db4afbf
赋值page1 2020-08-12 09:32:02 +08:00
gyh
1db45d40a7 Merge pull request 'gdpaoup' (#157) from gyh into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/157
2020-08-11 22:18:08 +08:00
Gdpao
ef79718190 gdpaoup 2020-08-11 22:15:58 +08:00
Niujiawei
23b2b11bc8 2020.08.10 2020-08-11 21:47:28 +08:00
Niujiawei
21d3201c4b 2020.08.10 2020-08-11 21:18:34 +08:00
91ca2fdd19 Merge pull request 'xbx' (#156) from xbx into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/156
2020-08-11 18:28:08 +08:00
0e7139bc16
红点 这找曾 2020-08-11 18:27:19 +08:00
523dadd55d fixing bug 8.11 2020-08-11 18:24:56 +08:00
693048f1ab
Merge branch 'master' of http://git.luyuan.tk/luyuan/deming into xbx 2020-08-11 16:03:48 +08:00
f9fa80665b
默认 2020-08-11 16:03:12 +08:00
9a0dc4c6d1 Merge branch 'master' of http://git.luyuan.tk/luyuan/deming into zhy 2020-08-11 15:40:53 +08:00
1ef4db7dc4 fixing bug 8.11 2020-08-11 15:39:56 +08:00
37d8ab7a2b fixing bug 8.11 2020-08-11 15:38:43 +08:00
Gdpao
703689d272 gdpaomg1 2020-08-11 11:12:32 +08:00
Gdpao
b3a7b2d032 Merge branch 'master' of http://git.luyuan.tk/luyuan/deming into gyh 2020-08-11 10:36:18 +08:00
Gdpao
b34ac35821 gdpaoup 2020-08-11 10:35:01 +08:00
def8f0cf1b Merge pull request 'xbx' (#151) from xbx into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/151
2020-08-11 10:26:19 +08:00
c01470b52d fixing bug 8.11 2020-08-11 10:23:04 +08:00
Gdpao
e1c908152a gdpao 2020-08-11 10:04:25 +08:00
Gdpao
aad2bca5c6 gdpao 2020-08-11 10:00:06 +08:00
4739ef71a9 fixed bug 8.11 2020-08-11 09:46:05 +08:00
a22b3fba71
图片 2020-08-11 09:36:03 +08:00
gyh
52bce327cc Merge pull request 'gdpaoup' (#145) from gyh into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/145
2020-08-10 19:08:19 +08:00
Gdpao
74fcc50696 gdpaoup 2020-08-10 19:06:47 +08:00
33b0137c06 Merge pull request 'zhy' (#144) from zhy into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/144
2020-08-10 17:47:31 +08:00
8c3121d5ed new member 8.9 2020-08-10 17:38:54 +08:00
8df5bc2701
状态 2020-08-10 17:30:41 +08:00
0c8e81f484
跳转提示 2020-08-10 17:03:15 +08:00
Gdpao
2e95172a75 upct 2020-08-09 19:11:12 +08:00
Gdpao
234f11eeef gdpao 2020-08-09 19:08:12 +08:00
520fa5497c serach input 8.9 2020-08-09 19:06:54 +08:00
9a4e4f5efe Merge pull request 'bug 8.9' (#140) from zhy into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/140
2020-08-09 18:40:07 +08:00
9b93b6a5a9 bug 8.9 2020-08-09 18:39:35 +08:00
b9b9a8e829
搜索完成 2020-08-09 18:29:36 +08:00
d00b4a75ac Merge pull request 'specil 8.9' (#138) from zhy into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/138
2020-08-09 14:24:30 +08:00
9631e9f827 specil 8.9 2020-08-09 14:23:59 +08:00
gyh
097f7e3cba Merge pull request 'gdpao' (#137) from gyh into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/137
2020-08-09 11:33:25 +08:00
Gdpao
fe8af80983 gdpao 2020-08-09 11:31:47 +08:00
228e34d8fc spec 8.9 2020-08-09 11:27:15 +08:00
cef9296a78 spike time 8.8 2020-08-08 18:15:07 +08:00
02702bc447 group buy 8.8 2020-08-08 12:07:50 +08:00
Gdpao
0290189205 gdpaomg 2020-08-07 19:59:51 +08:00
Gdpao
502e020000 gdpao 2020-08-07 19:56:47 +08:00
6bf4fdc7e3
Merge branch 'master' of http://git.luyuan.tk/luyuan/deming into xbx 2020-08-07 18:01:40 +08:00
9d3f8da629 rewrite tab swiper 8.7 2020-08-07 17:34:59 +08:00
93dbdca573
Merge branch 'master' of http://git.luyuan.tk/luyuan/deming into xbx 2020-08-07 17:10:29 +08:00
a088c895d2 collect 8.7 2020-08-07 11:59:08 +08:00
fc86ad2579
Merge branch 'master' of http://git.luyuan.tk/luyuan/deming into xbx 2020-08-07 11:41:03 +08:00
eb0d648f6a
完成 2020-08-07 11:40:13 +08:00
Gdpao
2afd55f79e gdpaomg 2020-08-06 20:46:40 +08:00
Gdpao
090b7cc753 gdpaoup 2020-08-06 20:42:03 +08:00
1a1a0de460 upgrade 8.6 2020-08-06 17:52:25 +08:00
8bf42a75dd Merge branch 'master' of http://git.luyuan.tk/luyuan/deming into zhy 2020-08-06 10:50:11 +08:00
2c6cdbead9
Merge branch 'zhy' of http://git.luyuan.tk/luyuan/deming into xbx 2020-08-06 10:48:46 +08:00
2cb8f90281 refund 8.6 2020-08-06 10:48:21 +08:00
2a8ee65a94
Merge branch 'master' of http://git.luyuan.tk/luyuan/deming into xbx 2020-08-06 10:45:18 +08:00
9872770472
Merge branch 'zmr' of http://git.luyuan.tk/luyuan/deming into xbx 2020-08-06 10:45:03 +08:00