Merge branch 'guang' into installment
# Conflicts: # js/App.js
Showing
68 changed files
with
4738 additions
and
13 deletions
Too many changes to show.
To preserve performance only 68 of 68+ files are displayed.
js/common/utils/helper.js
0 → 100644
js/common/utils/urlHandler.js
0 → 100644
js/guang/Guang.js
0 → 100644
js/guang/components/detail/Detail.js
0 → 100644
js/guang/components/detail/DetailBrand.js
0 → 100644
js/guang/components/detail/DetailText.js
0 → 100644
js/guang/components/detail/GoodsCell.js
0 → 100644
js/guang/components/detail/GoodsGroupList.js
0 → 100644
js/guang/components/detail/Header.js
0 → 100644
js/guang/components/detail/MoreLink.js
0 → 100644
js/guang/components/detail/OtherArticle.js
0 → 100644
js/guang/components/detail/SingleImage.js
0 → 100644
js/guang/components/detail/SmallPic.js
0 → 100644
js/guang/components/detail/Tags.js
0 → 100644
js/guang/components/detail/Weixin.js
0 → 100644
js/guang/components/list/HeaderCell.js
0 → 100644
js/guang/components/list/List.js
0 → 100644
js/guang/components/list/ListCell.js
0 → 100644
js/guang/constants/actionTypes.js
0 → 100644
js/guang/containers/DetailContainer.js
0 → 100644
js/guang/containers/ListContainer.js
0 → 100644
js/guang/image/chaopin_icon@2x.png
0 → 100755

2.47 KB
js/guang/image/chaopin_icon@3x.png
0 → 100755

5.49 KB
js/guang/image/chaoren_icon@2x.png
0 → 100755

2.61 KB
js/guang/image/chaoren_icon@3x.png
0 → 100755

5.48 KB
js/guang/image/community_enter_normal@2x.png
0 → 100644

561 Bytes
js/guang/image/community_enter_normal@3x.png
0 → 100644

1.34 KB
js/guang/image/dapei_icon@2x.png
0 → 100755

2.59 KB
js/guang/image/dapei_icon@3x.png
0 → 100755

5.59 KB
js/guang/image/global_arrow_up@2x.png
0 → 100644

1.39 KB
js/guang/image/huati_icon@2x.png
0 → 100755

2.6 KB
js/guang/image/huati_icon@3x.png
0 → 100755

5.48 KB
js/guang/image/sc_icon@2x.png
0 → 100755

1.36 KB
js/guang/image/sc_icon@3x.png
0 → 100755

1.89 KB

3.61 KB

4.2 KB
js/guang/image/shared_view_icon@2x.png
0 → 100644

3.62 KB
js/guang/image/shared_view_icon@3x.png
0 → 100644

4.17 KB
js/guang/image/time_icon@2x.png
0 → 100644

1.24 KB
js/guang/image/time_icon@3x.png
0 → 100644

1.37 KB
js/guang/image/wsc_icon@2x.png
0 → 100755

1.36 KB
js/guang/image/wsc_icon@3x.png
0 → 100755

1.89 KB
js/guang/image/xiaotieshi_icon@2x.png
0 → 100755

2.63 KB
js/guang/image/xiaotieshi_icon@3x.png
0 → 100755

5.51 KB
js/guang/image/zuanti_icon@2x.png
0 → 100755

2.68 KB
js/guang/image/zuanti_icon@3x.png
0 → 100755

3.66 KB
js/guang/reducers/app/appActions.js
0 → 100755
js/guang/reducers/app/appInitialState.js
0 → 100755
js/guang/reducers/app/appReducer.js
0 → 100755
js/guang/reducers/detail/detailActions.js
0 → 100644
js/guang/reducers/detail/detailReducer.js
0 → 100644
js/guang/reducers/index.js
0 → 100644
js/guang/reducers/list/listActions.js
0 → 100644
js/guang/reducers/list/listInitialState.js
0 → 100755
js/guang/reducers/list/listReducer.js
0 → 100644
js/guang/services/DetailService.js
0 → 100644
js/guang/services/ListService.js
0 → 100644
js/guang/store/configureStore.js
0 → 100644
js/plustar/components/detail/BrandIntro.js
0 → 100644
js/plustar/components/detail/Detail.js
0 → 100644
js/plustar/components/detail/NewArrival.js
0 → 100644
-
Please register or login to post a comment