add

src/views/modules/wallet/index.vue

@@ -104,7 +104,7 @@
                 </el-date-picker>
               </el-form-item>
               <el-form-item>
-                <el-button size="mini" type="primary" @click="queryList"
+                <el-button size="mini" type="primary" @click="init"
                   >查询</el-button
                 >
                 <el-button size="mini" type="primary" @click="Reset"
@@ -113,27 +113,41 @@
               </el-form-item>
             </el-form>
             <div>
-              <el-table :data="tableData" style="width: 100%">
+              <el-table border :data="tableData" style="width: 100%">
                 <el-table-column
+                  align="center"
                   prop="cashOutOrderNumber"
                   label="提现申请订单号"
                   width="180"
                 >
                 </el-table-column>
                 <el-table-column
+                  align="center"
                   prop="cashOutAmount"
                   label="提现申请金额"
-                  width="180"
+                  width="120"
                 >
                 </el-table-column>
-                <el-table-column prop="cashOutStatus" label="申请状态">
+                <el-table-column
+                  align="center"
+                  prop="cashOutStatus"
+                  label="申请状态"
+                >
                   <template slot-scope="scope">
                     <span>{{ getStatus(scope.row.cashOutStatus) }}</span>
                   </template>
                 </el-table-column>
-                <el-table-column prop="address" label="提现申请时间">
+                <el-table-column
+                  align="center"
+                  prop="cashOutTime"
+                  label="提现申请时间"
+                >
                 </el-table-column>
-                <el-table-column prop="address" label="交易到账时间">
+                <el-table-column
+                  align="center"
+                  prop="tradeReceivedTime"
+                  label="交易到账时间"
+                >
                 </el-table-column>
               </el-table>
             </div>
@@ -184,16 +198,16 @@
               <div>
                 <div style="font-size: 18px; font-weight: 600">总收入</div>
                 <div style="margin-top: 20px; font-size: 18px">
-                  ￥{{
+                  ￥{{ TotalData.totalIncome ? TotalData.totalIncome : "0" }}
-                    TotalData.totalIncome ? TotalData.totalIncome : "0"
-                  }}
                 </div>
               </div>
               <div>
                 <div style="font-size: 18px; font-weight: 600">总支出</div>
                 <div style="margin-top: 20px; font-size: 18px">
                   ￥{{
-                    TotalData.totalExpenditure ? TotalData.totalExpenditure : "0"
+                    TotalData.totalExpenditure
+                      ? TotalData.totalExpenditure
+                      : "0"
                   }}
                 </div>
               </div>
@@ -205,23 +219,24 @@
             </div>
             <div style="background: #fff; padding: 10px; height: 55vh">
               <div
-                v-for="item in 5"
+                v-for="item in billList"
-                :key="item"
+                :key="item.id"
                 style="
+                min-width: 380px;
                   background: #f1f8fe;
                   padding: 10px;
                   border-radius: 10px;
                   margin-bottom: 10px;
                 "
               >
-                <div style="font-size: 18px">12月06日 周五</div>
+                <div style="font-size: 18px">{{ item.billOrderTime }}</div>
                 <div class="wallet-item">
-                  <div>收入</div>
+                  <div>订单号：{{ item.billOrderNumber }}</div>
-                  <div>+666</div>
+                  <div>订单状态：{{ getBillStatus(item.billStatus) }}</div>
                 </div>
                 <div class="wallet-item">
-                  <div>转账</div>
+                  <div>{{ item.billTypeName }}</div>
-                  <div>余额：427</div>
+                  <div>余额：{{ item.amountAfterChange }}</div>
                 </div>
               </div>
             </div>
@@ -243,7 +258,8 @@ export default {
       value1: [],
       userInfo: {},
       tableData: [],
-      TotalData:{},
+      TotalData: {},
+      billList: [],
       query: {
         pageNumber: 1,
         pageSize: 10,
@@ -264,21 +280,17 @@ export default {
     init() {
       console.log("1213");
       this.$api.wallet.myWallet().then((res) => {
-        console.log(res);
         this.userInfo = res.data.data;
       });
       this.$api.wallet.WithdrawalRecord(this.query).then((res) => {
-        console.log(res, "1122");
-
         this.tableData = res.data.data.data;
       });
-      this.$api.wallet.totalAmount({amountChangeType:""}).then((res) => {
+      this.$api.wallet.totalAmount({ amountChangeType: "" }).then((res) => {
-        console.log(res);
+        this.TotalData = res.data.data;
-        this.TotalData = res.data.data
-        // this.total = res.data.data;
       });
       this.$api.wallet.getBankInfo().then((res) => {
-        console.log(res);
+        console.log(res, "bull");
+        this.billList = res.data.data.data;
         // this.total = res.data.data;
       });
     },
@@ -337,6 +349,17 @@ export default {
         this.formInline.endCashOutTime = "";
       }
     },
+    getBillStatus(row) {
+      if (row == 1) {
+        return "待同步";
+      } else if (row == 2) {
+        return "同步中";
+      } else if (row == 3) {
+        return "同步成功";
+      } else if (row == 4) {
+        return "同步失败";
+      }
+    },
   },
 };
 </script>