fix(income&buyer-confirm): 我的收入滚动条展示 & 订单确认页未登录提示 reviewed by 黄涛 & 邱俊

chore(*) : npm version

@@ -99,8 +99,8 @@ export default {
 <style lang="scss" scoped>
 .progress-box {
   position: absolute;
-  top: 36px;
-  right: 50px;
+  top: 0;
+  right: 90px;
   width: 204px;
   height: 204px;
 }

@@ -6,8 +6,8 @@
         :loading="loadingOptions"
         @pulling-up="onPullingUp">
 
-        <incomeHeader :data="getAssetSummary"></incomeHeader>
-        <payAccount></payAccount>
+        <incomeHeader :data="getAssetSummary" class="header-inner-padding"></incomeHeader>
+        <payAccount  class="inner-padding"></payAccount>
         <incomeDetail :data="incomeData">
           <template v-for="(item,index) in incomeData.list">
               <incomeItem :data="item" :key="index"></incomeItem>
@@ -104,7 +104,19 @@ export default {
   height: 100%;
   overflow-y: auto;
   background-color: white;
-  padding: 0 40px;
   color: #999;
 }
+
+.header-inner-padding {
+  padding: 0 40px;
+  position: relative;
+}
+
+.inner-padding {
+  padding: 0 40px;
+}
+
+/deep/ .income-detail-header {
+  padding: 0 40px;
+}
 </style>

@@ -10,13 +10,11 @@
         <div class="price"><span class='icon-ufo'></span> {{data.colorName}}，{{data.sizeName}}</div>
       </div>
     </div>
-    <div v-if="!getLogin" class="no-login-tip">完成“有货”登录授权后将显示商品优惠及运费信息，请先完成登录查看最终支付金额</div>
+    <div v-if="!isLogin" class="no-login-tip">完成“有货”登录授权后将显示商品优惠及运费信息，请先完成登录查看最终支付金额</div>
   </div>
 </template>
 
 <script>
-import { mapGetters } from 'vuex';
-
 export default {
   name: 'OrderProductInfo',
   props: {
@@ -27,8 +25,20 @@ export default {
       }
     }
   },
-  computed: {
-    ...mapGetters(['getLogin'])
+  data() {
+    return {
+      isLogin: true
+    };
+  },
+  activated() {
+    this.getLogin();
+  },
+  methods: {
+    async getLogin() {
+      const user = await this.$sdk.getUser();
+
+      this.isLogin = user && !!user.uid;
+    }
   }
 };
 </script>

 {
   "name": "xianyu-ufo-app-web",
-  "version": "1.2.1",
+  "version": "1.2.2",
   "private": true,
   "description": "Xianyu Project With Express",
   "repository": {