更新版本号和完善一店一码的功能
This commit is contained in:
@ -67,7 +67,7 @@ export function getHomeTeaStoreList(data: IHomeTeaStoreListParams) {
|
|||||||
* 获取茶室开通城市列表
|
* 获取茶室开通城市列表
|
||||||
*/
|
*/
|
||||||
export function getOpenCityList() {
|
export function getOpenCityList() {
|
||||||
return http.Post<IOpenCityListResult>('/api/teaStore/teaStoreCity', null,
|
return http.Post<IOpenCityListResult>('/api/teaStore/teaStoreCity', {},
|
||||||
{
|
{
|
||||||
meta: { ignoreAuth: true }
|
meta: { ignoreAuth: true }
|
||||||
}
|
}
|
||||||
@ -85,7 +85,7 @@ export function getTeaRoomSearchHistory() {
|
|||||||
* 清除茶室搜索历史
|
* 清除茶室搜索历史
|
||||||
*/
|
*/
|
||||||
export function clearTeaRoomSearchHistory() {
|
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
|
longitude: number
|
||||||
user_id: number
|
user_id: number
|
||||||
room_id?: number
|
room_id?: number
|
||||||
|
is_scan?: boolean
|
||||||
}
|
}
|
||||||
|
|
||||||
export function getTeaRoomDetail(data: IRoomDetailParams) {
|
export function getTeaRoomDetail(data: IRoomDetailParams) {
|
||||||
|
|||||||
@ -409,10 +409,10 @@
|
|||||||
<view>
|
<view>
|
||||||
<view class="text-28rpx leading-40rpx flex items-center mt-22rpx">
|
<view class="text-28rpx leading-40rpx flex items-center mt-22rpx">
|
||||||
<view class="text-[#606266] mr-54rpx">服务方式</view>
|
<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>
|
||||||
<view class="text-28rpx leading-40rpx flex items-center mt-22rpx">
|
<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 class="text-[#303133] line-1 w-300rpx">{{ order.address }}</view>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
|
|||||||
@ -427,7 +427,7 @@
|
|||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script lang="ts" setup>
|
<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 { router, toPlus, previewImage } from '@/utils/tools'
|
||||||
import PriceFormat from '@/components/PriceFormat.vue'
|
import PriceFormat from '@/components/PriceFormat.vue'
|
||||||
import { OrderType } from '@/utils/order'
|
import { OrderType } from '@/utils/order'
|
||||||
@ -440,16 +440,11 @@ import { CouponType } from '@/utils/coupon'
|
|||||||
|
|
||||||
const OSS = inject('OSS')
|
const OSS = inject('OSS')
|
||||||
const toast = useToast()
|
const toast = useToast()
|
||||||
const message = useMessage('wd-message-box-slot')
|
|
||||||
|
|
||||||
// 防止重复提交
|
// 防止重复提交
|
||||||
const isSubmitting = ref(false)
|
const isSubmitting = ref(false)
|
||||||
|
|
||||||
// 服务方式
|
// 服务方式
|
||||||
const serviceType = ref<Array<any>>([
|
|
||||||
{ type: 1, name: '到店服务' },
|
|
||||||
{ type: 2, name: '上门服务' },
|
|
||||||
])
|
|
||||||
const serviceTypeValue = ref<number>(1)
|
const serviceTypeValue = ref<number>(1)
|
||||||
|
|
||||||
// 选择茶馆
|
// 选择茶馆
|
||||||
@ -604,7 +599,7 @@ const costParams = ref({
|
|||||||
const teaPackage = ref<any>({})
|
const teaPackage = ref<any>({})
|
||||||
const teaPackageId = ref<number>(0)
|
const teaPackageId = ref<number>(0)
|
||||||
|
|
||||||
onLoad(async (args) => {
|
onLoad(async (args: any) => {
|
||||||
teaPackageId.value = Number(uni.getStorageSync('teaPackageId'))
|
teaPackageId.value = Number(uni.getStorageSync('teaPackageId'))
|
||||||
|
|
||||||
if (teaPackageId.value === 0) {
|
if (teaPackageId.value === 0) {
|
||||||
|
|||||||
@ -119,7 +119,7 @@
|
|||||||
<view class="flex justify-end">
|
<view class="flex justify-end">
|
||||||
<view class="flex items-center">
|
<view class="flex items-center">
|
||||||
<view class="font-400 text-[#303133] text-30rpx leading-42rpx">
|
<view class="font-400 text-[#303133] text-30rpx leading-42rpx">
|
||||||
2.14.18
|
2.14.19
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
|
|||||||
@ -204,13 +204,17 @@
|
|||||||
// 随机颜色列表
|
// 随机颜色列表
|
||||||
const tagColors = ['#40AE36', '#F55726']
|
const tagColors = ['#40AE36', '#F55726']
|
||||||
|
|
||||||
onLoad((args) => {
|
// 是否是扫码进入
|
||||||
|
const isScan = ref<boolean>(false)
|
||||||
|
|
||||||
|
onLoad((args: any) => {
|
||||||
console.log("🚀 ~ args:", args)
|
console.log("🚀 ~ args:", args)
|
||||||
// 处理小程序码扫码进入时的 scene 参数
|
// 处理小程序码扫码进入时的 scene 参数
|
||||||
if (!args.id && args.scene) {
|
if (!args.id && args.scene) {
|
||||||
const scene = decodeURIComponent(args.scene)
|
const scene = decodeURIComponent(args.scene)
|
||||||
const params = strToParams(scene)
|
const params = strToParams(scene)
|
||||||
Object.assign(args, params)
|
Object.assign(args, params)
|
||||||
|
isScan.value = true
|
||||||
}
|
}
|
||||||
|
|
||||||
if (args.id) {
|
if (args.id) {
|
||||||
@ -223,6 +227,7 @@
|
|||||||
|
|
||||||
Room.handleInit()
|
Room.handleInit()
|
||||||
}
|
}
|
||||||
|
console.log("🚀 ~ args2:", args)
|
||||||
|
|
||||||
// 如果是从分享进入的未登录的情况下
|
// 如果是从分享进入的未登录的情况下
|
||||||
uni.$on('refreshShareTeaRoomLists', (params) => {
|
uni.$on('refreshShareTeaRoomLists', (params) => {
|
||||||
@ -302,7 +307,8 @@
|
|||||||
id: teaRoomId.value,
|
id: teaRoomId.value,
|
||||||
latitude: uni.getStorageSync('latitude') || import.meta.env.VITE_DEFAULT_LATITUDE,
|
latitude: uni.getStorageSync('latitude') || import.meta.env.VITE_DEFAULT_LATITUDE,
|
||||||
longitude: uni.getStorageSync('longitude') || import.meta.env.VITE_DEFAULT_LONGITUDE,
|
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) {
|
if (res && res.status == 0) {
|
||||||
|
|||||||
Reference in New Issue
Block a user