From 06c7a41fe4680ae98d8ccd25b17d715b2a036532 Mon Sep 17 00:00:00 2001
From: 陶杰 <1378534974@qq.com>
Date: 星期一, 09 九月 2024 19:00:54 +0800
Subject: [PATCH] 1、 245-小程序-供应商-商品管理-回收站-平台或花农删除的商品全部到回收站,回收站增加恢复和删除的按钮,恢复可以将商品恢复到原来的状态,删除可以将此商品彻底删除 目前在回收站点击编辑上架等功能显示“商品未找到”点击删除也删不了商品 2、 255-小程序-供应商-增加同品类同等级价格排名,方便花农根据排名改价格(前后端修改) 3、252-小程序-花店-首页搜索、交易大厅搜索-1.点击分类显示下拉选择效果 2.热区扩大一些,点击<无法切换

---
 sub_pages/partner/order-manage/order-manage.vue |   60 ++++++++++++++++++++++++++++++++----------------------------
 1 files changed, 32 insertions(+), 28 deletions(-)

diff --git a/sub_pages/partner/order-manage/order-manage.vue b/sub_pages/partner/order-manage/order-manage.vue
index 66ea822..8e9de6d 100644
--- a/sub_pages/partner/order-manage/order-manage.vue
+++ b/sub_pages/partner/order-manage/order-manage.vue
@@ -16,38 +16,43 @@
             <view>
               订单:{{ item.orderNo }}
             </view>
-            <view class="status t-red m-l-a m-r-0">{{ item.paymentAmount }}</view>
+            <view class="status t-red m-l-a m-r-0">{{ item.paymentAmount || '' }}</view>
           </view>
-          <view class="desc flex">
-            <view class="label">
-              订单状态:
-            </view>
-            <view class="value">{{ item.statusBackendStr }}</view>
-          </view>
-          <view class="desc flex">
-            <view class="label">
-              收货人:
-            </view>
-            <view class="value">{{ item.customer }}</view>
-          </view>
-          <view class="desc flex">
-            <view class="label">
-              收货人手机号码:
-            </view>
-            <view class="value">{{ item.customerTel }}</view>
-          </view>
+          <view class="flex">
+			  <view class="desc flex flex1">
+			    <view class="label">
+			      订单状态:
+			    </view>
+			    <view class="value">{{ item.statusBackendStr }}</view>
+			  </view>
+			  <view class="desc flex flex1">
+			    <view class="label">
+			      支付时间:
+			    </view>
+			    <view class="value">{{ item.paymentTime||'-' }}</view>
+			  </view>
+		  </view>
+          <ivew class="flex">
+			  <view class="desc flex flex1">
+			    <view class="label">
+			      收货人:
+			    </view>
+			    <view class="value">{{ item.customer ||'-'}}</view>
+			  </view>
+			  <view class="desc flex flex1">
+			    <view class="label">
+			      收货人手机号码:
+			    </view>
+			    <view class="value">{{ item.customerTel ||'-'}}</view>
+			  </view>
+		  </ivew>
           <view class="desc flex">
             <view class="label">
               收货地址:
             </view>
-            <view class="value">{{ item.customerAddress }}</view>
+            <view class="value">{{ item.customerAddress ||'-'}}</view>
           </view>
-          <view class="desc flex">
-            <view class="label">
-              支付时间:
-            </view>
-            <view class="value">{{ item.paymentTime }}</view>
-          </view>
+          
 
           <view class="button-green-1" v-if="false">确认配送完成</view>
         </view>
@@ -72,12 +77,11 @@
     }
   },
   onLoad() {
-    this.listApi = `/api/partner/list`
+    this.listApi = `/api/partner/order/list`
     this.getList()
 
   },
   onReachBottom() {
-    this.page.current += 1
     this.getMore()
   },
   async onPullDownRefresh() {

--
Gitblit v1.9.3