提现审核列表

config/index.js

@@ -15,6 +15,7 @@ module.exports = {
     proxyTable: devEnv.OPEN_PROXY === false ? {} : {
       '/proxyApi': {
         target: 'http://zhqg.jsonpro.cn/bapi',
+        // target: 'http://192.168.31.118:8085/bapi',
         changeOrigin: true,
         pathRewrite: {
           '^/proxyApi': '/'

src/views/modules/order/audit-add-or-update.vue

 <template>
   <el-dialog
-    title="审核"
+    :title="isAudit? '审核': '详情'"
     :close-on-click-modal="false"
     :visible.sync="visible">
     <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmit()" label-width="150px">
       <el-form-item label="申请人昵称：" prop="nickName">
           <span>{{dataForm.nickName}}</span>
       </el-form-item>
-      <el-form-item label="提现人名称：" prop="bankName">
-        <span>{{dataForm.bankName}}</span>
-      </el-form-item>
       <el-form-item :label="dataForm.applyType == 2? '退款金额：': '提现金额：'" prop="amount">
-        <span>{{dataForm.amount}} 元</span>
+        <span>{{dataForm.amount || 0}} 元</span>
       </el-form-item>
       <el-form-item label="到账金额：" prop="cashAmount">
-        <span>{{dataForm.cashAmount}} 元</span>
+        <span>{{dataForm.cashAmount || 0}} 元</span>
+      </el-form-item>
+      <el-form-item label="待入账金额：" prop="waitAmount">
+        <span>{{dataForm.waitAmount || 0}} 元</span>
+      </el-form-item>
+      <el-form-item label="用户余额：" prop="userAmount">
+        <span>{{dataForm.userAmount || 0}} 元</span>
+      </el-form-item>
+      <el-form-item label="用户积分：" prop="integral">
+        <span>{{dataForm.integral}} 元</span>
+      </el-form-item>
+      <el-form-item label="冻结积分：" prop="frozenIntegral">
+        <span>{{dataForm.frozenIntegral || 0}} 元</span>
       </el-form-item>
-      <el-form-item label="银行开户行名称：" prop="bankCard">
+      <el-form-item label="银行开户行名称：" prop="bankName">
+        <span>{{dataForm.bankName}}</span>
+      </el-form-item>
+      <el-form-item label="银行卡号：" prop="bankCard">
         <span>{{dataForm.bankCard}}</span>
       </el-form-item>
       <el-form-item label="收款码图片：" prop="bankCard">
@@ -25,13 +37,13 @@
       <el-form-item label="类型：" prop="applyType">
         <span>{{dataForm.applyType == 1? '订单收益提现申请':(dataForm.applyType == 2 ? '退单申请': '余额提现申请') }}</span>
       </el-form-item>
-      <el-form-item label="审核：" prop="applyStatus">
+      <el-form-item label="审核：" prop="applyStatus" v-if="isAudit">
         <el-radio-group v-model="dataForm.applyStatus">
           <el-radio :label="1">通过</el-radio>
           <el-radio :label="2">不通过</el-radio>
         </el-radio-group>
-      </el-form-item>
-      <el-form-item label="备注：" prop="remark">
+      </el-form-item >
+      <el-form-item label="备注：" prop="remark"  v-if="isAudit">
         <el-input v-model="dataForm.remark" placeholder="备注"></el-input>
       </el-form-item>
     </el-form>
@@ -48,6 +60,7 @@
       return {
         resourcesUrl:window.SITE_CONFIG.resourcesUrl,
         visible: false,
+        isAudit: false,
         dataForm: {
           id: 0,
           applyStatus: 1,
@@ -62,9 +75,11 @@
       }
     },
     methods: {
-      init (id,row) {
+      init (id,isAudit,row) {
+        this.isAudit = isAudit
         this.dataForm.id = id || 0
         this.visible = true
+        console.log('isAudit',isAudit)
         this.$nextTick(() => {
           this.$refs['dataForm'].resetFields()
           if (this.dataForm.id) {
@@ -83,6 +98,10 @@
               this.dataForm.applyType =  data.result.applyType
               this.dataForm.bankCard =  data.result.bankCard
               this.dataForm.cashAmount =  data.result.cashAmount
+              this.dataForm.userAmount = data.result.userAccount.amount
+              this.dataForm.waitAmount  = data.result.userAccount.waitAmount
+              this.dataForm.integral  = data.result.userAccount.integral
+              this.dataForm.frozenIntegral  = data.result.userAccount.frozenIntegral
             })
           }
         })
@@ -90,6 +109,10 @@
       },
       // 表单提交
       dataFormSubmit () {
+        if(!this.isAudit){
+          this.visible = false
+          return
+        }
         this.$refs['dataForm'].validate((valid) => {
           if (valid) {
             this.$http({

src/views/modules/order/audit.vue

@@ -24,8 +24,14 @@
         <el-button
           type="primary"
           size="small"
+          icon="el-icon-detail"
+          @click="addOrUpdateHandle(scope.row.id,false,scope.row)">详情</el-button>
+        <el-button
+                    v-if="!scope.row.applyStatus"
+                   type="primary"
+                   size="small"
                    icon="el-icon-edit"
-                   @click="addOrUpdateHandle(scope.row.id,scope.row)">审核</el-button>
+                   @click="addOrUpdateHandle(scope.row.id,true,scope.row)">审核</el-button>
       </template>
 
     </avue-crud>
@@ -105,10 +111,10 @@ export default {
       this.dataListSelections = list
     },
     // 新增 / 修改
-    addOrUpdateHandle (id,row) {
+    addOrUpdateHandle (id,isAudit,row) {
       this.addOrUpdateVisible = true
       this.$nextTick(() => {
-        this.$refs.addOrUpdate.init(id, row)
+        this.$refs.addOrUpdate.init(id,isAudit,row)
       })
     },
     // 点击查询