Merge branch 'online' into wxl

dist/static/css/chunk-7b762049.e1695fd0.css → dist/static/css/chunk-03688f5e.e2745108.css

@@ -1 +1 @@
-.pagination-container[data-v-31cb099a]{background:#fff;padding:32px 16px;width:100%;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center}.pagination-container.hidden[data-v-31cb099a]{display:none}.m-container[data-v-54f15e8e]{-webkit-box-sizing:border-box;box-sizing:border-box;background-color:#fff}.newBand[data-v-54f15e8e]{display:inline-block}
+.pagination-container[data-v-31cb099a]{background:#fff;padding:32px 16px;width:100%;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center}.pagination-container.hidden[data-v-31cb099a]{display:none}.m-container[data-v-4503d628]{-webkit-box-sizing:border-box;box-sizing:border-box;background-color:#fff}.newBand[data-v-4503d628]{display:inline-block}

dist/static/css/chunk-472fd29e.bb8be262.css → dist/static/css/chunk-41e8aa7a.9ef2a540.css

@@ -1 +1 @@
-.pagination-container[data-v-31cb099a]{background:#fff;padding:32px 16px;width:100%;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center}.pagination-container.hidden[data-v-31cb099a]{display:none}.newBand[data-v-66194512]{display:inline-block;margin-right:10px}.right-code .title[data-v-66194512]{font-size:18px;text-align:center;padding-bottom:8px}
+.pagination-container[data-v-31cb099a]{background:#fff;padding:32px 16px;width:100%;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center}.pagination-container.hidden[data-v-31cb099a]{display:none}.newBand[data-v-dd85c0fa]{display:inline-block;margin-right:10px}.right-code .title[data-v-dd85c0fa]{font-size:18px;text-align:center;padding-bottom:8px}

src/router/index.js

@@ -44,23 +44,23 @@ export const constantRoutes = [
   //     }
   //   ]
   // },
-  {
-    path: '/timedtask', // 定时任务列表
-    component: Layout,
-    // component: () => import('@/views/timedTask/index'),
-    hidden: false,
-    children: [
-      {
-        name: '定时任务',
-        path: 'timedtask',
-        component: () => import('@/views/timedTask/index'),
-        hidden: true,
-        meta: {
-          title: '定时任务'
-        }
-      }
-    ]
-  },
+  // {
+  //   path: '/timedtask', // 定时任务列表
+  //   component: Layout,
+  //   // component: () => import('@/views/timedTask/index'),
+  //   hidden: false,
+  //   children: [
+  //     {
+  //       name: '定时任务',
+  //       path: 'timedtask',
+  //       component: () => import('@/views/timedTask/index'),
+  //       hidden: true,
+  //       meta: {
+  //         title: '定时任务'
+  //       }
+  //     }
+  //   ]
+  // },
   {
     path: '/setSilder', // 侧边栏
     component: Layout,
@@ -92,19 +92,20 @@ export const constantRoutes = [
     path: '/404',
     component: () => import('@/views/404'),
     hidden: true
-  }, {
-    path: '/sporadicManager',
-    component: Layout,
-    hidden: false,
-    children: [
-      {
-        name: '零星收费',
-        path: 'sporadicList',
-        component: () => import('@/views/setSilder/addSilder'),
-        hidden: false,
-      }
-    ]
-  },
+  }, 
+  // {
+  //   path: '/sporadicManager',
+  //   component: Layout,
+  //   hidden: false,
+  //   children: [
+  //     {
+  //       name: '零星收费',
+  //       path: 'sporadicList',
+  //       component: () => import('@/views/setSilder/addSilder'),
+  //       hidden: false,
+  //     }
+  //   ]
+  // },
   // { path: '*', redirect: '/404', hidden: true }
 ]
 // export const constantRoutes = [{
@@ -243,6 +244,8 @@ export const asyncRoutes = {
   // 网管课详情
   accompanys:()=> import('@/views/accompanyManager/accompanys'),
   // 版本控制
-  editionList:()=> import('@/views/editionManager/editionList')
+  editionList:()=> import('@/views/editionManager/editionList'),
+  // 定时任务
+  timedTask:()=> import('@/views/timedTask/index')
 }
 export default router

src/store/modules/tagsView.js

@@ -5,8 +5,7 @@ const tagsView = {
   },
   mutations: {
     ADD_VISITED_VIEWS: (state, view) => {
-      // console.log(view)
-      if (state.visitedViews.some(v => v.path === view.path)) {
+      if (state.visitedViews.some(v => v.fullPath === view.fullPath)) {
         state.visitedViews.forEach(v => {
           if (v.path === view.path) {
             v.fullPath = view.fullPath
@@ -20,7 +19,7 @@ const tagsView = {
           name: view.name,
           path: view.path,
           fullPath: view.fullPath,
-          query: view.query,
+          query: view.query, 
           title: view.meta.title || 'no-name'
         })
       }

src/utils/vueFilter.js

@@ -375,4 +375,17 @@ Vue.filter('editionFilter', value => {
         'android-education':'安卓-教务端',
   }
   return template[value]
+})
+
+
+// payStatus  订单支付状态
+Vue.filter('payStatus', value => {
+  let template = {
+    WAIT_PAY: "等待支付",
+    ING: "交易中",
+    SUCCESS:'成功交易',
+    FAILED:'交易失败',
+    CLOSE:'交易关闭'
+  }
+  return template[value]
 })

src/views/accompanyManager/accompanyList.vue

@@ -8,7 +8,7 @@
       <el-form :inline="true" class="searchForm" v-model.trim="searchForm">
         <!-- 状态 指导老师 活动方案-->
         <el-form-item>
-          <el-input v-model.trim="searchForm.search" @keyup.enter.native="search" placeholder="课程名称"></el-input>
+          <el-input v-model.trim="searchForm.search" @keyup.enter.native="search" placeholder="课程组名称"></el-input>
         </el-form-item>
            <el-form-item>
           <el-select
@@ -66,7 +66,7 @@
           :header-cell-style="{background:'#EDEEF0',color:'#444'}"
           :data="tableData"
         >
-          <el-table-column align="center" prop="id" label="课程编号"></el-table-column>
+          <el-table-column align="center" prop="id" label="课程组编号"></el-table-column>
           <el-table-column align="center" prop="name" label="课程组名称"></el-table-column>
            <el-table-column align="center" prop="organName" label="所属分部"></el-table-column>
           <!-- organName -->

src/views/studentManager/components/studentOrder.vue

@@ -78,27 +78,43 @@
                 :header-cell-style="{background:'#EDEEF0',color:'#444'}">
         <el-table-column label="订单日期"
                          prop="createTime"
+                        align='center'
                          width="180px">
         </el-table-column>
         <el-table-column label="交易类型"
+         align='center'
                          width="180px">
           <template slot-scope="scope">
             {{ scope.row.type | orderType }}
           </template>
         </el-table-column>
         <el-table-column width="180px"
+         align='center'
                          label="应付金额"
                          prop="expectAmount">
         </el-table-column>
         <el-table-column width="180px"
+         align='center'
                          label="余额支付"
                          prop="balancePaymentAmount">
         </el-table-column>
         <el-table-column width="180px"
+         align='center'
                          label="实际金额"
                          prop="actualAmount">
         </el-table-column>
+        <el-table-column width="180px"
+         align='center'
+                         label="订单状态"
+                         prop="status">
+                         <template slot-scope="scope">
+                           <div >
+                              {{scope.row.status | payStatus}}
+                           </div>
+                         </template>
+        </el-table-column>
         <el-table-column label="订单说明"
+         align='center'
                          prop="memo">
         </el-table-column>
       </el-table>

src/views/studentManager/studentList.vue

@@ -101,6 +101,11 @@
                            prop="username"
                            label="学员姓名">
           </el-table-column>
+           <el-table-column align='center'
+                           prop="organName"
+                            width="150px"
+                           label="所属分部">
+          </el-table-column>
           <el-table-column align='center'
                            label="性别">
             <template slot-scope="scope">
@@ -112,6 +117,7 @@
                            label="家长姓名">
           </el-table-column>
           <el-table-column align='center'
+           width="180px"
                            prop="parentsPhone"
                            label="家长联系电话">
           </el-table-column>
@@ -144,7 +150,8 @@
                            label="课程余额(元)">
           </el-table-column>
           <el-table-column align='center'
-          width="150px"
+         fixed="right"
+          width="180px"
                            label="操作">
             <template slot-scope="scope">
               <router-link style="color:#409EFF"

src/views/vipClass/vipList.vue

@@ -81,7 +81,7 @@
           :header-cell-style="{background:'#EDEEF0',color:'#444'}"
           :data="tableData"
         >
-          <el-table-column align="center" prop="id" label="VIP编号"></el-table-column>
+          <el-table-column align="center" prop="id" label="课程组编号"></el-table-column>
           <el-table-column align="center" prop="name" label="课程名称"></el-table-column>
           <el-table-column align="center" prop="status" label="课程状态">
             <template slot-scope="scope">