diff --git a/pages_order/mine/partner.vue b/pages_order/mine/partner.vue index 25919fb..0c08045 100644 --- a/pages_order/mine/partner.vue +++ b/pages_order/mine/partner.vue @@ -92,7 +92,7 @@ } ], state: 0, - userRole: ['会员', '用户', '渠道'], + userRole: ['用户', '会员', '渠道'], mixinsListApi: 'getHanHaiMemberUser', } }, diff --git a/pages_order/order/createOrder.vue b/pages_order/order/createOrder.vue index 42bf126..eefa48b 100644 --- a/pages_order/order/createOrder.vue +++ b/pages_order/order/createOrder.vue @@ -94,6 +94,17 @@ + + + + + 备注 + + + + + + @@ -348,6 +359,7 @@ addressId, payType : this.payMethod, list: JSON.stringify(list), + remark: this.remark || '', // 添加备注字段 } api = 'createSumOrder' @@ -362,6 +374,7 @@ payType : this.payMethod, isGive : this.isGive, memberNum : 1, + remark: this.remark || '', // 添加备注字段 } api = 'createOrder' } @@ -600,34 +613,49 @@ display: flex; justify-content: flex-end; - .stepper { - display: flex; - align-items: center; - - text { - display: flex; - align-items: center; - justify-content: center; - width: 44rpx; - height: 44rpx; - - &.minus, &.plus { - background: #F8F8F8; - border-radius: 50%; - font-size: 32rpx; - - &.disabled { - color: #ccc; - } - } - - &.num { - margin: 0 20rpx; - color: $uni-color; - font-size: 28rpx; - } - } - } + &.remark-input { + width: 70%; + justify-content: flex-start; + + &::v-deep .uv-textarea { + width: 100%; + padding: 0; + background-color: transparent; + } + + &::v-deep .uv-textarea__field { + padding: 0; + font-size: 28rpx; + } + } + + .stepper { + display: flex; + align-items: center; + text { + display: flex; + align-items: center; + justify-content: center; + width: 44rpx; + height: 44rpx; + + &.minus, &.plus { + background: #F8F8F8; + border-radius: 50%; + font-size: 32rpx; + + &.disabled { + color: #ccc; + } + } + + &.num { + margin: 0 20rpx; + color: $uni-color; + font-size: 28rpx; + } + } + } } }