From 22a394b21b94d4f9a89e3a7ecda6d1e524dd4c8f Mon Sep 17 00:00:00 2001
From: youc <357649470@qq.com>
Date: Wed, 29 Aug 2018 09:38:50 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=A6=96=E9=A1=B5?=
 =?UTF-8?q?=E6=A0=87=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 litemall-wx/pages/index/index.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/litemall-wx/pages/index/index.json b/litemall-wx/pages/index/index.json
index 6731ba36..b1b42c88 100644
--- a/litemall-wx/pages/index/index.json
+++ b/litemall-wx/pages/index/index.json
@@ -1,5 +1,5 @@
 {
- "navigationBarTitleText": "",
+ "navigationBarTitleText": "��ҳ",
  
  "usingComponents": {
   "zan-capsule": "../../lib/zanui-weapp/capsule/index"

From a236984340e7e66b32686957335f07a0b5902f39 Mon Sep 17 00:00:00 2001
From: youc <357649470@qq.com>
Date: Wed, 29 Aug 2018 09:41:27 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=A6=96=E9=A1=B5?=
 =?UTF-8?q?=E6=A0=87=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 litemall-wx/pages/index/index.json | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/litemall-wx/pages/index/index.json b/litemall-wx/pages/index/index.json
index b1b42c88..a0d6cacf 100644
--- a/litemall-wx/pages/index/index.json
+++ b/litemall-wx/pages/index/index.json
@@ -1,6 +1,5 @@
 {
- "navigationBarTitleText": "��ҳ",
- 
+ "navigationBarTitleText": "首页",
  "usingComponents": {
   "zan-capsule": "../../lib/zanui-weapp/capsule/index"
  }

From 0a69977dc4bba154dd2bb64c5800991aa870ebf2 Mon Sep 17 00:00:00 2001
From: youc <357649470@qq.com>
Date: Wed, 29 Aug 2018 13:40:51 +0800
Subject: [PATCH 3/3] fix warning

---
 litemall-admin/src/api/feedback.js | 2 +-
 litemall-admin/src/router/index.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/litemall-admin/src/api/feedback.js b/litemall-admin/src/api/feedback.js
index b5089e69..0eefe7b0 100644
--- a/litemall-admin/src/api/feedback.js
+++ b/litemall-admin/src/api/feedback.js
@@ -38,4 +38,4 @@ export function deleteFeedback(data) {
     method: 'post',
     data
   })
-}
\ No newline at end of file
+}
diff --git a/litemall-admin/src/router/index.js b/litemall-admin/src/router/index.js
index d4fed927..bd75e85a 100644
--- a/litemall-admin/src/router/index.js
+++ b/litemall-admin/src/router/index.js
@@ -66,7 +66,7 @@ export const asyncRouterMap = [
       { path: 'collect', component: _import('user/collect'), name: 'collect', meta: { title: '会员收藏', noCache: true }},
       { path: 'footprint', component: _import('user/footprint'), name: 'footprint', meta: { title: '会员足迹', noCache: true }},
       { path: 'history', component: _import('user/history'), name: 'history', meta: { title: '搜索历史', noCache: true }},
-	  { path: 'feedback', component: _import('user/feedback'), name: 'feedback', meta: { title: '意见反馈', noCache: true }}
+      { path: 'feedback', component: _import('user/feedback'), name: 'feedback', meta: { title: '意见反馈', noCache: true }}
     ]
   },