Merge pull request #1 from linlinjava/master

update

Merge pull request #1 from linlinjava/master
update
b68151cb · Menethil · GitHub · 126d027a · 02679509 · b68151cb
Unverified Commit b68151cb authored Jul 13, 2018 by Menethil Committed by GitHub Jul 13, 2018
--- a/litemall-wx/pages/cart/cart.wxml
+++ b/litemall-wx/pages/cart/cart.wxml
--- a/litemall-wx/pages/catalog/catalog.wxml
+++ b/litemall-wx/pages/catalog/catalog.wxml
--- a/litemall-wx/pages/category/category.wxml
+++ b/litemall-wx/pages/category/category.wxml
--- a/litemall-wx/pages/comment/comment.js
+++ b/litemall-wx/pages/comment/comment.js
--- a/litemall-wx/pages/commentPost/commentPost.js
+++ b/litemall-wx/pages/commentPost/commentPost.js
--- a/litemall-wx/pages/goods/goods.js
+++ b/litemall-wx/pages/goods/goods.js
--- a/litemall-wx/pages/goods/goods.wxml
+++ b/litemall-wx/pages/goods/goods.wxml
--- a/litemall-wx/pages/hotGoods/hotGoods.js
+++ b/litemall-wx/pages/hotGoods/hotGoods.js
--- a/litemall-wx/pages/hotGoods/hotGoods.wxml
+++ b/litemall-wx/pages/hotGoods/hotGoods.wxml
--- a/litemall-wx/pages/index/index.wxml
+++ b/litemall-wx/pages/index/index.wxml
--- a/litemall-wx/pages/index/index.wxss
+++ b/litemall-wx/pages/index/index.wxss
--- a/litemall-wx/pages/newGoods/newGoods.js
+++ b/litemall-wx/pages/newGoods/newGoods.js
--- a/litemall-wx/pages/newGoods/newGoods.wxml
+++ b/litemall-wx/pages/newGoods/newGoods.wxml
--- a/litemall-wx/pages/shopping/addressAdd/addressAdd.js
+++ b/litemall-wx/pages/shopping/addressAdd/addressAdd.js
--- a/litemall-wx/pages/shopping/checkout/checkout.js
+++ b/litemall-wx/pages/shopping/checkout/checkout.js
--- a/litemall-wx/pages/shopping/checkout/checkout.wxml
+++ b/litemall-wx/pages/shopping/checkout/checkout.wxml
--- a/litemall-wx/pages/topic/topic.wxml
+++ b/litemall-wx/pages/topic/topic.wxml
--- a/litemall-wx/pages/topicComment/topicComment.js
+++ b/litemall-wx/pages/topicComment/topicComment.js
--- a/litemall-wx/pages/topicCommentPost/topicCommentPost.js
+++ b/litemall-wx/pages/topicCommentPost/topicCommentPost.js
--- a/litemall-wx/pages/topicCommentPost/topicCommentPost.wxml
+++ b/litemall-wx/pages/topicCommentPost/topicCommentPost.wxml