Merge branch 'dev' of http://git.singsingenglish.com/new-sing/admin into dev

src/App.vue

 <template>
   <div id="app">
-    <router-view />
+    <router-view/>
   </div>
 </template>
 
 <script>
-import menu from "./util/menuList";
-export default {
-  name: "App",
-  data() {
-    return {};
-  },
-  mounted() {
-    // 权限验证 动态路由
-    if (window.location.href.indexOf("login") < 0) {
-      let permission = this.$store.state.progressList;
-      console.log(this.$store.state);
-      let menuList = [];
-      this.$router.options.routes[0].children = [];
-      let routerUserDetail = {
-        path: "/userDetail/:id",
-        name: "userDetail",
-        component: e => require(["@/components/userDetail"], e)
-      };
-      let routerTeacherDetail = {
-        path: "/teacher/:id",
-        name: "teacherDetail",
-        component: e => require(["@/components/teacherDetail"], e)
-      };
-      menu.forEach(i => {
-        let p = false;
-        let t = [];
-        i.list.forEach(j => {
-          let find = permission.find(x => {
-            return x.cover === j.cover;
-          });
-          if (find) {
-            j.router.meta = {};
-            j.router.meta.readonly = !!find.readonly;
-            j.router.meta.delete = !!find.delete;
-            j.router.meta.export = !!find.export;
-            j.router.meta.refund = !!find.refund;
-            j.router.meta.distribution = !!find.distribution;
-            j.router.meta.classManage = !!find.classManage;
-            j.router.meta.classManageUnlimited = !!find.classManageUnlimited;
-            j.router.meta.classTakeUnlimited = !!find.classTakeUnlimited;
-            j.router.meta.promoter = !!find.promoter;
-            j.router.meta.import = !!find.import;
-            t.push(j);
-            if (find.cover === "3-1") {
-              routerTeacherDetail.meta = {};
-              routerTeacherDetail.meta.readonly = find.readonly;
-              routerTeacherDetail.meta.delete = !!find.delete;
-              this.$router.options.routes[0].children.push(routerTeacherDetail);
-            }
-            if (find.cover === "3-2") {
-              routerUserDetail.meta = {};
-              routerUserDetail.meta.readonly = find.readonly;
-              routerUserDetail.meta.delete = !!find.delete;
-              this.$router.options.routes[0].children.push(routerUserDetail);
+  import menu from "./util/menuList";
+
+  export default {
+    name: "App",
+    data() {
+      return {};
+    },
+    mounted() {
+      // 权限验证 动态路由
+      if (window.location.href.indexOf("login") < 0) {
+        let permission = this.$store.state.progressList;
+        console.log(this.$store.state);
+        let menuList = [];
+        this.$router.options.routes[0].children = [];
+        let routerUserDetail = {
+          path: "/userDetail/:id",
+          name: "userDetail",
+          component: e => require(["@/components/userDetail"], e)
+        };
+        let routerTeacherDetail = {
+          path: "/teacher/:id",
+          name: "teacherDetail",
+          component: e => require(["@/components/teacherDetail"], e)
+        };
+        menu.forEach(i => {
+          let p = false;
+          let t = [];
+          i.list.forEach(j => {
+            let find = permission.find(x => {
+              return x.cover === j.cover;
+            });
+            if (find) {
+              j.router.meta = {};
+              j.router.meta.readonly = !!find.readonly;
+              j.router.meta.delete = !!find.delete;
+              j.router.meta.export = !!find.export;
+              j.router.meta.refund = !!find.refund;
+              j.router.meta.distribution = !!find.distribution;
+              j.router.meta.classManage = !!find.classManage;
+              j.router.meta.classManageUnlimited = !!find.classManageUnlimited;
+              j.router.meta.classTakeUnlimited = !!find.classTakeUnlimited;
+              j.router.meta.exportFinish = !!find.exportFinish;
+              j.router.meta.promoter = !!find.promoter;
+              j.router.meta.import = !!find.import;
+              t.push(j);
+              if (find.cover === "3-1") {
+                routerTeacherDetail.meta = {};
+                routerTeacherDetail.meta.readonly = find.readonly;
+                routerTeacherDetail.meta.delete = !!find.delete;
+                this.$router.options.routes[0].children.push(routerTeacherDetail);
+              }
+              if (find.cover === "3-2") {
+                routerUserDetail.meta = {};
+                routerUserDetail.meta.readonly = find.readonly;
+                routerUserDetail.meta.delete = !!find.delete;
+                this.$router.options.routes[0].children.push(routerUserDetail);
+              }
+              this.$router.options.routes[0].children.push(j.router);
+              p = true;
             }
-            this.$router.options.routes[0].children.push(j.router);
-            p = true;
+          });
+          if (p) {
+            i.list = t;
+            menuList.push(i);
           }
         });
-        if (p) {
-          i.list = t;
-          menuList.push(i);
-        }
-      });
-      this.$router.addRoutes([this.$router.options.routes[0]]); //调用add;
-      this.$store.dispatch("setMenu", menuList);
+        this.$router.addRoutes([this.$router.options.routes[0]]); //调用add;
+        this.$store.dispatch("setMenu", menuList);
+      }
     }
-  }
-};
+  };
 </script>
 
 <style lang="less">
-#app {
-  height: 100%;
-}
-
-html, body {
-  height: 100%;
-  margin: 0;
-  padding: 0;
-}
-
-.el-collapse-item__arrow {
-  margin-left: 0;
-}
-
-.fl {
-  float: left;
-}
-
-.fr {
-  float: right;
-}
-
-.clearfix {
-  *zoom: 1;
-}
-
-.clearfix:after {
-  content: "";
-  display: block;
-  height: 0;
-  visibility: hidden;
-  clear: both;
-}
-
-.page-div {
-  padding-top: 20px;
-}
-
-.cell-link {
-  /*color: #409EFF;*/
-  text-decoration: underline;
-  cursor: pointer;
-  user-select: none;
-}
-
-.el-table {
-  /*padding: 0 20px;*/
-}
-
-@gutterSize: 10px;
-
-.admin-refresh {
-  .section-search {
-    padding: @gutterSize;
-    background-color: #fff;
-    border-bottom: solid 1px #ebeef5;
-    &.search-single {
-      font-size: 0; // 去掉空隙
-      /*.el-form-item__content {
+  #app {
+    height: 100%;
+  }
+
+  html, body {
+    height: 100%;
+    margin: 0;
+    padding: 0;
+  }
+
+  .el-collapse-item__arrow {
+    margin-left: 0;
+  }
+
+  .fl {
+    float: left;
+  }
+
+  .fr {
+    float: right;
+  }
+
+  .clearfix {
+    *zoom: 1;
+  }
+
+  .clearfix:after {
+    content: "";
+    display: block;
+    height: 0;
+    visibility: hidden;
+    clear: both;
+  }
+
+  .page-div {
+    padding-top: 20px;
+  }
+
+  .cell-link {
+    /*color: #409EFF;*/
+    text-decoration: underline;
+    cursor: pointer;
+    user-select: none;
+  }
+
+  .el-table {
+    /*padding: 0 20px;*/
+  }
+
+  @gutterSize: 10px;
+
+  .admin-refresh {
+    .section-search {
+      margin-bottom: 10px;
+      padding: @gutterSize @gutterSize 0 @gutterSize;
+      background-color: #fff;
+      border-bottom: solid 1px #ebeef5;
+
+      &.search-single {
         font-size: 0; // 去掉空隙
-      }*/
-      .el-form-item {
-        margin-bottom: 0;
+        /*.el-form-item__content {
+          font-size: 0; // 去掉空隙
+        }*/
+
+        .el-form-item {
+          margin-bottom: 0;
+        }
       }
-    }
-    .el-form--inline {
-      .el-form-item {
-        margin-right: 0;
-        & + .el-form-item {
-          margin-left: 10px;
+
+      .el-form--inline, &.el-form--inline {
+        .el-form-item {
+          margin-right: 0;
+          margin-bottom: @gutterSize;
+
+          & + .el-form-item {
+            margin-left: @gutterSize;
+          }
         }
       }
+
+      .search-btn-wrapper {
+        display: flex;
+      }
     }
-    .search-btn-wrapper {
-      display: flex;
+
+    .page-div {
+      padding: 0;
     }
-  }
 
-  .page-div {
-    padding: 0;
-  }
-  .el-pagination {
-    padding: @gutterSize 0;
-    background-color: #fff;
-    border-bottom: solid 1px #ebeef5;
+    .el-pagination {
+      padding: @gutterSize 0;
+      background-color: #fff;
+      border-bottom: solid 1px #ebeef5;
+    }
   }
-}
 
   // cascader 支持多行
   .refresh-cascader-multi {
     &.width-480 .el-cascader-menu {
       max-width: 480px;
     }
+
     &.width-520 .el-cascader-menu {
       max-width: 520px;
     }
+
     &.width-560 .el-cascader-menu {
       max-width: 560px;
     }
@@ -180,11 +192,13 @@ html, body {
     .el-cascader-menu {
       .el-cascader-menu__wrap {
         height: 360px;
+
         ul {
           li {
             padding: 5px 20px 5px 20px;
             height: auto;
             line-height: 24px;
+
             .el-cascader-node__label {
               white-space: normal;
             }
@@ -199,24 +213,30 @@ html, body {
     &.width-320 {
       max-width: 320px;
     }
+
     &.width-360 {
       max-width: 360px;
     }
+
     &.width-400 {
       max-width: 400px;
     }
+
     &.width-480 {
       max-width: 480px;
     }
+
     &.width-520 {
       max-width: 520px;
     }
+
     &.width-560 {
       max-width: 560px;
     }
 
     .el-select-dropdown__wrap {
       max-height: 360px;
+
       ul {
         li {
           padding: 5px 20px 5px 20px;
@@ -239,20 +259,21 @@ html, body {
     }
   }
 
-.el-table {
-  .f-c > div {
-    display: flex !important;
-    flex-flow: row;
-    justify-content: flex-start;
-    align-items: center;
-  }
-  .avatar {
-    width: 50px;
-    margin-right: 8px;
-    border-radius: 50%;
-    height: 50px;
+  .el-table {
+    .f-c > div {
+      display: flex !important;
+      flex-flow: row;
+      justify-content: flex-start;
+      align-items: center;
+    }
+
+    .avatar {
+      width: 50px;
+      margin-right: 8px;
+      border-radius: 50%;
+      height: 50px;
+    }
   }
-}
 
   .update-time {
     margin-top: -12px;

src/components/autoClass/index.vue

@@ -148,7 +148,7 @@
     height: 50px;
   }
   .user{
-    height: 100%;
+    /*height: 100%;*/
     overflow: auto;
     padding: 20px 0;
     .btn-content{

src/components/class/index.vue

 <template>
   <div class="class admin-refresh">
     <div class="form-block section-search search-single">
-      <el-form label-width="90px" inline>
+      <el-form label-width="90px" inline size="small">
         <el-form-item>
           <el-cascader
             :popper-class="'refresh-cascader-multi width-560'"
@@ -14,10 +14,9 @@
         </el-form-item>
         <el-form-item>
           <el-select
-            filterable
-            v-model="teacher_id"
-            placeholder="请选择老师"
-            @change="getClassList" clearable>
+            style="width: 160px;" filterable
+            v-model="teacher_id" @change="getClassList"
+            placeholder="请选择老师" clearable>
             <el-option
               v-for="(data,index) in teacherList"
               :key="index"
@@ -30,7 +29,7 @@
         </el-form-item>
         <el-form-item style="float: right">
           <div class="search-btn-wrapper">
-            <el-button @click="onExport" type="primary" v-if="$store.state.export" plain>导出完课用户</el-button>
+            <el-button @click="onExport" type="primary" v-if="$store.state.exportFinish" plain>导出完课用户</el-button>
             <el-button @click="onAdd" type="success" v-if="!$store.state.readonly">添加班级</el-button>
             <el-button type="success" @click="sendMsg">发送活动通知</el-button>
           </div>

src/components/class/userList.vue

@@ -1257,7 +1257,7 @@
     height: 50px;
   }
   .user{
-    height: 100%;
+    /*height: 100%;*/
     overflow: auto;
     padding: 20px 0;
     .btn-content{

src/components/oldUser/index.vue

@@ -131,7 +131,7 @@
     height: 50px;
   }
   .user{
-    height: 100%;
+    /*height: 100%;*/
     overflow: auto;
     padding: 20px 0;
     .btn-content{

src/components/shop/dialog.vue

@@ -23,26 +23,11 @@
           <el-col :span="12">
             <el-form-item label="商品类型" required>
               <el-select v-model="form.goods_type" @change="goodsChange" placeholder="请选择">
-                <el-option
-                  :label="'普通商品'"
-                  :value="1">
-                </el-option>
-                <el-option
-                  :label="'团购商品'"
-                  :value="2">
-                </el-option>
-                <el-option
-                  :label="'续课商品'"
-                  :value="3">
-                </el-option>
-                <el-option
-                  :label="'优惠券商品'"
-                  :value="4">
-                </el-option>
-                <el-option
-                  :label="'实物商品'"
-                  :value="5">
-                </el-option>
+                <el-option :label="'普通商品'" :value="1"></el-option>
+                <el-option :label="'团购商品'" :value="2"></el-option>
+                <el-option :label="'续课商品'" :value="3"></el-option>
+                <el-option :label="'优惠券商品'" :value="4"></el-option>
+                <el-option :label="'实物商品'" :value="5"></el-option>
               </el-select>
             </el-form-item>
           </el-col>
@@ -56,14 +41,8 @@
           <el-col :span="12" v-if="form.goods_type === 4">
             <el-form-item label="课程类型" required>
               <el-select v-model="form.course_type" placeholder="请选择">
-                <el-option
-                  :label="'日课'"
-                  :value="1">
-                </el-option>
-                <el-option
-                  :label="'月课'"
-                  :value="0">
-                </el-option>
+                <el-option :label="'日课'" :value="1"></el-option>
+                <el-option :label="'月课'" :value="0"></el-option>
               </el-select>
             </el-form-item>
           </el-col>
@@ -654,7 +633,7 @@
       },
       initDialog() {
         switch (this.dialogObj.type) {
-          case 0:
+          case 0: // 添加商品
             this.loading = false;
             this.goOn_goods_Id.after_goods_id = '';
             this.goodsYou = [];
@@ -690,8 +669,8 @@
                 after_goods_id: 0
               },
               is_into_periods: '0'
-            },
-              this.getLessonList();
+            };
+            this.getLessonList();
             console.log(this.form.course_type)
             if (this.form.goods_type == 1 || this.form.goods_type == 2) {
               let json = {
@@ -713,8 +692,8 @@
               });
             }
             break;
-          case 1:
-          case 2:
+          case 1: // 编辑商品
+          case 2: // 查看商品
             this.goOn_goods_Id.after_goods_id = '';
             this.goOn_goods_Id.before_goods_id = '';
             this.goodsYou = [];
@@ -750,6 +729,7 @@
               },
               is_into_periods: '0'
             };
+            this.getLessonList();
             getGoodsDetailApi(this.dialogObj.id).then(res => {
               this.loading = false;
               let share_desc = JSON.parse(res.share_desc);

src/components/shop/index.vue

 <template>
-  <div class="user">
-    <el-form ref="searchFrom" size="small" :model="searchFrom" label-width="100px" class="search-form" inline>
+  <div class="admin-refresh">
+    <el-form ref="searchFrom" size="small" :model="searchFrom" label-width="100px" class="section-search" inline>
           <el-form-item label="商品名称">
             <el-input v-model="searchFrom.name"></el-input>
           </el-form-item>
@@ -42,7 +42,7 @@
       <el-tab-pane label="优惠券商品" name="4"></el-tab-pane>
       <el-tab-pane label="实物商品" name="5"></el-tab-pane>
     </el-tabs>
-    <el-tabs v-model="searchFrom.status" type="card" style="background: white;padding-top: 10px" @tab-click="getGoods">
+    <el-tabs v-model="searchFrom.status" type="card" style="background: white;" @tab-click="getGoods">
       <el-tab-pane label="上架" name="1"></el-tab-pane>
       <el-tab-pane label="编辑中" name="0"></el-tab-pane>
       <el-tab-pane label="下架" name="2"></el-tab-pane>
@@ -520,9 +520,9 @@
 <style scoped lang="less">
   @import "../../util/public";
   .user{
-    height: 100%;
-    overflow: auto;
-    padding: 20px 0;
+    /*height: 100%;*/
+    /*overflow: auto;*/
+    /*padding: 20px 0;*/
     .btn-content{
       text-align: center;
     }

src/router/index.js

@@ -100,6 +100,7 @@ router.beforeEach((to,from,next)=> {
   store.dispatch('promoter',to.meta.promoter)
   store.dispatch('classManageUnlimited',to.meta.classManageUnlimited)
   store.dispatch('classTakeUnlimited',to.meta.classTakeUnlimited)
+  store.dispatch('exportFinish',to.meta.exportFinish)
   console.log(to.meta)
   if(to.name==='userDetail'){
     let list = JSON.parse(localStorage.getItem('permission'))

src/store/actions.js

@@ -35,6 +35,9 @@ export default{
   classTakeUnlimited({commit},data){
     commit('classTakeUnlimited',data)
   },
+  exportFinish({commit},data){
+    commit('exportFinish',data)
+  },
   promoter({commit},data){
     commit('promoter',data)
   }

src/store/index.js

@@ -17,6 +17,7 @@ export default new vuex.Store({
     classManage:false,
     classManageUnlimited:false,
     classTakeUnlimited:false,
+    exportFinish:false,
     import:false,
     promoter:false,
     mainLoad:true,

src/store/mutations.js

@@ -33,6 +33,9 @@ const mutations={
   classManageUnlimited(state,data){
     state.classManageUnlimited=data;
   },
+  exportFinish(state,data){
+    state.exportFinish=data;
+  },
   classTakeUnlimited(state,data){
     state.classTakeUnlimited=data;
   },

src/util/menuList.js

@@ -425,7 +425,7 @@ export default [{
               component: e => require(['@/components/conversionList/channelTransList'], e),
           }
       },
-      
+
   ]
 },
 {