提现

src/components/promotion/index.vue

@@ -30,6 +30,13 @@
             </el-button>
           </el-form-item>
         </el-col>
+        <el-col :lg="4" :sm="24" :md="12">
+          <el-form-item>
+            <el-button type="primary" plain size="small" @click="doExport">
+              导出
+            </el-button>
+          </el-form-item>
+        </el-col>
       </el-row>
     </el-form>
     <el-table
@@ -104,6 +111,18 @@
         this.nowPage = 1
         this.limit = val
         this.initPage()
+      },
+      doExport(){
+        let query = `?type=export`;
+        if(this.searchFrom.source){
+          query = query + '&source=' + this.searchFrom.source
+        }
+
+        if(this.searchFrom.time && this.searchFrom.time.length > 0){
+          query = query + '&date_start=' + CommonJs.dateFmt(this.searchFrom.time[0],"yyyy-MM-dd hh:mm:ss");
+          query = query + '&date_end=' + CommonJs.dateFmt(this.searchFrom.time[1],"yyyy-MM-dd hh:mm:ss")
+        }
+        window.open(`https://wechat-test.changchangenglish.com/api/public/ads/export/all${query}`)
       }
     }
   }

src/components/putForward/index.vue

 <template>
   <div class="putForward">
-    <el-form :inline="true" :model="search" class="demo-form-inline" label-width="80px">
-      <el-form-item label="关键字">
-        <el-input v-model="search.key" placeholder="用户名/手机号"></el-input>
-      </el-form-item>
-      <el-form-item label="订单状态">
-        <el-select v-model="search.status" placeholder="用户名/手机/课程名称" @change="onSearch">
-          <el-option
-            v-for="item in liStatus"
-            :key="item.status"
-            :label="item.label"
-            :value="item.status">
-          </el-option>
-        </el-select>
-      </el-form-item>
-      <el-form-item label="">
-        <el-button type="primary" @click="onSearch">查询</el-button>
-      </el-form-item>
+    <el-form :model="search" class="demo-form-inline" label-width="80px">
+      <el-row>
+        <el-col :span="8">
+          <el-form-item label="提现单号">
+            <el-input v-model="search.withdraw_no" placeholder="提现单号"></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="订单号">
+            <el-input v-model="search.out_trade_no" placeholder="订单号"></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="订单状态">
+            <el-select v-model="search.status" placeholder="用户名/手机/课程名称" @change="onSearch">
+              <el-option
+                v-for="item in liStatus"
+                :key="item.status"
+                :label="item.label"
+                :value="item.status">
+              </el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="用户ID">
+            <el-input v-model="search.user_id" placeholder="用户ID"></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="提现金额">
+            <el-input v-model="search.money" placeholder="提现金额"></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="">
+            <el-button type="primary" @click="onSearch">查询</el-button>
+          </el-form-item>
+        </el-col>
+      </el-row>
     </el-form>
     <el-table
       :data="tableData"
       border
       style="width: 100%">
       <el-table-column
-        prop="username"
-        label="用户名"
+        prop="withdraw_no"
+        label="提现单号"
       >
       </el-table-column>
       <el-table-column
-        prop="mobile"
-        label="手机号"
+        prop="out_trade_no"
+        label="订单号"
       >
       </el-table-column>
       <el-table-column
-        label="已获得总额"
-      >
-        <template slot-scope="scope">
-          {{ scope.row.getSumMoney | moneyYuan }}
-        </template>
-      </el-table-column>
-      <el-table-column
-        label="已提金额"
+        prop="user_nickname"
+        label="用户名"
       >
-        <template slot-scope="scope">
-          {{ scope.row.alreadyMoney  | moneyYuan}}
-        </template>
       </el-table-column>
       <el-table-column
-        label="可提余额"
+        prop="user_mobile"
+        label="手机号"
       >
-        <template slot-scope="scope">
-          {{ scope.row.resMoney  | moneyYuan}}
-        </template>
       </el-table-column>
       <el-table-column
         label="提现金额"
@@ -70,10 +82,17 @@
         </template>
       </el-table-column>
       <el-table-column
-        label="同意提现时间"
+        label="提现成功时间"
       >
         <template slot-scope="scope">
-          {{ scope.row.pay_at }}
+          {{ scope.row.success_at }}
+        </template>
+      </el-table-column>
+      <el-table-column
+        label="提现时间"
+      >
+        <template slot-scope="scope">
+          {{ scope.row.created_at }}
         </template>
       </el-table-column>
       <el-table-column
@@ -187,6 +206,9 @@
     },
     filters:{
       moneyYuan:function (value) {
+        if(!value){
+            return '';
+        }
         return value = (value/100).toFixed(2) + '元';
       },
       filterStatus:function (value) {
@@ -219,6 +241,21 @@
           limit: this.limit,
           page: this.nowPage
         };
+        if(this.search.withdraw_no){
+          json.withdraw_no = this.search.withdraw_no
+        }
+        if(this.search.out_trade_no){
+          json.out_trade_no = this.search.out_trade_no
+        }
+        if(this.search.status || this.search.status === 0){
+          json.status = this.search.status
+        }
+        if(this.search.user_id){
+          json.user_id = this.search.user_id
+        }
+        if(this.search.money){
+          json.money = parseFloat(this.search.money) * 100
+        }
         getWithdrawListApi(json).then(res=>{
           this.tableData = res.list;
           this.total = res.total;
@@ -226,7 +263,7 @@
       },
       // 查询按钮
       onSearch(){
-        this.page.current = 1;
+        this.nowPage = 1;
         //调用查询接口
         this.getList();
       },

src/service/index.js

@@ -247,7 +247,7 @@ export function post(url,data = {}){
             name:'login'//从哪个页面跳转
           })
         }else if(response.data.code === 503){
-          Message.error('请勿平凡操作')
+          // Message.error('请勿平凡操作')
         }else{
           Message.error(response.data.msg)
         }
@@ -282,7 +282,7 @@ export function patch(url,data = {}){
             name:'login'//从哪个页面跳转
           })
         }else if(response.data.code === 503){
-          Message.error('请勿平凡操作')
+          // Message.error('请勿平凡操作')
         }else{
           Message.error(response.data.msg)
         }
@@ -317,7 +317,7 @@ export function put(url,data = {}){
             name:'login'//从哪个页面跳转
           })
         }else if(response.data.code === 503){
-          Message.error('请勿平凡操作')
+          // Message.error('请勿平凡操作')
         }else{
           Message.error(response.data.msg)
         }
@@ -345,7 +345,7 @@ export function del(url,data = {}){
             name:'login'//从哪个页面跳转
           })
         }else if(response.data.code === 503){
-          Message.error('请勿平凡操作')
+          // Message.error('请勿平凡操作')
         }else{
           Message.error(response.data.msg)
         }