合并

H5/src/components/BaseNavBar.vue

@@ -28,6 +28,7 @@ export default {
   }
 };
 </script>
+<<<<<<< HEAD
 <style>
 .van-nav-bar__content .van-nav-bar__title{
   font-family: PingFang-SC-Bold;
@@ -42,3 +43,11 @@ export default {
   font-size: 20px;
 }
 </style>
+=======
+
+<style lang="scss" scoped>
+::v-deep .van-nav-bar .van-icon {
+  color: #000000;
+}
+</style>
+>>>>>>> 9c88ed2d3a358c6255e210c7d5e50ed49773913a

H5/src/router/index.js

@@ -112,6 +112,12 @@ const routes = [
     component: () => import("@/views/airDropPool"),
     meta: { title: "空投池", noNav: true }
   },
+  {
+    path: "/router",
+    name: "Router",
+    component: () => import("@/views/router"),
+    meta: { title: "路径导航", noNav: true }
+  }
 ];
 
 const router = new VueRouter({

H5/src/views/cashOut/cash-out-record.vue

 <template>
   <div class="cash-out-record">
     <div id="top-month">
-      <span style="width: 80px; margin-right: 5px">{{ selected }}</span>
+      <span style="width: 90px; margin-right: 5px">{{ selected }}</span>
       <van-icon name="arrow-down" @click="show = true" />
     </div>
     <div class="record-list">

H5/src/views/cashOut/components/recordItem.vue

 <template>
   <div class="record-item">
-    <img src="@/assets/images/收益.png" />
+    <img src="@/assets/images/消费.png" />
     <div class="item" style="flex:2;margin-left:10px">
       <span style="font-size:14px;color:#333333">提现</span>
       <span style="font-size:12px;color:#999999">2021.1.14 10:02</span>

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

@@ -34,66 +34,68 @@ export default {
       pieOption: {
         legend: [
           {
-            selected: "false",
-            align: "left",
+            selectedMode:false,
             x: "1%",
             y: "65%",
+            itemWidth: 12,
             data: ["工资收益"]
           },
           {
-            selected: "false",
-            align: "left",
+            selectedMode:false,
             x: "28%",
             y: "65%",
+            itemWidth: 12,
             data: ["曾极差奖金"]
           },
           {
-            selected: "false",
-            align: "left",
+            selectedMode:false,
             x: "65%",
             y: "65%",
+            itemWidth: 12,
             data: ["自身消费返佣"]
           },
           {
-            selected: "false",
-            align: "left",
+            selectedMode:false,
             x: "1%",
             y: "75%",
+            itemWidth: 12,
             data: ["培育奖"]
           },
           {
-            selected: "false",
-            align: "left",
+            selectedMode:false,
             x: "28%",
             y: "75%",
+            itemWidth: 12,
             data: ["月度肥料池分红"]
           },
           {
-            selected: "false",
-            align: "left",
+            selectedMode:false,
             x: "65%",
             y: "75%",
+            itemWidth: 12,
             data: ["进步奖"]
           },
           {
-            selected: "false",
-            align: "left",
+            selectedMode:false,
             x: "1%",
             y: "85%",
+            itemWidth: 12,
             data: ["红包"]
           },
           {
-            selected: "false",
+            selectedMode:false,
             align: "left",
             x: "28%",
             y: "85%",
+            itemWidth: 12,
             data: ["运营中心补贴"]
           },
           {
-            selected: "false",
+            selectedMode:false,
             align: "left",
             x: "65%",
             y: "85%",
+            itemWidth: 12,
             data: ["其他收益"]
           }
         ],
@@ -107,6 +109,7 @@ export default {
             radius: ["50%", "70%"], // pie 内外环
             width: "180",
             height: "180",
+            top: -10,
             left: "center",
             avoidLabelOverlap: true,
             label: {
@@ -139,7 +142,7 @@ export default {
         ],
         graphic: {
           type: "group",
-          top: "80",
+          top: "70",
           left: "center",
           height: 80,
           children: [
@@ -197,6 +200,7 @@ export default {
   width: 345px;
   height: 268px;
   margin: 15px auto 12px;
+  padding: 0 5px;
   background-color: #ffffff;
 }
 

H5/src/views/router.vue

+<template>
+  <div class="routes">
+    <p>路径跳转导航:</p>
+    <ul>
+      <li v-for="item in routes" :key="item.Name">
+        <span style="margin:10px" @click="to(item.path)">{{
+          item.meta.title
+        }}</span>
+      </li>
+    </ul>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "Router",
+  data() {
+    return {
+      routes: []
+    };
+  },
+  mounted() {
+    const allRoutes = this.$router.options.routes;
+    allRoutes.forEach(el => {
+      if (el.children) {
+        const parentPath = el.path;
+        const temp = JSON.parse(JSON.stringify(el.children));
+        const arr = temp.map(item => {
+          item.path = parentPath + "/" + item.path;
+          return {
+            ...item
+          };
+        });
+        this.routes.push(...arr);
+      } else {
+        if (el.meta.title !== "路径导航") {
+          this.routes.push(el);
+        }
+      }
+    });
+  },
+  methods: {
+    to(path) {
+      this.$router.push(path);
+    }
+  }
+};
+</script>
+
+<style lang="scss" scoped>
+.routes {
+  margin: 0;
+  padding: 0;
+  font-size: 16px;
+}
+</style>