Merge branch 'master' of http://117.187.233.158:32779/hxhxhx/Onlife

components/smarttrading/item.vue

@@ -35,7 +35,7 @@
                                 </view>
                                 <view v-if="detail.hasOwnProperty('money')">
                                     <label class="label" style="font-size: 12px;">購買時間&nbsp;:&nbsp;</label>
-                                    <label>{{$moment(Number(detail.createTimes||detail.createTimestamp)).format('YYYY-MM-DD HH:mm:ss')}}</label>
+                                    <label>{{$moment(Number(detail.purchaseTime)).format('YYYY-MM-DD HH:mm:ss')}}</label>
                                 </view>
                                 <view>
                                     <label class="label"

pages/smarttrading/buy.vue

@@ -181,7 +181,7 @@
                 	    title: '購買1G以上算力才可交易',
                 		icon:"none"
                 	})
-                                this.loading = false
+                    this.loading = false
                 	return
                 }
                 let cobj = this.checkTypeAndValue(this.detail.investCoin,this.value)
@@ -190,7 +190,7 @@
                 	    title: cobj.message,
                 		icon:"none"
                 	})
-                                this.loading = false
+                    this.loading = false
                 	return
                 }
                 uni.showLoading({
@@ -202,13 +202,14 @@
                     type: this.detail.optionType,
                     name: this.userInfo.email,
                     money: this.value,
-                    money_wallet: this.userInfo.wallet.address
+                    money_wallet: this.userInfo.wallet.address,
                 }
                 _pushBuyInfo({
                     'buyinfo': data,
+                    ...this.detail,
                     money: this.value,
-                    ...this.detail
-                }).then((res) => {
+                }).then((res) => {
+                     uni.hideLoading()
                     let toast = {
                         type: "success",
                         position: 'bottom',
@@ -223,8 +224,6 @@
                         ...toast,
                         complete: () => {
                             uni.$emit('updateView', {})
-                            uni.hideLoading()
-                            this.loading = false
                             uni.navigateBack()
                         }
                     });

pages/smarttrading/incomes.vue

@@ -53,8 +53,8 @@
                 coins: ['USDT','BNB', 'ETH', 'BTC'],
                 scrollHeight: 0,
                 search: {
-                    size: 10,
-                    listrow: 1,
+                    page: 1,
+                    listrow: 10,
                     totalPage: 0,
                 },
                 optionsType: ['CALL', 'PUT'],
@@ -97,6 +97,7 @@
                 })
                 this.loading = true
                 let search = {
+                    'type':this.coins[this.coinIndex],
                     ...this.search
                 }
                 delete search.totalPage
@@ -113,7 +114,7 @@
                     this.incomes = this.incomes.concat(res.data.data)
                 }
                 this.list = this.incomes.map(item => {
-                    return item.info
+                    return {...item.info,'money':item.money}
                 })
                 this.search.totalPage = Math.ceil(res.data.total / this.search.page)
                 uni.hideLoading()

request/api.js

@@ -340,7 +340,7 @@ export function _getaccountorder(data){
 
 export function _myIncome(data){
     return jyRequest.get({
-        url:`/api/quantify/getlist` // 获取收益列表
+        url:`/api/quantify/getlist?${data}` // 获取收益列表
     })
 }