Merge commit '23a5044372d33ff64c28586c8781aeb02f530103' into gzb

# Conflicts:
#	src/views/regionSection/applicationManage/applicationManage.vue
#	src/views/regionSection/search/allApps.vue
#	src/views/schoolSection/applicationManage/applicationList.vue

src/assets/less/common.less

@@ -86,13 +86,9 @@ body,
         background-color: #ffffff;
         .action_list {
           color: #339dff;
-          .action_error,
           .action_del {
             color: #f0153f;
           }
-          .action_success {
-            color: #52c41a;
-          }
         }
       }
     }
@@ -397,6 +393,14 @@ fieldset[disabled] .ivu-input,
       margin: 0 4px;
       padding: 0 4px;
       cursor: pointer;
+      &.action_error {
+        color: #f0153f;
+        cursor: default;
+      }
+      &.action_success {
+        color: #52c41a;
+        cursor: default;
+      }
     }
   }
 }

src/views/regionSection/applicationManage/applicationManage.vue

@@ -71,13 +71,13 @@
         <template slot-scope="{ row }" slot="whited">
           <div class="action_list">
             <div v-if="row.whited === 1" class="action_success">是</div>
-            <div v-else class="action_del">否</div>
+            <div v-else class="action_error">否</div>
           </div>
         </template>
         <template slot-scope="{ row }" slot="showico">
           <div class="action_list">
             <div v-if="row.showico === 1" class="action_success">是</div>
-            <div v-else class="action_del">否</div>
+            <div v-else class="action_error">否</div>
           </div>
         </template>
         <template slot-scope="{ row }" slot="countSlot">

src/views/regionSection/search/allApps.vue

@@ -57,13 +57,13 @@
         <template slot-scope="{ row }" slot="whited">
           <div class="action_list">
             <div v-if="row.whited === 1" class="action_success">是</div>
-            <div v-else class="action_del">否</div>
+            <div v-else class="action_error">否</div>
           </div>
         </template>
         <template slot-scope="{ row }" slot="showico">
           <div class="action_list">
             <div v-if="row.showico === 1" class="action_success">是</div>
-            <div v-else class="action_del">否</div>
+            <div v-else class="action_error">否</div>
           </div>
         </template>
 

src/views/regionSection/search/allUsers.vue

@@ -20,7 +20,7 @@
         <template slot-scope="{ row }" slot="enabled">
           <div class="action_list">
             <div v-if="row.enabled === 1" class="action_success">启用</div>
-            <div v-if="row.enabled === 2" class="action_del">禁用</div>
+            <div v-if="row.enabled === 2" class="action_error">禁用</div>
           </div>
         </template>
       </Table>

src/views/schoolSection/applicationManage/applicationList.vue

@@ -87,13 +87,13 @@
         <template slot-scope="{ row }" slot="whited">
           <div class="action_list">
             <div v-if="row.whited === 1" class="action_success">是</div>
-            <div v-else class="action_del">否</div>
+            <div v-else class="action_error">否</div>
           </div>
         </template>
         <template slot-scope="{ row }" slot="showico">
           <div class="action_list">
             <div v-if="row.showico === 1" class="action_success">是</div>
-            <div v-else class="action_del">否</div>
+            <div v-else class="action_error">否</div>
           </div>
         </template>
         <template slot-scope="{ row }" slot="countSlot">

src/views/schoolSection/setting/wallpaper.vue

@@ -53,20 +53,11 @@
         <template slot-scope="{ row }" slot="actionSlot">
           <div class="action_list">
             <div @click="toView(row)">查看</div>
-            <div
-              v-if="
-                powerParams.rtype === row.wlevel &&
-                userInfo.adminid === row.updateid
-              "
-              @click="toEdit(row)"
-            >
+            <div v-if="powerParams.rtype === row.wlevel" @click="toEdit(row)">
               编辑
             </div>
             <div
-              v-if="
-                powerParams.rtype === row.wlevel &&
-                userInfo.adminid === row.updateid
-              "
+              v-if="powerParams.rtype === row.wlevel"
               class="action_del"
               @click="toDel(row)"
             >
@@ -308,7 +299,8 @@ export default {
   data() {
     return {
       userInfo: {},
-      add_has: false,
+      // 1有添加按钮0无
+      add_has: 0,
       searchForm: {
         name: "",
         page: 1,
@@ -404,7 +396,6 @@ export default {
     this.userInfo = JSON.parse(
       localStorage.getItem("xh_control_userInfo")
     ).content;
-    this.init();
     this.searchList();
   },
   computed: {
@@ -428,6 +419,7 @@ export default {
     // 搜索
     searchList() {
       this.searchForm.page = 1;
+      this.init();
       this.getList();
     },
     // 页码改变
@@ -664,7 +656,6 @@ export default {
               : wallpaper_add;
           api(form).then((data) => {
             if (data.code === 0) {
-              this.init();
               this.searchList();
               this.$Message.success(data.msg);
             } else {