From 5e8f70caf25beb34657f34a7ee06e1e1ff541cdb Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期六, 28 二月 2026 16:27:54 +0800
Subject: [PATCH] 合并
---
mini-program/pages/index/index.vue | 40 +++++++++++++++++++++++++---------------
1 files changed, 25 insertions(+), 15 deletions(-)
diff --git a/mini-program/pages/index/index.vue b/mini-program/pages/index/index.vue
index 3b24c1f..d5e9a78 100644
--- a/mini-program/pages/index/index.vue
+++ b/mini-program/pages/index/index.vue
@@ -1,12 +1,11 @@
<template>
<view class="index">
<view class="head" :style="{ height: 'calc(' + (navHeight + statusbarHeight + 'px + 248rpx)') }">
- <view :style="{ width: '100%', height: navHeight + statusbarHeight + 'px' }"></view>
<view class="head-bar" :style="{ height: navHeight + statusbarHeight + 'px' }">
<view :style="{ width: '100%', height: statusbarHeight + 'px' }"></view>
<view class="head-bar-nav" :style="{ height: navHeight + 'px' }" @click="openLoacing">
<image src="/static/icon/home_ic_location@2x.png" mode="widthFix"></image>
- <text>{{position.formatted_addresses.recommend}}</text>
+ <text>{{position.formatted_addresses.recommend || '鐐瑰嚮瀹氫綅'}}</text>
<u-icon name="arrow-right" color="#222222" size="13"></u-icon>
</view>
</view>
@@ -92,7 +91,7 @@
</view>
</view>
</view>
- <view class="dingwei" v-if="!position">
+ <view class="dingwei" v-if="isShow">
<view class="dingwei-left">
<text>鏈巿鏉冨畾浣�</text>
<text>鎴戜滑鏃犳硶鑾峰緱鎮ㄥ綋鍓嶄綅缃俊鎭负鎮ㄦ帹鑽愰檮杩戠粡閿�鍟�</text>
@@ -114,7 +113,7 @@
Login
},
computed: {
- ...mapState(['navHeight', 'statusbarHeight', 'position'])
+ ...mapState(['navHeight', 'statusbarHeight', 'position', 'userInfo'])
},
data() {
return {
@@ -130,11 +129,15 @@
specialZone: [],
goodsList: [],
page: 1,
- next: true
+ next: true,
+ isShow: false
}
},
async onLoad() {
await this.$onLaunched;
+ if (!this.position) {
+ this.isShow = true
+ }
this.getBanner()
this.getLabels()
this.getGoodsList()
@@ -149,6 +152,10 @@
})
},
addCard(e) {
+ if (!this.userInfo) {
+ this.$refs.loginRef.open()
+ return
+ }
this.$u.api.addCart({
goodsId: e.id,
goodsSkuId: e.goodsSkuResponseList[0].id,
@@ -244,8 +251,12 @@
countInCurrentChunk = 0; // 閲嶇疆璁℃暟鍣�
}
}
-
- return result;
+
+ if (result[1].length === 0) {
+ return [result[0]]
+ } else {
+ return result;
+ }
},
goToAppSetting() {
var that = this;
@@ -380,12 +391,6 @@
.head-bar {
width: 100%;
- position: fixed;
- padding: 0 30rpx;
- box-sizing: border-box;
- top: 0;
- left: 0;
- z-index: 999;
// background-color: #ffffff;
.head-bar-nav {
@@ -500,6 +505,7 @@
.commodity-item-image {
width: 100%;
height: 336rpx;
+ overflow: hidden;
display: flex;
align-items: center;
justify-content: center;
@@ -623,14 +629,14 @@
}
.cate-item {
- width: calc(100vw / 4 - 96rpx);
+ width: calc(100vw / 4 - 86rpx);
height: auto;
display: flex;
flex-direction: column;
align-items: center;
justify-content: center;
margin-bottom: 30rpx;
- margin-right: 96rpx;
+ margin-right: 86rpx;
&:last-child {
margin-right: 0 !important;
@@ -651,6 +657,10 @@
}
text {
+ width: 100%;
+ white-space: nowrap;
+ overflow: hidden;
+ text-overflow: ellipsis;
font-weight: 400;
font-size: 26rpx;
color: #333333;
--
Gitblit v1.9.3