From b4e197be7d2214d124ca5a770ee434f921700ca6 Mon Sep 17 00:00:00 2001
From: wanghongjun <1445693971@qq,com>
Date: Tue, 2 Apr 2024 10:51:58 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8D=96=E5=87=BA=E8=AE=A2=E5=8D=95=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/user/order/byOrder.vue | 147 +++++++++++++++++++++++++++--------
 1 file changed, 116 insertions(+), 31 deletions(-)

diff --git a/pages/user/order/byOrder.vue b/pages/user/order/byOrder.vue
index 2978c7f..20abf0f 100644
--- a/pages/user/order/byOrder.vue
+++ b/pages/user/order/byOrder.vue
@@ -3,7 +3,7 @@
     <mescroll-body ref="mescrollRef" :sticky="true" @init="mescrollInit" :down="{ native: true }" @down="downCallback" :up="upOption" @up="upCallback">
 
       <!-- tab栏 -->
-      <u-tabs :list="tabs" :is-scroll="false" :current="curTab" active-color="#FA2209" :duration="0.2" @change="onChangeTab" />
+      <u-tabs :list="tabs" :is-scroll="false" :barWidth="110" :current="curTab" active-color="#26587b" :duration="0.2" @change="onChangeTab" />
 
       <!-- 订单列表 -->
       <view class="order-list">
@@ -27,29 +27,27 @@
               <!-- 商品信息 -->
               <view class="goods-content">
                 <view class="goods-title">
-                  <text class="twoline-hide">{{ goods.goods_name }}</text>
-                  <text class="twoline-hide">
+                  <view class="twoline-hide">
+                    <text class="twoline-hide-name">{{ goods.goods_name }}</text>
+                  </view>
+                  <view class="twoline-hide-info">
                     <text class="twoline-hide-price">
                       单价：
-                      <text class="twoline-hide-icon">￥</text>
+                      <view class="twoline-hide-icon">￥</view>
                       {{ goods.price }}
                     </text>
-                  </text>
-                  <text class="twoline-hide">
                     <text class="twoline-hide-price">
                       购买年限： {{ goods.transaction_count }}年
                     </text>
-                  </text>
-                  <text class="twoline-hide">
                     <text class="twoline-hide-price">
                       交易佣金：
-                      <text class="twoline-hide-icon">￥</text>
+                      <view class="twoline-hide-icon">￥</view>
                       {{ goods.service_charge }}
-                      <text class="twoline-hide-sum">
+                      <view class="twoline-hide-sum">
                         合计：￥{{goods.money}}
-                      </text>
+                      </view>
                     </text>
-                  </text>
+                  </view>
                 </view>
               </view>
               <!-- 委托方等信息 -->
@@ -58,6 +56,29 @@
                 <view class="goods-props-item">
                   <text>交易方式：{{goods.goods_entrust=="1"?'转让':'授权'}}</text>
                 </view>
+                <view class="goods-props-item" v-if="item.status == 2 || item.status == '3' || item.status == '4'">
+                  <text>交易ISLI编码：{{goods.contract_code ? goods.contract_code :'--'}}</text>
+                </view>
+                <view class="goods-props-item" v-if="item.status == 2 || item.status == '3' || item.status == '4'">
+                  <text>提取期限：{{item.paymenttimeStr}}</text>
+                </view>
+              </view>
+            </view>
+            <view class="goods-sum">
+              <view class="goods-sum-date">
+                提交时间：{{item.createtime}}
+              </view>
+              <view class="goods-sum-time" v-if="item.status == 1">
+                付款倒计时：{{item.createDateTime}}
+              </view>
+              <view class="goods-sum-time" v-if="item.status == 2 || item.status == '3' || item.status == '4'">
+                支付时间：{{item.paymenttime}}
+              </view>
+              <view class="goods-sum-amount">
+                交易佣金：￥{{item.total_service_charge}}
+              </view>
+              <view class="goods-sum-amount">
+                应收金额：￥{{item.total_money_str}}
               </view>
             </view>
           </view>
@@ -70,6 +91,7 @@
 <script>
 import * as OrderApi from '@/api/order'
 import { checkLogin } from '@/core/app'
+import * as Comment from '@/api/order/comment'
 import { getEmptyPaginateObj, getMoreListData } from '@/core/app'
 import MescrollBody from '@/components/mescroll-uni/mescroll-body.vue'
 import MescrollMixin from '@/components/mescroll-uni/mescroll-mixins'
