Merge branch 'online' into wxl

src/api/buildTeam.js

@@ -571,7 +571,7 @@ export function pauseMusicGroup (data) {
   })
 }
 
-// 暂停乐团
+// 取消乐团
 export function cancelMusicGroup (data) {
   return request({
     url: api + `/musicGroup/cancelMusicGroup`,

src/router/index.js

@@ -201,7 +201,9 @@ export const asyncRoutes = {
   // 乐团修改 @/views/resetTeaming/index
   resetTeaming: () => import('@/views/resetTeaming/index'),
   // 乐团课排课
-  coursePlan: () => import('@/views/teamBuild/teamSeting/components/coursePlan')
+  coursePlan: () => import('@/views/teamBuild/teamSeting/components/coursePlan'),
+  // 收费分润管理
+  chargeProfitManager: () => import('../views/categroyManager/insideSetting/chargeProfitManager')
 
 }
 export default router

src/utils/request.js

@@ -1,8 +1,45 @@
+import ElementUI from 'element-ui'
 import axios from 'axios'
 import { Message } from 'element-ui'
 import store from '@/store'
 import { getToken } from '@/utils/auth'
 import { Loading } from 'element-ui'
+// import '@/main'
+import Vue from 'vue'
+const showMessage = Symbol('showMessage')
+class DonMessage {
+  success (options, single = true) {
+    this[showMessage]('success', options, single)
+  }
+  warning (options, single = true) {
+    this[showMessage]('warning', options, single)
+  }
+  info (options, single = true) {
+    this[showMessage]('info', options, single)
+  }
+  error (options, single = true) {
+    this[showMessage]('error', options, single)
+  }
+  [showMessage] (type, options, single) {
+    if (single) {
+      // 判断是否已存在Message
+      if (document.getElementsByClassName('el-message').length === 0) {
+        Message[type](options)
+      }
+    } else {
+      Message[type](options)
+    }
+  }
+}
+
+// ... 
+
+Vue.use(ElementUI)
+// 命名根据需要，DonMessage只是在文章中使用
+Vue.prototype.$message = new DonMessage()
+
+let vue = new Vue()
+
 let loading        //定义loading变量
 
 function startLoading () {    //使用Element loading-start 方法
@@ -80,11 +117,12 @@ service.interceptors.response.use(
       let data = JSON.parse(JSON.stringify(res.data))
       // 50008: Illegal token; 50012: Other clients logged in; 50014: Token expired;
       if (data.code == 401 || data.code == 403) {
-        Message({
-          message: `登陆过期，请重新登录！`,
-          type: 'error',
-          duration: 5 * 1000
-        })
+        // Message({
+        //   message: `登陆过期，请重新登录！`,
+        //   type: 'error',
+        //   duration: 5 * 1000
+        // })
+        vue.$message.error(`登陆过期，请重新登录！`)
         setTimeout(() => {
           tryHideFullScreenLoading()
           store.dispatch('user/resetToken').then(() => {
@@ -95,11 +133,14 @@ service.interceptors.response.use(
         return;
       }
       if (data.code != 200) {
-        Message({
-          message: data.msg || `请求失败code码为${data.code}`,
-          type: 'error',
-          duration: 5 * 1000
-        })
+        // Message({
+        //   message: data.msg || `请求失败code码为${ data.code }`,
+        //   type: 'error',
+        //   duration: 5 * 1000
+        // })
+        let str = data.msg || `请求失败code码为${data.code}`
+        // console.log(Vue);
+        vue.$message.error(str)
         tryHideFullScreenLoading()
         return Promise.reject(new Error(data.msg || 'Error'))
       } else {
@@ -117,11 +158,12 @@ service.interceptors.response.use(
   },
   error => {
     // console.log('err' + error) // for debug
-    Message({
-      message: error.message,
-      type: 'error',
-      duration: 5 * 1000
-    })
+    // Message({
+    //   message: error.message,
+    //   type: 'error',
+    //   duration: 5 * 1000
+    // })
+    vue.$message.error(error.message)
     tryHideFullScreenLoading()
     return Promise.reject(error)
   }

src/utils/vueFilter.js

@@ -263,6 +263,12 @@ Vue.filter('teamStatus', value => {
   return template[value]
 })
 
+// 学生状态
+/**studentStatus */
+Vue.filter('studentStatus', value => {
+  let template = ['正常', '退学', '退学中']
+  return template[value]
+})
 // 学生点名
 Vue.filter('studentRecord', value => {
   let template = {
@@ -335,10 +341,19 @@ Vue.filter('vipCourseStatus', value => {
   let template = {
     0: "未开始",
     1: "报名中",
-    5:"报名结束",
+    5: "报名结束",
     2: "进行中",
     4: "已结束",
     3: "取消"
   }
   return template[value]
+})
+
+// 交易状态
+Vue.filter('paymentChannelStatus', value => {
+  let template = {
+    YQPAY: "双乾",
+    BALANCE: "余额"
+  }
+  return template[value]
 })

src/views/businessManager/orderManager/income.vue

@@ -62,6 +62,7 @@
                            label="交易流水号">
           </el-table-column>
           <el-table-column align='center'
+                           width="210px"
                            prop="orderNo"
                            label="订单号">
           </el-table-column>
@@ -94,6 +95,9 @@
           <el-table-column align='center'
                            prop="paymentChannel"
                            label="交易方式">
+            <template slot-scope="scope">
+              {{ scope.row.paymentChannel | paymentChannelStatus }}
+            </template>
           </el-table-column>
           <el-table-column align='center'
                            label="收款账户">

src/views/teamBuild/components/teamBaseInfo.vue

@@ -308,7 +308,7 @@
            v-if='payList.student.chiose == "loop"'>按月缴费时，将在所选月份的1号的前一周提醒用户缴费操作，单次的缴费金额为当前列表「预计收费」的设置金额</p>
         <div class="chioseWrap"
              v-if='payList.student.chiose == "loop"'>
-          <p>请选择缴费月份:</p>
+          <p>缴费月份:</p>
           <el-checkbox-group v-model="payList.chioseMonth"
                              fill="#14928A"
                              text-color='#474747'>
@@ -894,7 +894,7 @@ export default {
     color: #606266;
   }
   .subTitle {
-    width: 1203px;
+    // width: 1203px;
     height: 40px;
     line-height: 40px;
     background-color: #fefceb;
@@ -910,8 +910,9 @@ export default {
     flex-direction: row;
     padding: 0 25px;
     p {
+      width: 80px;
       font-size: 14px;
-      margin-right: 30px;
+      // margin-right: 30px;
     }
   }
   // .baseRight {

src/views/teamBuild/components/teamResetSound.vue

@@ -551,7 +551,7 @@ export default {
   }
 }
 .subTitle {
-  width: 1203px;
+  // width: 1203px;
   height: 40px;
   line-height: 40px;
   background-color: #fefceb;

src/views/teamBuild/components/teamSoundMoney.vue

@@ -824,7 +824,7 @@ export default {
     margin-bottom: 15px;
   }
   .subTitle {
-    width: 1203px;
+    // width: 1203px;
     height: 40px;
     line-height: 40px;
     background-color: #fefceb;

src/views/teamBuild/teamSeting/components/improvementClass.vue

@@ -266,7 +266,7 @@ export default {
       // 获取提高班列表
       highClassGroups({ musicGroupId: this.teamid }).then(res => {
         if (res.code == 200) {
-          this.tableList = res.data;
+          this.tableList = res.data
           // for (let i in this.tableList) {
           //   this.tableList[i].endClassTime = this.tableList[i].endClassTime.substring(0, this.tableList[i].endClassTime.length - 3);
           //   this.tableList[i].startClassTime = this.tableList[i].startClassTime.substring(0, this.tableList[i].startClassTime.length - 3);

src/views/teamDetail/teamList.vue

@@ -186,6 +186,9 @@
                 <el-button type="text"
                            v-if="scope.row.status == 'DRAFT' && permission('teamDetail/draft/update')"
                            @click="lookTeamDetail(scope.row)">编辑</el-button>
+                <el-button type="text"
+                           v-if="scope.row.status == 'DRAFT' && permission('musicGroup/cancelMusicGroup')"
+                           @click="stopTeam(scope.row)">取消申请</el-button>
                 <!-- 审核失败 编辑 -->
                 <el-button type="text"
                            v-if="scope.row.status == 'AUDIT_FAILED' && permission('teamDetail/aduitFailed/update')"

src/views/vipClass/vipDetail/components/vipStudentList.vue

@@ -7,13 +7,46 @@
                 :header-cell-style="{background:'#EDEEF0',color:'#444'}">
         <el-table-column label="学员姓名"
                          prop="userName"
+                         align="center"
                          width="180">
         </el-table-column>
         <el-table-column label="手机号"
+                         align="center"
                          prop="phone"
                          width="180">
         </el-table-column>
-        <el-table-column label="操作">
+        <el-table-column prop="studentStatus"
+                         align="center"
+                         label="学员状态">
+          <template slot-scope="scope">
+            <div>
+              {{ scope.row.studentStatus | studentStatus }}
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column prop="courseSalary"
+                         align="center"
+                         label="剩余费用"></el-table-column>
+        <el-table-column prop="applyDate"
+                         align="center"
+                         label="报名时间">
+          <template slot-scope="scope">
+            <div>
+              {{scope.row.applyDate |formatTimer }}
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column prop="refundDate"
+                         align="center"
+                         label="退课时间">
+          <template slot-scope="scope">
+            <div>
+              {{scope.row.refundDate |formatTimer }}
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作"
+                         align="center">
           <template slot-scope="scope">
             <div>
               <!-- <el-popover placement="top"
@@ -79,8 +112,7 @@
                          align="center"
                          label="手机号"
                          width="200"></el-table-column>
-        <el-table-column prop="courseSalary"
-                         label="剩余费用"></el-table-column>
+
       </el-table>
       <pagination :total="rules.total"
                   :page.sync="rules.page"

src/views/vipClass/vipList.vue

@@ -141,6 +141,8 @@
             </template>
           </el-table-column>
           <el-table-column align='center'
+                           width="150px"
+                           fixed="right"
                            label="操作">
             <template slot-scope="scope">
               <div>

vue.config.js

@@ -15,10 +15,10 @@ const name = defaultSettings.title || '管乐迷后台管理系统' // page titl
 // 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 
-// 
-let target = 'http://testadm.dayaedu.com/' //勇哥迁库
+// // 
+// let target = 'http://testadm.dayaedu.com/' //勇哥迁库
 // let target = 'http://192.168.3.27:8000' // 箭河
-// let target = 'http://192.168.3.28: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' // 乔