jiayubo 4 місяців тому
батько
коміт
de5f7e8b4f

+ 1 - 1
components/its-calendar/its-calendar.vue

@@ -138,7 +138,7 @@
 					}
 				}
 				if (inReservedRange) {
-					uni.showToast({ title: '该时间段已被预约', icon: 'none' });
+					uni.showToast({ title: '服务时长不足,请选择其他时间段', icon: 'none' });
 					return false;
 				}
 

+ 12 - 11
pages_classify/pages/cancelationOforder/cancelationOforder.vue

@@ -19,8 +19,6 @@
     <!-- 申请类型 -->
     <view class="application-type"> 申请类型:取消订单 </view>
 
-  
-
     <!-- 申请说明 -->
     <view class="application-note">
       <up-textarea
@@ -62,15 +60,18 @@ const handlClick = async () => {
     refundReason: refundReason.value,
   }
   const res = await refunDnewOrderRefund(params)
-  if (res.status === 200) {
-    uni.showToast({
-      title: '退款成功',
-      icon: 'success', // 或者 'none'
-      duration: 1500, // 显示时间,单位毫秒,默认1500
-      mask: true, // 是否显示透明蒙层,防止触摸穿透,默认false
-    })
-    uni.navigateBack({
-      delta: 1,
+  if (res.code === 200) {
+    uni.showModal({
+      title: '提示',
+      content: res.msg,
+      showCancel: false,
+      success: function (modalRes) {
+        if (modalRes.confirm) {
+          uni.navigateBack({
+            delta: 1,
+          })
+        }
+      },
     })
   }
 }

+ 9 - 3
pages_home/pages/Volunteerside/goodsDetails.vue

@@ -333,7 +333,7 @@ const remark = ref('') //备注
 const radiovalue1 = ref('苹果')
 const selectedAddress = ref(null)
 const addressFlag = ref(false)
-const paymentMethod = ref(1) // Add payment method ref with default value 1 (wallet)
+const paymentMethod = ref(null) // Add payment method ref with default value 1 (wallet)
 
 const addressInfo = ref(null)
 // Radio 单选框数据
@@ -584,8 +584,14 @@ const handlConfiRmpurchase = () => {
       duration: 2000,
     })
     return // 阻止购买
+  } else if (!paymentMethod.value) {
+    uni.showToast({
+      title: '请选择支付方式',
+      icon: 'none',
+      duration: 2000,
+    })
+    return // 阻止购买
   }
-
   // 如果有地址,执行购买逻辑
   proceedToPayment()
 }
@@ -703,7 +709,7 @@ const proceedToPayment = async () => {
   } catch (error) {
     console.error('支付失败:', error)
     uni.showToast({
-      title: '支付失败余额不足',
+      title: '余额不足',
       icon: 'error',
       duration: 1500,
       mask: true,