本单客户地址

ghsApp/src/admin/home/components/OrderItem.vue

@@ -89,12 +89,8 @@
         <view class="order-info_box remark-box" v-if="!$util.isEmpty(item.remark)">
           <view class="remark-text">{{ item.remark }}</view>
         </view>
-        <view
-          v-if="item.sameTimeIdsNum && item.sameTimeIdsNum > 1"
-          class="merge-tips"
-          @click.stop="pageTo({ url: '/admin/order/itemOrder?ids=' + item.sameTimeIds })"
-        >
-          本客户共有{{ item.sameTimeIdsNum }}个订单，可合并发货
+        <view v-if="item.sameTimeIdsNum && item.sameTimeIdsNum > 1 && moreOrderRemind == true" class="merge-tips" @click.stop="pageTo({ url: '/admin/order/itemOrder?ids=' + item.sameTimeIds })" >
+          客户共有{{ item.sameTimeIdsNum }}个订单，可合并发货
         </view>
       </view>
       <view class="list-bottom">
@@ -253,9 +249,9 @@ export default {
     item: {
       required: true
     },
-    isScanEnv: {
+    moreOrderRemind:{
       type: Boolean,
-      default: false
+      default: true
     }
   },
   data() {
@@ -608,8 +604,8 @@ export default {
   margin-top: 20upx;
   font-size: 34upx;
   background-color: #3780a5ad;
-  padding-top:10upx;
-  padding-bottom:10upx;
+  padding-top:14upx;
+  padding-bottom:14upx;
 }
 
 .text-center {

ghsApp/src/admin/order/itemOrder.vue

@@ -7,9 +7,8 @@
             <OrderItem :item="item.orderInfo" @printOrder="printOrder"></OrderItem>
           </div>
           <div v-else>
-            <OrderItem :ref="`orderRef${item.id}`" :item="item" @printOrder="printOrder" @directFh="directFh" @fillNoFh="fillNoFh"></OrderItem>
+            <OrderItem :ref="`orderRef${item.id}`" :item="item" @printOrder="printOrder" @directFh="directFh" @fillNoFh="fillNoFh" :moreOrderRemind="false"></OrderItem>
           </div>
-
         </div>
       </block>
       <block v-else>

ghsApp/src/pagesOrder/modify.vue

@@ -3,7 +3,7 @@
 		<form @submit="formSubmit">
 			<view class="module-com input-line-wrap">
 
-				<view style="background-color: white;font-size:36upx;font-weight:bold;padding:20upx 0 10upx 30upx;">修改本订单地址：</view>
+				<view style="background-color: white;font-size:36upx;font-weight:bold;padding:20upx 0 10upx 30upx;">修改本单客户地址：</view>
 
 				<tui-list-cell class="line-cell" :hover="false" v-if="hasMap == 1">
 					<view class="tui-title">地址类型</view>