Merge branch 'dev' of licailing/wenlvju into master

src/main/vue/src/plugins/http.js

@@ -5,8 +5,8 @@ import qs from 'qs';
 let baseUrl = 'http://localhost:8080';
 switch (process.env.NODE_ENV) {
     case 'development':
-        baseUrl = 'http://192.168.50.190:8080';
-        // baseUrl = 'http://wlj.izouma.com';
+        // baseUrl = 'http://192.168.50.190:8080';
+        baseUrl = 'http://wlj.izouma.com';
         break;
     case 'test':
         baseUrl = 'http://localhost:8080';

src/main/vue/src/views/rate/RateDistrictList.vue

@@ -575,7 +575,7 @@ export default {
                     id: this.form.id,
                     status: 'FIRST_REVIEW_DENY',
                     score: 0,
-                    remark: '区文旅局退回意见' + this.reason
+                    remark: '区文旅局退回意见：' + this.reason
                 })
                 .then(res => {
                     this.$set(row, 'loading', false);

src/main/vue/src/views/rate/RateDistrictListDone.vue

@@ -594,7 +594,7 @@ export default {
                     id: this.form.id,
                     status: 'FIRST_REVIEW_DENY',
                     score: 0,
-                    remark: '区文旅局退回意见' + this.reason
+                    remark: '区文旅局退回意见：' + this.reason
                 })
                 .then(res => {
                     this.$set(row, 'loading', false);

src/main/vue/src/views/rate/RateDistrictListPending.vue

@@ -570,7 +570,7 @@ export default {
                     id: this.form.id,
                     status: 'FIRST_REVIEW_DENY',
                     score: 0,
-                    remark: '区文旅局退回意见' + this.reason
+                    remark: '区文旅局退回意见：' + this.reason
                 })
                 .then(res => {
                     this.$set(row, 'loading', false);

src/main/vue/src/views/rate/RateListRejected.vue

@@ -258,7 +258,7 @@ export default {
         beforeGetData() {
             let data = {
                 query: {
-                    submit: true,
+                    // submit: true,
                     isRejected: true
                 }
             };