Merge branch 'dev' of http://git.sinoecare.com/sinoecare/digital_village_v2/dvcp_v2_wxcp_app into dev

src/project/saas/AppConflictMediation/Content.vue

@@ -139,7 +139,7 @@ export default {
         params = {...this.forms}
       }
       params.id = this.id
-      this.$http.post(url, form).then((res) => {
+      this.$http.post(url, params).then((res) => {
         if (res?.code == 0) {
           this.$u.toast(successText)
           uni.$emit('update')

src/project/saas/AppResidentDocument/Tags.vue

@@ -96,6 +96,7 @@
     font-family: PingFangSC-Medium, PingFang SC;
     font-weight: 500;
     color: #FFF;
+
     div {
       text-align: center;
     }
@@ -127,6 +128,10 @@
         font-size: 28px;
         background: #F3F4F7;
         border-radius: 4px;
+        max-width: 100%;
+        text-overflow: ellipsis;
+        overflow: hidden;
+        white-space: nowrap;
 
         &.active {
           color: #fff;