Merge remote-tracking branch 'origin/dev' into dev

src/apps/AppMarryAndDie/AppMarryAndDie.vue

@@ -193,6 +193,7 @@ export default {
 
     initEchart(data) {
       var option = {
+        tooltip: {},
         xAxis: {
           type: 'category',
           data: data.map((v) => v.name.replace('数量', '').replace('和操办登记', '')),
@@ -225,7 +226,7 @@ export default {
             },
           },
           axisLabel: {
-            show: true, //是否显示刻度标签
+            show: true,
             interval: 0,
           },
         },
@@ -244,6 +245,13 @@ export default {
                     color: '#919191',
                     fontSize: 16,
                   },
+                  formatter: function (params) {
+                    if (params.value > 0) {
+                      return params.value
+                    } else {
+                      return ' '
+                    }
+                  },
                 },
               },
             },
@@ -315,14 +323,13 @@ export default {
 <style scoped lang="scss">
 uni-page-body {
   height: 100%;
-  background: #f3f6f9;
 }
 
 .AppMarryAndDie {
   height: 100%;
+  background: #fff;
 
   .msg {
-    height: 100%;
     background: #fff;
 
     .box {