修改样式

src/layout/components/Sidebar/index.vue

@@ -7,9 +7,9 @@
                :collapse='false'
                :background-color="variables.menuBg"
                :text-color="variables.menuText"
-               :unique-opened="false"
+               :unique-opened="true"
                :active-text-color="variables.menuActiveText"
-               :collapse-transition="false"
+               :collapse-transition="true"
                mode="vertical">
         <sidebar-item v-for="(route,index) in permission_routes"
                       :key="index"

src/views/businessManager/shopManager/shopCategory.vue

@@ -1,7 +1,7 @@
 
 <template>
   <div class='m-container'>
-    <h2>商品类型管理</h2>
+    <h2><div class="squrt"></div>商品类型管理</h2>
     <div class="m-core">
       <div class='newBand' @click="openTypes('create')">添加</div>
       <!-- 列表 -->
@@ -216,7 +216,7 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
-.el-input-group__append, .el-button--primary {
+.el-button--primary {
   background: #14928a;
   border-color: #14928a;
   color: #fff;

src/views/businessManager/shopManager/shopList.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="m-container">
-    <h2>商品列表</h2>
+    <h2><div class="squrt"></div>商品列表</h2>
     <div class="m-core">
       <div @click="onShopOperation('create')" class='newBand'>添加</div>
       <!-- 搜索类型 -->

src/views/categroyManager/generalSettings/errorManager.vue

@@ -155,7 +155,7 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
-.el-input-group__append, .el-button--primary {
+.el-button--primary {
   background: #14928a;
   border-color: #14928a;
   color: #fff;

src/views/categroyManager/globalConfig.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="m-container">
     <h2>
-      全局配置
+      <div class="squrt"></div>全局配置
     </h2>
     <div class="m-core">
       <!-- navMenu -->

src/views/categroyManager/insideSetting/addressManager.vue

@@ -1,6 +1,6 @@
 <template>
   <div class='m-container'>
-    <h2>分部教学点</h2>
+    <h2><div class="squrt"></div>教学点管理</h2>
     <div class="m-core">
       <div @click="openTeaching('create')"
            class='newBand'>新建</div>
@@ -337,6 +337,7 @@ export default {
       }
     },
     onSearchResult (pois) { // 搜索出来的Marker
+      this.markers = [] // 搜索时进行数据重置
       let latSum = 0
       let lngSum = 0
       if (pois.length > 0) {

src/views/categroyManager/insideSetting/adminManager.vue

@@ -1,6 +1,6 @@
 <template>
   <div class='m-container'>
-    <h2>系统角色权限管理</h2>
+    <h2><div class="squrt"></div>系统角色权限管理</h2>
     <div class="m-core">
       <div @click="onAdminOperation('create')" class='newBand'>添加</div>
       <!-- 列表 -->

src/views/categroyManager/insideSetting/branchActive.vue

@@ -97,7 +97,7 @@ export default {
 }
 </script>
 <style lang="scss">
-.el-input-group__append, .el-button--primary {
+.el-button--primary {
   background: #14928a;
   border-color: #14928a;
   color: #fff;

src/views/categroyManager/insideSetting/branchManager.vue

@@ -1,6 +1,6 @@
 <template>
   <div class='m-container'>
-    <h2>合作单位</h2>
+    <h2><div class="squrt"></div>合作单位</h2>
     <div class="m-core">
       <div @click="openTeaching('create')" class='newBand'>新建</div>
       <!-- 搜索类型 -->
@@ -260,7 +260,7 @@ export default {
 }
 </script>
 <style lang="scss">
-.el-input-group__append, .el-button--primary {
+.el-button--primary {
   background: #14928a;
   border-color: #14928a;
   color: #fff;

src/views/categroyManager/insideSetting/staffManager.vue

@@ -1,6 +1,6 @@
 <template>
   <div class='m-container'>
-    <h2>员工管理</h2>
+    <h2><div class="squrt"></div>员工管理</h2>
     <div class="m-core">
       <div @click="roleOperation('create')" class='newBand'>添加</div>
       
@@ -34,11 +34,17 @@
           <el-table-column align='center'
                            label="状态" :formatter="formatLockFlag">
           </el-table-column>
-          <el-table-column align='center' prop="entryDate"
+          <el-table-column align='center'
                            label="入职时间">
+            <template slot-scope="scope">
+              {{ scope.row.entryDate | formatTimer }}
+            </template>
           </el-table-column>
-          <el-table-column align='center' prop="demissionDate"
+          <el-table-column align='center'
                            label="离职时间">
+            <template slot-scope="scope">
+              {{ scope.row.demissionDate | formatTimer }}
+            </template>
           </el-table-column>
           <el-table-column align='center' width="250px"
                            label="操作">
@@ -299,7 +305,7 @@ export default {
 }
 </script>
 <style lang="scss">
-.el-input-group__append, .el-button--primary {
+.el-button--primary {
   background: #14928a;
   border-color: #14928a;
   color: #fff;

src/views/categroyManager/specialSetup/bannerManager.vue

@@ -76,7 +76,7 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
-.el-input-group__append, .el-button--primary {
+.el-button--primary {
   background: #14928a;
   border-color: #14928a;
   color: #fff;

src/views/categroyManager/specialSetup/branchSetting.vue

@@ -1,6 +1,6 @@
 <template>
   <div class='m-container'>
-    <h2>分部设置</h2>
+    <h2><div class="squrt"></div>分部设置</h2>
     <div class="m-core">
       <div @click="onBranchOperation('create')" class='newBand'>添加</div>
       <!-- 列表 -->
@@ -15,8 +15,11 @@
           <el-table-column align='center' prop="address"
                            label="分部地址">
           </el-table-column>
-          <el-table-column align='center' prop="registerDate"
+          <el-table-column align='center'
                            label="成立时间">
+            <template slot-scope="scope">
+              {{ scope.row.registerDate | formatTimer }}
+            </template>
           </el-table-column>
           <el-table-column align='center'
                            label="操作">
@@ -219,7 +222,7 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
-.el-input-group__append, .el-button--primary {
+.el-button--primary {
   background: #14928a;
   border-color: #14928a;
   color: #fff;

src/views/categroyManager/specialSetup/jobTemplateSetting.vue

@@ -233,7 +233,7 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
-.el-input-group__append, .el-button--primary {
+.el-button--primary {
   background: #14928a;
   border-color: #14928a;
   color: #fff;

src/views/categroyManager/specialSetup/musicalManager.vue

@@ -174,7 +174,7 @@ export default {
     margin-right: 12px;
   }
 }
-.el-input-group__append, .el-button--primary {
+.el-button--primary {
   background: #14928a;
   border-color: #14928a;
   color: #fff;

src/views/categroyManager/specialSetup/tryClass.vue

@@ -76,7 +76,7 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
-.el-input-group__append, .el-button--primary {
+.el-button--primary {
   background: #14928a;
   border-color: #14928a;
   color: #fff;

src/views/categroyManager/specialSetup/typesManager.vue

@@ -214,7 +214,7 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
-.el-input-group__append, .el-button--primary {
+.el-button--primary {
   background: #14928a;
   border-color: #14928a;
   color: #fff;

src/views/contentManager/contentOperation.vue

@@ -9,9 +9,9 @@
         <el-form-item label="标题" prop="title">
           <el-input v-model="form.title"></el-input>
         </el-form-item>
-        <!-- <el-form-item label="排序值">
+        <el-form-item label="排序值">
           <el-input  v-model="form.order"></el-input>
-        </el-form-item> -->
+        </el-form-item>
         <el-form-item label="链接地址" prop="linkUrl">
           <el-input v-model="form.linkUrl"></el-input>
         </el-form-item>
@@ -54,6 +54,24 @@ import 'quill/dist/quill.snow.css'
 import 'quill/dist/quill.bubble.css'
 
 import { quillEditor } from 'vue-quill-editor'
+
+// 工具栏配置
+const toolbarOptions = [
+  ["bold", "italic", "underline", "strike"], // 加粗 斜体 下划线 删除线
+  ["blockquote", "code-block"], // 引用  代码块
+  [{ header: 1 }, { header: 2 }], // 1、2 级标题
+  [{ list: "ordered" }, { list: "bullet" }], // 有序、无序列表
+  [{ script: "sub" }, { script: "super" }], // 上标/下标
+  [{ indent: "-1" }, { indent: "+1" }], // 缩进
+  // [{'direction': 'rtl'}],                         // 文本方向
+  [{ size: ["small", false, "large", "huge"] }], // 字体大小
+  [{ header: [1, 2, 3, 4, 5, 6, false] }], // 标题
+  [{ color: [] }, { background: [] }], // 字体颜色、字体背景颜色
+  [{ font: [] }], // 字体种类
+  [{ align: [] }], // 对齐方式
+  ["clean"], // 清除文本格式
+  ["link", "image", "video"] // 链接、图片、视频
+];
 export default {
     components: {
         quillEditor
@@ -69,11 +87,16 @@ export default {
             },
             content: null,
             editorOption: {
-            // some quill options
+              placeholder: '请输入内容',
+              modules: {
+                toolbar: {
+                  container: toolbarOptions
+                }
+              }
             },
             form: {
                 title: null,
-                order: 0,
+                order: null,
                 coverImage: null,
                 linkUrl: 'http://mstudev.dayaedu.com/#/specialdetail',
                 type: this.$route.query.type,

src/views/contentManager/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class='m-container'>
-    <h2> 内容管理 </h2>
+    <h2><div class="squrt"></div> 内容管理 </h2>
     <div class="m-core">
       <el-tabs v-model="activeName"
                type="card"

src/views/resetTeaming/index.vue

@@ -1,7 +1,8 @@
 <template>
   <div class="m-container">
     <h2>
-      乐团修改
+      <el-page-header @back="onCancel" content="乐团修改"></el-page-header>
+      
     </h2>
     <div class="m-core">
       <!-- navMenu -->
@@ -62,6 +63,9 @@ export default {
   mounted () {
 
   }, methods: {
+    onCancel() {
+      this.$router.push('/business/teamDetail')
+    },
     handleClick (val) {
       this.activeIndex = val.name
       this.acitveStatus[val.name - 1] = true

src/views/studentManager/studentList.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="m-container">
-    <h2>学员列表</h2>
+    <h2><div class="squrt"></div>学员列表</h2>
     <div class="m-core">
       <!-- <div class="newBand">声部调整</div> -->
       <!-- 搜索标题 -->

src/views/teacherManager/teacherList.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="m-container">
-    <h2>老师列表</h2>
+    <h2><div class="squrt"></div>老师列表</h2>
     <div class="m-core">
       <div class="newBand" @click="onTeacher('create')">老师新增</div>
       <!-- 搜索标题 -->

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

@@ -323,4 +323,13 @@ export default {
     }
   }
 }
+/deep/.el-input-group__append {
+    background-color: #F5F7FA;
+    color: #909399;
+    vertical-align: middle;
+    display: table-cell;
+    position: relative;
+    border: 1px solid #DCDFE6;
+    border-left: 0;
+}
 </style>

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

@@ -349,7 +349,7 @@ export default {
           type: 'success'
         })
       } else {
-        this.topForm.subjectId = []
+        this.topForm.subjectId = this.topForm.subjectId.split(',')
         this.$message.error(res.msg)
       }
     },

src/views/teamDetail/components/studentSignin.vue

@@ -1,6 +1,7 @@
 <template>
   <div class="m-container">
-    <h2>学生点名总览
+    <h2>
+      <el-page-header @back="onCancel" content="学生点名总览"></el-page-header>
       <!-- <div class="term">第一学期</div>
       <div class="term active">第二学期</div> -->
     </h2>
@@ -68,6 +69,9 @@ export default {
     this.getList()
   },
   methods: {
+    onCancel() {
+      history.go(-1)
+    },
     getList () {
       // console.log(111);
       getStudentRecord({ search: 1 }).then(res => {

src/views/teamDetail/index.vue

@@ -1,8 +1,8 @@
 <template>
   <div class='m-container'>
     <h2>
-      <div class='squrt'></div>
-      {{name}}
+      <!-- <div class='squrt'></div> -->
+      <el-page-header @back="onCancel" :content="name"></el-page-header>
       <!-- <div class="term">第一学期</div>
       <div class="term active">第二学期</div> -->
     </h2>
@@ -94,6 +94,9 @@ export default {
     handleClick (val) {
       this.activeIndex = val.name;
     },
+    onCancel() {
+      this.$router.push('/business/teamDetail')
+    },
     getname (name) {
       // console.log(name);
       this.name = name;

src/views/teamDetail/teamList.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="m-container">
-    <h2>乐团列表</h2>
+    <h2><div class="squrt"></div>乐团列表</h2>
     <div class="m-core">
       <div class="btnList">
         <div class='newBand'

src/views/vipClass/vipList.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="m-container">
-    <h2>VIP课列表
+    <h2><div class="squrt"></div>VIP课列表
     </h2>
     <div class="newBand"
          @click='gotoBuildVip'>新建vip课</div>

vue.config.js

@@ -14,13 +14,13 @@ const name = defaultSettings.title || '大雅后台管理系统' // page title
 // You can change the port by the following methods:
 // port = 9528 npm run dev OR npm run dev --port = 9528
 // const port = process.env.port || process.env.npm_config_port || 9528 // dev port
-// http://47.99.212.176:8000
+// http://47.99.212.176:8000 
 // 
 // let target = 'http://192.168.3.27:8000' // 箭河
 // let target = 'http://192.168.3.28:8000' //邹璇
 // let target = 'http://192.168.3.8:8000' //勇哥
-// let target = 'http://47.99.212.176:18000' // 测试服
-let target = 'http://192.168.3.48:8000' // 乔
+let target = 'http://47.99.212.176:8000' // 测试服
+// let target = 'http://192.168.3.48:8000' // 乔
 // All configuration item explanations can be find in https://cli.vuejs.org/config/
 module.exports = {
   /**