Merge branch 'main' of https://gitea.lihaink.cn/sjeam/digital_village_uni
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:
lewis 2025-09-07 10:59:22 +08:00
commit 6b903ef797
3 changed files with 51 additions and 27 deletions

View File

@ -364,7 +364,7 @@
</template>
</wd-card>
</view>
<view class="p-1">
<!-- <view class="p-1">
<wd-row class=" ">
<wd-col :span="12" v-for="(item, index) in index_live">
<view class="p-1" v-if="index < 4">
@ -383,26 +383,59 @@
{{ item.title }}
</view>
<view class="ps-2 pt-2 font-size-3 ellipsis">{{ item.description }}</view>
<view class="ps-2 pt-2 pb-2">
<!-- <view class="text-sm text-gray-500 text-left">
<wd-text size="20rpx" color="red" :text="item.price" mode="price" prefix="¥" />
<wd-text size="20rpx" color="red" text="券后价" mode="text" prefix=" " />
<wd-text
size="18rpx"
color="gray"
:text="item.ot_price"
mode="price"
decoration="line-through"
prefix="¥"
/>
</view> -->
</view>
<view class="ps-2 pt-2 pb-2"></view>
</wd-card>
</view>
</view>
</wd-col>
</wd-row>
</view> -->
<view class="p-2" v-for="(item, index) in index_purchase">
<view class="" style="" @click="goPage(item)" v-if="index < 4">
<wd-card custom-class="card-content">
<view class="relative" style="height: 360rpx">
<wd-img radius="20rpx" :width="'100%'" :height="'100%'" :src="item.cover" />
<!-- <view style="position: absolute; top: -20rpx; right: 40rpx">
<wd-img
:width="'120rpx'"
:height="'120rpx'"
src="/static/icons//top_num.png"
></wd-img>
<view
style="
position: absolute;
right: 0;
left: 0;
top: 20rpx;
margin: auto;
text-align: center;
color: white;
font-weight: bold;
display: flex;
align-items: center;
justify-content: center;
"
class="font-size-4"
>
NO.{{ index + 1 }}
</view>
</view> -->
<view
class="m-4 p-2 absolute bottom-0 text-center left-0 right-0 text-white bg-gray-300 bg-opacity-20"
style="backdrop-filter: blur(1px); border-radius: 10rpx"
>
<text class="block font-size-4 text-left ellipsis">{{ item.title }}</text>
<text class="font-size-3 text-left ellipsis-2">
{{ item.description }}
</text>
</view>
</view>
</wd-card>
</view>
</view>
<fly-login v-model="show" />
<view class="p-1"></view>
</view>
@ -430,12 +463,12 @@ export default defineComponent({
index_eat: {},
index_live: {},
index_play: {},
index_purchase: {},
eat_id: 1,
live_id: 7,
play_id: 8,
purchase_id: 6,
index_purchase: {},
current_item: {},
currentTab: 1,
city: '',

View File

@ -24,7 +24,7 @@
<view class="ml-2 flex-content-column">
<view class="ps-1 font-size-4 font-bold">
微信用户{{ userStore.userInfo?.nickname }}
{{ userStore.userInfo?.nickname }}
</view>
<view class="ml-1 font-size-3" style="align-items: end">
<text class="pe-2 font-size-3">ID{{ userStore.userInfo?.id }}</text>

View File

@ -142,7 +142,6 @@
},
]"
></wd-col-picker>
<!-- <button v-if="type === 1" class="mt-2" @click="goBack">返回</button> -->
</wd-popup>
</wd-card>
</view>
@ -152,12 +151,7 @@
<script lang="ts">
const switchValue = ref('')
function handleSwitchChange({ value }) {
console.log(value)
}
// import { useUserStore } from '@/store'
// import { http } from '@/utils/http'
// import WxLogin from './components/wx-login.vue'
import { useUserStore } from '@/store'
const userStore = useUserStore()
@ -227,9 +221,6 @@ export default defineComponent({
if (this.type === 1) {
//
this.show = true
// uni.navigateTo({
// url: '/pages/login/login',
// })
} else {
//
this.show = false