Merge remote-tracking branch 'origin/dev3.0' into dev3.0

src/views/projectInfo/index.vue

@@ -249,14 +249,17 @@ export default {
         cancelButtonText: '取消',
         type: 'warning'
       }).then(() => {
-        this.Loading = true
         getPush(formJson).then(res => {
-          if (res.data.code === '200') {
+          if (res.code === '200') {
             this.$message.success('推送成功')
+            this.getProjectData()
           } else {
-            this.$message.warning('推送失败')
-          }
+            this.$message({
+              type: 'warning',
+              message: res.data
+            })
             this.getProjectData()
+          }
         }).catch(e => {
         })
       })