Merge branch 'dev' of http://git.sinoecare.com/sinoecare/digital_village_cp/dv_cp_wechat_app into dev

src/apps/AppVillageDiscuss/Detail.vue

@@ -57,7 +57,10 @@
       </span>
       <div class="comments-vote">
         <div class="vote-item" v-for="(item, index) in data.voteList" :key="index">
-          <span>{{ item.content }}</span>
+          <div class="left">
+            <span>{{ item.item }}：</span>
+            <span>{{ item.content }}</span>
+          </div>
           <i>{{ item.count }}</i>
           <em :style="{ width: item.percentage }"></em>
         </div>
@@ -164,7 +167,7 @@ export default {
               this.timestamp = discussTime - nowTime
             }
 
-            if (res.data.type === '1') {
+            if (res.data.type === '1' && res.data.statistic) {
               const total = Object.values(res.data.statistic).reduce((x, y) => {
                 return x + y
               })
@@ -176,11 +179,12 @@ export default {
                 }
               })
             }
+            this.pageShow = true
 
             this.$hideLoading()
-            this.pageShow = true
           } else {
             this.$hideLoading()
+            this.pageShow = true
           }
         })
         .catch(() => {
@@ -437,15 +441,32 @@ export default {
       position: relative;
       align-items: center;
       justify-content: space-between;
-      height: 64px;
-      line-height: 64px;
+      padding: 24px 32px;
       margin-bottom: 16px;
-      padding: 0 32px;
       background: #ffffff;
       border-radius: 8px;
       overflow: hidden;
       border: 1px solid #95cbff;
 
+      .left {
+        display: flex;
+        flex: 1;
+        line-height: 1.2;
+        margin-right: 20px;
+
+        span {
+          word-break: break-word;
+
+          &:first-child {
+            flex-shrink: 1;
+          }
+
+          &:last-child {
+            flex: 1;
+          }
+        }
+      }
+
       em {
         position: absolute;
         left: 0;
@@ -456,6 +477,7 @@ export default {
       }
 
       span {
+        flex-shrink: 1;
         position: relative;
         z-index: 1;
         color: #5b84b3;