diff --git a/components/merchant_tabber/merchant_tabber.vue b/components/merchant_tabber/merchant_tabber.vue
new file mode 100644
index 0000000..e91d6ac
--- /dev/null
+++ b/components/merchant_tabber/merchant_tabber.vue
@@ -0,0 +1,183 @@
+
+
+
+
+
+
+
+
+
+ {{ item.text }}
+
+
+
+
+
+
+
+
+
+
+
diff --git a/components/mode_switch/mode_switch.vue b/components/mode_switch/mode_switch.vue
new file mode 100644
index 0000000..e8cd602
--- /dev/null
+++ b/components/mode_switch/mode_switch.vue
@@ -0,0 +1,52 @@
+
+
+ {{ label }}
+
+
+
+
+
+
+
diff --git a/pages.json b/pages.json
index 6790840..79e944a 100644
--- a/pages.json
+++ b/pages.json
@@ -101,6 +101,42 @@
"title": "购物车",
"group": "商城"
}
+ },
+ {
+ "path": "pages/merchant/pickupList",
+ "style": {
+ "navigationBarTitleText": "提货清单",
+ "navigationStyle": "custom"
+ },
+ "meta": {
+ "sync": true,
+ "title": "提货清单",
+ "group": "商户"
+ }
+ },
+ {
+ "path": "pages/merchant/storeManage",
+ "style": {
+ "navigationBarTitleText": "网店管理",
+ "navigationStyle": "custom"
+ },
+ "meta": {
+ "sync": true,
+ "title": "网店管理",
+ "group": "商户"
+ }
+ },
+ {
+ "path": "pages/merchant/scanVerify",
+ "style": {
+ "navigationBarTitleText": "扫码核销",
+ "navigationStyle": "custom"
+ },
+ "meta": {
+ "sync": true,
+ "title": "扫码核销",
+ "group": "商户"
+ }
}
],
"subPackages": [
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 5ed23e4..8e451de 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -1,6 +1,9 @@
+
+
+