Develop2.0 - #2

Open

Angelvoice wants to merge 119 commits into

Commits on Aug 17, 2018

更新图片
weihua
committed
6ea83ac

Commits on Aug 18, 2018

chushihua
passengerwong
committed
3a91e29
更新common.js和common.scss的文件
 DJCai
committed
7e8317f
coudan
passengerwong
committed
ca62f0e
Merge branch 'develop1.0' of https://github.com/DJCai/MMMai into develop1.0
passengerwong
committed
462535f
one
passengerwong
committed
294d66d
渲染数据
passengerwong
committed
b4c2056
完成品牌大全的主页面,数据渲染与搜索功能
 DJCai
committed
1f920ed
Merge branch 'develop1.0' of https://github.com/DJCai/MMMai into develop1.0
DJCai
committed
c0453cd
two
passengerwong
committed
f8f450a
Merge branches 'develop1.0' and 'develop1.0' of https://github.com/DJCai/MMMai into develop1.0
passengerwong
committed
7d41689
修改app下载
passengerwong
committed
ec566e7
完成品牌排名页面的基本功能
 DJCai
committed
8fa7fbe
完成品牌排行的页面
 DJCai
committed
74eba71
修改了一个bug
DJCai
committed
e28d38f
补充品牌大全的底部部分内容,同时修改了品牌排序页面的一个bug
DJCai
committed
9953d20

Commits on Aug 19, 2018

内容修正
 DJCai
committed
0a272ec
点击返回
passengerwong
committed
218e9be
将头部,搜索框,底部和广告栏部分的样式归并到common.scss中
 DJCai
committed
665b188
返回顶部和细节处理
passengerwong
committed
26a0e92
解决品牌排名中评论中的产品图片与名称的获取
 DJCai
committed
2a2e6c4
修改了比较的js
weihua
committed
bf69899
Merge branch 'develop2.0' of https://github.com/DJCai/MMMai into develop2.0
weihua
committed
33d100c
主体功能完成
passengerwong
committed
15a833c
Merge branch 'develop2.0' of https://github.com/DJCai/MMMai into develop2.0
passengerwong
committed
ae3ba6b
searchbar
passengerwong
committed
7f4c3f3
比较projs
weihua
committed
0bb0d6d
Merge branch 'develop2.0' of https://github.com/DJCai/MMMai into develop2.0
weihua
committed
89445c7
完成登录界面和注册页面
 DJCai
committed
245436e
Merge branch 'develop2.0' of https://github.com/DJCai/MMMai into develop2.0
DJCai
committed
71b96ca
国内折扣和商品详情页
 mishubaby
committed
42d3b7b
增加index页面
tuzeyu
committed
6d3ea2d
Merge branch 'develop2.0' of https://github.com/DJCai/MMMai into develop2.0
tuzeyu
committed
575195f
基本完成
weihua
committed
d61572e
Merge branch 'develop2.0' of https://github.com/DJCai/MMMai into develop2.0
weihua
committed
121fbc9
111
weihua
committed
49924b2
省钱控页面数据渲染完成
 SallyWSY
committed
6e7ef3d
重新上传首页
tuzeyu
committed
31bc606
搜索页
passengerwong
committed
20828c8
Merge branch 'develop2.0' of https://github.com/DJCai/MMMai into develop2.0
tuzeyu
committed
c5d1f0f
重新上传index
tuzeyu
committed
1a0044f
Merge branch 'develop2.0' of https://github.com/DJCai/MMMai into develop2.0
passengerwong
committed
abba8a9
nav 导航页完成
passengerwong
committed
a0bf32a
白菜价页面
 DJCai
committed
1b093c7
Revert "白菜价页面"
DJCai
committed
e5f34e1
Merge branch 'develop2.0' of https://github.com/DJCai/MMMai into develop2.0
DJCai
committed
8d729dd
关于跳转到详情页的修改
 SallyWSY
committed
e4e8d43

Commits on Aug 20, 2018

关于传id跳转到详情页的修改
 SallyWSY
committed
62b21a8
封装搜索功能
 DJCai
committed
e3313b0
Merge branch 'develop2.0' of https://github.com/DJCai/MMMai into develop2.0
DJCai
committed
e355766
移出搜索功能到单独js中
 DJCai
committed
49626a7
8月20 早上
weihua
committed
97823b1
Merge branch 'develop2.0' of https://github.com/DJCai/MMMai into develop2.0
weihua
committed
1c4d4d3
跳帧页面跳转链接
 DJCai
committed
22cfcf0
Merge branch 'develop2.0' of https://github.com/DJCai/MMMai into develop2.0
DJCai
committed
47ff3ec
页面命名
passengerwong
committed
5693d92
省钱控首页命名的修改
 SallyWSY
