钱包接口

H5/src/api/wallet.js

@@ -18,7 +18,7 @@ export function getMoneyPackage(params) {
  */
 export function getWithdrawalAmount(params) {
   return request({
-    url: "getWithdrawalAmount",
+    url: "/wallet/getWithdrawalAmount",
     method: "get",
     params
   });

H5/src/utils/request.js

@@ -22,6 +22,8 @@ service.interceptors.request.use(
   error => {
     if (loading) Toast.clear();
     console.log("rqquest====错误", error);
+    console.log(error);
+    this.$toast.fail(error.response.data.error);
   }
 );
 
@@ -33,7 +35,7 @@ service.interceptors.response.use(
   },
   error => {
     if (loading) Toast.clear();
-    console.log("response===错误", error);
+    return Promise.reject(error);
   }
 );
 

H5/src/views/canCashOut.vue

@@ -30,6 +30,8 @@
 </template>
 
 <script>
+import { getWithdrawalAmount } from "@/api/wallet";
+
 export default {
   name: "leagueNums",
   data() {
@@ -40,7 +42,23 @@ export default {
         "提现规则：这是一条规则，这是一条规则，这是一条规则，这是一条规则这是一条规则这是一条规则这是一条规则。"
     };
   },
-  methods: {}
+  mounted() {
+    this.getWithdrawal();
+  },
+  methods: {
+    getWithdrawal() {
+      const params = {
+        userId: "13100911369"
+      }
+      getWithdrawalAmount(params).then(res => {
+        if (res.code === 0) {
+          this.preNum = res.data.lastMoneyNot;
+          this.currentNum = res.data.currentMoneyCan
+          this.rules = res.data.withdrawRule;
+        }
+      })
+    }
+  }
 };
 </script>
 

H5/src/views/income/income-detail.vue

@@ -9,12 +9,12 @@
         <base-refresh-scroll @downLoad="onDownLoad" @upRefresh="onUpRefresh">
           <div slot="content">
             <div
-              v-for="(item, index) in 10"
+              v-for="(item, index) in detailList"
               :key="`income-detail-${index}`"
               class="detail-list-item"
             >
-              <span>工资收益</span>
-              <span>￥55</span>
+              <span>{{ item.name }}</span>
+              <span>￥{{ item.money }}</span>
               <span class="time">2021.02.26 10:02</span>
             </div>
           </div>
@@ -25,12 +25,52 @@
 </template>
 
 <script>
+import { queryIncomeDetail } from "@/api/wallet";
 import BaseRefreshScroll from "../../components/BaseRefreshScroll.vue";
 export default {
   components: { BaseRefreshScroll },
   name: "IncomeDetail",
   data() {
     return {
+      detailList: [],
+      legendPos: [
+        {
+          x: "1%",
+          y: "65%"
+        },
+        {
+          x: "28%",
+          y: "65%"
+        },
+        {
+          x: "65%",
+          y: "65%"
+        },
+        {
+          x: "1%",
+          y: "75%"
+        },
+        {
+          x: "28%",
+          y: "75%"
+        },
+        {
+          x: "65%",
+          y: "75%"
+        },
+        {
+          x: "1%",
+          y: "85%"
+        },
+        {
+          x: "28%",
+          y: "85%"
+        },
+        {
+          x: "65%",
+          y: "85%"
+        }
+      ],
       pieOption: {
         legend: [
           {
@@ -179,7 +219,8 @@ export default {
     };
   },
   mounted() {
-    this.pieOption.graphic.children[0].style.text = "123456";
+    // this.pieOption.graphic.children[0].style.text = "123456";
+    this.getDetail();
   },
   methods: {
     onDownLoad(val) {
@@ -187,6 +228,38 @@ export default {
     },
     onUpRefresh(val) {
       console.log("上拉加载", val);
+    },
+    getDetail() {
+      const params = {
+        userId: "13100911369"
+      }
+      queryIncomeDetail(params).then(res => {
+        if (res.code === 0) {
+          this.pieOption.graphic.children[0].style.text = res.data.totalIncome
+          this.detailList = res.data.list.map(item => {
+            return {
+              name: item.typeName,
+              money: item.money,
+              incomeTime: item.incomeTime.substr(0, 16).replaceAll('-', '.'),
+            }
+          });
+          this.pieOption.series[0].data = this.detailList.map(item => {
+            return { 
+              value: item.money,
+              name: item.name
+            };
+          })
+          const legend = this.detailList.map((item,index) => {
+            return {
+              selectedMode: false,
+              ...this.legendPos[index],
+              itemWidth: 12,
+              data: [item.name]
+            }
+          });
+          this.pieOption.legend = legend;
+        }
+      })
     }
   }
 };

H5/src/views/income/wallet.vue

@@ -99,6 +99,8 @@ export default {
         } else {
           this.$toast.fail(res.message);
         }
+      }).catch(error => {
+        console.log(error);
       });
     }
   }