调整样式

pages/order/confirm-order.vue

@@ -101,21 +101,6 @@
       @changeFree="changeFree"
     ></rechargeFree>
 
-    <!-- 充值享优惠 -->
-    <view
-      v-if="
-        !showFreeDine &&
-        (listinfo.status == 'unpaid' || !listinfo.id) &&
-        cartStore.orderCostSummary.finalPayAmount > 0
-      "
-    >
-      <ChargeVue
-        @updateChargeSel="(e) => updateChargeSel(e)"
-        @updateRechargeId="updateRechargeId"
-        @updateIsShow="updateIsShow"
-        v-if="listinfo.status == 'unpaid' || !listinfo.id"
-      ></ChargeVue>
-    </view>
     <!-- 支付方式 -->
     <paymentMethodes
       ref="paymentMethodref"
@@ -125,14 +110,31 @@
       :changeFreeenable="isBwc"
       v-model="paymentmethod"
       v-if="listinfo.status == 'unpaid' || !listinfo.id"
-    ></paymentMethodes>
+    >
+      <template #bottom>
+        <!-- 充值享优惠 -->
+        <view
+          v-if="
+            !showFreeDine &&
+            (listinfo.status == 'unpaid' || !listinfo.id) &&
+            cartStore.orderCostSummary.finalPayAmount > 0
+          "
+        >
+          <ChargeVue
+            @updateChargeSel="(e) => updateChargeSel(e)"
+            @updateRechargeId="updateRechargeId"
+            @updateIsShow="updateIsShow"
+            v-if="listinfo.status == 'unpaid' || !listinfo.id"
+          ></ChargeVue>
+        </view>
+      </template>
+    </paymentMethodes>
     <view class="fixedview">
       <view
         class="flex-between"
         v-if="listinfo.status == 'unpaid' || !listinfo.id"
       >
         <view class="fixedview_one flex-start">
-
           <view class="fixedview_oneone">实付金额</view>
           <view class="fixedview_onetow" v-if="rechargeItem.id">
             <text>¥</text>
@@ -1147,7 +1149,7 @@ async function init(opt) {
     let res = await APIgetOrderById({
       orderId: listinfo.id,
     });
-    if (res&&typeof res=='object') {
+    if (res && typeof res == "object") {
       setOrder(res);
     }
   }
@@ -1155,11 +1157,11 @@ async function init(opt) {
   const shopInfoRes = await APIusershopInfodetail({
     shopId: options.shopId,
   });
-  if (!isPayBefor()&&options.tableCode) {
+  if (!isPayBefor() && options.tableCode) {
     const res = await APIhistoryOrder({
       tableCode: options.tableCode || "",
     });
-	if (res&&typeof res=='object') {
+    if (res && typeof res == "object") {
       setOrder(res);
     }
   }
@@ -1693,14 +1695,13 @@ page {
     width: 100%;
     padding: 36rpx 36rpx 70rpx 36rpx;
     background: #ffffff;
-	
+
     .fixedview_one {
       display: flex;
-	  flex-direction: column;
-	  justify-content: center;
-	  align-items: center;
-    //   align-items: flex-end;
-
+      flex-direction: column;
+      justify-content: center;
+      align-items: center;
+      //   align-items: flex-end;
 
       .fixedview_oneone {
         font-weight: 400;