diff --git a/src/api/types/tea.ts b/src/api/types/tea.ts index f5325b4..1a86abd 100644 --- a/src/api/types/tea.ts +++ b/src/api/types/tea.ts @@ -29,6 +29,7 @@ export interface ITeaSpecialistDetailsFields { fare_price: number collect: number up_status: number + textarea: Array } /** diff --git a/src/bundle/wallet/wallet.vue b/src/bundle/wallet/wallet.vue index 2e9ace1..fecccda 100644 --- a/src/bundle/wallet/wallet.vue +++ b/src/bundle/wallet/wallet.vue @@ -77,8 +77,6 @@ - - diff --git a/src/pages/cashier/cashier.vue b/src/pages/cashier/cashier.vue index d6068c9..1b21b28 100644 --- a/src/pages/cashier/cashier.vue +++ b/src/pages/cashier/cashier.vue @@ -75,7 +75,8 @@ price: 0, fare_price: 0, collect: 0, - up_status: 0 + up_status: 0, + textarea: [] }) // 支付方式 diff --git a/src/pages/index/detail.vue b/src/pages/index/detail.vue index 6c9015a..f09b469 100644 --- a/src/pages/index/detail.vue +++ b/src/pages/index/detail.vue @@ -170,9 +170,9 @@ - - - 内容{{ item}} + + + {{ item.content }} @@ -296,12 +296,9 @@ const OSS = inject('OSS') // tab - const tab = ref(0) - const tabList = ref>([ - {type: 1, name: '费用说明'}, - {type: 2, name: '项目介绍'}, - {type: 3, name: '禁忌说明'}, - {type: 4, name: '下单须知'}, + const tab = ref(1) + const tabList = ref>([ + {id: 0, status: 0, content: '', title: ''}, ]) // 用户信息 @@ -323,7 +320,8 @@ price: 0, fare_price: 0, collect: 0, - up_status: 0 + up_status: 0, + textarea: [] }) const latitude = ref(0) // 纬度 const longitude = ref(0) // 经度 @@ -371,6 +369,8 @@ // 将返回的数据合并到 reactive 对象中 Object.assign(info, res.teamaster || {}) rate.value = info.star + tabList.value = info.textarea + console.log("🚀 ~ tabList:", res) // 茶艺师是否上线 // if (info.up_status == 0) { diff --git a/src/pages/reserve/tea-room.vue b/src/pages/reserve/tea-room.vue index 2b32f5c..9196c38 100644 --- a/src/pages/reserve/tea-room.vue +++ b/src/pages/reserve/tea-room.vue @@ -420,7 +420,8 @@ price: 0, fare_price: 0, collect: 0, - up_status: 0 + up_status: 0, + textarea: [] }) const is90 = ref(false)