From 83c04d43b5ab614785e9c60bbc421aeb228bed19 Mon Sep 17 00:00:00 2001
From: "DESKTOP-GMUNQ1B\\k" <1154079537@qq.com>
Date: Wed, 17 Apr 2024 17:43:57 +0800
Subject: [PATCH] 1
---
pages/cloud_warehouse/market/market.vue | 1187 ++++++++++++-----------
pages/index/index.vue | 68 +-
pages/order_addcart/order_addcart.vue | 280 +++---
pages/order_pay_status/index.vue | 12 +-
pages/store/home/index.vue | 318 +++---
5 files changed, 960 insertions(+), 905 deletions(-)
diff --git a/pages/cloud_warehouse/market/market.vue b/pages/cloud_warehouse/market/market.vue
index d002f3e..31c6997 100644
--- a/pages/cloud_warehouse/market/market.vue
+++ b/pages/cloud_warehouse/market/market.vue
@@ -1,651 +1,658 @@
-
+
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
- {{item.category_name}}
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+ {{item.category_name}}
+
+
+
+
+
+
-
-
-
-
-
+
+
+
+
-
-
-
-
-
-
-
-
- {{item.mer_name}}
- 月销{{item.sales}}
-
-
-
-
-
-
-
-
- {{item.service_score}}
- {{item.distance}}
-
-
-
- {{item.service_phone}}
-
- {{item.mer_take_time[0]}}-{{item.mer_take_time[1]}}
-
-
-
- {{item.mer_address}}
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+ {{item.mer_name}}
+ 月销{{item.sales}}
+
+
+
+
+
+
+
+
+ {{item.service_score}}
+ {{item.distance}}
+ {{item.category_name}}
+
+
+
+ {{item.service_phone}}
+
+ {{item.mer_take_time[0]}}-{{item.mer_take_time[1]}}
+
+
+
+ {{item.mer_address}}
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 50611ea..bca8934 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -89,7 +89,8 @@
+ @changeRecommedTab="changeRecommedTab" showTab :indexP="true" :isLogin="isLogin"
+ :loading="loading">
@@ -523,6 +524,35 @@
isSupport: true
};
},
+
+ onTabItemTap(e) {
+
+ },
+
+ // 滚动监听
+ onPageScroll(e) {
+
+ this.isFixed = e.scrollTop > 40;
+
+ // uni.setTabBarItem({
+ // index: 0,
+ // text: "123",
+ // selectedIconPath: "/static/tabbar_icon/b-a.png"
+ // })
+
+ // this.$forceUpdate();
+
+ if (this.isHeaderSerch) {
+ let isScroll = false
+ isScroll = e.scrollTop > 50
+ this.isScrolled = isScroll;
+ } else {
+ this.isScrolled = false
+ }
+ // 传入scrollTop值并触发所有easy-loadimage组件下的滚动监听事件
+ uni.$emit('scroll');
+ },
+
/**
* 用户点击右上角分享
*/
@@ -1048,7 +1078,7 @@
that.hotLoading[e] = true;
that.hotTitle = '加载中';
getProductHot(that.hotPage, that.hotLimit, 1, 1).then(res => {
- res.data.list = this.shuffleArray(res.data.list);
+ res.data.list = this.shuffleArray(res.data.list);
let list = res.data.list;
let productList = that.hostProduct;
if (!productList[e]) productList[e] = [];
@@ -1082,7 +1112,7 @@
getProductslist({
...query
}).then(res => {
- res.data.list = this.shuffleArray(res.data.list);
+ res.data.list = this.shuffleArray(res.data.list);
let list = res.data.list;
let productList = that.hostProduct;
if (!productList[e]) productList[e] = [];
@@ -1097,15 +1127,15 @@
that.$set(that, 'hotLimit', res.data.limit);
});
},
-
- // 数组乱序
- shuffleArray(array) {
- for (let i = array.length - 1; i > 0; i--) {
- const j = Math.floor(Math.random() * (i + 1));
- [array[i], array[j]] = [array[j], array[i]];
- }
- return array;
- },
+
+ // 数组乱序
+ shuffleArray(array) {
+ for (let i = array.length - 1; i > 0; i--) {
+ const j = Math.floor(Math.random() * (i + 1));
+ [array[i], array[j]] = [array[j], array[i]];
+ }
+ return array;
+ },
getCateData() {
getCateData().then(res => {
@@ -1210,20 +1240,6 @@
}
}
},
- // 滚动监听
- onPageScroll(e) {
- this.isFixed = e.scrollTop > 40;
-
- if (this.isHeaderSerch) {
- let isScroll = false
- isScroll = e.scrollTop > 50
- this.isScrolled = isScroll;
- } else {
- this.isScrolled = false
- }
- // 传入scrollTop值并触发所有easy-loadimage组件下的滚动监听事件
- uni.$emit('scroll');
- }
};
-
+
+
+
+
+
+
+
+ {{item.cate_name}}
+
+
+
@@ -144,10 +208,11 @@
-
-
+
@@ -181,38 +246,7 @@
-
-
-
@@ -227,7 +261,7 @@
-
+
@@ -251,130 +285,13 @@
{{loadTitle}}
-
-
-
-
-
-
-
@@ -402,7 +319,8 @@
followStore,
unfollowStore,
storeServiceList,
- hasServiceApi
+ hasServiceApi,
+ getCategoryIndexList
} from '@/api/store.js';
import {
initiateAssistApi,
@@ -425,6 +343,9 @@
import {
goShopDetail
} from '@/libs/order.js';
+ import {
+ getCartCounts
+ } from '@/api/order.js';
import history from "@/mixins/history";
import emptyPage from '@/components/emptyPage.vue'
import shareScence from "@/libs/spread";
@@ -453,6 +374,9 @@
import pictureCube from '../../index/component/pictureCube'
import titles from '../../index/component/titles';
// #endif
+ import {
+ merClassifly,
+ } from "@/api/store.js"
const app = getApp();
export default {
components: {
@@ -578,6 +502,10 @@
icon: 'icon-gouwu_o',
name: '商品',
value: 3,
+ }, {
+ icon: 'icon-gouwuche',
+ name: '购物车',
+ value: 9,
}, {
icon: 'icon-yingyongAPP_o',
name: '分类',
@@ -593,7 +521,11 @@
type: 0,
serviceInfo: {},
preview: false,
- listHeight: 0
+ listHeight: 0,
+ headHeight: 0,
+ asideMenu: [],
+ asideCurr: '',
+ CartCount: 0
}
},
computed: {
@@ -605,8 +537,7 @@
};
if ('postage_score' in store) {
score.number = (parseFloat(store.postage_score) + parseFloat(store.product_score) + parseFloat(
- store.service_score)) /
- 3;
+ store.service_score)) / 3;
score.star = score.number / 5 * 100;
}
return score;
@@ -701,6 +632,9 @@
})
}
})
+
+ this.getMerClassifly();
+ this.getCart();
},
/**
@@ -732,6 +666,41 @@
},
// #endif
methods: {
+
+ //获取购物车数量
+ getCart() {
+ let that = this;
+ console.log(111)
+ getCartCounts({
+ sale_type: this.where.sale_type
+ }).then(res => {
+ console.log(res)
+ that.CartCount = res.data[0].count;
+ });
+ },
+
+ // 修改菜单
+ onChangeAsideMenu(e) {
+ this.asideCurr = e;
+ this.resetParmas();
+ this.goods = [];
+ this.loadend = false;
+ this.getGoods();
+ },
+
+ // 获取分类
+ getMerClassifly() {
+ getCategoryIndexList({
+ mer_type: 2,
+ sale_type: this.where.sale_type
+ }).then(res => {
+ this.asideMenu = [{
+ cate_name: '全部',
+ store_category_id: ''
+ }, ...res.data];
+ })
+ },
+
navTo(url) {
uni.navigateTo({
url: url
@@ -775,6 +744,7 @@
const headHeight = await this.getDomInfo('.header');
const footerHeight = await this.getDomInfo('.footer');
const navHeight = await this.getDomInfo('#nav-cont');
+ this.headHeight = headHeight;
this.listHeight = headHeight.height + footerHeight.height + 'px';
})
@@ -869,6 +839,7 @@
});
}
},
+
// 本地生活服务商品
get_service_list: function(isPage) {
let that = this;
@@ -948,12 +919,16 @@
},
// 获取商铺商品
getGoods: function() {
+ console.log(2)
let that = this;
if (that.loadend) return;
if (that.loading) return;
if (that.goodsLoading) return;
+
that.goodsLoading = true;
that.loadTitle = '';
+ that.where.cate_pid = that.asideCurr;
+
if (this.tabActive == 7) getStoreCloudGoods(that.id, that.where).then(res => {
that.goodsLoading = false;
let list = res.data.list;
@@ -1176,11 +1151,17 @@
url: '/pages/index/index'
});
},
+
// 商铺底部切换
tab: function(param) {
+ console.log(param)
+ if (param == 9) return uni.switchTab({
+ url: "/pages/order_addcart/order_addcart"
+ })
this.tabActive = param;
this.goodsLoading = this.loadend = this.loading = false
},
+
resetParmas() {
this.navActive = 0;
this.where = {
@@ -1259,6 +1240,24 @@
overflow: auto;
}
+ .car-number {
+ position: relative;
+ backgrond: red;
+
+ &::after {
+ content: attr(data-attr);
+ display: inline-block;
+ position: absolute;
+ background-color: #40AE36;
+ color: #fff;
+ padding: 10rpx;
+ font-size: 24rpx;
+ border-radius: 16rpx;
+ line-height: 16rpx;
+ text-align: center;
+ }
+ }
+
.noPointer {
pointer-events: none;
}
@@ -1590,6 +1589,8 @@
display: flex;
justify-content: space-between;
align-items: center;
+ background: #fff;
+ border-bottom: 1px solid #f3f3f3;
.nav-cont {
display: flex;
@@ -1701,7 +1702,7 @@
padding-right: 20rpx;
padding-left: 20rpx;
background-color: #F5F5F5;
- width: 750rpx;
+ width: 100%;
.item {
width: 345rpx;
@@ -2235,7 +2236,6 @@
justify-content: center;
align-items: center;
margin-top: 0;
- padding-top: 200rpx;
image {
width: 414rpx;