diff --git a/pageA/login/login.vue b/pageA/login/login.vue
new file mode 100644
index 0000000..48d48ea
--- /dev/null
+++ b/pageA/login/login.vue
@@ -0,0 +1,8 @@
+
+
+
+
+
+
diff --git a/pageA/welcome/welcome.vue b/pageA/welcome/welcome.vue
new file mode 100644
index 0000000..51ffe1a
--- /dev/null
+++ b/pageA/welcome/welcome.vue
@@ -0,0 +1,34 @@
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pages.json b/pages.json
index 4b1a8d6..4bca65c 100644
--- a/pages.json
+++ b/pages.json
@@ -1,5 +1,11 @@
{
"pages": [ //pages数组中第一项表示应用启动页,参考:https://uniapp.dcloud.io/collocation/pages
+ {
+ "path": "pageA/welcome/welcome",
+ "style": {
+ "navigationBarTitleText": "uni-app"
+ }
+ },
{
"path": "pages/index/index",
"style": {
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 29d123e..48cf081 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -1,4 +1,5 @@
+
@@ -26,6 +27,24 @@ export default {
justify-content: center;
}
+<<<<<<< HEAD
+