Merge branch 'master' of http://111.203.232.171:8888/Song/xitiansenmall into dev_lqs

H5/src/utils/localGetter.js

 export function getUserId() {
+<<<<<<< HEAD
+    let userInfo = localStorage.getItem('user')
+    if(userInfo){
+        return JSON.parse(userInfo).userId || '';
+    }else{
+        return ''
+    }
+    
+=======
     if (localStorage.getItem("user")) {
         return JSON.parse(localStorage.getItem('user')).userId;
     } else {
         return "";
     }
+>>>>>>> fda7ecc8c9d2dc436d2ae853fbd549faf9b8cb85
 }
\ No newline at end of file

H5/src/views/income/wallet.vue

@@ -3,19 +3,19 @@
     <div class="content">
       <img class="balance-img" src="@/assets/images/余额.png" alt />
       <p
-        style="position:absolute;top:136px;width:100%;font-size:18px;color:#333333"
+      class="currentprofitlabel"
       >
         当月收益
       </p>
       <div
-        style="position:absolute;top:178px;width:100%"
+        class="currentprofit"
         @click="jumpToIncomeDetail"
       >
         <span class="month-income">{{ walletInfo.moneyIncome }}</span>
         <img
           src="@/assets/images/右箭头.png"
           alt
-          style="width:11px;height:18px"
+          class="month-income-arrow"
         />
       </div>
       <div class="bottom-box">
@@ -27,7 +27,7 @@
             <img
               src="@/assets/images/右箭头.png"
               alt
-              style="width:8px;height:15px"
+              class="arrow"
             />
           </div>
         </div>
@@ -39,7 +39,7 @@
             <img
               src="@/assets/images/右箭头.png"
               alt
-              style="width:8px;height:15px"
+              class="arrow"
             />
           </div>
         </div>
@@ -56,7 +56,6 @@
 
 <script>
 import { getMoneyPackage } from "@/api/wallet";
-
 export default {
   name: "Wallet",
   data() {
@@ -114,17 +113,31 @@ export default {
 <style lang="scss" scoped>
 .wallet {
   box-sizing: border-box;
-  height: 100vh;
-  padding: 10px 16px;
+  height: calc(100vh - 48px);
+  overflow: hidden;
+  padding:15px;
+  box-sizing: border-box;
   p {
     margin: 0;
   }
   .content {
     position: relative;
     width: 345px;
-    height: 90%;
+    height: 100%;
     text-align: center;
     background-color: #ffffff;
+    .currentprofitlabel{
+      position:absolute;
+      top:136px;
+      width:100%;
+      font-size:18px;
+      color:#333333
+    }
+    .currentprofit{
+      position: absolute;
+      width: 100%;
+      top: 178px;
+    }
     .balance-img {
       position: absolute;
       top: 72px;
@@ -138,6 +151,10 @@ export default {
       font-size: 28px;
       color: #333333;
     }
+    .month-income-arrow{
+      width: 11px;
+      height: 18px;
+    }
 
     .bottom-box {
       position: absolute;
@@ -151,6 +168,10 @@ export default {
       img {
         width: 30px;
         height: 29px;
+        &.arrow{
+          width: 12px;
+          height: 18px;
+        }
       }
       .income-item {
         display: flex;

H5/src/views/modefyAvatar.vue

@@ -2,9 +2,6 @@
   <div class="modefy-avatar">
     <img class="avatar" :src="avatar" alt />
     <div class="btn">
-      <van-button type="primary" plain style="height:44px" @click="checkBtn"
-        >确定</van-button
-      >
       <van-uploader
         :max-count="1"
         :before-delete="onDeleteAvatar"
@@ -12,6 +9,9 @@
       >
         <van-button type="primary">上传新头像</van-button>
       </van-uploader>
+      <van-button type="primary" plain  @click="checkBtn"
+        >确定</van-button
+      >
     </div>
   </div>
 </template>
@@ -84,7 +84,7 @@ export default {
 .modefy-avatar {
   box-sizing: border-box;
   text-align: center;
-  padding-top: 115px;
+  padding-top: 25px;
 }
 .avatar {
   width: 345px;
@@ -92,6 +92,9 @@ export default {
   margin-bottom: 52px;
   border-radius: 4px;
 }
+.van-uploader{
+  font-size: 0;
+}
 .btn {
   display: flex;
   justify-content: space-around;