Merge branch 'dev' of cloud.wodcloud.com:apaas/apaas-v3-ui into dev

.beagle.yml

 clone:
   git:
     image: registry.cn-qingdao.aliyuncs.com/wod-devops/git:1.4.0
-
+    pull: true
+    dns: 223.5.5.5
 pipeline:
   read-cache:
     image: registry.cn-qingdao.aliyuncs.com/wod-devops/cache:latest

src/App.vue

 <template>
-  <div id="app" :class="{ is_fwgl: isFwgl }">
+  <div id="app">
     <bd-menu class="outmenu"></bd-menu>
     <router-view />
   </div>
@@ -9,11 +9,6 @@
 import bdMenu from "./components/menu";
 export default {
   data: () => ({}),
-  computed: {
-    isFwgl() {
-      return this.$route.name && this.$route.name.indexOf("fwgl") > -1;
-    },
-  },
   components: {
     bdMenu,
   },
@@ -31,15 +26,5 @@ export default {
 }
 #app {
   background-color: #f6f7fb;
-  padding-bottom: 20px;
-}
-</style>
-
-<style>
-.is_fwgl {
-  padding-bottom: 0 !important;
-}
-.is_fwgl .decor {
-  display: none !important;
 }
-</style>
+</style>
\ No newline at end of file

src/pages/fwglList.vue

@@ -15,7 +15,7 @@
         :autoAdd="false"
         :isDialog="true"
         :confirmOptions="confirmOptions"
-        detailsUrl="/servicedetail/"
+        detailsUrl="/fwgl/servicedetail/"
         @primary-edit="editItem"
         @sold-out="soldOutItem"
         :emptyText="emptyText"

src/router/index.js

@@ -54,7 +54,7 @@ export default new Router({
               component: () => import("@/pages/fwglList"),
             },
             {
-              path: "/fwgl/servicedetail",
+              path: "/fwgl/servicedetail/:id",
               name: "servicedetail",
               component: () => import("@/pages/serviceDetail"),
             },