|
|
@@ -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 {
|