update files

dist/static/css/chunk-3e699cc0.b1174fc4.css

@@ -0,0 +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}.vipwrap[data-v-de5bbc76]{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:start;-ms-flex-pack:start;justify-content:flex-start}.vipwrap .newBand[data-v-de5bbc76]{margin-right:20px}.resetClassForm[data-v-de5bbc76] .el-date-editor.el-input,.resetClassForm[data-v-de5bbc76] .el-date-editor.el-input__inner{width:180px!important}[data-v-de5bbc76] .el-date-editor.el-input,[data-v-de5bbc76] .el-date-editor.el-input__inner{width:100px!important}

dist/static/css/chunk-5e5d6dc0.641b676e.css

@@ -0,0 +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}

dist/static/css/chunk-dc69ca8a.641b676e.css

@@ -0,0 +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}

dist/static/js/chunk-2d0b8f21.783b5a70.js

@@ -0,0 +1 @@
+(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-2d0b8f21"],{"319f":function(n,e,t){"use strict";t.r(e);var u=function(){var n=this,e=n.$createElement,t=n._self._c||e;return t("div",[n._v("\n  结算周期设置\n")])},c=[],l=t("2877"),r={},s=Object(l["a"])(r,u,c,!1,null,null,null);e["default"]=s.exports}}]);

dist/static/js/chunk-2d0c42e2.62e0bc46.js

@@ -0,0 +1 @@
+(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-2d0c42e2"],{"3a75":function(e,n,t){"use strict";t.r(n);var u=function(){var e=this,n=e.$createElement,t=e._self._c||n;return t("div",[t("router-view")],1)},c=[],r=t("2877"),l={},a=Object(r["a"])(l,u,c,!1,null,null,null);n["default"]=a.exports}}]);

dist/static/js/chunk-2d0c49aa.2dfc794d.js

@@ -0,0 +1 @@
+(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-2d0c49aa"],{"3c15":function(n,e,c){"use strict";c.r(e);var t=function(){var n=this,e=n.$createElement,c=n._self._c||e;return c("div",[n._v("\n  异常签到\n")])},u=[],a=c("2877"),l={},r=Object(a["a"])(l,t,u,!1,null,null,null);e["default"]=r.exports}}]);

dist/static/js/chunk-2d0cc2c5.c0a8c3fd.js

@@ -0,0 +1 @@
+(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-2d0cc2c5"],{"4d98":function(e,n,c){"use strict";c.r(n);var t=function(){var e=this,n=e.$createElement,c=e._self._c||n;return c("div",[c("router-view")],1)},u=[],r=c("2877"),l={},i=Object(r["a"])(l,t,u,!1,null,null,null);n["default"]=i.exports}}]);

dist/static/js/chunk-2d0e22e3.34c43ada.js

@@ -0,0 +1 @@
+(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-2d0e22e3"],{"7e32":function(n,e,t){"use strict";t.r(e);var u=function(){var n=this,e=n.$createElement,t=n._self._c||e;return t("div",[n._v("\n  支付通道设置\n")])},c=[],l=t("2877"),r={},s=Object(l["a"])(r,u,c,!1,null,null,null);e["default"]=s.exports}}]);

dist/static/js/chunk-2d0f0a2c.ddbd9970.js

@@ -0,0 +1 @@
+(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-2d0f0a2c"],{"9ce1":function(e,n,t){"use strict";t.r(n);var c=function(){var e=this,n=e.$createElement,t=e._self._c||n;return t("div",{staticClass:"m-container"},[t("router-view")],1)},a=[],r={},s=r,u=t("2877"),i=Object(u["a"])(s,c,a,!1,null,null,null);n["default"]=i.exports}}]);

dist/static/js/chunk-2d208c0d.bab4493e.js

@@ -0,0 +1 @@
+(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-2d208c0d"],{a5ad:function(n,e,t){"use strict";t.r(e);var c=function(){var n=this,e=n.$createElement,t=n._self._c||e;return t("div",[n._v("\n  请假管理\n")])},u=[],a=t("2877"),l={},r=Object(a["a"])(l,c,u,!1,null,null,null);e["default"]=r.exports}}]);

dist/static/js/chunk-2d209131.5d48aa67.js

@@ -0,0 +1 @@
+(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-2d209131"],{a804:function(n,e,t){"use strict";t.r(e);var u=function(){var n=this,e=n.$createElement,t=n._self._c||e;return t("div",[n._v("\n  系统模板设置\n")])},c=[],l=t("2877"),a={},r=Object(l["a"])(a,u,c,!1,null,null,null);e["default"]=r.exports}}]);

dist/static/js/chunk-2d2221d6.a53adbe2.js

@@ -0,0 +1 @@
+(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-2d2221d6"],{ccdd:function(n,e,c){"use strict";c.r(e);var t=function(){var n=this,e=n.$createElement,c=n._self._c||e;return c("div",[n._v("\n  节假日设置\n")])},u=[],l=c("2877"),d={},r=Object(l["a"])(d,t,u,!1,null,null,null);e["default"]=r.exports}}]);

dist/static/js/chunk-2d226388.52a44c04.js

@@ -0,0 +1 @@
+(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-2d226388"],{e876:function(n,e,t){"use strict";t.r(e);var u=function(){var n=this,e=n.$createElement,t=n._self._c||e;return t("div",[n._v("\n  课程活动设置\n")])},c=[],l=t("2877"),r={},s=Object(l["a"])(r,u,c,!1,null,null,null);e["default"]=s.exports}}]);

dist/static/js/chunk-2d229d67.a43b4f63.js

@@ -0,0 +1 @@
+(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-2d229d67"],{dec3:function(e,n,t){"use strict";t.r(n);var u=function(){var e=this,n=e.$createElement,t=e._self._c||n;return t("div",[t("router-view")],1)},c=[],r={},l=r,i=t("2877"),o=Object(i["a"])(l,u,c,!1,null,null,null);n["default"]=o.exports}}]);

dist/static/js/chunk-a18ee754.d9803d7d.js

@@ -0,0 +1 @@
+(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-a18ee754"],{"26fc":function(t,s,a){t.exports=a.p+"static/img/404_cloud.0f4bc32b.png"},"8cdb":function(t,s,a){"use strict";a.r(s);var e=function(){var t=this,s=t.$createElement,a=t._self._c||s;return a("div",{staticClass:"wscn-http404-container"},[a("div",{staticClass:"wscn-http404"},[t._m(0),t._v(" "),a("div",{staticClass:"bullshit"},[a("div",{staticClass:"bullshit__oops"},[t._v("OOPS!")]),t._v(" "),t._m(1),t._v(" "),a("div",{staticClass:"bullshit__headline"},[t._v(t._s(t.message))]),t._v(" "),a("div",{staticClass:"bullshit__info"},[t._v("Please check that the URL you entered is correct, or click the button below to return to the homepage.")]),t._v(" "),a("a",{staticClass:"bullshit__return-home",attrs:{href:""}},[t._v("Back to home")])])])])},c=[function(){var t=this,s=t.$createElement,e=t._self._c||s;return e("div",{staticClass:"pic-404"},[e("img",{staticClass:"pic-404__parent",attrs:{src:a("a36b"),alt:"404"}}),t._v(" "),e("img",{staticClass:"pic-404__child left",attrs:{src:a("26fc"),alt:"404"}}),t._v(" "),e("img",{staticClass:"pic-404__child mid",attrs:{src:a("26fc"),alt:"404"}}),t._v(" "),e("img",{staticClass:"pic-404__child right",attrs:{src:a("26fc"),alt:"404"}})])},function(){var t=this,s=t.$createElement,a=t._self._c||s;return a("div",{staticClass:"bullshit__info"},[t._v("All rights reserved\n        "),a("a",{staticStyle:{color:"#20a0ff"},attrs:{href:"https://wallstreetcn.com",target:"_blank"}},[t._v("wallstreetcn")])])}],i={name:"Page404",computed:{message:function(){return"The webmaster said that you can not enter this page..."}}},l=i,n=(a("ba3c"),a("2877")),r=Object(n["a"])(l,e,c,!1,null,"6dd02360",null);s["default"]=r.exports},a36b:function(t,s,a){t.exports=a.p+"static/img/404.a57b6f31.png"},ba3c:function(t,s,a){"use strict";var e=a("e6b3"),c=a.n(e);c.a},e6b3:function(t,s,a){}}]);

src/utils/searchArray.js

@@ -48,8 +48,7 @@ const orderStatus = [
   { value: "APPLY", label: "报名" },
   { value: "RENEW", label: "续费" },
   { value: "OTHER", label: "其他" },
-  { value: "SMALL_CLASS_TO_BUY", label: "VIP购买" },
-  { value: "SPORADIC", label: "零星收费" }
+  { value: "SMALL_CLASS_TO_BUY", label: "VIP购买" }
 ]
 
 // 交易状态

src/views/businessManager/orderManager/backMoney.vue

@@ -133,6 +133,7 @@ import pagination from '@/components/Pagination/index'
 import { studentRefundsQueryPage, applyRefundAudit } from '@/api/orderManager'
 import { getEmployeeOrgan } from '@/api/buildTeam'
 import store from '@/store'
+import { orderStatus, dealStatus } from '@/utils/searchArray'
 export default {
   components: { pagination },
   name: 'income',

src/views/businessManager/orderManager/expend.vue

@@ -128,6 +128,7 @@ import pagination from '@/components/Pagination/index'
 import { studentWithdraw, studentWithdrawConfirm } from '@/api/orderManager'
 import { getEmployeeOrgan } from '@/api/buildTeam'
 import store from '@/store'
+import { orderStatus, dealStatus } from '@/utils/searchArray'
 export default {
   components: { pagination },
   name: 'income',

src/views/businessManager/orderManager/incomeTwo.vue

@@ -138,9 +138,11 @@ import { orderQueryPage2 } from '@/api/orderManager'
 import { getEmployeeOrgan } from '@/api/buildTeam'
 // import store from '@/store'
 import { orderStatus, dealStatus } from '@/utils/searchArray'
-import axios from 'axios'
-import qs from 'qs'
-import { getToken } from '@/utils/auth'
+  import axios from 'axios'
+  import qs from 'qs'
+  import {
+    getToken
+  } from '@/utils/auth'
 export default {
   components: { pagination },
   name: 'income',

src/views/studentManager/components/studentOrder.vue

@@ -52,7 +52,10 @@
         <el-select v-model="searchForm.paymentType"
                    filterable
                    clearable
+<<<<<<< Updated upstream
                    @clear="onClear('paymentType')"
+=======
+>>>>>>> Stashed changes
                    placeholder="交易类型">
           <el-option v-for="(item, index) in orderStatus"
                      :key="index"
@@ -146,11 +149,14 @@ export default {
     this.__init()
   },
   methods: {
+<<<<<<< Updated upstream
     onClear(type) {
       if(type == 'paymentType') {
         this.searchForm.paymentType = null
       }
     },
+=======
+>>>>>>> Stashed changes
     __init () {
       getUserCashAccountBaseInfo({ userId: this.$route.query.userId }).then(res => {
         if (res.code == 200) {

src/views/teamDetail/components/studentSignin.vue

@@ -21,6 +21,7 @@
                           end-placeholder="结束日期">
           </el-date-picker>
         </el-form-item>
+<<<<<<< Updated upstream
         <el-form-item label='班级名称'>
           <el-select v-model="searchForm.className">
             <el-option v-for='(item,index) in classList'
@@ -28,6 +29,10 @@
                        :label="item.name"
                        :value="item.id"></el-option>
           </el-select>
+=======
+        <el-form-item label='课程名称'>
+          <el-input v-model="searchForm.courseName"></el-input>
+>>>>>>> Stashed changes
         </el-form-item>
         <el-form-item label='学生名字'>
           <el-input v-model="searchForm.studentName"></el-input>
@@ -108,12 +113,10 @@ export default {
         times: [],
         courseName: '',
         studentName: '',
-        sign: '',
-        className: ''
+        sign: ''
       },
 
-      teamid: '',
-      classList: []
+      teamid: ''
     }
   },
   created () {
@@ -129,11 +132,6 @@ export default {
   mounted () {
     this.getList();
     // 获取乐团所有班级
-    getMusicGroupAllClass({ musicGroupId: this.teamid }).then(res => {
-      if (res.code == 200) {
-        this.classList = res.data;
-      }
-    })
   },
   methods: {
     search () {
@@ -178,9 +176,7 @@ export default {
       let userName = this.searchForm.studentName || null
       let signStatus = this.searchForm.sign || null
       let musicGroupId = this.teamid
-      let classGroupId = this.searchForm.className || null
-
-      getStudentRecord({ musicGroupId, page: this.rules.page, rows: this.rules.limit, startTime, endTime, classGroupId, userName, signStatus }).then(res => {
+      getStudentRecord({ musicGroupId, page: this.rules.page, rows: this.rules.limit, startTime, endTime, courseScheduleName, userName, signStatus }).then(res => {
         if (res.code == 200) {
           this.tableList = res.data.rows;
           this.rules.total = res.data.total;

src/views/vipClass/vipReset.vue

@@ -144,16 +144,6 @@
                           }">
           </el-time-select>
         </el-form-item> -->
-        <el-form-item label="课程类型"
-                      prop="courseType">
-          <el-select clearable
-                     v-model="maskForm.teachMode">
-            <el-option label="线上课"
-                       value="ONLINE"></el-option>
-            <el-option label="线下课"
-                       value="OFFLINE"></el-option>
-          </el-select>
-        </el-form-item>
         <el-form-item label="教学地点"
                       v-if='maskForm.teachMode == "OFFLINE"'>
           <el-select v-model="maskForm.address"
@@ -269,9 +259,9 @@
                       v-if='isaddCourse'>
           <el-input v-model="adjustmentForm.fee"></el-input>
         </el-form-item>
-        <!--  v-if='isaddCourse' -->
         <el-form-item label="课程类型"
-                      prop="courseType">
+                      prop="courseType"
+                      v-if='isaddCourse'>
           <el-select clearable
                      v-model="adjustmentForm.courseType">
             <el-option label="线上课"
@@ -280,18 +270,6 @@
                        value="OFFLINE"></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="教学点"
-                      v-if='adjustmentForm.courseType == "OFFLINE"'
-                      prop="address">
-          <el-select v-model="adjustmentForm.address"
-                     clearable
-                     filterable>
-            <el-option v-for="(item,index) in schoolList"
-                       :key="index"
-                       :value="item.id"
-                       :label="item.name"></el-option>
-          </el-select>
-        </el-form-item>
         <br>
         <el-form-item label="排课起始时间"
                       prop="courseTime">
@@ -438,15 +416,13 @@ export default {
         checked: false,
         addCount: '',
         courseType: '',
-        fee: '',
-        address: ''
+        fee: ''
       },
       adjustmentRules: {
         courseTime: [{ required: true, message: '请选择开始时间' }],
         addCount: [{ required: true, message: '请输入加课次数' }],
         courseType: [{ required: true, message: '请选择课程类型' }],
-        fee: [{ required: true, message: '请输入费用' }],
-        address: [{ required: true, message: '选择教学点' }]
+        fee: [{ required: true, message: '请输入费用' }]
       },
       weekDateList: [
         { value: '1', label: '星期一' },
@@ -521,16 +497,11 @@ export default {
       this.courseVisible = false;
       this.$refs['maskForm'].resetFields()
     },
-    // 提交单次课程调整
     submitResetClass () {
       //   endClassTimeStr: this.maskForm.endTime,
-      if (this.maskForm.teachMode == 'ONLINE') {
-        this.maskForm.address = null;
-      }
       let obj = {
         startClassTimeStr: this.maskForm.startTime,
         id: this.maskForm.id,
-        teachMode: this.maskForm.teachMode,
         classDate: this.maskForm.date,
         schoolId: this.maskForm.address || null
       }
@@ -648,7 +619,6 @@ export default {
         }
       }
     },
-    // '批量调整
     adjustment () {
       this.adjustmentName = '批量调整'
       this.isaddCourse = false;
@@ -675,12 +645,6 @@ export default {
           obj.courseTimes = this.weekList;
           obj.holiday = this.adjustmentForm.checked;
           obj.vipGroupId = this.vipid;
-          obj.schoolId = this.adjustmentForm.address || null;
-          obj.teachMode = this.adjustmentForm.courseType || null;
-          if (this.adjustmentForm.courseType == 'ONLINE') {
-            this.adjustmentForm.address = null;
-            obj.schoolId = null;
-          }
           vipCourseAdjust(obj).then(res => {
             if (res.code == 200) {
               this.$message.success('恭喜您修改成功');

vue.config.js

@@ -21,8 +21,8 @@ const name = defaultSettings.title || '管乐迷后台管理系统' // page titl
 // 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://47.99.212.176:8000' // 测试服
-let target = 'http://192.168.3.48:8080' // 乔
+let target = 'http://47.99.212.176:8000' // 测试服
+// let target = 'http://192.168.3.48:8080' // 乔
 // All configuration item explanations can be find in https://cli.vuejs.org/config/
 module.exports = {
   /**