新增积分商城页面

zhiyangdu
1 parent 8620c2a7
Showing 1 changed file with 14 additions and 13 deletions
src/router/index.js
@@ -213,29 +213,30 @@ const router = new Router({
                     }
                 },
                 {
-<<<<<<< HEAD
-                    // 新版积分商城
-                    path: "/pointsMall",
-                    name: "pointsMall",
-                    component: resolve => {
-                        require(["@/pages/pointsMall/pointsMall"], resolve);
-=======
                     // 新版优选库“优选品质优选列表”页面
                     path: "/optimizationList",
                     name: "optimizationList",
                     component: resolve => {
-                        require(["@/pages/optimizationList/optimizationList"], resolve);
->>>>>>> e10075b4c3858b1775d274fd2f1893fc25d266a5
+                        require([
+                            "@/pages/optimizationList/optimizationList"
+                        ], resolve);
                     },
                     meta: {
                         requireAuth: false
                     }
-<<<<<<< HEAD
-                }
-=======
                 },
+                {
+                    // 积分商城首页
+                    path: "/pointsMall",
+                    name: "pointsMall",
+                    component: resolve => {
+                        require(["@/pages/pointsMall/pointsMall"], resolve);
+                    },
+                    meta: {
+                        requireAuth: false
+                    }
+                }
->>>>>>> e10075b4c3858b1775d274fd2f1893fc25d266a5
                 /* 优选和商城页面改版升级页面 结束 */
             ]
         },