修改

src/api/orderManager.js

@@ -43,7 +43,7 @@ export function studentWithdrawConfirm (data) {
   return request({
     url: api + '/studentWithdraw/confirm',
     method: 'post',
-    data: data
+    data: qs.stringify(data)
   })
 }
 
@@ -54,4 +54,13 @@ export function verifyMusicalList (data) {
     method: 'GET',
     params: data
   })
+}
+
+// 充值列表分页查询
+export function studentRechargeList (data) {
+  return request({
+    url: api + '/studentRecharge/queryPage',
+    method: 'GET',
+    params: data
+  })
 }

src/views/businessManager/orderManager/expend.vue

@@ -29,9 +29,9 @@
           <el-table-column align='center' prop="amount"
                           label="提现金额">
           </el-table-column>
-          <el-table-column align='center' prop="balance"
+          <!-- <el-table-column align='center' prop="balance"
                           label="账户余额">
-          </el-table-column>
+          </el-table-column> -->
           <el-table-column align='center' prop="bankCardNo"
                           label="提现账户">
           </el-table-column>
@@ -50,13 +50,18 @@
           <el-table-column align='center'
                           label="支付渠道">
             <template slot-scope="scope">
-              <el-input type="text" v-model="scope.row.channel" placeholder="支付渠道"></el-input>
+              <!-- <el-input type="text" v-model="scope.row.channel" placeholder="支付渠道"></el-input> -->
+              <el-select  v-model="scope.row.channel" placeholder="请选择">
+                <el-option label="微信" value="WECHAT"> </el-option>
+                <el-option label="支付宝" value="ALIPAY"> </el-option>
+                <el-option label="银联" value="FAST_PAYMENT"> </el-option>
+              </el-select>
             </template>
           </el-table-column>
           <el-table-column align='center'
                           label="交易流水号">
             <template slot-scope="scope">
-              <el-input type="text" v-model="scope.row.withdrawNo" placeholder="交易流水号"></el-input>
+              <el-input type="text" v-model="scope.row.transNo" placeholder="交易流水号"></el-input>
             </template>
           </el-table-column>
           <el-table-column align='center'
@@ -115,13 +120,31 @@ export default {
       })
     },
     onSure(row) {
-      // console.log(row)
-      // studentWithdrawConfirm({
-      //   id: row.id,
-      //   platformAccountNo: row.platformAccountNo,
-      //   channel: row.channel,
-      //   withdrawNo: row.withdrawNo
-      // })
+      console.log(row)
+      this.$confirm('是否提现?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        studentWithdrawConfirm({
+          id: row.id,
+          platformAccountNo: row.platformAccountNo,
+          transType: row.channel,
+          transNo: row.transNo
+        }).then(res => {
+          if(res.code == 200) {
+            this.$message({
+              type: 'success',
+              message: '删除成功!'
+            })
+            this.getList()
+          } else {
+            this.$message.error(res.msg)
+          }
+        })
+        
+      }).catch(() => { })
+      
     }
   }
 }

src/views/businessManager/orderManager/incomebuy.vue

@@ -7,7 +7,7 @@
               class="searchForm"
               v-model="searchForm">
         <el-form-item>
-          <el-date-picker
+          <el-date-picker style="width: 400px"
             v-model="orderDate"
             type="daterange"
             value-format="yyyy-MM-dd"
@@ -82,7 +82,7 @@
 </template>
 <script>
 import pagination from '@/components/Pagination/index'
