Merge branch '03/12permission' into dev

src/layout/components/TagsView.vue

@@ -245,8 +245,8 @@ export default {
     background: #edeef0;
     height: 34px;
     // border-bottom: 1px solid #d8dce5;
-    // box-shadow: 0 1px 3px 0 rgba(0, 0, 0, 0.12), 0 0 3px 0 rgba(0, 0, 0, 0.04);
-    box-shadow: 0 2px 10px 0 rgba(0,0,0,.05);
+    box-shadow: 0 1px 3px 0 rgba(0, 0, 0, 0.12), 0 0 3px 0 rgba(0, 0, 0, 0.04);
+    // box-shadow: 0 2px 10px 0 rgba(0,0,0,.05);
     .tags-view-item {
       min-width: 120px;
       display: inline-flex;

src/views/teacherManager/teacherOperation/components/salarySet.vue

@@ -156,7 +156,7 @@
                         @mousewheel.native.prevent
                         v-model.trim="scope.row.offlineClassesSalary"
                         placeholder="请输入内容">
-                <template slot="append"> 元/人</template>
+                <template slot="append"> 节/元</template>
                 <!-- <template slot="append" v-else>节/人</template>  v-if="scope.row.musicTheory" -->
               </el-input>
               </div>