wangxiaowei/chazhi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

更新版本号和完善一店一码的功能

Browse Source
This commit is contained in:
wangxiaowei
2026-05-16 14:21:31 +08:00
parent 4c33f1b460
commit e987030a70
5 changed files with 16 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/api/tea-room.ts
View File

@ -67,7 +67,7 @@ export function getHomeTeaStoreList(data: IHomeTeaStoreListParams) {
* 获取茶室开通城市列表
*/
export function getOpenCityList() {
return http.Post<IOpenCityListResult>('/api/teaStore/teaStoreCity', null,
return http.Post<IOpenCityListResult>('/api/teaStore/teaStoreCity', {},
{
meta: { ignoreAuth: true }
}
@ -85,7 +85,7 @@ export function getTeaRoomSearchHistory() {
* 清除茶室搜索历史
*/
export function clearTeaRoomSearchHistory() {
return http.Post('/api/teaStore/delTeaStoreSearchHistory', null)
return http.Post('/api/teaStore/delTeaStoreSearchHistory', {})
}
/**
@ -97,6 +97,7 @@ export interface IRoomDetailParams {
longitude: number
user_id: number
room_id?: number
is_scan?: boolean
}
export function getTeaRoomDetail(data: IRoomDetailParams) {

4
src/bundle/order/tea-specialist/order-detail.vue
View File

@ -409,10 +409,10 @@
<view>
<view class="text-28rpx leading-40rpx flex items-center mt-22rpx">
<view class="text-[#606266] mr-54rpx">服务方式</view>
<view class="text-[#303133]">{{ order.service_type == 1 ? '到店服务' : '上门服务'}}</view>
<view class="text-[#303133]">{{ order.server_type == 1 ? '到店服务' : '上门服务'}}</view>
</view>
<view class="text-28rpx leading-40rpx flex items-center mt-22rpx">
<view class="text-[#606266] mr-54rpx">{{ order.service_type == 1 ? '服务门店' : '服务地址'}}</view>
<view class="text-[#606266] mr-54rpx">{{ order.server_type == 1 ? '服务门店' : '服务地址'}}</view>
<view class="text-[#303133] line-1 w-300rpx">{{ order.address }}</view>
</view>
</view>

9
src/bundle/package/reserve.vue
View File

@ -427,7 +427,7 @@
</template>
<script lang="ts" setup>
import { useMessage, useToast } from 'wot-design-uni'
import { useToast } from 'wot-design-uni'
import { router, toPlus, previewImage } from '@/utils/tools'
import PriceFormat from '@/components/PriceFormat.vue'
import { OrderType } from '@/utils/order'
@ -440,16 +440,11 @@ import { CouponType } from '@/utils/coupon'
const OSS = inject('OSS')
const toast = useToast()
const message = useMessage('wd-message-box-slot')
// 防止重复提交
const isSubmitting = ref(false)
// 服务方式
const serviceType = ref<Array<any>>([
{ type: 1, name: '到店服务' },
{ type: 2, name: '上门服务' },
])
const serviceTypeValue = ref<number>(1)
// 选择茶馆
@ -604,7 +599,7 @@ const costParams = ref({
const teaPackage = ref<any>({})
const teaPackageId = ref<number>(0)
onLoad(async (args) => {
onLoad(async (args: any) => {
teaPackageId.value = Number(uni.getStorageSync('teaPackageId'))
if (teaPackageId.value === 0) {

2
src/bundle/profile/profile.vue
View File

@ -119,7 +119,7 @@
<view class="flex justify-end">
<view class="flex items-center">
<view class="font-400 text-[#303133] text-30rpx leading-42rpx">
2.14.18
2.14.19
</view>
</view>
</view>

10
src/bundle/tea-room/room.vue
View File

@ -204,13 +204,17 @@
// 随机颜色列表
const tagColors = ['#40AE36', '#F55726']
onLoad((args) => {
// 是否是扫码进入
const isScan = ref<boolean>(false)
onLoad((args: any) => {
console.log("🚀 ~ args:", args)
// 处理小程序码扫码进入时的 scene 参数
if (!args.id && args.scene) {
const scene = decodeURIComponent(args.scene)
const params = strToParams(scene)
Object.assign(args, params)
isScan.value = true
}
if (args.id) {
@ -223,6 +227,7 @@
Room.handleInit()
}
console.log("🚀 ~ args2:", args)
// 如果是从分享进入的未登录的情况下
uni.$on('refreshShareTeaRoomLists', (params) => {
@ -302,7 +307,8 @@
id: teaRoomId.value,
latitude: uni.getStorageSync('latitude') || import.meta.env.VITE_DEFAULT_LATITUDE,
longitude: uni.getStorageSync('longitude') || import.meta.env.VITE_DEFAULT_LONGITUDE,
user_id: userInfo.value.id || 0
user_id: userInfo.value.id || 0,
is_scan: isScan.value
})
if (res && res.status == 0) {