新增会员提现功能

manager/src/config/index.js

@@ -21,10 +21,10 @@ export default {
     buyer: "https://buyer-api.pickmall.cn",
     seller: "https://store-api.pickmall.cn",
     manager: "https://admin-api.pickmall.cn"
-    // common: 'http://192.168.0.109:8890',
+    // common: 'http://192.168.0.100:8890',
-    // buyer: 'http://192.168.0.109:8888',
+    // buyer: 'http://192.168.0.100:8888',
-    // seller: 'http://192.168.0.109:8889',
+    // seller: 'http://192.168.0.100:8889',
-    // manager: 'http://192.168.0.109:8887'
+    // manager: 'http://192.168.0.100:8887'
   },
   api_prod: {
     common: "https://common-api.pickmall.cn",

manager/src/views/member/advance/withdrawApply.vue

@@ -2,86 +2,34 @@
   <div class="search">
     <Card>
       <Row @keydown.enter.native="handleSearch">
-        <Form
+        <Form ref="searchForm" :model="searchForm" inline :label-width="70" class="search-form">
-          ref="searchForm"
-          :model="searchForm"
-          inline
-          :label-width="70"
-          class="search-form"
-        >
           <Form-item label="会员名称" prop="memberName">
-            <Input
+            <Input type="text" v-model="searchForm.memberName" placeholder="请输入会员名称" clearable style="width: 200px" />
-              type="text"
-              v-model="searchForm.memberName"
-              placeholder="请输入会员名称"
-              clearable
-              style="width: 200px"
-            />
           </Form-item>
           <Form-item label="审核状态" prop="applyStatus">
-            <Select
+            <Select v-model="searchForm.memberName" clearable style="width: 200px">
-              v-model="searchForm.memberName"
-              clearable
-              style="width: 200px"
-            >
               <Option value="APPLY">申请中</Option>
               <Option value="VIA_AUDITING">审核通过(提现成功)</Option>
               <Option value="FAIL_AUDITING">审核拒绝</Option>
             </Select>
           </Form-item>
           <Form-item label="申请时间">
-            <DatePicker
+            <DatePicker v-model="selectDate" type="datetimerange" format="yyyy-MM-dd HH:mm:ss" clearable @on-change="selectDateRange" placeholder="选择起始时间" style="width: 200px"></DatePicker>
-              v-model="selectDate"
-              type="datetimerange"
-              format="yyyy-MM-dd HH:mm:ss"
-              clearable
-              @on-change="selectDateRange"
-              placeholder="选择起始时间"
-              style="width: 200px"
-            ></DatePicker>
           </Form-item>
           <Form-item style="margin-left: -35px" class="br">
-            <Button @click="handleSearch" type="primary" icon="ios-search"
+            <Button @click="handleSearch" type="primary" icon="ios-search">搜索
-            >搜索
+            </Button>
-            </Button
-            >
           </Form-item>
         </Form>
       </Row>
-      <Table
+      <Table :loading="loading" border :columns="columns" :data="data" ref="table" sortable="custom" @on-sort-change="changeSort" @on-selection-change="changeSelect"></Table>
-        :loading="loading"
-        border
-        :columns="columns"
-        :data="data"
-        ref="table"
-        sortable="custom"
-        @on-sort-change="changeSort"
-        @on-selection-change="changeSelect"
-      ></Table>
       <Row type="flex" justify="end" class="page">
-        <Page
+        <Page :current="searchForm.pageNumber" :total="total" :page-size="searchForm.pageSize" @on-change="changePage" @on-page-size-change="changePageSize" :page-size-opts="[10, 20, 50]" size="small"
-          :current="searchForm.pageNumber"
+          show-total show-elevator show-sizer></Page>
-          :total="total"
-          :page-size="searchForm.pageSize"
-          @on-change="changePage"
-          @on-page-size-change="changePageSize"
-          :page-size-opts="[10, 20, 50]"
-          size="small"
-          show-total
-          show-elevator
-          show-sizer
-        ></Page>
       </Row>
     </Card>
-    <Modal
+    <Modal :title="modalTitle" v-model="roleModalVisible" :mask-closable="false" :width="500">
-      :title="modalTitle"
+      <Form :label-width="80">
-      v-model="roleModalVisible"
-      :mask-closable="false"
-      :width="500"
-    >
-      <Form
-        :label-width="80"
-      >
         <FormItem label="申请编号">
           <span>{{showList.sn}}</span>
         </FormItem>
@@ -89,7 +37,7 @@
           <span>{{showList.memberName}}</span>
         </FormItem>
         <FormItem label="申请金额">
-          <span>{{showList.applyMoney}}</span>
+          <span>{{showList.applyMoney | unitPrice}}</span>
         </FormItem>
         <FormItem label="提现状态">
           <span>{{showList.applyStatus | paramTypeFilter}}</span>
@@ -104,22 +52,13 @@
       </Form>
       <div slot="footer" v-if="showList.applyStatus == 'APPLY'">
         <Button type="text" @click="submitRole(false)">拒绝</Button>
-        <Button type="primary" :loading="submitLoading" @click="submitRole(true)"
+        <Button type="primary" :loading="submitLoading" @click="submitRole(true)">通过
-        >通过
+        </Button>
-        </Button
-        >
       </div>
     </Modal>
 
-    <Modal
+    <Modal :title="modalTitle" v-model="queryModalVisible" :mask-closable="false" :width="500">
-      :title="modalTitle"
+      <Form :label-width="80">
-      v-model="queryModalVisible"
-      :mask-closable="false"
-      :width="500"
-    >
-      <Form
-        :label-width="80"
-      >
         <FormItem label="申请编号">
           <span>{{showList.sn}}</span>
         </FormItem>
@@ -139,14 +78,11 @@
           <span>{{showList.inspectTime}}</span>
         </FormItem>
 
-
       </Form>
       <div slot="footer" v-if="showList.applyStatus == 'APPLY'">
         <Button type="text" @click="submitRole(false)">拒绝</Button>
-        <Button type="primary" :loading="submitLoading" @click="submitRole(true)"
+        <Button type="primary" :loading="submitLoading" @click="submitRole(true)">通过
-        >通过
+        </Button>
-        </Button
-        >
       </div>
       <div slot="footer" v-else>
         <Button type="text" @click="queryModalVisible = false">取消</Button>
@@ -156,10 +92,7 @@
 </template>
 
 <script>
-  import {
+import { getUserWithdrawApply, withdrawApply } from "@/api/member";
-    getUserWithdrawApply,
-    withdrawApply
-  } from "@/api/member";
 
 export default {
   name: "withdrawApply",
@@ -170,7 +103,7 @@
       openSearch: true, // 显示搜索
       openTip: true, // 显示提示
       loading: true, // 表单加载状态
-        audit: '', // 审核备注
+      audit: "", // 审核备注
       roleModalVisible: false, // 审核模态框
       queryModalVisible: false, // 审核模态框
       searchForm: {
@@ -182,7 +115,7 @@
         startDate: "", // 起始时间
         endDate: "", // 终止时间
         memberName: "",
-          applyStatus: ""
+        applyStatus: "",
       },
       selectDate: null, // 选择时间段
       submitLoading: false, // 添加或编辑提交状态
@@ -194,19 +127,28 @@
           title: "申请编号",
           key: "sn",
           align: "left",
-            tooltip: true
+          tooltip: true,
         },
         {
           title: "用户名称",
           key: "memberName",
           align: "left",
-            tooltip: true
+          tooltip: true,
         },
         {
           title: "申请金额",
           key: "applyMoney",
           align: "left",
           width: 120,
+          render: (h, params) => {
+            return h("div", [
+              h(
+                "span",
+                {},
+                this.$options.filters.unitPrice(params.row.applyMoney)
+              ),
+            ]);
+          },
         },
         {
           title: "提现状态",
@@ -215,60 +157,53 @@
           width: 120,
           render: (h, params) => {
             if (params.row.applyStatus == "APPLY") {
-                return h('div', [
+              return h("Tag", { props: { color: "volcano" } }, "申请中");
-                  h('span', {}, '申请中'),
-                ]);
             } else if (params.row.applyStatus == "VIA_AUDITING") {
-                return h('div', [
+              return h("Tag", { props: { color: "green" } }, "审核通过");
-                  h('span', {}, '审核通过'),
-                ]);
             } else if (params.row.applyStatus == "SUCCESS") {
-                return h('div', [
+              return h("Tag", { props: { color: "blue" } }, "提现成功");
-                  h('span', {}, '提现成功'),
-                ]);
             } else {
-                return h('div', [
+              return h("Tag", { props: { color: "red" } }, "审核拒绝");
-                  h('span', {}, '审核拒绝'),
+            }
-                ]);
           }
-            },
         },
         {
           title: "申请时间",
           key: "createTime",
           align: "left",
-            width: 170
+          width: 170,
         },
         {
           title: "审核时间",
           key: "inspectTime",
           align: "left",
-            width: 170
+          width: 170,
-          }, {
+        },
+        {
           title: "操作",
           key: "action",
           width: 120,
           align: "center",
           fixed: "right",
           render: (h, params) => {
-              if (params.row.applyStatus == 'APPLY') {
+            if (params.row.applyStatus == "APPLY") {
               return h(
                 "Button",
                 {
                   props: {
                     type: "success",
-                      size: "small"
+                    size: "small",
                   },
                   style: {
-                      marginRight: "5px"
+                    marginRight: "5px",
                   },
                   on: {
                     click: () => {
-                        this.showList = {}
+                      this.showList = {};
                       this.roleModalVisible = true;
-                        this.showList = params.row
+                      this.showList = params.row;
-                      }
+                    },
-                    }
+                  },
                 },
                 "审核"
               );
@@ -278,25 +213,25 @@
                 {
                   props: {
                     type: "primary",
-                      size: "small"
+                    size: "small",
                   },
                   style: {
                     marginRight: "5px",
                   },
                   on: {
                     click: () => {
-                        this.showList = {}
+                      this.showList = {};
                       this.queryModalVisible = true;
-                        this.showList = params.row
+                      this.showList = params.row;
-                        this.modalTitle = "查看"
+                      this.modalTitle = "查看";
-                      }
+                    },
-                    }
+                  },
                 },
                 "查看"
               );
             }
