diff --git a/common/custom.scss b/common/custom.scss index c27900f..0678074 100644 --- a/common/custom.scss +++ b/common/custom.scss @@ -64,6 +64,21 @@ -webkit-line-clamp: 1; -webkit-box-orient: vertical; } +.label-text{ + position: relative; + display: inline-block; + margin-right: 20rpx; +} +.label-text-required{ + &::after{ + position: absolute; + font-size: 34rpx; + content: '*'; + color: $uni-color-primary; + right: -16rpx; + top: 8%; + } +} %blcok { margin-top: 30rpx; border-radius: 30rpx; diff --git a/components/buns-edit-sheet/buns-edit-sheet.vue b/components/buns-edit-sheet/buns-edit-sheet.vue index 067a6d1..03c1165 100644 --- a/components/buns-edit-sheet/buns-edit-sheet.vue +++ b/components/buns-edit-sheet/buns-edit-sheet.vue @@ -56,7 +56,12 @@ return { } } - } + }, + okCloseModal: { + default () { + return true + } + }, }, data() { return { @@ -80,7 +85,7 @@ const val = this.submitVals this.$emit('onSure', val) this.$emit('update:value', val) - this.handleCloseModal() + this.okCloseModal && this.handleCloseModal() } } } diff --git a/components/buns-post-edit-templates/bpe-cost-tmp.vue b/components/buns-post-edit-templates/bpe-cost-tmp.vue index 73e883b..bd51deb 100644 --- a/components/buns-post-edit-templates/bpe-cost-tmp.vue +++ b/components/buns-post-edit-templates/bpe-cost-tmp.vue @@ -94,27 +94,27 @@ - + - 首重费 + 首重费 - 续重单价 + 续重单价 - 应收 + 应收 - 实收 + 实收 @@ -248,8 +248,15 @@ }) this.modelInfo.freight = total }, - handleCostItemSure(data){ + async handleCostItemSure(data){ + if(data.feeCode == '9999') { + if(!data.realFee) { + this.showToast("实收不能为空") + return false + } + } this.modelInfo.feeItems.push({ ...data }) + this.costModal.show = false setTimeout(()=>{ this.calteFreight() }, 500) diff --git a/pages/post/freightCalculate.vue b/pages/post/freightCalculate.vue index 1866012..bb8fb1e 100644 --- a/pages/post/freightCalculate.vue +++ b/pages/post/freightCalculate.vue @@ -62,7 +62,13 @@ - + + + + +