1

src/api/studentManager.js

@@ -242,9 +242,9 @@ export function findStudentCourseGroupsWithWeb (data) {
 }
 
 // 账户流水列表
-export function cashAccountDetail (data) {
+export function userCashAccountDetail (data) {
   return request({
-    url: api + `/cashAccountDetail/queryPage`,
+    url: api + `/userCashAccountDetail/queryPage`,
     method: 'get',
     params: data
   })

src/views/studentManager/components/studentOrder.vue

@@ -4,7 +4,7 @@
       <div class="left">
         <div class="headItem">
           <p>账户余额:<span>{{ dataInfo.balance }}</span></p>
-          <el-button type="text" v-permission="'userCashAccount/transferCourseBalanceToBalance'" @click="onMoneyOperation('recharge')">充值</el-button>
+          <el-button type="text" v-permission="'userCashAccount/transferCourseBalanceToBalance'" @click="onMoneyOperation('recharge')">修改</el-button>
         </div>
         <div class="headItem">
            <!-- v-if="amountStatus" -->
@@ -134,7 +134,7 @@
                :visible.sync="cashAccount.status">
       <el-table :data="cashAccount.gridData">
         <el-table-column align='center'
-                         property="userName"
+                         property="createTime"
                          label="操作时间"></el-table-column>
         <el-table-column align='center'
                          property="phone"
@@ -145,6 +145,16 @@
         <el-table-column align='center'
                          property="subjectName"
                          label="余额"></el-table-column>
+        <el-table-column align='center' label="交易状态">
+          <template slot-scope="scope">
+            {{ scope.row.status | payStatus }}
+          </template>
+        </el-table-column>
+        <el-table-column align='center' label="交易类型">
+          <template slot-scope="scope">
+            {{ scope.row.type | payType }}
+          </template>
+        </el-table-column>
         <el-table-column align='center'
                          property="subjectName"
                          label="备注"></el-table-column>
@@ -206,7 +216,7 @@
 </template>
 <script>
 import pagination from '@/components/Pagination/index'
-import { studentPaymentOrderList, getUserCashAccountBaseInfo, updateCourseBalance,transferCourseBalanceToBalance, cashAccountDetail, updateBalance } from '@/api/studentManager'
+import { studentPaymentOrderList, getUserCashAccountBaseInfo, updateCourseBalance,transferCourseBalanceToBalance, userCashAccountDetail, updateBalance } from '@/api/studentManager'
 import { orderStatus } from '@/utils/searchArray'
 import store from '@/store'
 let validPrice = (rule, value, callback) => {
@@ -326,7 +336,7 @@ export default {
         rows: cashAccount.limit,
         userId: this.searchForm.studentId
       }
-      cashAccountDetail(params).then(res => {
+      userCashAccountDetail(params).then(res => {
         let result = res.data
         cashAccount.status = true
         if (res.code == 200) {
@@ -356,7 +366,7 @@ export default {
             updateCourseBalance({
               userId: this.searchForm.studentId,
               decimal: courseBalance,
-              description: moneyForm.remark
+              memo: moneyForm.remark
             }).then(res => {
               let result = res.data
               if (res.code == 200) {
@@ -383,7 +393,7 @@ export default {
             updateBalance({
               userId: this.searchForm.studentId,
               decimal: balance,
-              description: moneyForm.remark
+              memo: moneyForm.remark
             }).then(res => {
               let result = res.data
               if (res.code == 200) {