diff --git a/src/bundle/pages/appoint_time/index.vue b/src/bundle/pages/appoint_time/index.vue
index eee5033..9f5041e 100644
--- a/src/bundle/pages/appoint_time/index.vue
+++ b/src/bundle/pages/appoint_time/index.vue
@@ -130,8 +130,8 @@ const handleTimeSlot = (timeSlot: TimeSlotObj[]) => {
const startTime = time.getHours() + '' + (min <= 9 ? '0' + min : min) // 获取时分并组合成标准格式(时分)比如 10:30 --> 1030
timeSlot.forEach(item => {
const end = item.endTime.replace(':', '')
- // 只可预约三个小时后的时间段
- item.disabled = Number(startTime) + 300 >= Number(end)
+ // 只可预约半小时后的时间段
+ item.disabled = Number(startTime) + 50 >= Number(end)
// console.log("startTime: " + startTime);
// console.log("end: " + end);
})
diff --git a/src/bundle/pages/service_order/components/order-card.vue b/src/bundle/pages/service_order/components/order-card.vue
index 60c9cb6..28efa21 100644
--- a/src/bundle/pages/service_order/components/order-card.vue
+++ b/src/bundle/pages/service_order/components/order-card.vue
@@ -21,12 +21,12 @@
{{ orderInfo.appointTimeStart }} - {{ orderInfo.appointTimeEnd }}
-
+
diff --git a/src/bundle/pages/service_order_detail/index.vue b/src/bundle/pages/service_order_detail/index.vue
index b20bc10..eafb0de 100644
--- a/src/bundle/pages/service_order_detail/index.vue
+++ b/src/bundle/pages/service_order_detail/index.vue
@@ -84,14 +84,14 @@
服务金额
¥{{ orderData.orderAmount }}
-
+
@@ -106,10 +106,10 @@
订单编号
{{ orderData.sn }}
-
+
下单时间
{{ orderData.createTime }}
diff --git a/src/pages/category/index.vue b/src/pages/category/index.vue
index 7dbef69..ddf2d0f 100644
--- a/src/pages/category/index.vue
+++ b/src/pages/category/index.vue
@@ -2,7 +2,17 @@
-
+
+
+
+
+
+
+
+
+ 请输入关键词搜索
+
+
@@ -17,16 +27,16 @@
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
@@ -51,7 +61,7 @@ import { onLoad } from "@dcloudio/uni-app"
const categoryData = ref>([])
const current = ref(0)
const paging = shallowRef()
-const categoryId=ref('')
+let categoryId=ref('')
const queryList = async (pageNo: number, pageSize: number) => {
try {
diff --git a/src/pages/order/components/order-card.vue b/src/pages/order/components/order-card.vue
index df82386..c9ad405 100644
--- a/src/pages/order/components/order-card.vue
+++ b/src/pages/order/components/order-card.vue
@@ -19,13 +19,13 @@
预约时间: {{ orderInfo.appointTime }} {{ orderInfo.weekDay }}
-
+
+
diff --git a/src/pages/order_buy/index.vue b/src/pages/order_buy/index.vue
index 31b28ca..31fbbd8 100644
--- a/src/pages/order_buy/index.vue
+++ b/src/pages/order_buy/index.vue
@@ -97,25 +97,31 @@
-
+
-
-
+
下单时间
{{ orderData.createTime }}