consumer模块完成度95%，优化安卓端界面和小程序测试6

pages.json

@@ -69,7 +69,7 @@
       }
     },
     {
-      "path": "pages/mall/consumer/index",
+      "path": "pages/main/index",
       "style": {
         "navigationBarTitleText": "首页",
         "navigationStyle": "custom",
@@ -77,27 +77,28 @@
       }
     },
     {
-      "path": "pages/mall/consumer/category",
+      "path": "pages/main/category",
       "style": {
         "navigationBarTitleText": "分类",
         "navigationStyle": "custom"
       }
     },
     {
-      "path": "pages/mall/consumer/messages",
+      "path": "pages/main/messages",
       "style": {
         "navigationBarTitleText": "消息",
         "enablePullDownRefresh": true
       }
     },
     {
-      "path": "pages/mall/consumer/cart",
+      "path": "pages/main/cart",
       "style": {
-        "navigationBarTitleText": "购物车"
+        "navigationBarTitleText": "购物车",
+        "navigationStyle": "custom"
       }
     },
     {
-      "path": "pages/mall/consumer/profile",
+      "path": "pages/main/profile",
       "style": {
         "navigationBarTitleText": "我的"
       }
@@ -249,24 +250,24 @@
             "navigationBarTitleText": "软件订阅"
           }
         },
-        {
-          "path": "subscription/plan-detail",
-          "style": {
-            "navigationBarTitleText": "订阅详情"
-          }
-        },
+         {
+           "path": "subscription/plan-detail",
+           "style": {
+             "navigationBarTitleText": "订阅详情"
+           }
+         },
         {
           "path": "subscription/subscribe-checkout",
           "style": {
             "navigationBarTitleText": "确认订阅"
           }
         },
-        {
-          "path": "subscription/my-subscriptions",
-          "style": {
-            "navigationBarTitleText": "我的订阅"
-          }
-        },
+         {
+           "path": "subscription/my-subscriptions",
+           "style": {
+             "navigationBarTitleText": "我的订阅"
+           }
+         },
         {
           "path": "subscription/followed-shops",
           "style": {
@@ -645,31 +646,31 @@
     "borderStyle": "black",
     "list": [
       {
-        "pagePath": "pages/mall/consumer/index",
+        "pagePath": "pages/main/index",
         "text": "首页",
         "iconPath": "static/tabbar/home.png",
         "selectedIconPath": "static/tabbar/home-active.png"
       },
       {
-        "pagePath": "pages/mall/consumer/category",
+        "pagePath": "pages/main/category",
         "text": "分类",
         "iconPath": "static/tabbar/category.png",
         "selectedIconPath": "static/tabbar/category-active.png"
       },
       {
-        "pagePath": "pages/mall/consumer/messages",
+        "pagePath": "pages/main/messages",
         "text": "消息",
         "iconPath": "static/tabbar/messages.png",
         "selectedIconPath": "static/tabbar/messages-active.png"
       },
       {
-        "pagePath": "pages/mall/consumer/cart",
+        "pagePath": "pages/main/cart",
         "text": "购物车",
         "iconPath": "static/tabbar/cart.png",
         "selectedIconPath": "static/tabbar/cart-active.png"
       },
       {
-        "pagePath": "pages/mall/consumer/profile",
+        "pagePath": "pages/main/profile",
         "text": "我的",
         "iconPath": "static/tabbar/profile.png",
         "selectedIconPath": "static/tabbar/profile-active.png"