pull

src/router/router-config.js

 import loadable from '@loadable/component'
 
 
-import Index from '@/components/Index';
-import My from '@/components/my';
-import Passport from '@/components/passport';
-import Scholarship from '@/components/scholarship';
+import Index from '@/components/Index'
+import My from '@/components/my'
+import Passport from '@/components/passport'
+import Scholarship from '@/components/scholarship'
 
 const Coupons = loadable(() => import(/* webpackChunkName: 'coupons'*/ '@/components/coupons'))
 const Study = loadable(() => import(/* webpackChunkName: 'study'*/'@/components/study'))
@@ -31,6 +31,8 @@ const CampTest = loadable(() => import(/* webpackChunkName: 'Classify'*/'@/compo
 const CampResolve = loadable(() => import(/* webpackChunkName: 'Classify'*/'@/components/video/camp/campResolve'))
 const ShareCourse = loadable(() => import(/* webpackChunkName: 'ShareCourse'*/'@/components/ShareCourse/index'))
 const Country = loadable(() => import(/* webpackChunkName: 'Country' */'@/components/country/index'))
+const ExpandCallback = loadable(() => import('@/components/expand/callback'))
+const ExpandShare = loadable(() => import('@/components/expand/share'))
 export default [
     {
         path: '/',
@@ -169,6 +171,7 @@ export default [
         path: '/aist-share',
         component: loadable(() => import(/* webpackChunkName: 'aist-share'*/'@/components/share-page/aist-share'))
     },
+<<<<<<< HEAD
     {
         path: '/blessingRank',
         component: loadable(() => import(/* webpackChunkName: 'blessing-rank' */'@/components/blessingRank/index'))
@@ -180,5 +183,31 @@ export default [
     {
         path: '/prize-winner-list',
         component: loadable(() => import(/* webpackChunkName: 'prize-winner-list' */'@/components/activity/prize-winner-list'))
+=======
+    //定金订单页面
+    {
+        path: '/deposit-order',
+        component: loadable(() => import(/* webpackChunkName: 'deposit-order' */ '@components/order/deposit/deposit-order'))
+    },
+    //定金支付页面
+    {
+        path: '/deposit-pay-order',
+        component: loadable(() => import(/* webpackChunkName: 'deposit-pay-order' */ '@components/order/deposit/deposit-pay-order'))
+    },
+    //尾款支付页面
+    {
+        path: '/final-deposit-order',
+        component: loadable(() => import(/* webpackChunkName: 'deposit-pay-order' */ '@components/order/deposit/final-order'))
+    },
+    // 定金支付之后
+    {
+        path: '/expand/callback',
+        component: ExpandCallback
+    },
+    // 定金-邀请好友助力
+    {
+        path: '/expand/index',
+        component: ExpandShare
+>>>>>>> 8347ddd690a7fd9ee47bd9b74cc662e453035ff2
     },
 ]