完成consumer端同步

pages.merchant.json

@@ -1,11 +1,5 @@
-{
+{
   "pages": [
-    {
-      "path": "pages/user/boot",
-      "style": {
-        "navigationBarTitleText": ""
-      }
-    },
     {
       "path": "pages/user/login",
       "style": {
@@ -13,6 +7,12 @@
         "navigationStyle": "custom"
       }
     },
+    {
+      "path": "pages/user/boot",
+      "style": {
+        "navigationBarTitleText": ""
+      }
+    },
     {
       "path": "pages/user/register",
       "style": {
@@ -164,10 +164,22 @@
       }
     }
   ],
+  "subPackages": [],
   "globalStyle": {
     "navigationBarTextStyle": "black",
     "navigationBarTitleText": "mall",
     "navigationBarBackgroundColor": "#FFFFFF",
     "backgroundColor": "#F8F8F8"
+  },
+  "condition": {
+    "current": 0,
+    "list": [
+      {
+        "name": "merchant端",
+        "path": "pages/mall/merchant/index",
+        "query": "role=merchant"
+      }
+    ]
   }
 }
+