Merge branch '1xinfeng-dev' of www.gitinn.com:proginn/proginn-frontend into dev

assets/css/other/report.scss

@@ -182,11 +182,8 @@
             color:rgba(255,255,255,1);
             line-height:20px;
           }
-
         }
-
       }
     }
   }
-
 }

pages/other/report/_uid.vue

@@ -143,7 +143,7 @@
             typeData.push(item.name)
           }
         })
-        typeData = typeData.join('|')
+        typeData = typeData.join(',')
         if (!typeData) {
           this.$message.warning('请选择举报类型')
           return