From db2bd784e93cd6b39eb754d80f09d27eceef68c2 Mon Sep 17 00:00:00 2001
From: "453530270@qq.com" <aa123456>
Date: Mon, 1 Jan 2024 15:18:06 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/order/index.vue | 34 ++++++++++++++++++++++------------
 1 file changed, 22 insertions(+), 12 deletions(-)

diff --git a/pages/order/index.vue b/pages/order/index.vue
index 2371fa6..969730a 100644
--- a/pages/order/index.vue
+++ b/pages/order/index.vue
@@ -27,10 +27,15 @@
               <!-- 商品信息 -->
               <view class="goods-content">
                 <view class="goods-title"><text class="twoline-hide">{{ goods.goods_name }}</text></view>
+				<!-- 委托方 -->
+<!-- 				<view class="goods-suply">
+					<text>委托方：{{goods.entrust_name}}</text>
+				</view> -->
                 <view class="goods-props clearfix">
-                  <view class="goods-props-item" v-for="(props, idx) in goods.goods_props" :key="idx">
-                    <text>{{ props.value.name }}</text>
-                  </view>
+					<view class="goods-props-item">
+						<text>{{goods.goods_entrust=="1"?'转让':'授权'}}</text>
+					</view>
+					<view class="goods-props-item">{{goods.entrust_name}}</view>
                 </view>
               </view>
               <!-- 交易信息 -->
@@ -40,11 +45,16 @@
                   <text class="value">{{goods.price }}</text>
                 </view>
                 <view class="goods-num">
-                  <text>×{{ goods.transaction_count }}</text>
+                  <text>×{{ goods.transaction_count }}年</text>
                 </view>
               </view>
+			  <!-- 委托方等信息 -->
+<!-- 			  <view class="goods-other">
+			  	<text>{{goods.entrust_name}}</text>
+			  </view> -->
             </view>
           </view>
+
           <!-- 订单合计 -->
           <view class="order-total">
             <text>共{{ item.total_num }}件商品，总金额</text>
@@ -226,11 +236,11 @@
 
       // 初始化当前选中的标签
       initCurTab(options) {
-        // const app = this
-        // if (options.dataType) {
-        //   const index = app.tabs.findIndex(item => item.value == options.dataType)
-        //   app.curTab = index > -1 ? index : 0
-        // }
+        const app = this
+        if (options.dataType) {
+          const index = app.tabs.findIndex(item => item.value == options.dataType)
+          app.curTab = index > -1 ? index : 0
+        }
       },
 
       /**
@@ -258,11 +268,11 @@
 			OrderApi.ordquery(data)
           //OrderApi.list({ dataType: app.getTabValue(), page: pageNo }, { load: false })
             .then(result => {
-				// 按格式封装
-				let nlist = {data:result.data,total:result.count,current_page:pageNo}
-				
+			  // 按格式封装
+			  let nlist = {data:result.data,total:result.count,current_page:pageNo}
               // 合并新数据
               const newList = app.initList(nlist)
+			  console.log(newList,"newlist")
               app.list.data = getMoreListData(newList, app.list, pageNo)
               resolve(newList)
             })