shish 2 месяцев назад
Родитель
Сommit
b82a1db26a

+ 4 - 4
ghsApp/src/admin/home/components/OrderItem.vue

@@ -90,7 +90,7 @@
           <view class="remark-text">{{ item.remark }}</view>
         </view>
         <view v-if="item.sameTimeIdsNum && item.sameTimeIdsNum > 1 && moreOrderRemind == true" class="merge-tips" @click.stop="pageTo({ url: '/admin/order/mergeOrder?ids=' + item.sameTimeIds+'&mergeId='+item.mergeId })" >
-          客户共有{{ item.sameTimeIdsNum }}个订单,可合并发货
+          客户共有{{ item.sameTimeIdsNum }}个订单,点击查看
         </view>
       </view>
       <view class="list-bottom">
@@ -602,10 +602,10 @@ export default {
   text-align: center;
   color: white;
   margin-top: 20upx;
-  font-size: 34upx;
+  font-size: 38upx;
   background-color: #3780a5ad;
-  padding-top:14upx;
-  padding-bottom:14upx;
+  padding-top:16upx;
+  padding-bottom:16upx;
 }
 
 .text-center {

+ 3 - 3
hdApp/src/pagesPurchase/orderItem.vue

@@ -58,7 +58,7 @@
       class="merge-tips"
       @click.stop="clickMergeEvent"
     >
-      共{{ info.mergeNum }}个订单
+      共有{{ info.mergeNum }}个采购单,点击查看
     </view>
   </view>
 </template>
@@ -187,10 +187,10 @@ export default {
   }
   .merge-tips {
     margin: 24upx 20upx 0;
-    padding: 16upx 20upx;
+    padding: 18upx 0upx;
     text-align: center;
     color: #fff;
-    font-size: 30upx;
+    font-size: 38upx;
     background-color: #09C567;
     border-radius: 8upx;
   }