Merge branches 'master' and 'master' of https://gitee.com/lvYeJu/lane-crawford-3

src/router/index.ts

@@ -7,6 +7,19 @@ const router = createRouter({
       path: '/',
       redirect: '/workshop'
     },
+    {
+      path: '/login',
+      component: () => import('@/views/login/LoginPage.vue')
+    },
+    {
+      path: '/signup',
+      component: () => import('@/views/login/SignupPage.vue')
+    },
+    { path: '/welcome', component: () => import('@/views/login/WelcomePage.vue') },
+    {
+      path: '/stylist',
+      component: () => import('@/views/stylist/index.vue')
+    },
     {
       path: '/workshop',
       name: 'Workshop',
@@ -22,21 +35,29 @@ const router = createRouter({
           path: '/workshop/selectStyle',
           name: 'SelectStyle',
           component: () => import('../views/Workshop/selectStyle.vue')
+        },
+        {
+          path: '/workshop/selectModel',
+          name: 'SelectModel',
+          component: () => import('../views/Workshop/selectModel.vue')
+        },
+        {
+          path: '/workshop/selectModelContinue',
+          name: 'SelectModelContinue',
+          component: () => import('../views/Workshop/selectModelContinue.vue')
+        },
+
+        {
+          path: '/workshop/uploadFace',
+          name: 'uploadFace',
+          component: () => import('../views/Workshop/uploadFace/index.vue')
+        },
+        {
+          path: '/workshop/customize',
+          name: 'customize',
+          component: () => import('../views/Workshop/customize/index.vue')
         }
       ]
-    },
-    {
-      path: '/login',
-      component: () => import('@/views/login/LoginPage.vue')
-    },
-    {
-      path: '/signup',
-      component: () => import('@/views/login/SignupPage.vue')
-    },
-    { path: '/welcome', component: () => import('@/views/login/WelcomePage.vue') },
-    {
-      path:'/stylist',
-      component: () => import('@/views/stylist/index.vue')
     }
   ]
 })