修改页面
This commit is contained in:
@ -191,7 +191,7 @@
|
||||
<view class="bg-[#F0F6EF] h-60rpx rounded-20rpx flex items-center justify-between py-14rpx px-30rpx relative w-304rpx font-400 text-26rpx text-[#333]">
|
||||
<view class="absolute left-30rpx top-1/2 -translate-y-1/2 z-2" :class="serviceTypeValue == 1 ? 'text-[#fff]' : ''" @click="TeaRoom.handleChooseService(1)">到店服务</view>
|
||||
<view class="absolute right-30rpx top-1/2 -translate-y-1/2 z-2" :class="serviceTypeValue == 2 ? 'text-[#fff]' : ''" @click="TeaRoom.handleChooseService(2)">上门服务</view>
|
||||
<view class="swiper-service"></view>
|
||||
<view class="swiper-service" :style="{ transform: serviceTypeValue == 1 ? 'translateY(-50%) translateX(0)' : 'translateY(-50%) translateX(76px)' }"></view>
|
||||
</view>
|
||||
</view>
|
||||
|
||||
@ -304,15 +304,12 @@
|
||||
<view class="fixed left-0 right-0 bottom-0 z-2 bg-[#fff]"
|
||||
:style="{ height: '140rpx' }">
|
||||
<view class="mt-22rpx flex justify-between items-center">
|
||||
<view class="flex items-center ml-60rpx" @click="showCostPopup = true">
|
||||
<view class="text-24rpx text-[#303133] leading-34rpx w-72rpx">合计:</view>
|
||||
<view class="flex items-center ml-40rpx mr-20rpx" @click="showCostPopup = true">
|
||||
<view class="text-24rpx text-[#303133] leading-34rpx w-50rpx whitespace-nowrap mr-10rpx">合计:</view>
|
||||
<view class="flex items-center h-56rpx mr-16rpx">
|
||||
<price-format color="#FF5951" :first-size="40" :second-size="40" :subscript-size="28" :price="bill.total"></price-format>
|
||||
<view class="ml-20rpx" v-if="isGroupBuying">
|
||||
<price-format color="#909399" :first-size="26" :second-size="26" :subscript-size="26" :price="23.02" lineThrough></price-format>
|
||||
</view>
|
||||
</view>
|
||||
<view class="flex items-center text-[#4C9F44]">
|
||||
<view class="flex items-center text-[#4C9F44] w-100rpx whitespace-nowrap">
|
||||
<view class="text-24rpx mr-10rpx">费用明细</view>
|
||||
<wd-icon :name="showCostPopup ? 'arrow-up' : 'arrow-down'" size="24rpx" color="#4C9F44"></wd-icon>
|
||||
</view>
|
||||
@ -501,12 +498,6 @@
|
||||
*/
|
||||
handleChooseService: (type: number) => {
|
||||
serviceTypeValue.value = type
|
||||
const swiperService = document.querySelector('.swiper-service') as HTMLElement
|
||||
if (type == 1) {
|
||||
swiperService.style.transform = 'translateY(-50%) translateX(0)'
|
||||
} else if (type == 2) {
|
||||
swiperService.style.transform = 'translateY(-50%) translateX(76px)'
|
||||
}
|
||||
},
|
||||
|
||||
/**
|
||||
|
||||
@ -31,7 +31,7 @@
|
||||
</view>
|
||||
<view class="mt-124rpx mx-60rpx box-border">
|
||||
<wd-button custom-class="!bg-[#4C9F44] !rounded-8rpx !text-[#fff] !text-30rpx !leading-42rpx !h-90rpx !w-[100%] box-border" @click="Login.handleLogin">立即登录</wd-button>
|
||||
<wd-button custom-class="!bg-[#4C9F44] !rounded-8rpx !text-[#fff] !text-30rpx !leading-42rpx !h-90rpx !w-[100%] box-border" @click="Login.handleMobileLogin">测试-账号登录</wd-button>
|
||||
<!-- <wd-button custom-class="!bg-[#4C9F44] !rounded-8rpx !text-[#fff] !text-30rpx !leading-42rpx !h-90rpx !w-[100%] box-border" @click="Login.handleMobileLogin">测试-账号登录</wd-button> -->
|
||||
<!-- <wd-button open-type="getUserInfo" @getuserinfo="Login.handleWxLogin" custom-class="!bg-[#4C9F44] !rounded-8rpx !text-[#fff] !text-30rpx !leading-42rpx !h-90rpx !w-[100%] box-border">立即登录</wd-button> -->
|
||||
<!-- <view class="text-30rpx font-400 text-[#303133] leading-42rpx text-center mt-32rpx">其它手机号登录</view> -->
|
||||
</view>
|
||||
@ -134,17 +134,17 @@
|
||||
/**
|
||||
* 测试-账号登录
|
||||
*/
|
||||
handleMobileLogin: async () => {
|
||||
const userStore = useUserStore()
|
||||
console.log("🚀 ~ userStore:", userStore)
|
||||
const res = await userStore.mobileLogin('15005837859', 1, 2)
|
||||
if (res) {
|
||||
uni.setStorageSync('latitude', '30.74744')
|
||||
uni.setStorageSync('longitude', '120.78483')
|
||||
toast.info('登录成功')
|
||||
router.navigateBack(1, 500)
|
||||
}
|
||||
},
|
||||
// handleMobileLogin: async () => {
|
||||
// const userStore = useUserStore()
|
||||
// console.log("🚀 ~ userStore:", userStore)
|
||||
// const res = await userStore.mobileLogin('15005837859', 1, 2)
|
||||
// if (res) {
|
||||
// uni.setStorageSync('latitude', '30.74744')
|
||||
// uni.setStorageSync('longitude', '120.78483')
|
||||
// toast.info('登录成功')
|
||||
// router.navigateBack(1, 500)
|
||||
// }
|
||||
// },
|
||||
|
||||
/**
|
||||
* 登录成功跳转页面
|
||||
|
||||
Reference in New Issue
Block a user