日期

hdApp/src/admin/home/components/order-item.vue

@@ -8,15 +8,14 @@
 				<image class="scan-icon" v-if="info.repeat == 1 && info.payStatus == 1" :src="`${constant.imgUrl}/gathering/scan.jpg`" mode="aspectFit"></image>
 				<view class="list-msg">
 					<view><text>客户：</text><text>{{info.customName||''}}</text></view>
-					<view style="margin-top:3upx;"><text>配送：</text>
-					<text>{{info.reachDate.substr(5,5)}} {{info.reachPeriod}}前</text>
-					</view>
-					<view><text>收花：</text><text>{{info.receiveUserName||''}}</text></view>
 					<view style="margin-top:3upx;">
-						<text>美团：</text>
-						<text v-if="info.fromType == 4 && !$util.isEmpty(info.thirdSn)">{{info.thirdSn}}</text>
-						<text v-else></text>
+						<text>{{info.sendType==1?'取花':'配送'}}：</text>
+						<text>
+							{{info.reachDate.substr(5,5)}} {{info.reachPeriod}}前 
+							<text v-if="info.sendType==1" style="color:#3385FF;font-weight:bold;margin-left:20upx;border:1upx solid #3385FF;border-radius: 6upx;padding:0 6upx;font-size:24upx;">到店自取</text>
+						</text>
 					</view>
+					<view><text>收花：</text><text>{{info.receiveUserName||''}}</text></view>
 					<view style="margin-top:3upx;">
 						<text>下单：</text>
 						<text>{{info.shopAdminName}}</text>
@@ -77,7 +76,7 @@ export default {
 			position: absolute;
 			width:190upx;
 			height:190upx;
-			top:60upx;
+			top:84upx;
 			left:340upx;
 		}
 		.list-msg {

hdApp/src/admin/order/detail.vue

@@ -138,12 +138,12 @@
             </view>
 
             <!-- 送达时间 -->
-            <view class="msg-list" v-if="orderInfo.sendType != 1">
-              <view class="label">配送时间：</view>
+            <view class="msg-list">
+              <view class="label">{{orderInfo.sendType == 1?'取花时间':'配送时间'}}：</view>
               <view class="value">
                 <text v-if="orderInfo.reachDate == orderInfo.today">今天</text>
                 <text v-else-if="orderInfo.reachDate == orderInfo.tomorrow">明天</text>
-                <text v-else>{{orderInfo.reachDate ? orderInfo.reachDate.substr(5,11):''}}</text>
+                <text v-else>{{thisYear==orderInfo.reachDate.substr(0,4)?'':orderInfo.reachDate.substr(0,4)+'-'}}{{orderInfo.reachDate ? orderInfo.reachDate.substr(5,11):''}}</text>
                 <text class="ml-10">{{orderInfo.reachPeriod||''}}前</text>
               </view>
             </view>
@@ -156,8 +156,8 @@
 
             <!-- 自取信息 -->
             <view class="msg-list" v-if="orderInfo.sendType == 1">
-              <view class="label">类型：</view>
-              <view class="value"><text class="tag tag--danger">到店自取</text></view>
+              <view class="label">配送类型：</view>
+              <view class="value"><text class="tag tag--primary">到店自取</text></view>
             </view>
 
             <!-- 订花人信息 -->
@@ -455,7 +455,8 @@ export default {
       refreshPage: 0,
       expressData: {},
       showModal: false,
-      inputValue:0
+      inputValue:0,
+      thisYear: new Date().getFullYear()
     };
   },