committed
72f1767
Merge branch 'develop2.0' of https://github.com/DJCai/MMMai into develop2.0
SallyWSY
committed
ecd6a98
修改index.html
tuzeyu
committed
c1f8f20
修改首页
tuzeyu
committed
94fc181
bing
wangwenbing
committed
8576681
Merge branch 'develop2.0' of https://github.com/DJCai/MMMai into develop2.0
wangwenbing
committed
b472ab1
wanglin
wanglin
committed
da861bf
common.js多一个换行的修改
wangwenbing
committed
6165ca7
wanglin
wanglin
committed
ff73e17
Merge branch 'develop2.0' of https://github.com/DJCai/MMMai into develop2.0
wanglin
committed
b259519
把自己的命名修改从主页过来的链接
wangwenbing
committed
8cf7edc
Merge branch 'develop2.0' of https://github.com/DJCai/MMMai into develop2.0
wangwenbing
committed
89ed09c
更改跳到主页
wanglin
committed
cf171f0
Merge branch 'develop2.0' of https://github.com/DJCai/MMMai into develop2.0
wanglin
committed
b9e7731
shengqian
wangwenbing
committed
b2f10e3
修改名字之后
 mishubaby
committed
80678db
分页功能实现测试
 SallyWSY
committed
7f348e4
分页写半
weihua
committed
0502d5c
Merge branch 'develop2.0' of https://github.com/DJCai/MMMai into develop2.0
mishubaby
committed
d101b5a
分页end
weihua
committed
e932d8b
添加图片
 mishubaby
committed
b9fd06e
分页第3次传
weihua
committed
ea75d23
Merge branch 'develop2.0' of https://github.com/DJCai/MMMai into develop2.0
weihua
committed
37abcfe
优化首页
tuzeyu
committed
603e3cd
修改了图片路径
 mishubaby
committed
a31a661
Merge branch 'develop2.0' of https://github.com/DJCai/MMMai into develop2.0
mishubaby
committed
a064ef1
地步返回
weihua
committed
3650d4e
Merge branch 'develop2.0' of https://github.com/DJCai/MMMai into develop2.0
weihua
committed
c36c1fb
白菜价DEMO
hbwml123
committed
904e064
Merge branch 'develop2.0' of https://github.com/DJCai/MMMai into develop2.0
hbwml123
committed
a725391
修改APP下载的导航
 hbwml123
committed
049be94
首页部分productId改成小写i
tuzeyu
committed
c30df48
Merge branch 'develop2.0' of https://github.com/DJCai/MMMai into develop2.0
tuzeyu
committed
f73ff9a
1
passengerwong
committed
fd7306b
底部分页的实现
 SallyWSY
committed
1bbe3de
Merge branch 'develop2.0' of https://github.com/DJCai/MMMai into develop2.0
SallyWSY
committed
77939f9
Merge branch 'develop2.0' of https://github.com/DJCai/MMMai into develop2.0
passengerwong
committed
5fb0d3d
更改首页a标签不跳转
tuzeyu
committed
fa48f63
Merge branch 'develop2.0' of https://github.com/DJCai/MMMai into develop2.0
tuzeyu
committed
0defccc
...
DJCai
committed
370ee24
Revert "..."
DJCai
committed
97307cc
增加图片
 crazyFamily
authored
00848ca
上传图片
 SallyWSY
committed
7d5e42f
Merge branch 'develop2.0' of https://github.com/DJCai/MMMai into develop2.0
SallyWSY
committed
af892be
Merge branch 'develop2.0' of https://github.com/DJCai/MMMai into develop2.0
DJCai
committed
5fcdac4
重新修改图片路径
 mishubaby
committed
b9878f3
Merge branch 'develop2.0' of https://github.com/DJCai/MMMai into develop2.0
DJCai
committed
358329d
11
passengerwong
committed
90cab1c
Merge branch 'develop2.0' of https://github.com/DJCai/MMMai into develop2.0
passengerwong
committed
6caa10c
修改连接路径
 DJCai
committed
42f7dd6
Merge branch 'develop2.0' of https://github.com/DJCai/MMMai into develop2.0
DJCai
committed
b12fbd2
分页bug的修改
 SallyWSY
committed
8bd6a40
Merge branch 'develop2.0' of https://github.com/DJCai/MMMai into develop2.0
SallyWSY
committed
7f27eaa
改变a标签路径
 DJCai
committed
5fa2d9f
Merge branch 'develop2.0' of https://github.com/DJCai/MMMai into develop2.0
DJCai
committed
3544e9c
不要再改图片了
 crazyFamily
authored
720f9a4
终极版本
 mishubaby
committed
3eed8b9
终极大版本:修改日期格式
 mishubaby
committed
11436b3
上下翻页做好了
weihua
committed
3a7a9f4
Merge branch 'develop2.0' of https://github.com/DJCai/MMMai into develop2.0
weihua
committed
452c733
修改好分页
weihua
committed
d0ca475
交任务前完成修改
weihua
committed
e11be83
实现页面之间的跳转
weihua
committed
f8607c9