匿名配送

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

@@ -13,7 +13,10 @@
 						<text v-if="info.fromType == 4 && !$util.isEmpty(info.thirdSn)">{{info.thirdSn}}</text>
 						<text v-else></text>
 					</view>
-					<view style="margin-top:3upx;"><text>备注：</text><text>{{info.remark||''}}</text></view>
+					<view style="margin-top:3upx;">
+						<text>备注：</text>
+						<text style="overflow:hidden;text-overflow:ellipsis;white-space:nowrap;width:420upx;display:inline-block;line-height:27upx;">{{info.remark||''}}</text>
+					</view>
 				</view>
 			</view>
 		</block>

hdApp/src/admin/order/detail.vue

@@ -57,7 +57,7 @@
               </view>
             </view>
             <view class="msg-list">
-              <view class="label">寄语：</view>
+              <view class="label">贺卡内容：</view>
               <view class="value">{{ orderInfo.cardInfo || '' }}</view>
             </view>
             <view class="msg-list" v-if="orderInfo.sendType == 1">

hdApp/src/admin/work/components/workItem.vue

@@ -24,7 +24,7 @@
             </view>
             <view class="order-info_box">
                 <view>备注：</view>
-                <view>{{ item.remark||'' }}</view>
+                <view style="overflow:hidden;text-overflow:ellipsis;white-space:nowrap;width:420upx;">{{ item.remark||'' }}</view>
             </view>
         </view>
         <view class="list-bottom">

hdPad/src/pages/home/components/workInfo.vue

@@ -17,13 +17,12 @@
             <text style="margin-left:5upx;">{{orderInfo.reachPeriod}} 前</text>
           </text>
         </view>
-        <view v-if="!$util.isEmpty(orderInfo.remark)" style="height:35upx;">
-          <text class="right" style="color:red;font-weight:bold;width:190upx;text-align:right;">{{orderInfo.remark}}</text>
+        <view v-if="!$util.isEmpty(orderInfo.remark)" style="min-height:35upx;height:auto;">
+          <text class="right" style="color:red;">[备注] {{orderInfo.remark}}</text>
         </view>
 
-        <view v-if="!$util.isEmpty(orderInfo.cardInfo)">
-          <text class="left">贺卡内容</text>
-          <text class="right" style="font-weight:bold;color:red;">{{orderInfo.cardInfo}}</text>
+        <view v-if="!$util.isEmpty(orderInfo.cardInfo)" style="min-height:35upx;height:auto;">
+          <text class="right" style="color:red;">[贺卡内容] {{orderInfo.cardInfo}}</text>
         </view>
 
         <view v-if="Number(orderInfo.orderPrice)>0">
@@ -36,6 +35,11 @@
         <view><text class="left">数量</text>
         <text class="right" style="color:red;font-weight:bold;">{{orderInfo.num}}</text>
         </view>
+
+        <view><text class="left" v-if="orderInfo.anonymity == 1">要求</text>
+        <text class="right" style="color:red;font-weight:bold;">匿名派送！！！</text>
+        </view>
+
         <view v-if="Number(orderInfo.orderDebtPrice)>0">
           <text class="left">尾款</text>
           <text class="right" style="color:red;font-weight:bold;">¥{{orderInfo.orderDebtPrice?parseFloat(orderInfo.orderDebtPrice):0}}</text>
@@ -358,8 +362,10 @@ export default {
 }
 .work-info{
   display:flex;
-  height: 100%;
+  height: 100vh;
   & .work-detail{
+      height: 100vh;
+      overflow: scroll;
       border-right:1upx solid #EEEEEE;
       flex: 40;
       .order-img{