|
|
@@ -156,8 +156,8 @@
|
|
|
打印<text>({{ item.printNum || 0 }})</text>
|
|
|
</button>
|
|
|
</view>
|
|
|
- <view class="list-button-item action-icon-btn" @click.stop="openMore(item)">
|
|
|
- <image class="action-icon-btn__icon" :src="iconSrc('more_button')" mode="aspectFit" />
|
|
|
+ <view class="list-button-item">
|
|
|
+ <button @click.stop="openMore(item)" class="admin-button-com bule">更多</button>
|
|
|
</view>
|
|
|
</view>
|
|
|
</view>
|
|
|
@@ -324,7 +324,6 @@ import { createExpressOrder, cancelExpressOrder as cancelSFExpressOrder } from '
|
|
|
import { cancelDeliveryOrder } from '@/api/express/delivery';
|
|
|
import { createCallExpressOrder, cancelCallExpressOrder,getOrderFee } from '@/api/shop/shop-express';
|
|
|
import { printWlLabel, cloudPrintOrder, getOrderPrintLog, modifyRemarkFn } from '@/api/order';
|
|
|
-import { iconSrc } from '@/utils/iconSrc';
|
|
|
export default {
|
|
|
name: 'OrderItem',
|
|
|
options: {
|
|
|
@@ -371,7 +370,6 @@ export default {
|
|
|
}
|
|
|
},
|
|
|
methods: {
|
|
|
- iconSrc,
|
|
|
modifyAddress(item) {
|
|
|
this.closeExpressPop()
|
|
|
this.$util.pageTo({url: '/pagesClient/member/modify?id=' + item.customId + '&name=' + item.customName,type:2})
|
|
|
@@ -617,17 +615,6 @@ export default {
|
|
|
.class-popup-style {
|
|
|
z-index: 999999;
|
|
|
}
|
|
|
-.admin-button-com {
|
|
|
- width: 140upx;
|
|
|
- height: 60upx;
|
|
|
- padding: 0;
|
|
|
- line-height: 60upx;
|
|
|
- text-align: center;
|
|
|
- font-size: 26upx;
|
|
|
- &.active {
|
|
|
- border: 1upx solid #ccc;
|
|
|
- }
|
|
|
-}
|
|
|
.print-btn--unprinted {
|
|
|
color: #fff;
|
|
|
background-color: $mainColor;
|
|
|
@@ -662,32 +649,23 @@ export default {
|
|
|
flex: none;
|
|
|
min-height: 48upx;
|
|
|
}
|
|
|
+ /* 底部操作栏按钮:与原组件级 .admin-button-com 移入前一致 */
|
|
|
.admin-button-com {
|
|
|
+ width: 140upx;
|
|
|
+ height: 60upx;
|
|
|
+ padding: 0;
|
|
|
+ line-height: 60upx;
|
|
|
+ text-align: center;
|
|
|
+ font-size: 26upx;
|
|
|
margin: 0;
|
|
|
min-width: 90upx;
|
|
|
max-width: 140upx;
|
|
|
flex: none;
|
|
|
box-sizing: border-box;
|
|
|
- }
|
|
|
- .action-icon-btn {
|
|
|
- width: 52upx;
|
|
|
- height: 52upx;
|
|
|
- padding: 0;
|
|
|
- line-height: 1;
|
|
|
- display: flex;
|
|
|
- align-items: center;
|
|
|
- justify-content: center;
|
|
|
- flex: none;
|
|
|
- background: transparent;
|
|
|
- border: none;
|
|
|
- &::after {
|
|
|
- border: none;
|
|
|
+ &.active {
|
|
|
+ border: 1upx solid #ccc;
|
|
|
}
|
|
|
}
|
|
|
- .action-icon-btn__icon {
|
|
|
- width: 52upx;
|
|
|
- height: 52upx;
|
|
|
- }
|
|
|
}
|
|
|
}
|
|
|
.order-top_box {
|