Merge branch 'dev/v1.2.16_wmh' of jianyu/jy-docs into feature/v1.2.16

jydocs-pc/src/App.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="docs-app">
+  <div :class="{'docs-app':true,'in-app': inIframe}">
     <div class="docs-app-main">
       <router-view></router-view>
     </div>
@@ -12,6 +12,7 @@ export default {
   components: {},
   data () {
     return {
+      inIframe: false,
       cashViews: [],
       links: [
         {
@@ -39,6 +40,9 @@ export default {
   },
   created () {
     this.getMemberInfo()
+    if (window.goTemplateData && window.goTemplateData.inIframe) { // 在工作台内
+      this.inIframe = true
+    }
   },
   methods: {
     ...mapActions({
@@ -59,4 +63,13 @@ export default {
     background-color: #fff;
   }
 }
+.in-app{
+  width: 100%;
+  min-width: 1012px;
+  .docs-app-main{
+        width: auto!important;
+        min-width: auto!important;
+      }
+
+}
 </style>

jydocs-pc/src/views/Home.vue

@@ -725,4 +725,17 @@ export default {
         }
       }
     }
+    .in-app{
+      .top-search-group{
+        height: 286px;
+      }
+      .word-recommend-ad-list{
+        width: 24%!important;
+      }
+      .pages--home{
+        padding-left: 18px;
+        padding-right: 18px;
+      }
+
+    }
 </style>

jydocs-pc/src/views/UserCollections.vue

@@ -204,4 +204,16 @@ export default {
     }
   }
 }
+.in-app{
+  .user-d-list{
+    ::v-deep{
+      .docs-card{
+        width: auto!important;
+      }
+    }
+  }
+  .user-collections{
+    padding: 0 18px;
+  }
+}
 </style>

jydocs-pc/src/views/UserDocs.vue

@@ -399,4 +399,17 @@ export default {
     }
   }
 }
+.in-app{
+  .user-d-list{
+    ::v-deep{
+      .docs-card{
+        width: auto!important;
+        box-sizing: border-box!important;
+      }
+    }
+  }
+  .user-docs{
+    padding: 0 18px;
+  }
+}
 </style>