@@ -79,7 +101,7 @@ const pageSize = 10
 
 // tab栏数据
 const tabs = [
-  {name: `全部`,value: 'all',key: ''},
+  {name: `全部订单`,value: 'all',key: ''},
   {name: `待付款`,value: 'payment',key: 1},
   {name: `待交付`,value: 'delivery',key: 2},
   {name: `已终止`,value: 'hasabort',key: 4},
@@ -207,6 +229,10 @@ export default {
       newList.data.forEach(item => {
         item.total_num = item.order_detail.length
         item.state_text = this.showStateText(item.staus)
+        item.createDateTime = Comment.getDateTime(item.createtime,item.status)
+        item.total_money_str = Comment.formatAmount(item.total_money)
+        item.paymenttimeStr = Comment.getDateTerm(item.paymenttime,item.status)
+        item.total_service_charge = Comment.formatAmount(item.total_service_charge)
       })
       return newList
     },
@@ -267,17 +293,18 @@ export default {
 .item-top {
   display: flex;
   justify-content: space-between;
-  font-size: 26rpx;
+  font-size: 28rpx;
   margin-bottom: 20rpx;
   padding-bottom: 20rpx;
-  border-bottom: 1rpx #9F9F9F solid;
 
   .order-time {
     color: #777;
+    font-weight: 600;
   }
 
   .state-text {
-    color: $uni-text-color-active;
+    color: #26587b;
+    font-weight: 600;
   }
 }
 
@@ -288,7 +315,9 @@ export default {
   .goods-item {
     display: flex;
     flex-wrap: wrap;
-    margin-bottom: 40rpx;
+    margin-bottom: 20rpx;
+    margin-top: -20rpx;
+    border-top: 1rpx #e8e8e8 solid;
 
     // 商品图片
     .goods-image {
@@ -308,7 +337,7 @@ export default {
     // 商品内容
     .goods-content {
       padding-left: 16rpx;
-      padding-top: 16rpx;
+      padding-top: 10rpx;
       flex-basis: calc(66.66% - 10rpx);
       margin-right: 10rpx;
 
@@ -317,18 +346,41 @@ export default {
         max-height: 76rpx;
       }
 
-      .twoline-hide-price{
-        font-size: 20rpx;
-        color: #979082;
+      .twoline-hide {
+        height: 70rpx;
+      }
 
-        .twoline-hide-icon{
-          color: #0b0b0b;
-          font-weight: bold;
-        }
-        .twoline-hide-sum{
-          float: right;
-          margin-top: 5rpx;
-          color: red;
+      .twoline-hide-name {
+        font-size: 28rpx;
+        font-weight: bold;
+        display: -webkit-box;
+        -webkit-line-clamp: 2; /* 控制显示的行数 */
+        -webkit-box-orient: vertical;
+        overflow: hidden;
+        text-overflow: ellipsis;
+      }
+
+      .twoline-hide-info {
+        margin-top: 10rpx;
+        position: absolute;
+
+        .twoline-hide-price{
+          display: block;
+          font-size: 24rpx;
+          color: #767285;
+
+          .twoline-hide-icon{
+            display: inline-block;
+            color: #0b0b0b;
+            font-weight: bold;
+          }
+          .twoline-hide-sum{
+            width: 250rpx;
+            color: #c1382d;
+            text-align: right;
+            font-weight: bold;
+            display: inline-block;
+          }
         }
       }
 
@@ -337,11 +389,10 @@ export default {
     // 委托方等信息
     .goods-props {
       float: left;
-      height: 30rpx;
       font-size: 20rpx;
       margin-top: 10rpx;
       flex-basis: 100%;
-      color: $uni-text-color-grey;
+      color: #767285;
 
       .goods-props-item {
         margin-top: 10rpx;
@@ -349,6 +400,40 @@ export default {
     }
   }
 
+  .goods-sum {
+    border-top: 1rpx #e8e8e8 solid;
+    font-size: 20rpx;
+    color: #767285;
+    font-weight: 600;
+
+    .goods-sum-date {
+      margin-top: 20rpx;
+    }
+    .goods-sum-time {
+      margin-top: 5rpx;
+    }
+    .goods-sum-amount {
+      color: #c1382d;
+      font-size: 28rpx;
+      margin-top: 20rpx;
+    }
+    .goods-sum-bt {
+      float: right;
+      width: 120rpx;
+      height: 50rpx;
+      margin-top: -50rpx;
+      background-color: #26587b;
+      color: white;
+      border-radius: 50rpx;
+
+      .goods-sum-bt-pay {
+        text-align: center;
+        margin-top: 14rpx;
+      }
+
+    }
+  }
+
 }
 
 </style>
\ No newline at end of file