|
|
@@ -126,21 +126,25 @@
|
|
|
</view>
|
|
|
</view>
|
|
|
|
|
|
- <view class="box_6 flex-row" v-if="Number(ghsInfo.balance) < 0">
|
|
|
- <view class="show_clear_area flex-row justify-between">
|
|
|
+ <view class="box_6 flex-row box_6--settle" v-if="Number(ghsInfo.balance) < 0">
|
|
|
+ <view class="show_clear_area flex-row justify-between show_clear_area--inline-settle">
|
|
|
<text class="waite_clear_order">
|
|
|
待结 ¥{{ Math.abs(parseFloat(ghsInfo.balance)) }}
|
|
|
</text>
|
|
|
- <view class="clear-actions flex-row">
|
|
|
- <text
|
|
|
+ <view
|
|
|
+ class="settle-options flex-row"
|
|
|
+ :class="{ 'settle-options--single': !canSelectOrderClear(ghsInfo) }"
|
|
|
+ >
|
|
|
+ <view
|
|
|
v-if="canSelectOrderClear(ghsInfo)"
|
|
|
- class="clear-action"
|
|
|
+ class="settle-option"
|
|
|
@click.stop="settleAccounts(ghsInfo)"
|
|
|
- >选订单结算 ></text>
|
|
|
- <text
|
|
|
- class="clear-action"
|
|
|
- @click.stop="recharge(ghsInfo)"
|
|
|
- >自定义金额 ></text>
|
|
|
+ >
|
|
|
+ <text class="settle-option__title">选订单结算</text>
|
|
|
+ </view>
|
|
|
+ <view class="settle-option" @click.stop="recharge(ghsInfo)">
|
|
|
+ <text class="settle-option__title">填金额结算</text>
|
|
|
+ </view>
|
|
|
</view>
|
|
|
</view>
|
|
|
</view>
|
|
|
@@ -1261,19 +1265,42 @@ export default {
|
|
|
text-overflow: ellipsis;
|
|
|
}
|
|
|
|
|
|
-.clear-actions {
|
|
|
+.purchase-ghs-panel .ghs_list_page .ghs_list_area .ghs_box .box_6--settle .show_clear_area--inline-settle {
|
|
|
+ align-items: center;
|
|
|
+}
|
|
|
+
|
|
|
+.settle-options {
|
|
|
+ flex-shrink: 0;
|
|
|
+ margin-left: 12upx;
|
|
|
+ box-sizing: border-box;
|
|
|
+}
|
|
|
+
|
|
|
+.settle-options .settle-option + .settle-option {
|
|
|
+ margin-left: 10upx;
|
|
|
+}
|
|
|
+
|
|
|
+.settle-option {
|
|
|
flex-shrink: 0;
|
|
|
+ padding: 10upx 16upx;
|
|
|
+ border: 1upx solid #f50e24;
|
|
|
+ border-radius: 10upx;
|
|
|
+ background: #fff;
|
|
|
+ box-sizing: border-box;
|
|
|
display: flex;
|
|
|
- flex-direction: row;
|
|
|
align-items: center;
|
|
|
+ justify-content: center;
|
|
|
}
|
|
|
|
|
|
-.clear-actions .clear-action {
|
|
|
- margin-left: 16upx;
|
|
|
+.settle-option:active {
|
|
|
+ background: #ffe8ea;
|
|
|
}
|
|
|
|
|
|
-.clear-actions .clear-action:first-child {
|
|
|
- margin-left: 0;
|
|
|
+.settle-option__title {
|
|
|
+ font-size: 24upx;
|
|
|
+ line-height: 32upx;
|
|
|
+ font-weight: 700;
|
|
|
+ color: #f50e24;
|
|
|
+ white-space: nowrap;
|
|
|
}
|
|
|
|
|
|
.clear-action {
|
