提交

pages/orderList/orderList.js

@@ -17,14 +17,7 @@ Page({
    * 生命周期函数--监听页面加载
    */
   onLoad: function (options) {
-    if (options.sts) {
-      this.setData({
-        sts: options.sts
-      });
-      this.loadOrderData(options.sts, 1);
-    } else {
-      this.loadOrderData(0, 1);
-    }
+
   },
 
   /**
@@ -84,7 +77,14 @@ Page({
    * 生命周期函数--监听页面显示
    */
   onShow: function () {
-
+    if (this.options.sts) {
+      this.setData({
+        sts: this.options.sts
+      });
+      this.loadOrderData(this.options.sts, 1);
+    } else {
+      this.loadOrderData(0, 1);
+    }
   },
 
   /**
@@ -290,7 +290,7 @@ Page({
 
     }
     wx.navigateTo({
-      url: '/pages/orderWithdrawal/orderWithdrawal?type=' + data.type + '&ordernum=' + data.ordernum + '&amount='+ amount,
+      url: '/pages/orderWithdrawal/orderWithdrawal?type=' + data.type + '&ordernum=' + data.ordernum + '&amount='+ amount+ '&orderIncome=' +JSON.stringify(data.item.orderIncome),
     })
   },
   // 挂单

pages/orderList/orderList.wxml

@@ -47,7 +47,7 @@
                   <view class='prod-info-cont'>{{prod.skuName}}</view>
                   <view class='price-nums'>
                     <view>
-                      <text class='prodprice' style="margin-left: 20rpx;"><text class='symbol'>￥</text>
+                      <text class='prodprice'><text class='symbol'>￥</text>
                         <text class='big-num'>{{wxs.parsePrice(prod.updatePrice)[0]}}</text>
                         <text class='small-num'>.{{wxs.parsePrice(prod.updatePrice)[1]}}</text></text>
                     </view>
@@ -79,11 +79,21 @@
             <text class='big-num'>{{wxs.parsePrice(item.actualTotal)[0]}}</text>
             <text class='small-num'>.{{wxs.parsePrice(item.actualTotal)[1]}}</text>
           </view>
-          <view class='prodprice'>订单金额：
+          <view class='prodprice'>当前金额：
             <text class='symbol'>￥</text>
             <text class='big-num'>{{wxs.parsePrice(item.orderIncome.nowOrderAmount)[0]}}</text>
             <text class='small-num'>.{{wxs.parsePrice(item.orderIncome.nowOrderAmount)[1]}}</text>
           </view>
+          <view class='prodprice'>总收益：
+            <text class='symbol'>￥</text>
+            <text class='big-num'>{{wxs.parsePrice(item.orderIncome.incomeAmount)[0]}}</text>
+            <text class='small-num'>.{{wxs.parsePrice(item.orderIncome.incomeAmount)[1]}}</text>
+          </view>
+           <!-- <view class='prodprice'>可提现：
+            <text class='symbol'>￥</text>
+            <text class='big-num'>{{wxs.parsePrice(item.orderIncome.toCashAmmount)[0]}}</text>
+            <text class='small-num'>.{{wxs.parsePrice(item.orderIncome.toCashAmmount)[1]}}</text>
+          </view> -->
         </view>
         <!-- end 商品列表 -->
         <view class='prod-foot'>

pages/orderList/orderList.wxss

@@ -182,15 +182,24 @@ page {
 
 .prod-item .total-num .prodprice {
   display: inline-block;
-  color: #333;
+  color: #999;
+  font-size: 20rpx;
 }
-.prod-item .total-num .prodprice:last-child{
-  margin-left: 20rpx;
+.prod-item .total-num .prodprice:not(:last-child){
+  margin-right: 20rpx;
 }
 .prod-item .total-num .prodcount {
   margin-right: 20rpx;
 }
-
+.prod-item .total-num .symbol{
+  color: #333;
+}
+.prod-item .total-num .big-num{
+  color: #333;
+}
+.prod-item .total-num .small-num{
+  color: #333;
+}
 .prod-item  .prod-foot {
   padding: 0 30rpx;
   border-top: 2rpx solid #e6e6e6;

pages/orderWithdrawal/orderWithdrawal.js

@@ -12,6 +12,7 @@ Page({
     amount: '',
     name: '',
     actualAmount: '',
+    orderIncome: '',
     how: false,//是否显示如何上传收款码提示框
   },
   /**
@@ -34,7 +35,8 @@ Page({
     this.setData({
       type: this.options.type,
       ordernum: this.options.ordernum,
-      amount: this.options.amount
+      amount: this.options.amount,
+      orderIncome: JSON.parse(this.options.orderIncome)
     })
     console.log('list',this.data.type,this.data.ordernum)
     this.getData();

pages/orderWithdrawal/orderWithdrawal.wxml

@@ -9,7 +9,10 @@
           placeholder='请输入提现金额'></input>
       </view>
       <view class="notice">
-        可提现金额￥<text>{{amount}}</text><text class="primary" bindtap="allWithdrawal">全部提现</text>
+      <text style="margin-right: 20rpx;">可提现金额￥{{amount}}</text>
+        <text wx:if="{{type == 1}}" style="margin: 0 20rpx;">已提现金额￥{{orderIncome.cashAmomunt}}</text>
+        <text  wx:if="{{type == 1}}" >累计收益金额：{{orderIncome.incomeAmount}}</text>
+        <view class="primary" bindtap="allWithdrawal">全部提现</view>
       </view>
     </view>
   </view>

pages/orderWithdrawal/orderWithdrawal.wxss

@@ -65,7 +65,7 @@ page {
 
 .top .primary {
   color: #3a86b9;
-  margin-left: 30rpx;
+  margin-top: 10rpx;
 }
 
 .phcolor {

pages/userAccount/withdrawalRecord/index.wxml

@@ -11,7 +11,7 @@
     <view class="li-box" wx:for="{{list}}" wx:key="index">
       <view class="li-head">
         <view>
-          <text>{{item.bankName}}</text>
+          <text>{{item.nickName}}</text>
           <view class="time">{{item.createTime}}</view>
         </view>
         <text>{{item.showStatus}}</text>