From e4f9739d74323aacf09d139700f22a383910ee97 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期三, 04 三月 2026 10:38:32 +0800
Subject: [PATCH] 合并
---
mini-program/pages/index/index.vue | 59 +++++++++++++++++++++++++++--------------------------------
1 files changed, 27 insertions(+), 32 deletions(-)
diff --git a/mini-program/pages/index/index.vue b/mini-program/pages/index/index.vue
index ed2c49d..5c3d053 100644
--- a/mini-program/pages/index/index.vue
+++ b/mini-program/pages/index/index.vue
@@ -10,7 +10,7 @@
</view>
</view>
<view class="search" @click="jumpSearch">
- <u-search placeholder="璇疯緭鍏ュ晢 鍝佸悕绉版悳绱�" disabled height="36" searchIconColor="#999999" borderColor="#eeeeee"
+ <u-search placeholder="璇疯緭鍏ュ晢鍝佸悕绉版悳绱�" disabled height="36" searchIconColor="#999999" borderColor="#eeeeee"
bgColor="rgba(255,255,255,0.9)" :showAction="false" />
</view>
<view class="banner">
@@ -118,16 +118,20 @@
</view>
</view>
<view class="commodity-item-shou">
- <text>宸插敭{{item.saleNum + item.realSaleNum}}</text>
+<<<<<<< HEAD
+ <text>宸插敭{{item.shou}}</text>
+=======
+ <text>宸插敭{{(item.saleNum||0) + (item.realSaleNum||0)}}</text>
+>>>>>>> 7b09a9950f13521190a4aef9bbc2a6163445566c
<view class="commodity-item-shou-add" @click.stop="addCard(item)">+</view>
</view>
</view>
</view>
</view>
</view>
- <view class="dingwei" v-if="isShow">
+ <view class="dingwei" v-if="!position">
<view class="dingwei-left">
- <text>鏈巿鏉冨畾浣�</text>
+ <text>鏈幏鍙栧畾浣嶄俊鎭�</text>
<text>鎴戜滑鏃犳硶鑾峰緱鎮ㄥ綋鍓嶄綅缃俊鎭负鎮ㄦ帹鑽愰檮杩戠粡閿�鍟�</text>
</view>
<view class="dingwei-btn" @click="goToAppSetting">寮�鍚畾浣�</view>
@@ -152,14 +156,8 @@
data() {
return {
list: [],
- labels: [
- [],
- []
- ],
- brand: [
- [],
- [],
- ],
+ labels: [],
+ brand: [],
specialZone: [],
goodsList: [],
page: 1,
@@ -282,6 +280,7 @@
if (res.code === 200) {
res.data.records.forEach(item => {
item.minPrice = item.minPrice.toFixed(2).split('.')
+ item.shou = (item.salenum || 0) + (item.realSaleNum || 0)
})
this.goodsList.push(...res.data.records)
this.page++
@@ -353,26 +352,17 @@
openLoacing() {
var that = this;
uni.chooseLocation({
- success(res1) {
- const locParam = {
- latitude: res1.latitude,
- longitude: res1.longitude
- };
- const qqmapsdk = new QQMapWX({
- key: 'HEIBZ-QJLLM-SZ36X-6ZBHI-S6Y2J-S6FND'
- });
- // 鑵捐鍦板浘閫嗗湴鐞嗙紪鐮�
- qqmapsdk.reverseGeocoder({
- locParam,
- success: function(res) {
- console.log(res, '==================index鑾峰彇鍦板潃')
- console.log(locParam)
- that.$store.commit('setPosition', res.result)
+ success(res) {
+ let obj = {
+ formatted_addresses: {
+ recommend: res.name
},
- fail: (err) => {
- console.error('鑾峰彇浣嶇疆澶辫触===========', err);
+ location: {
+ lat: res.latitude,
+ lng: res.longitude
}
- });
+ }
+ that.$store.commit('setPosition', obj)
}
})
},
@@ -579,9 +569,9 @@
display: flex;
align-items: center;
justify-content: center;
-
image {
- width: 100%;
+ width: 100%;
+ height: 330rpx;
}
}
@@ -591,6 +581,11 @@
box-sizing: border-box;
.commodity-item-box-title {
+ width: 100%;
+ display: -webkit-box;
+ -webkit-box-orient: vertical;
+ -webkit-line-clamp: 2;
+ overflow: hidden;
font-weight: 600;
font-size: 30rpx;
color: #222222;
--
Gitblit v1.9.3