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

@@ -69,11 +69,11 @@ export default {
     methods: {
     methods: {
       ...mapActions(['fetchWallet']),
       ...mapActions(['fetchWallet']),
       onPullingDown() {
       onPullingDown() {
-        this.fetchWallet({isRefresh:true})
+        this.fetchWallet({isRefresh:true, tradeType: this.walletData.tradeType})
       },
       },
       onPullingUp() {
       onPullingUp() {
         if(!this.walletData.endReached) {
         if(!this.walletData.endReached) {
-          this.fetchWallet({isRefresh:false})
+          this.fetchWallet({isRefresh:false, tradeType: this.walletData.tradeType})
         } else {
         } else {
           this.$refs.scroll.forceUpdate()
           this.$refs.scroll.forceUpdate()
         }
         }

 <template>
 <template>
   <div class="single-image">
   <div class="single-image">
-     <a :href="data.url" class="link">
+     <LayoutLink :href="data.url" class="link">
          <img :src="data.src" :alt="data.title"  class="img" :style="style">
          <img :src="data.src" :alt="data.title"  class="img" :style="style">
-     </a>
+     </LayoutLink>
   </div>
   </div>
 </template>
 </template>
 
 

 <template>
 <template>
-  <LayoutApp :show-back="true">
+  <LayoutApp :show-back="true" title="支付成功">
     <div class="body">
     <div class="body">
       <div class="header">
       <div class="header">
         <i class="iconfont iconOk icon-class"></i>
         <i class="iconfont iconOk icon-class"></i>

 <template>
 <template>
-  <LayoutApp :show-back="true">
+  <LayoutApp :show-back="true" title="确认订单">
     <div class="body">
     <div class="body">
-      <TitleComp txt="确认订单" class="title-class"></TitleComp>
       <AddressInfo :data="address" class="order-item" :show-tip="false"></AddressInfo>
       <AddressInfo :data="address" class="order-item" :show-tip="false"></AddressInfo>
       <ProductInfo :data="orderDetail.good" class="product-info order-item"></ProductInfo>
       <ProductInfo :data="orderDetail.good" class="product-info order-item"></ProductInfo>
       <Coupon class="order-item" v-if="couponList.length > 0" :data="orderDetail.recommendedCouponInfo"
       <Coupon class="order-item" v-if="couponList.length > 0" :data="orderDetail.recommendedCouponInfo"

 <template>
 <template>
-  <LayoutApp :show-back="true">
+  <LayoutApp :show-back="true" title="支付中">
     <div class="timer-wrapper">
     <div class="timer-wrapper">
       <div class="timer">{{count}}s</div>
       <div class="timer">{{count}}s</div>
     </div>
     </div>
@@ -26,7 +26,7 @@ export default {
   props: ['orderCode', 'payParams', 'extra'],
   props: ['orderCode', 'payParams', 'extra'],
   data() {
   data() {
     return {
     return {
-      count: 10,
+      count: 60,
       page: null,
       page: null,
       timer: null
       timer: null
     };
     };
@@ -42,7 +42,7 @@ export default {
       this.page = JSON.parse(this.extra || '{}');
       this.page = JSON.parse(this.extra || '{}');
     }
     }
   },
   },
-  beforeDestroy() {
+  beforeRouteLeave () {
     if (this.timer) {
     if (this.timer) {
       clearTimeout(this.timer);
       clearTimeout(this.timer);
     }
     }

 <template>
 <template>
-  <LayoutApp :show-back="true">
+  <LayoutApp :show-back="true" title="上架成功">
     <div class="body">
     <div class="body">
       <div class="header">
       <div class="header">
         <i class="iconfont iconOk icon-class"></i>
         <i class="iconfont iconOk icon-class"></i>

 <template>
 <template>
-  <LayoutApp :show-back="true">
+  <LayoutApp :show-back="true" title="确认出售">
     <div class="body">
     <div class="body">
-      <TitleComp txt="出售"></TitleComp>
       <ProductInfo :data="productDetail" class="product-info"></ProductInfo>
       <ProductInfo :data="productDetail" class="product-info"></ProductInfo>
       <InputPrice @input="changePrice" :value="price" class="input-price" @on-blur="compute"></InputPrice>
       <InputPrice @input="changePrice" :value="price" class="input-price" @on-blur="compute"></InputPrice>
       <OrderMargin class="order-item order-margin" :data="fee"></OrderMargin>
       <OrderMargin class="order-item order-margin" :data="fee"></OrderMargin>

@@ -287,6 +287,7 @@ export default {
       this.showSizeSelectSheet = true;
       this.showSizeSelectSheet = true;
     },
     },
     async onSelectTradeProduct(tradeProduct) {
     async onSelectTradeProduct(tradeProduct) {
+      if (this.selectSizeConfig.type === 'buy') {
         try {
         try {
           const info = await this.payment({
           const info = await this.payment({
             skup: tradeProduct.skup,
             skup: tradeProduct.skup,
@@ -316,7 +317,7 @@ export default {
               },
               },
               onConfirm: () => {
               onConfirm: () => {
                 this.$router.push({
                 this.$router.push({
-                name: this.selectSizeConfig.type === 'buy' ? 'OrderList' : 'InSaleOrderList',
+                  name: 'OrderList',
                   params: {
                   params: {
                     owner: this.selectSizeConfig.type,
                     owner: this.selectSizeConfig.type,
                   },
                   },
@@ -328,6 +329,7 @@ export default {
         } catch (e) {
         } catch (e) {
           // e
           // e
         }
         }
+      }
 
 
       this.$router.push({
       this.$router.push({
         name: this.selectSizeConfig.dest,
         name: this.selectSizeConfig.dest,

@@ -141,15 +141,11 @@ export default function() {
         return tabList;
         return tabList;
       },
       },
       getYearMonth(state) {
       getYearMonth(state) {
-        let beginTime = moment(
-          new Date(state.filterData.beginTime * 1000),
-        ).format('YYYY-MM');
-        let endTime = moment(new Date(state.filterData.endTime * 1000)).format(
-          'YYYY-MM',
-        );
+        let beginTime = moment(new Date(state.filterData.beginTime * 1000)).format('YYYY-MM');
+        let endTime = moment(new Date(state.filterData.endTime * 1000)).format('YYYY-MM');
 
 
-        var a = moment(endTime.split('-'));
-        var b = moment(beginTime.split('-'));
+        let a = moment(endTime.split('-'));
+        let b = moment(beginTime.split('-'));
         let yearNum = a.diff(b, 'years');
         let yearNum = a.diff(b, 'years');
         let monthNum = a.diff(b, 'months');
         let monthNum = a.diff(b, 'months');
         let beginYear = beginTime.split('-')[0];
         let beginYear = beginTime.split('-')[0];
@@ -239,9 +235,7 @@ export default function() {
       },
       },
       addWallet(state, walletData) {
       addWallet(state, walletData) {
         walletData.list.map(item => {
         walletData.list.map(item => {
-          item.time = moment(new Date(item.createTime * 1000)).format(
-            'YYYY.MM.DD HH:mm',
-          );
+          item.time = moment(new Date(item.createTime * 1000)).format('YYYY.MM.DD HH:mm');
           item.amount = Number(Math.abs(item.amount)).toFixed(2);
           item.amount = Number(Math.abs(item.amount)).toFixed(2);
           return item;
           return item;
         });
         });
@@ -440,8 +434,7 @@ export default function() {
           let newList = [...oldList, ...data.list];
           let newList = [...oldList, ...data.list];
 
 
           walletData.currentPage = data.page;
           walletData.currentPage = data.page;
-          walletData.endReached =
-            data.list.length === 0 || data.page === data.totalPage;
+          walletData.endReached = data.list.length === 0 || data.page === data.totalPage;
           walletData.list = newList;
           walletData.list = newList;
           commit('addWallet', walletData);
           commit('addWallet', walletData);
         }
         }