diff --git a/MiniProgram/rzyc-weapp-ylt-main/src/pages/select-free-plate/select-free-plate.scss b/MiniProgram/rzyc-weapp-ylt-main/src/pages/select-free-plate/select-free-plate.scss index 22e2a89..9e68157 100644 --- a/MiniProgram/rzyc-weapp-ylt-main/src/pages/select-free-plate/select-free-plate.scss +++ b/MiniProgram/rzyc-weapp-ylt-main/src/pages/select-free-plate/select-free-plate.scss @@ -230,4 +230,51 @@ .btn2 { margin-left: 20px; +} + +.btn-box { + display: flex; + flex-direction: row; + align-items: center; + &__left { + display: flex; + align-items: baseline; + } + &__symbol { + font-size: $rz-font-size-xl; + color: $rz-color-primary; + font-weight: 600; + } + &__price { + font-size: 42px; + color: $rz-color-primary; + font-weight: 600; + } + &__btn { + // margin-left: $rz-spacing-row-xxxl; + @include display-flex-center; + // width: 330px; + padding: 0 36px; + height: 90px; + background: $rz-color-primary; + // border-radius: 45px; + &-txt { + color: $rz-text-color-inverse; + font-size: $rz-font-size-lg; + } + .btn-box__txt { + color: $rz-color-primary; + font-size: $rz-font-size-lg; + } + } + &__btn2 { + border-top-left-radius: 45px; + border-bottom-left-radius: 45px; + background: #ecf6ee; + margin-left: $rz-spacing-row-xl; + } + &__btn1 { + border-top-right-radius: 45px; + border-bottom-right-radius: 45px; + } } \ No newline at end of file diff --git a/MiniProgram/rzyc-weapp-ylt-main/src/pages/select-free-plate/select-free-plate.tsx b/MiniProgram/rzyc-weapp-ylt-main/src/pages/select-free-plate/select-free-plate.tsx index 51ce130..91ff712 100644 --- a/MiniProgram/rzyc-weapp-ylt-main/src/pages/select-free-plate/select-free-plate.tsx +++ b/MiniProgram/rzyc-weapp-ylt-main/src/pages/select-free-plate/select-free-plate.tsx @@ -58,30 +58,26 @@ export const SelectFreePlate: Taro.FC = () => { }); } else { showFailToast('车牌号格式不正确!'); + setConnectorSn(''); return; } } }; - const handleSave = async () => { + const handleSave = () => { if (selectedCarId == 0) { - showFailToast('请选择车辆或手动输入车牌号!'); + showFailToast('请选择车辆或手工输入车牌号!'); return; } else { - const res = await showModalOnlyWithConfirmBtn( - '提示', - '当前微信版本过低,微信订阅消息,请升级到最新微信版本后重试。' - ); - console.log(res); - // syncChargePilePay({ - // order_no: router.params.order_no, - // charge_plate_no: connectorSn - // }); - // Taro.redirectTo({ - // url: `/pages/order-detail/order-detail?isFromCharging=${true}&orderNo=${router.params.order_no}`, - // }); + syncChargePilePay({ + order_no: router.params.order_no, + charge_plate_no: connectorSn + }); + Taro.redirectTo({ + url: `/pages/order-detail/order-detail?isFromCharging=${true}&orderNo=${router.params.order_no}`, + }); } }; @@ -99,7 +95,7 @@ export const SelectFreePlate: Taro.FC = () => { {carList.length === 0 ? ( - 暂时没有爱车,请手动输入车牌号 + 暂时没有爱车,请手工输入车牌号 ) : ( carList.map((item) => { return ( @@ -158,7 +154,7 @@ export const SelectFreePlate: Taro.FC = () => { className="btnCtrl btn1" hoverClass="btn-hover" onClick={handleInputCode}> - 手动输入车牌号 + 手工输入车牌号 { className="station-detail__overlay" onClick={handleCloseModal}> - 手动输入车牌号 + 手工输入车牌号 setConnectorSn(e.detail.value)}>