Merge branch 'feature/v1.0.29' of https://jygit.jydev.jianyu360.cn/jianyu/web into feature/v1.0.29

apps/bigmember_pc/src/views/article-content/components/RecommendCustomers.vue

@@ -32,6 +32,8 @@ const getListData = computed(() => {
   const result = customerList.value
   if (result.length > 0) {
     getListStatus(result)
+  } else {
+    that.$emit('doHide')
   }
   return result
 })

apps/bigmember_pc/src/views/article-content/components/RecommendServesCard.vue

@@ -80,7 +80,7 @@ const props = defineProps({
     margin-right: 0;
   }
   margin: 16px 8px 0 8px;
-  width: 442px;
+  width: calc(50% - 8px);
   min-height: 178px;
   overflow: hidden;
   border-radius: 8px;

apps/bigmember_pc/src/views/article-content/pages/Article.vue

@@ -444,26 +444,24 @@ const canShowMask = computed(() => {
 .article-page-container.v-w1200 {
   margin-top: 32px;
 }
-</style>
-<style lang="scss" scoped>
-.article-page-container {
-  ::v-deep {
-    .content-container {
-      &.calc {
-        .content-main {
-          display: block;
-          width: calc(100% - 200px);
-          margin: 0 auto;
-        }
+.in-app .article-page-container.v-w1200 {
+  .content-container {
+    &.calc {
+      .content-main {
+        display: block;
+        width: calc(100% - 200px);
+        margin: 0 auto;
       }
+    }
 
-      .content-right {
-        width: 200px;
-        margin-left: 16px;
-      }
+    .content-right {
+      width: 200px;
+      margin-left: 16px;
     }
   }
 }
+</style>
+<style lang="scss" scoped>
 .article-content-footer-container {
   ::v-deep {
     .adsense {
@@ -587,6 +585,10 @@ const canShowMask = computed(() => {
         tr td {
           border: 1px solid #ebebeb;
           padding: 10px;
+          &:empty {
+            border-width: 0;
+            padding: 0;
+          }
         }
       }
     }

data/data-models/modules/article/transform/summary2.js

@@ -107,6 +107,9 @@ class SummaryModel extends BaseModel {
 
   tranSummaryOfDefault(summary) {
     const result = this.createModel()
+    if (!summary) {
+      return result
+    }
 
     const list = []
 
@@ -213,6 +216,9 @@ class SummaryModel extends BaseModel {
 
   tranSummaryOfProposed(summary) {
     const result = this.createModel()
+    if (!summary) {
+      return result
+    }
 
     const list = []