Merge branch 'online' into LAO_MO

dist/static/css/chunk-c1f8785c.d13556af.css → dist/static/css/chunk-098565e5.07131c65.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-0548f97e]{display:inline-block;margin-right:10px}.right-code .title[data-v-0548f97e]{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-46ed72ba]{display:inline-block;margin-right:10px}.right-code .title[data-v-46ed72ba]{font-size:18px;text-align:center;padding-bottom:8px}

dist/static/css/chunk-296f2107.1a0b5ca0.css → dist/static/css/chunk-2bbe03f0.d799bdce.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}.right-code .title[data-v-1a8f1464]{font-size:18px;text-align:center;padding-bottom:8px}.newBand[data-v-1a8f1464]{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}.right-code .title[data-v-16e18c2f]{font-size:18px;text-align:center;padding-bottom:8px}.newBand[data-v-16e18c2f]{display:inline-block}

dist/static/css/chunk-2c7693d9.5b722d11.css

@@ -1 +0,0 @@
-.el-button--primary[data-v-15e68305],.el-button--primary[data-v-15e68305]:active,.el-button--primary[data-v-15e68305]:focus,.el-button--primary[data-v-15e68305]:hover{background:#14928a;border-color:#14928a;color:#fff}.el-row[data-v-15e68305]{margin-top:40px}.el-col[data-v-15e68305]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center;margin-bottom:20px;-webkit-box-pack:end;-ms-flex-pack:end;justify-content:flex-end;margin-right:50%}.el-input-group[data-v-15e68305]{width:200px;margin:0 20px}[data-v-15e68305] .el-tree-node__content{height:40px!important}[data-v-15e68305] .avatar-uploader .el-upload{border:1px dashed #d9d9d9;border-radius:6px;cursor:pointer;position:relative;overflow:hidden}.avatar-uploader .el-upload[data-v-15e68305]:hover{border-color:#409eff}.avatar-uploader-icon[data-v-15e68305]{font-size:28px;color:#8c939d;width:120px;height:120px;line-height:120px;text-align:center}.avatar[data-v-15e68305]{width:120px;height:120px;display:block}

dist/static/css/chunk-9808b29c.d25d6733.css

@@ -0,0 +1 @@
+.el-button--primary[data-v-fcd7a628],.el-button--primary[data-v-fcd7a628]:active,.el-button--primary[data-v-fcd7a628]:focus,.el-button--primary[data-v-fcd7a628]:hover{background:#14928a;border-color:#14928a;color:#fff}.el-row[data-v-fcd7a628]{margin-top:40px}.el-col[data-v-fcd7a628]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center;margin-bottom:20px;-webkit-box-pack:end;-ms-flex-pack:end;justify-content:flex-end;margin-right:50%}.el-input-group[data-v-fcd7a628]{width:200px;margin:0 20px}[data-v-fcd7a628] .el-tree-node__content{height:40px!important}[data-v-fcd7a628] .avatar-uploader .el-upload{border:1px dashed #d9d9d9;border-radius:6px;cursor:pointer;position:relative;overflow:hidden}.avatar-uploader .el-upload[data-v-fcd7a628]:hover{border-color:#409eff}.avatar-uploader-icon[data-v-fcd7a628]{font-size:28px;color:#8c939d;width:120px;height:120px;line-height:120px;text-align:center}.avatar[data-v-fcd7a628]{width:120px;height:120px;display:block}

src/layout/components/Sidebar/index.vue

@@ -46,7 +46,7 @@ export default {
       if (meta.activeMenu) {
         return meta.activeMenu
       }
-      console.log(meta, path)
+      // console.log(meta, path)
       return path
     },
     showLogo () {

src/utils/searchArray.js

@@ -49,7 +49,8 @@ const orderStatus = [
   { value: "RENEW", label: "续费" },
   { value: "OTHER", label: "其他" },
   { value: "SMALL_CLASS_TO_BUY", label: "VIP购买" },
-  { value: "SPORADIC", label: "零星收费" }
+  { value: "SPORADIC", label: "零星收费" },
+  { value: "LUCK", label: "福袋活动" },
 ]
 
 // 交易状态

src/utils/vueFilter.js

@@ -196,7 +196,8 @@ Vue.filter('orderType', value => {
     RENEW: "续费",
     OTHER: "其他",
     SMALL_CLASS_TO_BUY: "VIP购买",
-    SPORADIC: '零星收费'
+    SPORADIC: '零星收费',
+    LUCK: "福袋活动"
   }
   return template[value]
 })

src/views/businessManager/orderManager/income.vue

@@ -122,6 +122,12 @@
               {{ scope.row.status | dealStatus }}
             </template>
           </el-table-column>
+          <el-table-column align='center'
+                           label="备注">
+            <template slot-scope="scope">
+              {{ scope.row.memo ? scope.row.memo : '-' }}
+            </template>
+          </el-table-column>
         </el-table>
         <pagination :total="pageInfo.total"
                     :page.sync="pageInfo.page"

src/views/businessManager/orderManager/incomeOne.vue

@@ -69,6 +69,12 @@
               {{ scope.row.status | dealStatus }}
             </template>
           </el-table-column>
+          <el-table-column align='center'
+                           label="备注">
+            <template slot-scope="scope">
+              {{ scope.row.memo ? scope.row.memo : '-' }}
+            </template>
+          </el-table-column>
         </el-table>
         <pagination :total="pageInfo.total" :page.sync="pageInfo.page" :limit.sync="pageInfo.limit" :page-sizes="pageInfo.page_size"
           @pagination="getList" />

src/views/businessManager/orderManager/incomeTwo.vue

@@ -122,6 +122,12 @@
               {{ scope.row.status | dealStatus }}
             </template>
           </el-table-column>
+          <el-table-column align='center'
+                           label="备注">
+            <template slot-scope="scope">
+              {{ scope.row.memo ? scope.row.memo : '-' }}
+            </template>
+          </el-table-column>
         </el-table>
         <pagination :total="pageInfo.total"
                     :page.sync="pageInfo.page"

src/views/businessManager/shopManager/shopOperation.vue

@@ -101,10 +101,10 @@ import { categoryListTree, goodsAdd, goodsUpdate, goodsSingleQuery } from '@/api
 // import store from '@/store'
 import { getToken } from '@/utils/auth'
 let validPrice = (rule, value, callback) => {
-  if (!value) {
+  if (value == '' && typeof value == 'string') {
     callback(new Error('请输入金额'))
   } else if (value < 0) {
-    callback(new Error('输入金额必须大于0'))
+    callback(new Error('输入金额必须大于或等于0'))
   } else if (value >= 100000) {
     callback(new Error('输入金额必须小于100000'))
   } else {

src/views/resetTeaming/components/resetSound.vue

@@ -10,7 +10,7 @@
       <el-table-column align='center'
                        width="180px;"
                        prop="yuji"
-                       label="预计收费">
+                       label="课程费用">
         <template slot-scope="scope">
           <div>
             <el-input style="width:100px"

src/views/sporadicManager/sporadicList.vue

@@ -45,7 +45,6 @@
                        :value="5"></el-option>
             <el-option label="福袋活动"
                        :value="6"></el-option>
-
           </el-select>
         </el-form-item>
         <el-form-item>
@@ -106,7 +105,7 @@
           <el-table-column align='center'
                            label="订单类型">
             <template slot-scope="scope">
-              {{ scope.row.userId ? '人个' : '公用' }}
+              {{ scope.row.userId ? '个人' : '公用' }}
             </template>
           </el-table-column>
           <el-table-column align='center'

src/views/studentManager/studentList.vue

@@ -133,7 +133,6 @@
                width="700px"
                label-width='100px'
                label-position="right"
-               before-close="closeStudentVisible"
                :visible.sync="studentVisible">
       <el-divider>基本信息</el-divider>
       <el-form :model="studentForm"
@@ -455,9 +454,6 @@ export default {
         nation: row.nation
       }
     },
-    closeStudentVisible () {
-
-    },
   },
   watch: {
     studentVisible (val) {

src/views/teamDetail/componentCourse/courseList.vue

@@ -25,19 +25,6 @@
                      value="SINGLE"></el-option>
         </el-select>
       </el-form-item>
-      <el-form-item label="课程状态">
-        <el-select v-model="searchForm.classStatus"
-                   clearable
-                   filterable
-                   placeholder="课程状态">
-          <el-option label="未开始"
-                     value="NOT_START"></el-option>
-          <el-option label="进行中"
-                     value="UNDERWAY"></el-option>
-          <el-option label="已结束"
-                     value="OVER"></el-option>
-        </el-select>
-      </el-form-item>
       <el-form-item label="班级名称">
         <!-- getMusicGroupAllClass -->
         <el-select v-model="searchForm.class"

src/views/teamDetail/teamCourseList.vue

@@ -1,11 +1,28 @@
 <template>
   <div class='m-container'>
+    <h2>
+      <div class="squrt"></div>课表列表
+    </h2>
     <div class="m-core">
       <!-- 搜索类型 -->
       <el-form :inline="true"
               class="searchForm"
               v-model="searchForm">
         <el-form-item>
+          <el-input v-model="searchForm.search" placeholder="乐团名或VIP课名" />
+        </el-form-item>
+        <el-form-item>
+          <el-select v-model="searchForm.teacherIdList"
+                    clearable
+                    filterable
+                    placeholder="请选择老师">
+            <el-option v-for="(item, index) in teacherList"
+                       :key="index"
+                       :value="item.id"
+                       :label="item.realName"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item>
           <el-select class='multiple'
                      v-model="searchForm.organIdList"
                      filterable
@@ -18,9 +35,6 @@
           </el-select>
         </el-form-item>
         <el-form-item>
-          <el-input v-model="searchForm.search" placeholder="乐团名或VIP课名" />
-        </el-form-item>
-        <el-form-item>
           <el-select v-model="searchForm.courseType"
                     clearable
                     filterable
@@ -183,6 +197,7 @@ export default {
         timer: [nowTime, nowTime], // 时间
         class: null,
         search: null, // 乐团名称 编号 vip课名称
+        teacherIdList: null, // 老师编号
       },
       tableList: [],
       searchLsit: [],
@@ -248,7 +263,8 @@ export default {
         page: this.rules.page, rows: this.rules.limit,
         classGroupId: searchForm.class || null,
         organIdList: searchForm.organIdList || null,
-        search: searchForm.search || null
+        search: searchForm.search || null,
+        teacherIdList: searchForm.teacherIdList || null
       }
       superFindCourseSchedules(obj).then(res => {
         if (res.code == 200) {

vue.config.js

@@ -18,10 +18,10 @@ const name = defaultSettings.title || '管乐迷后台管理系统' // page titl
 // //  https://online.dayaedu.com
 // let target = 'https://online.dayaedu.com' //线上
 // let target = 'http://testadm.dayaedu.com/' //test环境
-let target = 'http://192.168.3.27:8000' // 箭河
+// let target = 'http://192.168.3.27:8000' // 箭河
 // let target = 'http://192.168.3.28:8000' //邹璇
 // let target = 'http://192.168.3.8:18000' //勇哥
-// let target = 'http://admin.dayaedu.com/' // 测试服
+let target = 'http://admin.dayaedu.com' // 测试服
 // let target = 'http://192.168.3.48:8080' // 乔
 // All configuration item explanations can be find in https://cli.vuejs.org/config/
 module.exports = {