linwenxin 7 ماه پیش
والد
کامیت
a6a10791b2
2فایلهای تغییر یافته به همراه18 افزوده شده و 29 حذف شده
  1. 1 12
      src/packageMine/pages/salesProfit/index.vue
  2. 17 17
      src/packageMine/pages/salesProfit/orderList.vue

+ 1 - 12
src/packageMine/pages/salesProfit/index.vue

@@ -13,16 +13,9 @@
           <view class="text">收益总金额(元)</view>
           <view class="num">{{ count.zsy | priceFilter }}</view>
         </view>
-        <view class="right">
-          <!-- <view class="btn btn1" @tap="navToPage(`/packageMine/pages/salesProfit/withdraw/list`)">提现明细</view>
-          <view class="btn btn2" @tap="navToPage(`/packageMine/pages/salesProfit/withdraw/index`)">提现</view> -->
-        </view>
+        <view class="right"> </view>
       </view>
       <view class="stats-container">
-        <!-- <view class="item" @tap="navToPage(`/packageMine/pages/salesProfit/orderList?tab=ING`)">
-          <view class="text">提现中(元)<text class="iconfont icon-jinru"></text></view>
-          <view class="num">{{ count.txz | priceFilter }}</view>
-        </view> -->
         <view class="item" @tap="navToPage(`/packageMine/pages/salesProfit/orderList?tab=WAIT`)">
           <view class="text">待结算(元)<text class="iconfont icon-jinru"></text></view>
           <view class="num">{{ count.djs | priceFilter }}</view>
@@ -31,10 +24,6 @@
           <view class="text">已结算(元)<text class="iconfont icon-jinru"></text></view>
           <view class="num">{{ count.yjs | priceFilter }}</view>
         </view>
-        <!-- <view class="item" @tap="navToPage(`/packageMine/pages/salesProfit/orderList?tab=OVER`)">
-          <view class="text">已提现(元)<text class="iconfont icon-jinru"></text></view>
-          <view class="num">{{ count.ytx | priceFilter }}</view>
-        </view> -->
       </view>
     </template>
 

+ 17 - 17
src/packageMine/pages/salesProfit/orderList.vue

@@ -103,17 +103,17 @@ import zjDialogDateRangePicker from '@/components/zj-dialog/zj-dialog-dateRangeP
 			dataList: [],
 			pageNum: 1,
 			loadStatus: 0,
-       refresherTriggered: false,
-       tabList: [
-         {name: '待结算', value: 'WAIT'},
-        //  {name: '可提现', value: 'WAIT_ING'},
-        //  {name: '提现中', value: 'ING'},
-         {name: '已结算', value: 'OVER'},
-       ],
-       status: '',
-       isShowDatePicker: false,
-       startDate: '',
-       endDate: '',
+      refresherTriggered: false,
+      tabList: [
+        {name: '待结算', value: 'WAIT'},
+      //  {name: '可提现', value: 'WAIT_ING'},
+      //  {name: '提现中', value: 'ING'},
+        {name: '已结算', value: 'OVER'},
+      ],
+      status: '',
+      isShowDatePicker: false,
+      startDate: '',
+      endDate: '',
      }
    },
 
@@ -134,12 +134,12 @@ import zjDialogDateRangePicker from '@/components/zj-dialog/zj-dialog-dateRangeP
      	this.$api.post('/settlementOrder/list/pageV2', {
      	  pageNum: this.pageNum,
      	  pageSize: 10,
-         startTime: this.startDate ? this.startDate + ' 00:00:00' : '',
-         endTime: this.endDate ? this.endDate + ' 23:59:59' : '',
-          status: ({
-            WAIT: "WAIT,YC",
-            OVER:"OK,LINE"
-          })[this.status],
+        startTime: this.startDate ? this.startDate + ' 00:00:00' : '',
+        endTime: this.endDate ? this.endDate + ' 23:59:59' : '',
+        status: ({
+          WAIT: "WAIT, YC",
+          OVER:"OK, LINE"
+        })[this.status] || "",
      	}).then(res => {
      		this.loadStatus = 0;
      		let list = res.data.records;