junyuanz пре 3 година
родитељ
комит
a1206b8c91

+ 4 - 3
packageUser/pages/user/commission/commission.js

@@ -9,7 +9,7 @@ Page({
     balance: 0
   },
   onLoad: function (options) {
-    // this.getBalanceInfo()
+    this.getBalanceInfo()
     this.getBalanceList()
   },
   onShow () {
@@ -25,11 +25,12 @@ Page({
   },
   getBalanceInfo () {
     var that = this
-    var url = 'v1/user/balance/info'
+    var url = 'v1/district/total'
     var params = {
     }
     var success = function (res) {
-      var result = res.data.silver_total
+		console.log('res',res);
+      var result = res.data.sum
       that.setData({
         balance: result
       })

+ 5 - 5
packageUser/pages/user/commission/commission.wxml

@@ -1,15 +1,15 @@
 <view class="bg">
-  <!-- <view class="radish-top">
-    <view class="radish-top__title">我的提成</view>
+  <view class="radish-top">
+    <view class="radish-top__title">本月合计</view>
     <view class="radish-top__count">{{balance / 100}}</view>
-  </view> -->
+  </view>
   <!-- <view class="silver-help-height"></view> -->
   <view class="radish-main">
-    <!-- <view class="radish-main__title">交易记录</view> -->
+    <view class="radish-main__title">提成记录</view>
     <view class="radish-main__line" wx:key="{{index}}" data-val="{{item.id}}" wx:for="{{list}}">
       <view class="radish-main__left">
         <view class="radish-main__text ellipsis">{{item.order_id}} - {{item.contact}}</view>
-        <view class="radish-main__time"><format-time type="formatTime" value="{{item.ctime}}" ></format-time></view>
+        <view class="radish-main__time"><format-time type="formatTime" value="{{item.paied_at}}" ></format-time></view>
         <view class="clean"></view>
       </view>
       <view class="radish-main__count">{{item.dis_amount / 100}}</view>