From 3b534063da2660079da47b7493c7a4a62678eb71 Mon Sep 17 00:00:00 2001
From: yvan.ni <yvan.ni@youlipai.com>
Date: Sat, 20 May 2023 12:40:40 +0800
Subject: [PATCH] OA单优化

---
 components/diy_seckill/diy_seckill.wxml            | 2 +-
 packageD/pages/shop/order_detail/order_detail.wxml | 2 +-
 packageD/pages/shop/order_detail/order_detail.wxss | 1 +
 pages/user/order_detail/order_detail.wxml          | 2 +-
 pages/user/order_detail/order_detail.wxss          | 1 +
 5 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/components/diy_seckill/diy_seckill.wxml b/components/diy_seckill/diy_seckill.wxml
index e3820d0..a2fd889 100644
--- a/components/diy_seckill/diy_seckill.wxml
+++ b/components/diy_seckill/diy_seckill.wxml
@@ -106,7 +106,7 @@
             </view>
 
             <view class="o1_right">
-              <view class="sp_wzi ellipsis-2">{{aitem.title}}</view>
+              <view class="sp_wzi ellipsis-2">{{aitem.goods_name}}</view>
               <view class="o1_sj_kill">
                 <text>{{aitem.djs.day}}</text> 天
                 <text>{{aitem.djs.hou}}</text> :
diff --git a/packageD/pages/shop/order_detail/order_detail.wxml b/packageD/pages/shop/order_detail/order_detail.wxml
index 2e34bef..c670adf 100644
--- a/packageD/pages/shop/order_detail/order_detail.wxml
+++ b/packageD/pages/shop/order_detail/order_detail.wxml
@@ -1,6 +1,6 @@
 <wxs module="filters" src="../../../../utils/filter.wxs"></wxs>
 <view class="container">
-    <view class="user-mes" wx:if="{{order.exp_type==0}}">
+    <view class="user-mes" wx:if="{{order.exp_type==0 || order.exp_type==2 }}">
         <view class="user-contact">
           <text selectable>  {{order.consignee}}{{'　　'}}{{order.mobile}}  </text> 
         </view>
diff --git a/packageD/pages/shop/order_detail/order_detail.wxss b/packageD/pages/shop/order_detail/order_detail.wxss
index d0b0b02..9dbaf3a 100644
--- a/packageD/pages/shop/order_detail/order_detail.wxss
+++ b/packageD/pages/shop/order_detail/order_detail.wxss
@@ -29,6 +29,7 @@
 .order-meg {
     margin-bottom: 20rpx;
     font-size: 30rpx;
+    margin-top: 20rpx;
 }
 
 .order-state {
diff --git a/pages/user/order_detail/order_detail.wxml b/pages/user/order_detail/order_detail.wxml
index e4c5011..19f2cb5 100644
--- a/pages/user/order_detail/order_detail.wxml
+++ b/pages/user/order_detail/order_detail.wxml
@@ -1,6 +1,6 @@
 <wxs module="filters" src="../../../utils/filter.wxs"></wxs>
 <view class="container">
-    <view class="user-mes" wx:if="{{order.exp_type==0}}">
+    <view class="user-mes" wx:if="{{order.exp_type==0 || order.exp_type==2 }}">
         <view class="user-contact">
         {{order.consignee}}{{'　　'}}{{order.mobile}}
         </view>
diff --git a/pages/user/order_detail/order_detail.wxss b/pages/user/order_detail/order_detail.wxss
index d0b0b02..9dbaf3a 100644
--- a/pages/user/order_detail/order_detail.wxss
+++ b/pages/user/order_detail/order_detail.wxss
@@ -29,6 +29,7 @@
 .order-meg {
     margin-bottom: 20rpx;
     font-size: 30rpx;
+    margin-top: 20rpx;
 }
 
 .order-state {
--
libgit2 0.21.4