-            }
+          },
-          }
+        },
       ],
       data: [], // 表单数据
       total: 0, // 表单数据总数
@@ -304,26 +239,26 @@
   },
   filters: {
     paramTypeFilter(val) {
-        if (val === 'APPLY') {
+      if (val === "APPLY") {
-          return '申请中'
+        return "申请中";
-        } else if (val === 'VIA_AUDITING') {
+      } else if (val === "VIA_AUDITING") {
-          return '审核通过(提现成功)'
+        return "审核通过(提现成功)";
-        } else if (val === 'FAIL_AUDITING') {
+      } else if (val === "FAIL_AUDITING") {
-          return '审核拒绝'
+        return "审核拒绝";
       } else {
-          return '未知状态'
+        return "未知状态";
-        }
       }
     },
+  },
   methods: {
     submitRole(res) {
-        const params = {}
+      const params = {};
-        params.apply_id = this.showList.id
+      params.applyId = this.showList.id;
-        params.result = res
+      params.result = res;
-        params.remark = this.audit
+      params.remark = this.audit;
-        if (res === false && params.remark === '') {
+      if (res === false && params.remark === "") {
         this.$Message.error("审核备注不能为空");
-          return
+        return;
       }
       withdrawApply(params).then((res) => {
         this.loading = false;

seller/src/config/index.js

@@ -22,10 +22,7 @@ export default {
     buyer: 'https://buyer-api.pickmall.cn',
     seller: 'https://store-api.pickmall.cn',
     manager: 'https://admin-api.pickmall.cn',
-    // common: 'http://192.168.0.100:8890',
+
-    // buyer: 'http://192.168.0.100:8888',
-    // seller: 'http://192.168.0.100:8889',
-    // manager: 'http://192.168.0.100:8887'
   },
   api_prod: {
     common: 'https://common-api.pickmall.cn',