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

@@ -59,6 +59,7 @@ const xianyu = {
   },
   },
 
 
   goXianyuNewPage(args) {
   goXianyuNewPage(args) {
+    console.log(args);
     if (!args.url) {
     if (!args.url) {
       return;
       return;
     }
     }

@@ -8,7 +8,6 @@
             :totalTime="totalTime"
             :totalTime="totalTime"
             :lineWidth="lineWidth"
             :lineWidth="lineWidth"
     ></canvas>
     ></canvas>
-    <p>{{desc}}</p>
   </div>
   </div>
 
 
 </template>
 </template>
@@ -21,7 +20,7 @@
  * 在自己的页面做定时器，修改time，
  * 在自己的页面做定时器，修改time，
  */
  */
 export default { // 环形倒计时
 export default { // 环形倒计时
-  name: 'count-circle',
+  name: 'CountCircle',
   props: {
   props: {
     time: {
     time: {
       type: Number,
       type: Number,
@@ -35,10 +34,6 @@ export default { // 环形倒计时
       type: Number,
       type: Number,
       default: 8
       default: 8
     },
     },
-    desc: {
-      type: String,
-      default: '正在支付中...'
-    }
   },
   },
   data() {
   data() {
     return {
     return {
@@ -80,7 +75,6 @@ export default { // 环形倒计时
         y: this.canvasHeight / 2,
         y: this.canvasHeight / 2,
         radius: this.canvasWidth / 2
         radius: this.canvasWidth / 2
       };
       };
-      console.log(this.canvas, this.circle, this.time, this.totalTime);
     },
     },
     drawCircle() {
     drawCircle() {
       if (this.canvas && this.context) {
       if (this.canvas && this.context) {

 <template>
 <template>
   <LayoutApp :show-back="true" :title="title">
   <LayoutApp :show-back="true" :title="title">
-    <Scroll :scrollEvents="['scroll']" :options="scrollOptions" @scroll="scroll"
+    <Scroll :scroll-events="['scroll-end','scroll']"
+            @scroll-end="fetchList"
             v-if="favoriteProductList.list.length"
             v-if="favoriteProductList.list.length"
-            @pulling-up="onPullingUp">
+            >
       <ProductList :list="favoriteProductList.list"></ProductList>
       <ProductList :list="favoriteProductList.list"></ProductList>
     </Scroll>
     </Scroll>
     <!-- <empty-list v-show="!isShowEmpty" /> -->
     <!-- <empty-list v-show="!isShowEmpty" /> -->
@@ -42,20 +43,23 @@ export default {
     this.fetchFavoriteList();
     this.fetchFavoriteList();
   },
   },
   methods: {
   methods: {
-    ...mapActions(['fetchFavoriteList','isShowEmpty']),
+    ...mapActions(['fetchFavoriteList','isMore']),
 
 
-    async onPullingUp() {
-      await this.fetchFavoriteList();
+    async fetchList() {
+      if(isMore){
+        await this.fetchFavoriteList();
+      }
+      
     },
     },
-    scroll({ y }) {
-      const height = this.$refs.banner.$el.offsetHeight + this.$refs.header.offsetHeight;
+    // scroll({ y }) {
+    //   const height = this.$refs.banner.$el.offsetHeight + this.$refs.header.offsetHeight;
 
 
-      if (-y >= height) {
-        this.fixed = true;
-      } else {
-        this.fixed = false;
-      }
-    }
+    //   if (-y >= height) {
+    //     this.fixed = true;
+    //   } else {
+    //     this.fixed = false;
+    //   }
+    // }
   },
   },
   
   
   computed: {
   computed: {

@@ -24,7 +24,7 @@ export default {
     ...mapState(
     ...mapState(
       {
       {
         amountPart1: (state) => {
         amountPart1: (state) => {
-          return (''+state.userWalletInfo.walletAmount).split('.')[0]
+          return (''+state.userWalletInfo.walletAmount).split('.')[0].split('¥')[1]
         },
         },
         amountPart2: (state) => {
         amountPart2: (state) => {
           return (''+state.userWalletInfo.walletAmount).split('.')[1]
           return (''+state.userWalletInfo.walletAmount).split('.')[1]

@@ -46,7 +46,7 @@ export default {
     },
     },
     onLinkClick() {
     onLinkClick() {
       if (this.url) {
       if (this.url) {
-
+        this.$xianyu.goXianyuNewPage({url: this.url});
       }
       }
     }
     }
   }
   }

@@ -242,9 +242,9 @@ export default {
       this.platformFeeModalVisible = true;
       this.platformFeeModalVisible = true;
     },
     },
 
 
-    showEarnestQuestion() { // 跳转保证金页面
+    showEarnestQuestion() { // 跳转保证金说明页
       console.log('showEarnest');
       console.log('showEarnest');
-
+      this.$xianyu.goXianyuNewPage({url: this.agreementURL});
     },
     },
 
 
     /**
     /**

 import { get, set } from 'lodash';
 import { get, set } from 'lodash';
 import { getImgUrl } from '../../common/utils';
 import { getImgUrl } from '../../common/utils';
 import Vue from 'vue';
 import Vue from 'vue';
-const uid = '500031170';
+// const uid = '500031170';
 
 
 export default function() {
 export default function() {
   return {
   return {
@@ -13,17 +13,23 @@ export default function() {
       favoriteProductList: {
       favoriteProductList: {
         list:[]
         list:[]
       },
       },
-      isShowEmpty: false,
+      isMore: true,
     },
     },
     mutations: {
     mutations: {
       addList(state, { data }) {
       addList(state, { data }) {
         console.log(data)
         console.log(data)
         if(data && data.product_list){
         if(data && data.product_list){
           // data.product_list.
           // data.product_list.
-            let { page, product_list = [] } = data;
+            let { page, product_list = [], pageTotal } = data;
             let isShowEmpty = page === 1 && product_list === 0;
             let isShowEmpty = page === 1 && product_list === 0;
             // console.log("isShowEmpty:"+isShowEmpty)
             // console.log("isShowEmpty:"+isShowEmpty)
             // state.isShowEmpty = isShowEmpty
             // state.isShowEmpty = isShowEmpty
+            if(pageTotal > page){
+              state.isMore = true;
+            }
+            state.pageTotal = pageTotal;
+            state.page = page + 1;
+
             let list = state.favoriteProductList.list.concat(product_list);
             let list = state.favoriteProductList.list.concat(product_list);
             Vue.set(state.favoriteProductList, "list", list);
             Vue.set(state.favoriteProductList, "list", list);
         }else {
         }else {
@@ -38,16 +44,21 @@ export default function() {
      
      
     },
     },
     actions: {
     actions: {
-      async fetchFavoriteList({ commit }) {
-        const result = await this.$api.get('/api/ufo/home/favoriteProduct', {uid});
-        if (result.code === 200) {
-            let data =result.data;
-          commit('addList', { data:data });
-        }else {
-          // console.log("error=//=isShowEmpty:")
-          commit('errorData');
-        }
-        return result.data || [];
+      async fetchFavoriteList({ commit, state }) {
+          let page = state.page;
+          let limit = 20;
+          const result = await this.$api.get('/api/ufo/home/favoriteProduct', {page, limit});
+          if (result.code === 200) {
+              let data =result.data;
+            commit('addList', { data:data });
+          }else {
+            // console.log("error=//=isShowEmpty:")
+            commit('errorData');
+          }
+          return result.data || [];
+        // }else {
+        //   return [];
+        // }
       },
       },
     },
     },
   };
   };

@@ -46,11 +46,11 @@ export default function() {
         endTime: 0,
         endTime: 0,
       },
       },
       userWalletInfo: {
       userWalletInfo: {
-        totalAmount: 0.0,
+        totalAmount: 0.00,
         withdrawLimit: 0,
         withdrawLimit: 0,
         withdrawAmount: 0,
         withdrawAmount: 0,
         shareSettlementAmount: 0,
         shareSettlementAmount: 0,
-        walletAmount: 0.0,
+        walletAmount: '¥0.00',
       },
       },
       filterData: {
       filterData: {
         tradeTypes: [],
         tradeTypes: [],
@@ -102,7 +102,7 @@ export default function() {
           resource1: { name: 'resource1', data: state.resource1 },
           resource1: { name: 'resource1', data: state.resource1 },
           income: {
           income: {
             title: '我的收入',
             title: '我的收入',
-            num: '¥' + state.userWalletInfo.walletAmount,
+            num: state.userWalletInfo.walletAmount,
             page: 'income',
             page: 'income',
           }, // 原交易收入 tradeIncome
           }, // 原交易收入 tradeIncome
           buyOrder: {
           buyOrder: {
@@ -249,6 +249,8 @@ export default function() {
         state.walletData.endTime = endTime;
         state.walletData.endTime = endTime;
       },
       },
       addUserWalletInfo(state, data) {
       addUserWalletInfo(state, data) {
+        // data.totalAmount = formatNumber(data.totalAmount);
+        data.walletAmount = formatNumber(data.walletAmount);
         state.userWalletInfo = data;
         state.userWalletInfo = data;
       },
       },
       addfilterData(state, data) {
       addfilterData(state, data) {

@@ -84,6 +84,7 @@ module.exports = {
     ufo: true,
     ufo: true,
     api: 'ufo.user.favoriteList',
     api: 'ufo.user.favoriteList',
     params: {},
     params: {},
+    auth: true,
   },
   },
   '/api/ufo/channel/channelList': {
   '/api/ufo/channel/channelList': {
     ufo: true,
     ufo: true,