页面
Some checks are pending
Auto Merge Main to Other Branches / Merge main into i18n (push) Waiting to run
Auto Merge Main to Other Branches / Merge main into base-sard-ui (push) Waiting to run

This commit is contained in:
sjeam 2025-09-06 13:54:54 +08:00
parent d62e963162
commit 8e42d1fa81
5 changed files with 26 additions and 23 deletions

View File

@ -44,7 +44,7 @@
<wd-img radius="10rpx" :width="'160rpx'" :height="'100rpx'" :src="item.image" />
<view
class="absolute bottom-5 text-center left-5 right-5 text-white text-center text-gray-500 font-size-3 bg-black bg-opacity-20"
class="absolute bottom-5 text-center left-5 right-5 text-white text-center font-size-3 bg-black bg-opacity-20"
>
{{ item.name }}
</view>
@ -71,12 +71,12 @@
</view>
<view class="relative" style="width: 280rpx; height: 200rpx">
<wd-img :width="'100%'" :height="'100%'" radius="20rpx" :src="item.cover" alt="joy" />
<view
<!-- <view
class="m-2 p-1 absolute bottom-0 text-right right-0 text-white bg-black bg-opacity-20"
style="backdrop-filter: blur(2rpx); border-radius: 10rpx"
>
<text class="block font-size-3 text-left">{{ item.category_name }}</text>
</view>
</view> -->
</view>
</view>
</wd-card>

View File

@ -172,7 +172,7 @@
<template #title>
<view class="title">
<view>
<text class="text-xl text-sm font-size-4 font-bold">美丽乡村</text>
<text class="text-xl text-sm font-size-4 font-bold color-black">美丽乡村</text>
<text class="ps-2 text-xl text-sm font-size-3 color-black">美丽乡村风貌展示厅</text>
</view>
<wd-button type="primary" size="small" @click="switchTab(eat_id)">
@ -201,7 +201,9 @@
class="m-2 p-2 absolute bottom-0 text-center left-0 right-0 text-white bg-gray-300 bg-opacity-5"
style="backdrop-filter: blur(2rpx); border-radius: 10rpx"
>
<text class="block font-size-4 text-left ellipsis-2">{{ current_item.title }}</text>
<text class="block font-size-4 text-left ellipsis-2">
{{ current_item.title }}
</text>
<view class="font-size-3 text-left ellipsis-2">
{{ current_item.description }}
</view>
@ -230,7 +232,7 @@
<template #title>
<view class="title">
<view>
<text class="text-xl text-sm font-size-4 font-bold">特产好物</text>
<text class="text-xl text-sm font-size-4 font-bold color-black">特产好物</text>
<text class="ps-2 text-xl text-sm font-size-3 color-black">精选好物不容错过</text>
</view>
<wd-button type="primary" size="small" @click="switchTab(live_id)">
@ -273,7 +275,7 @@
<template #title>
<view class="title">
<view>
<text class="text-xl text-sm font-size-4 font-bold">热门咨询</text>
<text class="text-xl text-sm font-size-4 font-bold color-black">热门咨询</text>
<text class="ps-2 text-xl text-sm font-size-3 color-black">
热门咨询一键掌握新鲜事
</text>
@ -315,7 +317,7 @@
<template #title>
<view class="title">
<view>
<text class="text-xl text-sm font-size-4 font-bold">景区旅游</text>
<text class="text-xl text-sm font-size-4 font-bold color-black">景区旅游</text>
<text class="ps-2 text-xl text-sm font-size-3 color-black">好玩儿路线一网打尽</text>
</view>
<wd-button type="primary" size="small" @click="switchTab(purchase_id)">

View File

@ -146,7 +146,7 @@
</wd-popup>
</wd-card>
</view>
<!-- <button v-if="hasLogin" class="mt-2" @click="logout">退出登录</button> -->
<button v-if="hasLogin" class="mt-2" @click="logout">退出登录</button>
</view>
</template>
@ -180,10 +180,11 @@ export default defineComponent({
data() {
return {
type: 0, // 0 1
show: false,
hasLogin: false,
showPhone: false,
showName: false,
show: false,
address_string: '',
propShowOrder: false,
@ -217,16 +218,19 @@ export default defineComponent({
}
},
async onLoad(option) {
this.type = option.type || 0
if (this.type === 1) {
//
} else {
//
this.show = true
}
this.getArea()
this.getUserInfo()
console.log(option)
this.type = parseInt(option.type) || 0
console.log('type值', this.type)
if (this.type === 1) {
//
this.show = true
} else {
//
this.show = false
}
console.log('type值', this.show)
},
methods: {
logout() {
@ -327,7 +331,7 @@ export default defineComponent({
},
async submitGroup() {
const res = await setGroupAPI(this.addressinfo)
console.log(res)
// console.log(res)
this.show = false
//
userStore.getUserInfo()

View File

@ -142,7 +142,6 @@ $container-width: 100%;
$padding-width: 20rpx;
.ellipsis {
display: inline-block;
color: #333333ff !important;
width: calc($container-width - $padding-width); /* 确保容器有宽度 */
/* 防止文字换行 */
@ -153,7 +152,6 @@ $padding-width: 20rpx;
/* 确保元素有宽度 */
}
.ellipsis-2 {
color: #333333ff !important;
display: -webkit-box;
// font-weight: 500;
font-size: 40rpx;
@ -168,7 +166,6 @@ $padding-width: 20rpx;
}
.ellipsis-5 {
color: #333333ff !important;
display: -webkit-box;
// font-weight: 500;
font-size: 40rpx;

View File

@ -220,7 +220,7 @@ import { useUserStore } from '@/store'
export function hasLogin() {
const hasLogin = useUserStore().userInfo.id ? true : false
// console.log(useUserStore().userInfo)
console.log('是否登录', hasLogin)
// console.log('是否登录', hasLogin)
console.log('是否登录sss', useUserStore().userInfo)
//强制跳转设置村庄
if (hasLogin && !useUserStore().userInfo.isset) {