From 80d88f15a2222ec2dbe33f5d1d2b2296a890f41b Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期二, 03 三月 2026 16:22:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
mini-program/pages/index/index.vue | 51 ++++++++++++++++++---------------------------------
1 files changed, 18 insertions(+), 33 deletions(-)
diff --git a/mini-program/pages/index/index.vue b/mini-program/pages/index/index.vue
index a39d61f..d995322 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,16 @@
</view>
</view>
<view class="commodity-item-shou">
- <text>宸插敭{{item.saleNum + item.realSaleNum}}</text>
+ <text>宸插敭{{(item.saleNum||0) + (item.realSaleNum||0)}}</text>
<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 +152,8 @@
data() {
return {
list: [],
- labels: [
- [],
- []
- ],
- brand: [
- [],
- [],
- ],
+ labels: [],
+ brand: [],
specialZone: [],
goodsList: [],
page: 1,
@@ -235,7 +229,7 @@
},
jumpShopZ(item) {
uni.navigateTo({
- url: '/pages/special-zone/special-zone?qualityId=' + item.id
+ url: '/pages/special-zone/special-zone?qualityId=' + item.id+'&title='+item.name
})
},
// 杞挱鍥�
@@ -353,26 +347,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 +564,9 @@
display: flex;
align-items: center;
justify-content: center;
-
image {
- width: 100%;
+ width: 100%;
+ height: 330rpx;
}
}
--
Gitblit v1.9.3