From 00811f746d40f90077fd1ee89dd7d088fc2072cc Mon Sep 17 00:00:00 2001
From: devil <fuxiang.gong@qq.com>
Date: Tue, 10 Mar 2020 15:49:45 +0800
Subject: [PATCH] =?UTF-8?q?=20=E8=BF=94=E7=8E=B0=E6=8F=92=E4=BB=B6?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../excellentbuyreturntocash/profit/profit.js       | 13 +++++++++++++
 .../excellentbuyreturntocash/profit/profit.wxml     |  7 ++++---
 .../excellentbuyreturntocash/profit/profit.wxss     |  6 +++---
 3 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/sourcecode/weixin/pages/plugins/excellentbuyreturntocash/profit/profit.js b/sourcecode/weixin/pages/plugins/excellentbuyreturntocash/profit/profit.js
index c3faa11b0..7e1cb142d 100644
--- a/sourcecode/weixin/pages/plugins/excellentbuyreturntocash/profit/profit.js
+++ b/sourcecode/weixin/pages/plugins/excellentbuyreturntocash/profit/profit.js
@@ -144,6 +144,19 @@ Page({
     });
   },
 
+  // 订单详情
+  list_submit_order_event(e) {
+    var oid = e.currentTarget.dataset.oid || null;
+    if (oid != null)
+    {
+      wx.navigateTo({
+        url: "/pages/user-order-detail/user-order-detail?id="+oid
+      });
+    } else {
+      app.showToast('订单id有误');
+    }
+  },
+
   // 立即结算事件
   list_submit_settlement_event(e) {
     var index = e.currentTarget.dataset.index || 0;
diff --git a/sourcecode/weixin/pages/plugins/excellentbuyreturntocash/profit/profit.wxml b/sourcecode/weixin/pages/plugins/excellentbuyreturntocash/profit/profit.wxml
index d8050bedf..d8f1d7559 100644
--- a/sourcecode/weixin/pages/plugins/excellentbuyreturntocash/profit/profit.wxml
+++ b/sourcecode/weixin/pages/plugins/excellentbuyreturntocash/profit/profit.wxml
@@ -10,7 +10,7 @@
   <view class="data-list">
     <view class="item bg-white spacing-mb" wx:if="{{data_list.length > 0}}" wx:for="{{data_list}}" wx:key="key">
       <view class="base oh br-b">
-        <text class="cr-666">{{item.add_time_time}}</text>
+        <text class="cr-666">{{item.add_time}}</text>
         <text class="fr cr-main">{{item.status_name}}</text>
       </view>
       <navigator url="/pages/plugins/excellentbuyreturntocash/profit-detail/profit-detail?id={{item.id}}" hover-class="none">
@@ -37,8 +37,9 @@
           </view>
         </view>
       </navigator>
-      <view wx:if="{{item.status == 2}}" class="operation tr br-t-dashed">
-        <button class="cr-888 br" type="default" size="mini" hover-class="none" class="br" data-index="{{index}}" data-id="{{item.id}}" bindtap="list_submit_settlement_event">立即结算</button>
+      <view class="operation tr br-t-dashed">
+        <button class="br" type="default" size="mini" hover-class="none" data-oid="{{item.order_id}}" bindtap="list_submit_order_event">查看订单</button>
+        <button wx:if="{{item.status == 2}}" class="settlement-submit" type="default" size="mini" hover-class="none" data-index="{{index}}" bindtap="list_submit_settlement_event">立即结算</button>
       </view>
     </view>
 
diff --git a/sourcecode/weixin/pages/plugins/excellentbuyreturntocash/profit/profit.wxss b/sourcecode/weixin/pages/plugins/excellentbuyreturntocash/profit/profit.wxss
index 48035c61c..8527e6972 100644
--- a/sourcecode/weixin/pages/plugins/excellentbuyreturntocash/profit/profit.wxss
+++ b/sourcecode/weixin/pages/plugins/excellentbuyreturntocash/profit/profit.wxss
@@ -38,9 +38,9 @@
 .data-list .item .operation {
   padding: 20rpx 10rpx;
 }
-.data-list .item .submit-order {
-  border: 1px solid #e5e5e5;
-  color: #888 !important;
+.data-list .item .settlement-submit {
+  border: 1px solid #d2364c;
+  color: #d2364c !important;
 }
 .data-list .item .operation button:not(:first-child) {
   margin-left: 30rpx;
-- 
GitLab