Merge branch 'dev_lqs' into 'master'

修改bug

See merge request !7

H5/src/App.vue

@@ -27,7 +27,7 @@ export default {
 <style lang="scss">
 body {
   font-size: 16px;
-  font-family: "PingFang-SC-Medium";
+  font-family: PingFang-SC-Medium;
   background: #f8f8f8;
   -webkit-font-smoothing: antialiased;
   -moz-osx-font-smoothing: grayscale;

H5/src/components/BaseNavBar.vue

@@ -28,9 +28,9 @@ export default {
   }
 };
 </script>
-<<<<<<< HEAD
+
 <style>
-.van-nav-bar__content .van-nav-bar__title{
+.van-nav-bar__content .van-nav-bar__title {
   font-family: PingFang-SC-Bold;
   font-size: 20px;
   font-weight: normal;
@@ -38,16 +38,14 @@ export default {
   line-height: 20px;
   color: #333333;
 }
-.van-nav-bar__content  .van-nav-bar__left .van-icon{
+.van-nav-bar__content .van-nav-bar__left .van-icon {
   color: #333333;
   font-size: 20px;
 }
 </style>
-=======
 
 <style lang="scss" scoped>
 ::v-deep .van-nav-bar .van-icon {
   color: #000000;
 }
 </style>
->>>>>>> 9c88ed2d3a358c6255e210c7d5e50ed49773913a

H5/src/views/airDropPool.vue

@@ -12,7 +12,7 @@
     <div class="air-panel-box">
       <div class="air-panel">
         <div class="notice-bar">
-                <img src="@/assets/images/icon-notice.png" alt="">
+          <img src="@/assets/images/icon-notice.png" alt="" />
           <div class="notice-bar-show">
             <p class="dark">88888888888</p>
             <p>88888888888</p>
@@ -26,8 +26,10 @@
     </div>
     <div class="air-panel-num">
       <div class="air-panel-num-content">
-            <img src="@/assets/images/parachute.png" alt="">
-            <p>本月<span>{{personNum}}</span> 人在池</p>
+        <img src="@/assets/images/parachute.png" alt="" />
+        <p>
+          本月<span>{{ personNum }}</span> 人在池
+        </p>
       </div>
     </div>
   </div>
@@ -38,21 +40,17 @@ export default {
   name: "leagueNums",
   data() {
     return {
-        personNum:108
-    }
-  },
-  mounted:{
-
+      personNum: 108
+    };
   },
-  methods: {
-
-  }
+  mounted: {},
+  methods: {}
 };
 </script>
 
 <style lang="scss" scoped>
 $white: #ffffff;
-.air-drop-pool{
+.air-drop-pool {
   width: 100%;
   height: 100vh;
   background-image: url("../assets/images/空投池背景.png");
@@ -80,35 +78,34 @@ $white: #ffffff;
       font-size: 16px;
     }
   }
-  .air-panel-box{
+  .air-panel-box {
     padding: 25px 15px 0px 15px;
     box-sizing: border-box;
-      .air-panel{
-	    height:110px;
+    .air-panel {
+      height: 110px;
       background-color: #ffffff;
-	    box-shadow: 0px 2px 12px 0px 
-		rgba(6, 0, 1, 0.04);
+      box-shadow: 0px 2px 12px 0px rgba(6, 0, 1, 0.04);
       border-radius: 4px;
     }
   }
-  .air-panel-num{
+  .air-panel-num {
     padding: 10px 15px 15px 15px;
     box-sizing: border-box;
-      height: calc(100vh - 220px );
+    height: calc(100vh - 220px);
   }
-   .air-panel-num-content{
+  .air-panel-num-content {
     padding: 20px 15px;
     height: 100%;
     box-shadow: 0px 2px 12px 0px rgba(6, 0, 1, 0.04);
     border-radius: 4px;
     background-size: cover;
     background-color: #ffffff;
-        img{
+    img {
       object-fit: contain;
       width: 100%;
       height: 100%;
     }
-        p{
+    p {
       font-size: 16px;
       font-weight: normal;
       font-stretch: normal;
@@ -116,11 +113,11 @@ $white: #ffffff;
       position: absolute;
       left: 50%;
       top: 50%;
-            transform: translate(-50%,-50%);
+      transform: translate(-50%, -50%);
       display: flex;
       align-items: center;
     }
-        span{
+    span {
       font-size: 32px;
       font-weight: normal;
       font-stretch: normal;
@@ -129,19 +126,19 @@ $white: #ffffff;
       margin: 0 20px;
     }
   }
-    .notice-bar{
+  .notice-bar {
     height: 100%;
     overflow: hidden;
     display: flex;
     align-items: center;
     padding: 0 20px 0 50px;
-        img{
+    img {
       width: 16px;
       margin-right: 15px;
     }
-        .notice-bar-show{
+    .notice-bar-show {
       height: 100%;
-            p{
+      p {
         font-size: 16px;
         color: #333333;
         height: 33.33%;
@@ -151,11 +148,10 @@ $white: #ffffff;
         align-items: center;
         color: #333;
       }
-            .dark{
+      .dark {
         opacity: 0.4;
       }
     }
   }
 }
-
 </style>

H5/src/views/canCashOut.vue

@@ -12,18 +12,18 @@
     <div class="cash-panel-nums">
       <div class="cash-panel">
         <div class="cash-nums">
-                <span class="cash-num">{{preNum}}</span>
+          <span class="cash-num">{{ preNum }}</span>
           <span class="cash-label">上月未提</span>
         </div>
         <div class="cash-nums">
-              <span class="cash-num">{{currentNum}}</span>
+          <span class="cash-num">{{ currentNum }}</span>
           <span class="cash-label">本月可提</span>
         </div>
       </div>
     </div>
     <div class="cash-rules">
       <div class="cash-rule-content">
-            <p>{{rules}}</p>
+        <p>{{ rules }}</p>
       </div>
     </div>
   </div>
@@ -34,10 +34,11 @@ export default {
   name: "leagueNums",
   data() {
     return {
-     preNum:'125',
-     currentNum:'325',
-     rules:'提现规则：这是一条规则，这是一条规则，这是一条规则，这是一条规则这是一条规则这是一条规则这是一条规则。'
-    }
+      preNum: "125",
+      currentNum: "325",
+      rules:
+        "提现规则：这是一条规则，这是一条规则，这是一条规则，这是一条规则这是一条规则这是一条规则这是一条规则。"
+    };
   },
   methods: {}
 };
@@ -45,7 +46,7 @@ export default {
 
 <style lang="scss" scoped>
 $white: #ffffff;
-.can-cash-out{
+.can-cash-out {
   width: 100%;
   height: 298px;
   background-image: url("../assets/images/森林状态.png");
@@ -73,24 +74,23 @@ $white: #ffffff;
       font-size: 16px;
     }
   }
-  .cash-panel-nums{
+  .cash-panel-nums {
     padding: 25px 15px 0px 15px;
     box-sizing: border-box;
-      .cash-panel{
-	    height:98px;
+    .cash-panel {
+      height: 98px;
       background-color: #ffffff;
-	    box-shadow: 0px 2px 12px 0px 
-		rgba(6, 0, 1, 0.04);
+      box-shadow: 0px 2px 12px 0px rgba(6, 0, 1, 0.04);
       border-radius: 4px;
     }
-      .cash-nums{
+    .cash-nums {
       width: 50%;
       text-align: center;
       display: inline-block;
       padding: 22px 0;
       position: relative;
-          &:first-child{
-              &::before{
+      &:first-child {
+        &::before {
           width: 1px;
           height: 50px;
           content: "";
@@ -101,9 +101,9 @@ $white: #ffffff;
           margin-top: -25px;
         }
       }
-          span{
+      span {
         display: block;
-              &.cash-num{
+        &.cash-num {
           font-size: 26px;
           font-weight: normal;
           font-stretch: normal;
@@ -111,30 +111,27 @@ $white: #ffffff;
           letter-spacing: 0px;
           color: #333333;
         }
-              &.cash-label{
+        &.cash-label {
           font-size: 14px;
           color: #666;
           line-height: 27px;
         }
-              
       }
-
     }
   }
-  .cash-rules{
+  .cash-rules {
     padding: 10px 15px 15px 15px;
     box-sizing: border-box;
-      height: calc(100vh - 220px );
+    height: calc(100vh - 220px);
   }
-   .cash-rule-content{
+  .cash-rule-content {
     background-color: #ffffff;
     padding: 20px 15px;
     height: 100%;
     background-color: #ffffff;
-	     box-shadow: 0px 2px 12px 0px 
-		rgba(6, 0, 1, 0.04);
+    box-shadow: 0px 2px 12px 0px rgba(6, 0, 1, 0.04);
     border-radius: 4px;
-          p{
+    p {
       font-family: PingFang-SC-Regular;
       font-size: 14px;
       font-weight: normal;
@@ -146,5 +143,4 @@ $white: #ffffff;
     }
   }
 }
-
 </style>

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

@@ -135,7 +135,7 @@ export default {
 <style lang="scss" scoped>
 .cash-out {
   padding: 10px 0;
-  font-family: "PingFang-SC-Medium";
+  font-family: PingFang-SC-Medium;
   .bank {
     ::v-deep .van-field__control {
       text-align: right;
@@ -205,7 +205,7 @@ export default {
   width: 185px;
   margin: 25px auto;
   text-align: center;
-  font-family: "PingFang-SC-Medium";
+  font-family: PingFang-SC-Medium;
   font-size: 14px;
   color: #333333;
 }

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

@@ -34,56 +34,56 @@ export default {
       pieOption: {
         legend: [
           {
-            selectedMode:false,
+            selectedMode: false,
             x: "1%",
             y: "65%",
             itemWidth: 12,
             data: ["工资收益"]
           },
           {
-            selectedMode:false,
+            selectedMode: false,
             x: "28%",
             y: "65%",
             itemWidth: 12,
             data: ["曾极差奖金"]
           },
           {
-            selectedMode:false,
+            selectedMode: false,
             x: "65%",
             y: "65%",
             itemWidth: 12,
             data: ["自身消费返佣"]
           },
           {
-            selectedMode:false,
+            selectedMode: false,
             x: "1%",
             y: "75%",
             itemWidth: 12,
             data: ["培育奖"]
           },
           {
-            selectedMode:false,
+            selectedMode: false,
             x: "28%",
             y: "75%",
             itemWidth: 12,
             data: ["月度肥料池分红"]
           },
           {
-            selectedMode:false,
+            selectedMode: false,
             x: "65%",
             y: "75%",
             itemWidth: 12,
             data: ["进步奖"]
           },
           {
-            selectedMode:false,
+            selectedMode: false,
             x: "1%",
             y: "85%",
             itemWidth: 12,
             data: ["红包"]
           },
           {
-            selectedMode:false,
+            selectedMode: false,
             align: "left",
             x: "28%",
             y: "85%",
@@ -91,7 +91,7 @@ export default {
             data: ["运营中心补贴"]
           },
           {
-            selectedMode:false,
+            selectedMode: false,
             align: "left",
             x: "65%",
             y: "85%",

H5/src/views/income/wallet.vue

@@ -30,7 +30,7 @@
         </div>
         <div class="income-item">
           <img src="@/assets/images/累计收入.png" alt />
-          <p>可提现</p>
+          <p>未提余额</p>
           <div>
             <span class="money">325.36</span>
             <img
@@ -41,11 +41,30 @@
           </div>
         </div>
       </div>
-      <van-button type="primary" class="cash-out-btn">提现</van-button>
+      <div class="cash-out-btn">
+        <van-button type="primary" color="#88c678" @click="onToCashOut"
+          >提现</van-button
+        >
+        <p @click="onToRecord">查看提现记录</p>
+      </div>
     </div>
   </div>
 </template>
 
+<script>
+export default {
+  name: "Wallet",
+  methods: {
+    onToCashOut() {
+      this.$router.push("/cash-out");
+    },
+    onToRecord() {
+      this.$router.push("/cash-out-record");
+    }
+  }
+};
+</script>
+
 <style lang="scss" scoped>
 .wallet {
   box-sizing: border-box;
@@ -103,11 +122,18 @@
 
     .cash-out-btn {
       position: absolute;
-      bottom: 96px;
+      bottom: 63px;
       left: 50%;
       transform: translateX(-50%);
+      .van-button {
         width: 160px;
       }
+      p {
+        margin-top: 20px;
+        font-size: 14px;
+        color: #88c678;
+      }
+    }
   }
 }
 </style>

H5/src/views/instructions.vue

@@ -44,7 +44,7 @@ export default {
     text-align: center;
     margin-bottom: 10px;
   }
-  .paragraph{
+  .paragraph {
     font-family: PingFang-SC-Regular;
     font-size: 13px;
     color: #333;

H5/src/views/my/components/invitee.vue

@@ -59,7 +59,7 @@
     display: flex;
     justify-content: space-between;
     align-items: center;
-    font-family: "aPingFang-SC-Regular";
+    font-family: PingFang-SC-Regular;
     color: #333333;
   }
 }

H5/src/views/rewards/compoments/rankItem.vue

@@ -29,10 +29,11 @@ export default {
   justify-content: space-around;
   align-items: center;
   width: 100%;
-  font-family: "PingFang-SC-Medium";
+  font-family: PingFang-SC-Medium;
   font-size: 14px;
   .index {
-    font-family: "PingFang-SC-Bold";
+    font-family: PingFang-SC-Bold;
+    color: #999999;
   }
   .color-rank-1 {
     color: #fe0000;

H5/src/views/rewards/fastest-progress.vue

@@ -89,6 +89,7 @@ export default {
   .header {
     height: 36px;
     font-size: 13px;
+    font-weight: bold;
     border-bottom: 1px solid #eeeeee;
   }
   .rank-content {

H5/src/views/rewards/month-award.vue

@@ -10,7 +10,11 @@
       <span class="nav-title">月度奖励</span>
     </div>
     <div class="notice">
-      <van-notice-bar left-icon="volume-o" background="transparent">
+      <van-notice-bar
+        left-icon="volume-o"
+        color="#333333"
+        background="transparent"
+      >
         <div slot="left-icon" style="margin-right: 10px">
           <img class="notice-icon" src="@/assets/images/notice.png" alt />
         </div>
@@ -30,8 +34,8 @@
     </div>
     <div class="content">
       <p style="font-size: 16px; font-weight: bold">本月累计奖金</p>
-      <p style="font-weight: bold">193,49.00</p>
-      <p style="font-size: 14px">历史累计奖金：￥110000.00</p>
+      <p style="font-weight: bold">19,349.00</p>
+      <p style="font-size: 14px;color:#333333">历史累计奖金：￥110000.00</p>
     </div>
     <div class="newAdd-my">
       <div class="newAdd">
@@ -64,7 +68,7 @@
         <span> ￥1000.00</span>
       </p>
       <p class="level-pool-item">
-        <span>森田合伙人等级</span>
+        <span>西田森合伙人等级</span>
         <span> ￥1000.00</span>
       </p>
     </div>
@@ -131,7 +135,7 @@
   align-items: center;
   height: 120px;
   margin-bottom: 90px;
-  font-family: "PingFang-SC";
+  font-family: PingFang-SC;
   p {
     margin: 0;
   }
@@ -166,6 +170,10 @@
     .bottom {
       display: flex;
       justify-content: space-between;
+      span {
+        font-family: PingFang-SC-Bold;
+        color: #666666;
+      }
     }
   }
 }
@@ -178,7 +186,7 @@
   height: 170px;
   margin: 0 auto;
   padding: 18px 15px 19px;
-  font-family: "PingFang-SC-Medium";
+  font-family: PingFang-SC-Medium;
   background-color: #ffffff;
   p {
     margin: 0;

H5/src/views/settings.vue

@@ -18,11 +18,7 @@
         @click="fillInviterCode"
       />
       <van-cell is-link title="软件更新" value="版本v1.2" />
-      <van-cell 
-      is-link 
-      title="用户协议" 
-
-      />
+      <van-cell is-link title="用户协议" />
     </van-cell-group>
     <van-button size="large" class="logout-btn">退出登录</van-button>