站点充电时优惠选择问题修复

src/components/station-charge-coupon/station-charge-coupon.vue

@@ -178,8 +178,8 @@ const handleConfirm = () => {
     rightsId: rightsId.value,
     couponId: couponId.value,
     stationId: stationId.value,
-    userRights: rightsList.value?.find((k: any) => k.userRechargeRightsId == userRechargeRightsId.value ),
-    userCoupon: couponList.value?.find((k: any) => k.userCouponId == userCouponId.value)
+    userRights: rightsList.value?.find((k: any) => k.rightsId == rightsId.value ),
+    userCoupon: couponList.value?.find((k: any) => k.couponId == couponId.value)
   }
   // console.log(emitData)
   emits('on-change', emitData)
@@ -195,7 +195,7 @@ const changeTab = (tab: number) => {
 }
 
 const handleCheckRights = (val: boolean, userRightsId: any) => {
-  console.log("handleCheckRights", userRightsId, val)
+  // console.log("handleCheckRights", userRightsId, val)
   if (rightsId.value == userRightsId) {
     rightsId.value = null;
   } else {
@@ -205,7 +205,7 @@ const handleCheckRights = (val: boolean, userRightsId: any) => {
 }
 
 const handleCheckCoupon = (e: any, userCouponId: any) => {
-  console.log("handleCheckCoupon", userCouponId, e)
+  // console.log("handleCheckCoupon", userCouponId, e)
   if (couponId.value == userCouponId) {
     couponId.value = null;
   } else {
@@ -237,7 +237,7 @@ const loadData = () => {
       mode.value = 1;
     }
 
-    console.log(res)
+    // console.log(res)
     uni.hideLoading();
   });
 }

src/pages-charge/appointment/appointment.vue

@@ -156,18 +156,21 @@
           <!--          `/pages-charge/discount/discountV2?rightsId=${userRechargeRightsId}&couponId=${userCouponId}&stationId=${stationId}`-->
           <!--          )-->
           <view class="fs-28 lh-28 color-000 fw-500">优惠</view>
-          <block v-if="checkedUserRightsOrCoupon&&checkedUserRightsOrCoupon.userRights">
+          <block v-if="checkedUserRightsOrCoupon&&checkedUserRightsOrCoupon.rightsId">
             <view class="fs-28 lh-28 ml-auto" style="color: #f43636"
             >{{ ((checkedUserRightsOrCoupon?.userRights?.discount || 0) / 10).toFixed(1) }}折
             </view
             >
             <uni-icons type="right" size="16" color="#CACACA"></uni-icons>
           </block>
-          <block v-else-if="checkedUserRightsOrCoupon&&checkedUserRightsOrCoupon.userCoupon">
-            <view class="fs-28 lh-28 ml-auto" style="color: #f43636"
-            >{{ ((checkedUserRightsOrCoupon?.userCoupon?.discount || 0) / 100).toFixed(2) }}元
-            </view
-            >
+          <block v-else-if="checkedUserRightsOrCoupon&&checkedUserRightsOrCoupon.couponId">
+            <view class="fs-28 lh-28 ml-auto" style="color: #f43636" v-if="checkedUserRightsOrCoupon.userCoupon.couponType=='FullDiscount'">
+            {{ ((checkedUserRightsOrCoupon?.userCoupon?.discount || 0) / 100).toFixed(2) }}元
+            </view >
+            <view class="fs-28 lh-28 ml-auto" style="color: #f43636" v-else>
+              {{ ((checkedUserRightsOrCoupon?.userCoupon?.discount || 0) / 10).toFixed(1) }}折
+            </view >
+
             <!--            <view class="fs-28 lh-28 color-666 ml-8">权益待领取</view>-->
             <uni-icons type="right" size="16" color="#CACACA"></uni-icons>
           </block>
@@ -715,12 +718,12 @@ const submit = () => {
   if (chargeType.value === 1) {
     query += "isBooking=false";
   }
-  let {userRechargeRightsId, userCouponId} = checkedUserRightsOrCoupon.value;
-  if (userRechargeRightsId && userRechargeRightsId >= 0) {
-    query += `&userRechargeRightsId=${userRechargeRightsId}`;
+  let {rightsId, couponId} = checkedUserRightsOrCoupon.value;
+  if (rightsId && rightsId >= 0) {
+    query += `&userRechargeRightsId=${rightsId}`;
   }
-  if (userCouponId && userCouponId >= 0) {
-    query += `&userCouponId=${userCouponId}`;
+  if (couponId && couponId >= 0) {
+    query += `&userCouponId=${couponId}`;
   }
   console.log(query)
   uni.showLoading({