修改

src/api/orderManager.js

@@ -1,12 +1,47 @@
 // 系统专项设置api文件
 import request from '@/utils/request'
-// import qs from 'qs'
+import qs from 'qs'
+// 订单列表
+export function orderQueryPage(data) {
+    return request({
+        url: '/web-server/order/queryPage',
+        method: 'get',
+        params: data
+    })
+}   
 
-// 分页查询提现 
+// 退费管理
+export function studentRefundsQueryPage(data) {
+    return request({
+        url: '/web-server/studentRefunds/queryPage',
+        method: 'get',
+        params: data
+    })
+}   
+
+// 退费
+export function applyRefundAudit(data) {
+    return request({
+        url: '/web-server/vipGroupManage/applyRefundAudit',
+        method: 'post',
+        data: qs.stringify(data)
+    })
+}   
+
+// 提现 
 export function studentWithdraw(data) {
     return request({
         url: '/web-server/studentWithdraw/queryPage',
         method: 'get',
         params: data
     })
+}
+
+// 确认提现 
+export function studentWithdrawConfirm(data) {
+    return request({
+        url: '/web-server/studentWithdraw/confirm',
+        method: 'post',
+        data: data
+    })
 }

src/router/index.js

@@ -87,8 +87,10 @@ export const asyncRoutes = {
   studentDetail: () => import('@/views/studentManager/index'),
   // 订单管理
   orderList: () => import('@/views/businessManager/orderManager/index'),
-  // 收入
+  // 订单列表
   income: () => import('@/views/businessManager/orderManager/income'),
+  // 充值列表
+  incomebuy: () => import('@/views/businessManager/orderManager/incomebuy'),
   // 退费订单
   backOrder: () => import('@/views/businessManager/orderManager/backMoney'),
   // 支出

src/store/modules/user.js

@@ -56,8 +56,7 @@ const actions = {
           if (!data.data) {
             reject('获取用户信息错误,请重新登录')
           }
-
-          const username = data.data.phone;
+          const username = data.data.username ? data.data.username : data.data.realName;
           const avatar = data.data.avatar;
           const organ = data.data.organId;
           // const { name, avatar } = data

src/utils/searchArray.js

@@ -47,9 +47,20 @@ const orderStatus = [
     { value: "APPLY", label: "报名" },
     { value: "RENEW", label: "续费" },
     { value: "OTHER", label: "其他" },
-    { value: "SMALL_CLASS_TO_BUY", label: "小课购买" }
+    { value: "SMALL_CLASS_TO_BUY", label: "VIP购买" }
 ]
 
+// 交易状态
+const dealStatus = [
+    { value: "ING", label: "交易中" },
+    { value: "SUCCESS", label: "成功交易" },
+    { value: "FAilED", label: "交易失败" },
+    { value: "CLOSE", label: "交易关闭" }
+]
+
+
+
+
 
 export {
     courseType,
@@ -57,5 +68,6 @@ export {
     jobNature,
     teacherStatus,
     attendanceStatus,
-    orderStatus
+    orderStatus,
+    dealStatus
 }

src/utils/vueFilter.js

@@ -164,7 +164,37 @@ Vue.filter('orderType', value => {
     APPLY: "报名",
     RENEW: "续费",
     OTHER: "其他",
-    SMALL_CLASS_TO_BUY: "小课购买"
+    SMALL_CLASS_TO_BUY: "VIP购买"
+  }
+  return template[value]
+})
+
+// 
+Vue.filter('paymentChannelType', value => {
+  let template = {
+    PER: "个人",
+    COM: "公司"
+  }
+  return template[value]
+})
+
+// 交易状态
+Vue.filter('dealStatus', value => {
+  let template = {
+    ING: "交易中",
+    SUCCESS: "成功交易",
+    FAilED: "交易失败",
+    CLOSE: "交易关闭"
+  }
+  return template[value]
+})
+
+// 交易状态
+Vue.filter('returnStatus', value => {
+  let template = {
+    ING: "审核中",
+    REJECT: "拒绝",
+    PASS: "通过"
   }
   return template[value]
 })

src/views/businessManager/orderManager/backMoney.vue

@@ -7,79 +7,183 @@
               class="searchForm"
               v-model="searchForm">
         <el-form-item>
-          <el-select v-model="searchForm.status"
-                    placeholder="工作类型">
-            <el-option label="哈哈哈"
-                      value="1"></el-option>
-          </el-select>
+          <el-date-picker
+            v-model="orderDate"
+            type="daterange"
+            value-format="yyyy-MM-dd"
+            @change="searchOrderDate"
+            range-separator="至"
+            start-placeholder="开始日期"
+            end-placeholder="结束日期">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item>
+          <el-button @click="getList" type="danger">搜索</el-button>
+          <el-button @click="onReSet" type="primary">重置</el-button>
         </el-form-item>
       </el-form>
       <!-- 列表 -->
       <div class="tableWrap">
-        <el-table :data='tableList'>
-          <el-table-column align='center'
+        <el-table :data='tableList' :header-cell-style="{background:'#EDEEF0',color:'#444'}">
+          <el-table-column align='center' prop="createTime"
                           label="申请时间">
           </el-table-column>
-          <el-table-column align='center'
+          <el-table-column align='center' prop="orderNo"
                           label="原订单编号">
           </el-table-column>
-          <el-table-column align='center'
+          <el-table-column align='center' prop="studentPaymentOrder.expectAmount"
                           label="应付金额">
           </el-table-column>
-          <el-table-column align='center'
+          <el-table-column align='center' prop="studentPaymentOrder.actualAmount"
                           label="实付金额">
           </el-table-column>
-          <el-table-column align='center'
+          <el-table-column align='center' prop="user.username"
                           label="学员姓名">
           </el-table-column>
-          <el-table-column align='center'
+          <el-table-column align='center' prop="remark"
                           label="退费说明">
           </el-table-column>
-          <el-table-column align='center'
+          <el-table-column align='center' prop="expectAmount"
                           label="预退费金额">
           </el-table-column>
-          <el-table-column align='center'
+          <el-table-column align='center' prop="actualAmount"
                           label="实退费金额">
           </el-table-column>
           <el-table-column align='center'
                           label="退费状态">
+            <template slot-scope="scope">
+              {{ scope.row.status | returnStatus }}
+            </template>
           </el-table-column>
           <el-table-column align='center'
                           label="操作">
+            <template slot-scope="scope" v-if="scope.row.status == 'ING'">
+              <el-button @click="onBackMoney(scope.row)" type="text">退费</el-button>
+            </template>
           </el-table-column>
         </el-table>
-        <pagination :total="rules.total"
-                    :page.sync="rules.page"
-                    :limit.sync="rules.limit"
-                    :page-sizes="rules.page_size"
+        <pagination :total="pageInfo.total"
+                    :page.sync="pageInfo.page"
+                    :limit.sync="pageInfo.limit"
+                    :page-sizes="pageInfo.page_size"
                     @pagination="getList" />
       </div>
+      <el-dialog title="退费确认" :visible.sync="backStatus" @close="onFormClose('ruleForm')" width="500px">
+        <el-form :model="form" :rules="rules" ref="ruleForm">
+          <el-form-item label="退费路径" prop="name" :label-width="formLabelWidth">
+            <el-input disabled value="余额" autocomplete="off"></el-input>
+          </el-form-item>
+          <el-form-item label="退费金额" prop="amount" :label-width="formLabelWidth">
+            <el-input v-model.number="form.amount" autocomplete="off"></el-input>
+          </el-form-item>
+        </el-form>
+        <span slot="footer" class="dialog-footer">
+          <el-button type="danger" @click="onTeachingSubmit('ruleForm', 'REJECT')">拒绝退费</el-button>
+          <el-button type="primary" @click="onTeachingSubmit('ruleForm', 'PASS')">确认退费</el-button>
+        </span>
+      </el-dialog>
     </div>
   </div>
 </template>
 <script>
 import pagination from '@/components/Pagination/index'
+import { studentRefundsQueryPage, applyRefundAudit } from '@/api/orderManager'
+import store from '@/store'
+import { orderStatus, dealStatus } from '@/utils/searchArray'
 export default {
   components: { pagination },
   name: 'income',
   data () {
     return {
+      orderDate: null,
       searchForm: {
-        status: ''
+        startTime: null,
+        endTime: null
       },
-      searchLsit: [],
       tableList: [],
-      rules: {
+      pageInfo: {
         // 分页规则
         limit: 10, // 限制显示条数
         page: 1, // 当前页
         total: 0, // 总条数
         page_size: [10, 20, 40, 50] // 选择限制显示条数
       },
+      backStatus: false,
+      formLabelWidth: '100px',
+      form: {
+        id: null,
+        amount: null,
+      },
+      rules: {
+        amount: [{ required: true, type: 'number', message: '请输入金额', trigger: 'blur' }],
+      },
     }
   },
+  mounted() {
+    this.getList()
+  },
   methods: {
-    getList () { }
+    onTeachingSubmit(formName, status) { // 添加数据
+      this.$refs[formName].validate((valid) => {
+        if (valid) {
+          this.form.status = status
+          applyRefundAudit(this.form).then(res => {
+            // console.log(res)
+            if(res.code == 200) {
+              this.$message({
+                message: '操作成功',
+                type: 'success'
+              })
+              this.backStatus = false
+              this.getList()
+            } else {
+              this.$message.error(res.msg)
+            }
+          })
+        } else {
+          return false;
+        }
+      })
+    },
+    getList () { 
+      let params = this.searchForm
+      params.rows = this.pageInfo.limit
+      params.page = this.pageInfo.page
+      studentRefundsQueryPage(params).then(res => {
+        let result = res.data
+        if(res.code == 200) {
+          this.tableList = result.rows
+          this.pageInfo.total = result.total
+        }
+      })
+    },
+    searchOrderDate(value) {
+      if(value) {
+        this.searchForm.startTime = value[0]
+        this.searchForm.endTime = value[1]
+      } else {
+        this.searchForm.startTime = null
+        this.searchForm.endTime = null
+      }
+    },
+    onReSet() {
+      this.orderDate = null
+      this.searchForm = {
+        startTime: null,
+        endTime: null
+      }
+    },
+    onFormClose(formName) { // 关闭弹窗重置验证
+      this.$refs[formName].clearValidate()
+    },
+    onBackMoney(row) { // 退费
+      this.backStatus = true
+      this.form = {
+        id: row.id,
+        amount: row.expectAmount
+      }
+      // applyRefundAudit()
+    }
   }
 }
 </script>

src/views/businessManager/orderManager/expend.vue

@@ -1,9 +1,9 @@
 <template>
   <div class="m-container">
-    <h2>支出</h2>
+    <h2>提现列表</h2>
     <div class="m-core">
       <!-- 搜索类型 -->
-      <el-form :inline="true"
+      <!-- <el-form :inline="true"
               class="searchForm"
               v-model="searchForm">
         <el-form-item>
@@ -13,46 +13,63 @@
                       value="1"></el-option>
           </el-select>
         </el-form-item>
-      </el-form>
-      <!-- 查询列表 -->
-      <div class="searchWrap">
-        <p>查询条件:</p>
-        <div class="searchItem"
-            @click="closeSearch(item)"
-            v-for="(item,index) in searchLsit">
-          {{ item.key }}
-          <i class="el-icon-close"></i>
-        </div>
-      </div>
+      </el-form> -->
       <!-- 列表 -->
       <div class="tableWrap">
-        <el-table :data='tableList'>
-          <el-table-column align='center'
+        <el-table :data='tableList' :header-cell-style="{background:'#EDEEF0',color:'#444'}">
+          <!-- <el-table-column align='center' prop="transNo"
                           label="提现交易流水号">
-          </el-table-column>
-          <el-table-column align='center'
+          </el-table-column> -->
+          <el-table-column align='center' prop="createTime"
                           label="申请时间">
           </el-table-column>
-          <el-table-column align='center'
+          <el-table-column align='center' prop="realName"
                           label="学员姓名">
           </el-table-column>
-          <el-table-column align='center'
+          <el-table-column align='center' prop="amount"
                           label="提现金额">
           </el-table-column>
-          <el-table-column align='center'
+          <el-table-column align='center' prop="balance"
                           label="账户余额">
           </el-table-column>
-          <el-table-column align='center'
+          <el-table-column align='center' prop="bankCardNo"
                           label="提现账户">
           </el-table-column>
           <el-table-column align='center'
                           label="提现状态">
+            <template slot-scope="scope">
+              {{ scope.row.status | dealStatus }}
+            </template>
+          </el-table-column>
+          <el-table-column align='center'
+                          label="支付账号">
+            <template slot-scope="scope">
+              <el-input type="text" v-model="scope.row.platformAccountNo" placeholder="支付账号"></el-input>
+            </template>
+          </el-table-column>
+          <el-table-column align='center'
+                          label="支付渠道">
+            <template slot-scope="scope">
+              <el-input type="text" v-model="scope.row.channel" placeholder="支付渠道"></el-input>
+            </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>
+            </template>
+          </el-table-column>
+          <el-table-column align='center'
+                          label="操作">
+            <template slot-scope="scope">
+              <el-button @click="onSure(scope.row)" type="text">确认</el-button>
+            </template>
           </el-table-column>
         </el-table>
-        <pagination :total="rules.total"
-                    :page.sync="rules.page"
-                    :limit.sync="rules.limit"
-                    :page-sizes="rules.page_size"
+        <pagination :total="pageInfo.total"
+                    :page.sync="pageInfo.page"
+                    :limit.sync="pageInfo.limit"
+                    :page-sizes="pageInfo.page_size"
                     @pagination="getList" />
       </div>
     </div>
@@ -60,6 +77,9 @@
 </template>
 <script>
 import pagination from '@/components/Pagination/index'
+import { studentWithdraw, studentWithdrawConfirm } from '@/api/orderManager'
+import store from '@/store'
+import { orderStatus, dealStatus } from '@/utils/searchArray'
 export default {
   components: { pagination },
   name: 'income',
@@ -68,9 +88,8 @@ export default {
       searchForm: {
         status: ''
       },
-      searchLsit: [],
       tableList: [],
-      rules: {
+      pageInfo: {
         // 分页规则
         limit: 10, // 限制显示条数
         page: 1, // 当前页
@@ -79,8 +98,31 @@ export default {
       },
     }
   },
+  mounted() {
+    this.getList()
+  },
   methods: {
-    getList () { }
+    getList () {
+      studentWithdraw({
+        rows: this.pageInfo.limit,
+        page: this.pageInfo.page
+      }).then(res => {
+        let result = res.data
+        if(res.code == 200) {
+          this.tableList = result.rows
+          this.pageInfo.total = result.total
+        }
+      })
+    },
+    onSure(row) {
+      console.log(row)
+      // studentWithdrawConfirm({
+      //   id: row.id,
+      //   platformAccountNo: row.platformAccountNo,
+      //   channel: row.channel,
+      //   withdrawNo: row.withdrawNo
+      // })
+    }
   }
 }
 </script>

src/views/businessManager/orderManager/income.vue

@@ -7,55 +7,74 @@
               class="searchForm"
               v-model="searchForm">
         <el-form-item>
-          <el-select v-model="searchForm.status"
-                    placeholder="工作类型">
-            <el-option label="哈哈哈"
-                      value="1"></el-option>
+          <el-date-picker
+            v-model="orderDate"
+            type="daterange"
+            value-format="yyyy-MM-dd"
+            @change="searchOrderDate"
+            range-separator="至"
+            start-placeholder="开始日期"
+            end-placeholder="结束日期">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item>
+          <el-select v-model="searchForm.paymentType" placeholder="交易类型">
+            <el-option v-for="(item, index) in orderStatus" :key="index" 
+              :label="item.label" :value="item.value"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item>
+          <el-select v-model="searchForm.paymentStatus" placeholder="交易状态">
+            <el-option v-for="(item, index) in dealStatus" :key="index" 
+              :label="item.label" :value="item.value"></el-option>
           </el-select>
         </el-form-item>
+        <el-form-item>
+          <el-button @click="getList" type="danger">搜索</el-button>
+          <el-button @click="onReSet" type="primary">重置</el-button>
+        </el-form-item>
       </el-form>
-      <!-- 查询列表 -->
-      <div class="searchWrap">
-        <p>查询条件:</p>
-        <div class="searchItem"
-            @click="closeSearch(item)"
-            v-for="(item,index) in searchLsit">
-          {{ item.key }}
-          <i class="el-icon-close"></i>
-        </div>
-      </div>
       <!-- 列表 -->
       <div class="tableWrap">
-        <el-table :data='tableList'>
-          <el-table-column align='center'
+        <el-table :data='tableList' :header-cell-style="{background:'#EDEEF0',color:'#444'}">
+          <el-table-column align='center' prop="transNo"
                           label="交易流水号">
           </el-table-column>
-          <el-table-column align='center'
+          <el-table-column align='center' prop="orderNo"
+                          label="订单号">
+          </el-table-column>
+          <el-table-column align='center' prop="payTime"
                           label="订单日期">
           </el-table-column>
           <el-table-column align='center'
                           label="交易类型">
+            <template slot-scope="scope">
+              {{ scope.row.type | orderType }}
+            </template>
           </el-table-column>
-          <el-table-column align='center'
-                          label="订单说明">
-          </el-table-column>
-          <el-table-column align='center'
+          <el-table-column align='center' prop="expectAmount"
                           label="应付金额">
           </el-table-column>
-          <el-table-column align='center'
+          <el-table-column align='center' prop="actualAmount"
                           label="实付金额">
           </el-table-column>
-          <el-table-column align='center'
+          <el-table-column align='center' prop="user.username"
                           label="学员姓名">
           </el-table-column>
-          <el-table-column align='center'
+          <el-table-column align='center' prop="paymentChannel"
                           label="交易方式">
           </el-table-column>
           <el-table-column align='center'
                           label="收款账户">
+            <template slot-scope="scope">
+              {{ scope.row.paymentChannelType | paymentChannelType }}
+            </template>
           </el-table-column>
           <el-table-column align='center'
                           label="交易状态">
+            <template slot-scope="scope">
+              {{ scope.row.status | dealStatus }}
+            </template>
           </el-table-column>
         </el-table>
         <pagination :total="pageInfo.total"
@@ -69,17 +88,23 @@
 </template>
 <script>
 import pagination from '@/components/Pagination/index'
-import { studentWithdraw } from '@/api/orderManager'
+import { orderQueryPage } from '@/api/orderManager'
 import store from '@/store'
+import { orderStatus, dealStatus } from '@/utils/searchArray'
 export default {
   components: { pagination },
   name: 'income',
   data () {
     return {
+      orderStatus: orderStatus,
+      dealStatus: dealStatus,
+      orderDate: null,
       searchForm: {
-        status: ''
+        orderStartDate: null,
+        orderEndDate: null,
+        paymentStatus: null,
+        paymentType: null,
       },
-      searchLsit: [],
       tableList: [],
       pageInfo: {
         // 分页规则
@@ -90,10 +115,40 @@ export default {
       },
     }
   },
+  mounted() {
+    this.getList()
+  },
   methods: {
     getList () { 
-      studentWithdraw()
-    }
+      let params = this.searchForm
+      params.rows = this.pageInfo.limit
+      params.page = this.pageInfo.page
+      orderQueryPage(params).then(res => {
+        let result = res.data
+        if(res.code == 200) {
+          this.tableList = result.rows
+          this.pageInfo.total = result.total
+        }
+      })
+    },
+    searchOrderDate(value) {
+      if(value) {
+        this.searchForm.orderStartDate = value[0]
+        this.searchForm.orderEndDate = value[1]
+      } else {
+        this.searchForm.orderStartDate = null
+        this.searchForm.orderEndDate = null
+      }
+    },
+    onReSet() { // 重置搜索
+      this.orderDate = null
+      this.searchForm = {
+        orderStartDate: null,
+        orderEndDate: null,
+        paymentStatus: null,
+        paymentType: null,
+      }
+    },
   }
 }
 </script>

src/views/businessManager/orderManager/incomebuy.vue

@@ -0,0 +1,150 @@
+<template>
+  <div class="m-container">
+    <h2>充值列表</h2>
+    <div class="m-core">
+      <!-- 搜索类型 -->
+      <el-form :inline="true"
+              class="searchForm"
+              v-model="searchForm">
+        <el-form-item>
+          <el-date-picker
+            v-model="orderDate"
+            type="daterange"
+            value-format="yyyy-MM-dd"
+            @change="searchOrderDate"
+            range-separator="至"
+            start-placeholder="开始日期"
+            end-placeholder="结束日期">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item>
+          <el-select v-model="searchForm.paymentType" placeholder="交易类型">
+            <el-option v-for="(item, index) in orderStatus" :key="index" 
+              :label="item.label" :value="item.value"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item>
+          <el-select v-model="searchForm.paymentStatus" placeholder="交易状态">
+            <el-option v-for="(item, index) in dealStatus" :key="index" 
+              :label="item.label" :value="item.value"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item>
+          <el-button @click="getList" type="danger">搜索</el-button>
+          <el-button @click="onReSet" type="primary">重置</el-button>
+        </el-form-item>
+      </el-form>
+      <!-- 列表 -->
+      <div class="tableWrap">
+        <el-table :data='tableList' :header-cell-style="{background:'#EDEEF0',color:'#444'}">
+          <el-table-column align='center' prop="transNo"
+                          label="交易流水号">
+          </el-table-column>
+          <el-table-column align='center' prop="orderNo"
+                          label="订单号">
+          </el-table-column>
+          <el-table-column align='center' prop="payTime"
+                          label="订单日期">
+          </el-table-column>
+          <el-table-column align='center' prop="expectAmount"
+                          label="应付金额">
+          </el-table-column>
+          <el-table-column align='center' prop="actualAmount"
+                          label="实付金额">
+          </el-table-column>
+          <el-table-column align='center' prop="user.username"
+                          label="学员姓名">
+          </el-table-column>
+          <el-table-column align='center' prop="paymentChannel"
+                          label="交易方式">
+          </el-table-column>
+          <el-table-column align='center'
+                          label="收款账户">
+            <template slot-scope="scope">
+              {{ scope.row.paymentChannelType | paymentChannelType }}
+            </template>
+          </el-table-column>
+          <el-table-column align='center'
+                          label="交易状态">
+            <template slot-scope="scope">
+              {{ scope.row.status | dealStatus }}
+            </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" />
+      </div>
+    </div>
+  </div>
+</template>
+<script>
+import pagination from '@/components/Pagination/index'
+import { orderQueryPage } from '@/api/orderManager'
+import store from '@/store'
+import { orderStatus, dealStatus } from '@/utils/searchArray'
+export default {
+  components: { pagination },
+  name: 'income',
+  data () {
+    return {
+      orderStatus: orderStatus,
+      dealStatus: dealStatus,
+      orderDate: null,
+      searchForm: {
+        orderStartDate: null,
+        orderEndDate: null,
+        paymentStatus: null,
+        paymentType: null,
+      },
+      tableList: [],
+      pageInfo: {
+        // 分页规则
+        limit: 10, // 限制显示条数
+        page: 1, // 当前页
+        total: 0, // 总条数
+        page_size: [10, 20, 40, 50] // 选择限制显示条数
+      },
+    }
+  },
+  mounted() {
+    this.getList()
+  },
+  methods: {
+    getList () { 
+      let params = this.searchForm
+      params.rows = this.pageInfo.limit
+      params.page = this.pageInfo.page
+      orderQueryPage(params).then(res => {
+        let result = res.data
+        if(res.code == 200) {
+          this.tableList = result.rows
+          this.pageInfo.total = result.total
+        }
+      })
+    },
+    searchOrderDate(value) {
+      if(value) {
+        this.searchForm.orderStartDate = value[0]
+        this.searchForm.orderEndDate = value[1]
+      } else {
+        this.searchForm.orderStartDate = null
+        this.searchForm.orderEndDate = null
+      }
+    },
+    onReSet() { // 重置搜索
+      this.orderDate = null
+      this.searchForm = {
+        orderStartDate: null,
+        orderEndDate: null,
+        paymentStatus: null,
+        paymentType: null,
+      }
+    },
+  }
+}
+</script>
+<style lang="scss">
+</style>

src/views/businessManager/shopManager/shopList.vue

@@ -27,7 +27,7 @@
       </div> -->
       <!-- 列表 -->
       <div class="tableWrap">
-        <el-table :data='tableList'>
+        <el-table :data='tableList' :header-cell-style="{background:'#EDEEF0',color:'#444'}">
           <el-table-column align='center' prop="id"
                            label="商品编号">
           </el-table-column>

src/views/studentManager/components/studentCashout.vue

@@ -2,23 +2,26 @@
   <div>
     <div class="tableWrap">
       <el-table :data="tableList" :header-cell-style="{background:'#EDEEF0',color:'#444'}">
-        <el-table-column label=提现交易流水号 prop="withdrawNo">
+        <el-table-column label=提现交易流水号 prop="id">
         </el-table-column>
         <el-table-column label=申请时间 prop="createTime">
         </el-table-column>
         <el-table-column label=提现金额 prop="amount">
         </el-table-column>
-        <el-table-column label=账户余额 prop="amount">
+        <el-table-column label=账户余额 prop="balance">
         </el-table-column>
         <el-table-column label=账户号 prop="bankCardNo">
         </el-table-column>
-        <el-table-column label=提现状态 prop="status">
+        <el-table-column label=提现状态 >
+          <template slot-scope="scope">
+            {{ scope.row.status | dealStatus }}
+          </template>
         </el-table-column>
-        <el-table-column label=支付账号 prop="">
+        <el-table-column label=支付账号 prop="platformAccountNo">
         </el-table-column>
-        <el-table-column label=支付渠道>
+        <el-table-column label=支付渠道 prop="channel">
         </el-table-column>
-        <el-table-column label=交易流水号 prop="transNo">
+        <el-table-column label=交易流水号 prop="withdrawNo">
         </el-table-column>
       </el-table>
       <pagination :total="pageInfo.total"
@@ -53,6 +56,7 @@ export default {
   methods: {
     getList() {
       studentWithdraw({
+        userId: this.$route.query.userId,
         rows: this.pageInfo.limit,
         page: this.pageInfo.page
       }).then(res => {

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

@@ -25,7 +25,6 @@
           end-placeholder="结束日期">
         </el-date-picker>
       </el-form-item>
-      </el-form-item>
       <el-form-item>
         <el-button @click="getList" type="danger">搜索</el-button>
         <el-button @click="onReSet" type="primary">重置</el-button>

src/views/vipClass/vipList.vue

@@ -189,7 +189,9 @@ export default {
       // 'organId': this.$store.getters.organ,
       getVipList({ 'page': this.rules.page, 'rows': this.rules.limit, }).then(res => {
         if (res.code == 200) {
-          this.tableData = res.data
+          console.log(res.data)
+          this.tableData = res.data.rows
+          this.rules.total = res.data.total
         }
       })
     },
@@ -212,7 +214,13 @@ export default {
   },
   filters: {
     formatterTime (val) {
-      return val.split(' ')[0];
+      let result
+      if(val) {
+        result = val.split(' ')[0];
+      } else {
+        result = ''
+      }
+      return result
     },
     formatterStatus (val) {
       let arr = ["未开始", "报名中", "报名结束", '取消', '停止']

vue.config.js

@@ -17,10 +17,10 @@ const name = defaultSettings.title || 'vue Admin Template' // page title
 // http://47.99.212.176:8000
 // 
 // 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:8000' //勇哥
 // let target = 'http://47.99.212.176:8000' // 测试服
-let target = 'http://192.168.3.48:8000' // 乔
+// let target = 'http://192.168.3.48:8000' // 乔
 // All configuration item explanations can be find in https://cli.vuejs.org/config/
 module.exports = {
   /**