Merge branch 'develop' of http://git.yoho.cn/fe/xianyu-ufo-app-web into develop

@@ -68,7 +68,7 @@
             checked="model.is_default"
             v-model="model.is_default"
           ></Radio>
-          <div v-if="isUpdate && !isSeller" class="del-address" @click="delAddress">删除地址</div>
+          <div v-if="isUpdate && !isBuyerOrSeller" class="del-address" @click="delAddress">删除地址</div>
         </div>
       </div>
       <div :class="submitClass" @touchend="onSubmit">确 认</div>
@@ -116,7 +116,7 @@ export default {
       },
       isShowProvince: false,
       isUpdate: false,
-      isSeller: false,
+      isBuyerOrSeller: false,
       updateMobileNum: '',
       isMobileNumEdit: false,
       title: '',
@@ -319,7 +319,7 @@ export default {
     let addressInfo = this.updateAddressInfo;
 
     //判断是否是出售订单，出售订单不显示“删除地址”
-    this.isSeller = this.$route.query.fromPage === 'OrderSellConfirm' ? true : false;
+    this.isBuyerOrSeller = this.$route.query.fromPage === 'OrderSellConfirm' || this.$route.query.fromPage === 'OrderBuyConfirm' ? true : false;
 
     this.isUpdate = addressInfo.isUpdate;
     this.orderCode = addressInfo.orderCode;

@@ -56,9 +56,10 @@ export default {
   beforeRouteEnter (to, from, next) {
       // 从我的绑定支付宝后进入交易明细
       next(vm => {
-        if(from.name === 'bindAccount') {
+        let isbind = vm.$store.state.home.bindAccount.validStatus === 1
+        if(isbind && from.name === 'bindAccount') {
         vm.$router.push({name: 'tradeIncome'})
-      }
+        }
       })
     },
   methods: {

-<template>
+<template functional>
   <div class="income-detail-header">
      <p class="total-income">收入明细</p>
      <slot><div class="no-data">暂无收入明细</div></slot>
   </div>
 </template>
 
-<script>
-export default {
-  name: 'income-detail',
-  props: {
-
-  },
-  
-  methods: {
-    
-  },
-};
-</script>
-
 <style lang="scss" scoped>
 .income-detail-header {
   margin-top: 15px;

-<template>
+<template functional>
   <div class="assets-record-container">
   <div class='assets-record-info-detail-view'>
     <div class='assets-record-left-view'>
       <div class='assets-record-middle-view'>
-        <span class='assets-record-code-txt'>{{data.productName}}<span class="size">（尺码：{{data.sizeName}}）</span></span>
-        <span class='assets-record-time-txt'>{{data.time}}</span>
+        <span class='assets-record-code-txt'>{{props.data.productName}}<span class="size">（尺码：{{props.data.sizeName}}）</span></span>
+        <span class='assets-record-time-txt'>{{props.data.time}}</span>
       </div>
     </div>
     <div class='assets-record-right-view'>
-      <span class='assets-record-income-txt'>{{data.price}}</span>
-      <span class='assets-record-income-tip-txt'>{{data.normalFlag ? '' : '打款失败'}}</span>
-      <span class='assets-record-income-desc'>{{data.tradeTypeDesc}}</span>
+      <span class='assets-record-income-txt'>{{props.data.price}}</span>
+      <span class='assets-record-income-tip-txt'>{{props.data.normalFlag ? '' : '打款失败'}}</span>
+      <span class='assets-record-income-desc'>{{props.data.tradeTypeDesc}}</span>
     </div>
   </div>
   </div>
 </template>
 
-<script>
-
-export default {
-  name: 'income-item',
-  props: {
-      data: {
-          type: Object,
-          default: {}
-      }
-  },
-  data() {
-    return {
-     
-    };
-  },
-};
-</script>
-
 <style lang="scss" scoped>
   .assets-record-container {
   display: flex;

@@ -7,7 +7,6 @@
         :options="options"
         :data="orderList"
         class="order-list-scroll-wrap"
-        v-show="!isShowEmpty"
       >
         <ul class="list-wrapper">
           <li v-for="(order, i) in orderList" :key="i">
@@ -23,12 +22,13 @@
             </div>
           </li>
         </ul>
+
+        <empty-list
+          class="empty-wrapper"
+          tip="这里什么都没有..."
+          v-show="isShowEmpty"
+        />
       </scroll>
-      <empty-list
-        class="empty-wrapper"
-        tip="这里什么都没有..."
-        v-show="isShowEmpty"
-      />
     </div>
   </layout-app>
 </template>
@@ -111,16 +111,13 @@ export default {
 </script>
 <style lang="scss" scoped>
 .content-wrapper {
-  height: calc(100vh - 100px);
+  height: 100%;
   overflow-x: hidden;
   overflow-y: auto;
   -webkit-box-orient: vertical;
 
   .empty-wrapper {
-    margin: auto 0;
-    position: absolute;
-    top: 0;
-    bottom: 0;
+    margin: 20vh 0;
   }
 
   .footer-wrapper {

@@ -8,7 +8,6 @@
         :options="options"
         :data="orderList"
         class="order-list-scroll-wrap"
-        v-show="!isShowEmpty"
       >
         <ul class="list-wrapper">
           <li v-for="order in orderList" :key="order.orderCode">
@@ -39,14 +38,14 @@
             </div>
           </li>
         </ul>
-      </scroll>
 
-      <empty-list
-        @touch.prevent
-        class="empty-wrapper"
-        tip="这里什么都没有..."
-        v-show="isShowEmpty"
-      />
+        <empty-list
+          @touch.prevent
+          class="empty-wrapper"
+          tip="这里什么都没有..."
+          v-show="isShowEmpty"
+        />
+      </scroll>
     </div>
   </layout-app>
 </template>
@@ -155,10 +154,7 @@ export default {
   }
 
   .empty-wrapper {
-    margin: auto 0;
-    position: absolute;
-    top: 0;
-    bottom: 0;
+    margin: 20vh 0;
   }
 
   .order-list-scroll-wrap {