Merge branch 'dev' of http://git.izouma.com/xiongzhu/jmrh into dev

src/main/jmrh/src/components/news/hot.vue

@@ -46,7 +46,7 @@ export default {
     data() {
         return {
             url: '/article/all',
-            query: { mainType: '热点推荐' }
+            query: { mainType: '热点推荐', status: 'PASS' }
         };
     },
     methods: {

src/main/jmrh/src/components/news/qusetion.vue

@@ -46,7 +46,7 @@ export default {
     data() {
         return {
             url: '/article/all',
-            query: { mainType: '通知通告' }
+            query: { mainType: '通知通告', status: 'PASS' }
         };
     },
     methods: {

src/main/jmrh/src/components/news/topic.vue

@@ -47,7 +47,7 @@ export default {
     data() {
         return {
             url: '/article/all',
-            query: { mainType: '行业动态' }
+            query: { mainType: '行业动态', status: 'PASS' }
         };
     },
     methods: {

src/main/jmrh/src/views/mine/docking.vue

@@ -280,6 +280,10 @@ export default {
             }
         },
         saveMessage(id) {
+            if (this.editTab == '') {
+                this.$message('请选择对接状态');
+                return;
+            }
             this.$http
                 .post('/conversation/create', { id: id, state: this.editTab, onExist: '2' }, { body: 'json' })
                 .then(res => {

src/main/jmrh/src/views/mine/editInfo.vue

@@ -67,7 +67,7 @@
                 <el-input v-model="form.addressDetail" placeholder="请选择"></el-input>
             </el-form-item>
             <el-form-item prop="description" label="企业简介">
-                <el-input type="textarea" v-model="form.intro" placeholder="请填写企业简介，不超过200字"></el-input>
+                <el-input type="textarea" v-model="form.intro" placeholder="请填写企业简介"></el-input>
             </el-form-item>
             <el-form-item label="企业标志" prop="logo">
                 <single-upload v-model="form.logo"></single-upload>
@@ -162,7 +162,11 @@ export default {
     },
     methods: {
         submit() {
-            if (this.$store.state.userInfo) {
+            if (
+                this.$store.state.userInfo &&
+                localStorage.getItem('token') != undefined &&
+                localStorage.getItem('token') != null
+            ) {
                 this.$refs.form
                     .validate()
                     .then(() => {

src/main/jmrh/src/views/mine/releaseDetails.vue

@@ -105,7 +105,7 @@ export default {
             appear: 0, //detail 默认隐藏
             dialogReplyVisible: false, // 回复
             dialogVisible: false, // 编辑
-            editTab: 0,
+            editTab: '',
             // url: '/message/getMessage',
             query: { onExist: '0,2' },
             info: {},
@@ -145,6 +145,10 @@ export default {
                 });
         },
         saveMessage(id) {
+            if (this.editTab == '') {
+                this.$message('请选择对接状态');
+                return;
+            }
             this.$http
                 .post('/conversation/create', { id: id, status: this.editTab }, { body: 'json' })
                 .then(res => {

src/main/jmrh/src/views/policy.vue

@@ -97,7 +97,7 @@ export default {
                 .get('/article/all', {
                     size: 10000,
                     sort: 'createdAt,desc',
-                    query: { mainType: '政策法规', subType: (this.tabList[this.current] || {}).name }
+                    query: { mainType: '政策法规', subType: (this.tabList[this.current] || {}).name, status: 'PASS' }
                 })
                 .then(res => {
                     this.tableData = res.content;