-import { orderQueryPage } from '@/api/orderManager'
+import { studentRechargeList } from '@/api/orderManager'
 import store from '@/store'
 import { orderStatus, dealStatus } from '@/utils/searchArray'
 export default {
@@ -117,7 +117,7 @@ export default {
       let params = this.searchForm
       params.rows = this.pageInfo.limit
       params.page = this.pageInfo.page
-      orderQueryPage(params).then(res => {
+      studentRechargeList(params).then(res => {
         let result = res.data
         if(res.code == 200) {
           this.tableList = result.rows

src/views/teacherManager/teacherDetail/components/teacherInfo.vue

@@ -145,7 +145,11 @@ export default {
         if(res.code == 200) {
           let tempData = res.data
           tempData.subjectName = this.joinArray(tempData.subjectName)
-          tempData.teacherSchools = this.joinArray(tempData.teacherSchools) // 教学点
+          let sn = []
+          tempData.teacherSchools.forEach(item => {
+            sn.push(item.name)
+          })
+          tempData.teacherSchools = this.joinArray(sn, ',') // 教学点
           tempData.entryDate = this.formatTimer(tempData.entryDate)
           tempData.jobNature = this.jobNature(tempData.jobNature)
           tempData.birthdate = this.formatTimer(tempData.birthdate)

src/views/teacherManager/teacherOperation/components/salarySet.vue

@@ -31,14 +31,20 @@
           <el-table-column label="3.0课酬-主教">
             <template slot-scope="scope">
               <el-input :disabled="scope.row.courseScheduleType == 'CLASSROOM'" v-model="scope.row.mainTeacher90MinSalary" placeholder="请输入课酬">
-                <template slot="append">元/{{ (scope.row.courseScheduleType == 'HIGH' || scope.row.courseScheduleType == 'CLASSROOM') ? 45 : 90 }}分钟</template>
+                <template slot="append" v-if="scope.row.courseScheduleType == 'HIGH'">元/45分钟</template>
+                <template slot="append" v-else-if="scope.row.courseScheduleType == 'CLASSROOM'">元/40分钟</template>
+                <template slot="append" v-else>元/90分钟</template>
+                <!-- <template slot="append">元/{{ (scope.row.courseScheduleType == 'HIGH' || scope.row.courseScheduleType == 'CLASSROOM') ? 45 : 90 }}分钟</template> -->
               </el-input>
             </template>
           </el-table-column>
           <el-table-column label="3.0课酬-助教">
             <template slot-scope="scope">
               <el-input :disabled="scope.row.courseScheduleType == 'CLASSROOM'" v-model="scope.row.assistantTeacher90MinSalary" placeholder="请输入课酬">
-                <template slot="append">元/{{ (scope.row.courseScheduleType == 'HIGH' || scope.row.courseScheduleType == 'CLASSROOM') ? 45 : 90 }}分钟</template>
+                <template slot="append" v-if="scope.row.courseScheduleType == 'HIGH'">元/45分钟</template>
+                <template slot="append" v-else-if="scope.row.courseScheduleType == 'CLASSROOM'">元/40分钟</template>
+                <template slot="append" v-else>元/90分钟</template>
+                <!-- <template slot="append">元/{{ (scope.row.courseScheduleType == 'HIGH' || scope.row.courseScheduleType == 'CLASSROOM') ? 45 : 90 }}分钟</template> -->
               </el-input>
             </template>
           </el-table-column>
@@ -275,9 +281,9 @@ export default {
                 type: 'success'
               })
 
-              if(this.$route.query.type == 'create') {
+              // if(this.$route.query.type == 'create') {
                 this.$router.push('/business/teacherList')
-              }
+              // }
             }
           })
         }

src/views/teacherManager/teacherOperation/components/teacherOperation.vue

@@ -321,7 +321,8 @@ export default {
                     this.topForm.id = this.teacherId
                     teacherUpdate(this.topForm).then(res => {
                         if(res.code == 200) {
-                            this.$emit('onTeacher')
+                            // this.$emit('onTeacher')
+                            this.$router.push('/business/teacherList')
                         }
                         this.messageTips('修改', res)
                     })
@@ -347,7 +348,6 @@ export default {
           message: title + '成功',
           type: 'success'
         })
-        // this.$router.push('/business/teacherList')
       } else {
         this.topForm.subjectId = []
         this.$message.error(res.msg)

src/views/teamBuild/signupList.vue

@@ -19,7 +19,7 @@
                @click="extendPaymentStatus = true"
                v-if="status=='PAY'">延长缴费</div>
           <div class='newBand'
-               @click="onCreateQRCode">生成二维码</div>
+               @click="onCreateQRCode">报名二维码</div>
         </div>
       </div>
       <!--  stepImgs: {