demo测试提交

src/pages.json

@@ -74,6 +74,13 @@
         "navigationStyle": "custom"
       }
     },
+	{
+	  "path": "pages/merchant/testPage",
+	  "style": {
+	    "navigationBarTitleText": "店铺",
+	    "navigationStyle": "custom"
+	  }
+	},
     {
       "path": "pages/login/register",
       "style": {

src/pages/merchant/testPage.vue

@@ -0,0 +1,11 @@
+<template>
+	<view class="">
+		13123
+	</view>
+</template>
+
+<script>
+</script>
+
+<style>
+</style>