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

@@ -19,10 +19,10 @@
 </template>
 
 <script>
-  export default {
+export default {
   appName: '居民标签',
 
-    data () {
+  data() {
     return {
       currIndex: 0,
       list: [],
@@ -30,7 +30,7 @@
     }
   },
 
-    onLoad (query) {
+  onLoad(query) {
     this.getList()
 
     if (query.ids) {
@@ -48,7 +48,7 @@
       })
     },
 
-      onClick (id) {
+    onClick(id) {
       const index = this.checked.indexOf(id)
 
       if (index === -1) {
@@ -58,7 +58,7 @@
       }
     },
 
-      submit () {
+    submit() {
       if (!this.checked.length) {
         return this.$u.toast('请选择标签')
       }
@@ -72,11 +72,11 @@
       uni.navigateBack()
     }
   }
-  }
+}
 </script>
 
 <style lang="scss" scoped>
-  .tags {
+.tags {
   padding: 16px 0 130px;
 
   * {
@@ -96,7 +96,8 @@
     font-family: PingFangSC-Medium, PingFang SC;
     font-weight: 500;
     color: #FFF;
-      div{
+
+    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;
@@ -135,5 +140,5 @@
       }
     }
   }
-  }
+}
 </style>