'commit'

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;
+  }
 }

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 = () => {
         <View>
             <ScrollView scrollY className="my-car">
                 {carList.length === 0 ? (
-                    <RzException type="nodata">暂时没有爱车，请手动输入车牌号</RzException>
+                    <RzException type="nodata">暂时没有爱车，请手工输入车牌号</RzException>
                 ) : (
                     carList.map((item) => {
                         return (
@@ -158,7 +154,7 @@ export const SelectFreePlate: Taro.FC = () => {
                     className="btnCtrl btn1"
                     hoverClass="btn-hover"
                     onClick={handleInputCode}>
-                    <Text className="">手动输入车牌号</Text>
+                    <Text className="">手工输入车牌号</Text>
                 </View>
                 <View
                     className="btnCtrl btn2"
@@ -176,12 +172,12 @@ export const SelectFreePlate: Taro.FC = () => {
                     className="station-detail__overlay"
                     onClick={handleCloseModal}></View>
                 <View className="station-detail__container">
-                    <View className="station-detail__title">手动输入车牌号</View>
+                    <View className="station-detail__title">手工输入车牌号</View>
                     <Input
                         className="station-detail__input"
                         placeholder="请输入车牌号"
                         maxLength={20}
-                        value=''
+                        value={connectorSn}
                         onInput={(e) => setConnectorSn(e.detail.value)}></Input>
                     <View className="station-detail__box">
                         <AtButton