diff --git a/pages/cloud_warehouse/market/market.vue b/pages/cloud_warehouse/market/market.vue
index 31c6997..ce8f75a 100644
--- a/pages/cloud_warehouse/market/market.vue
+++ b/pages/cloud_warehouse/market/market.vue
@@ -418,7 +418,7 @@
style="margin-left: 20rpx;color: #FF6D20;font-size: 22.78rpx; ">{{item.service_score}}
{{item.distance}}
- {{item.category_name}}
+ {{item.category_name}}
- .tab-cont {
- display: flex;
-
- .aside-left-placeholder {
- width: 152rpx;
- }
-
- .aside-left {
- position: fixed;
- left: 0;
- z-index: 2;
- display: flex;
- flex-wrap: wrap;
- width: 152rpx;
- overflow-y: auto;
- background-color: #F4F4F4;
-
- .aside-left-item {
- width: 100%;
- height: 94rpx;
- line-height: 94rpx;
- text-align: center;
- padding: 0 14rpx;
- }
-
- .aside-active {
- position: relative;
- font-weight: bold;
- font-size: 26rpx;
- color: #40AE36;
- background-color: #fff;
-
- &::before {
- content: "";
- display: inline-block;
- position: absolute;
- left: 0;
- top: 50%;
- transform: translateY(-50%);
- width: 6rpx;
- height: 36rpx;
- background: #40AE36;
- border-radius: 0rpx 4rpx 4rpx 0rpx;
-
- }
- }
- }
- }
-
-
-
{{store.mer_name}}
@@ -87,7 +28,8 @@
月销{{store.sales}}+
-
+
+
营业时间 :
@@ -111,50 +53,51 @@
-
-
-
-
- 默认商品
-
-
-
- 销量
-
-
-
- 价格
-
-
-
-
-
- 评分
-
+
+
+
+ 默认商品
-
-
- {{ store.care ? '已关注' : '关注' }}
+
+ 销量
+
+
+
+ 价格
+
+
-
- {{ store.care ? '已关注' : '关注' }}
-
-
+
+
+ 评分
+
+
+
+ {{ store.care ? '已关注' : '关注' }}
+
+
+ {{ store.care ? '已关注' : '关注' }}
+
+
+
+
+
+
+ :style="{'top':'calc('+headHeight+')','height':'calc(100vh - '+listHeight+')'}">
-
+
{{item.cate_name}}
@@ -214,8 +157,7 @@
-
+
已售罄
@@ -231,7 +173,9 @@
- {{ii}}
+
+ {{ii}}
+
@@ -269,13 +213,13 @@
-
+
{{ item.cate_name }}
- {{ value.cate_name }}
@@ -514,7 +458,6 @@
tabs: [],
storeScroll: true,
storeTop: 0,
- navHeight: 0,
currSpid: "",
topicList: [],
service_open: false,
@@ -525,7 +468,9 @@
headHeight: 0,
asideMenu: [],
asideCurr: '',
- CartCount: 0
+ CartCount: 0,
+ navHeight: 0,
+ listTop: 0
}
},
computed: {
@@ -666,11 +611,9 @@
},
// #endif
methods: {
-
//获取购物车数量
getCart() {
let that = this;
- console.log(111)
getCartCounts({
sale_type: this.where.sale_type
}).then(res => {
@@ -706,6 +649,7 @@
url: url
})
},
+
// 查看地图
showMaoLocation: function() {
if (!this.store.lat || !this.store.long) return this
@@ -743,10 +687,9 @@
this.$nextTick(async () => {
const headHeight = await this.getDomInfo('.header');
const footerHeight = await this.getDomInfo('.footer');
- const navHeight = await this.getDomInfo('#nav-cont');
- this.headHeight = headHeight;
+ const navObj = await this.getDomInfo('.nav');
- this.listHeight = headHeight.height + footerHeight.height + 'px';
+ this.listHeight = headHeight.height + footerHeight.height + navObj.height + 'px';
})
},
@@ -1138,8 +1081,8 @@
},
// 商铺首页滚动 navbar 吸顶
scrollHome: function(e) {
- uni.$emit('scroll');
- this.navShow = e.detail.scrollTop >= 50;
+ // uni.$emit('scroll');
+ // this.navShow = e.detail.scrollTop >= 50;
},
goback: function() {
@@ -1238,6 +1181,52 @@
background: #f5f5f5;
min-height: 500rpx;
overflow: auto;
+ display: flex;
+
+ .aside-left-placeholder {
+ width: 152rpx;
+ }
+
+ .aside-left {
+ position: fixed;
+ left: 0;
+ z-index: 2;
+ display: flex;
+ flex-wrap: wrap;
+ width: 152rpx;
+ overflow-y: auto;
+ background-color: #F4F4F4;
+
+ .aside-left-item {
+ width: 100%;
+ height: 94rpx;
+ line-height: 94rpx;
+ text-align: center;
+ padding: 0 14rpx;
+ }
+
+ .aside-active {
+ position: relative;
+ font-weight: bold;
+ font-size: 26rpx;
+ color: #40AE36;
+ background-color: #fff;
+
+ &::before {
+ content: "";
+ display: inline-block;
+ position: absolute;
+ left: 0;
+ top: 50%;
+ transform: translateY(-50%);
+ width: 6rpx;
+ height: 36rpx;
+ background: #40AE36;
+ border-radius: 0rpx 4rpx 4rpx 0rpx;
+
+ }
+ }
+ }
}
.car-number {
@@ -1425,6 +1414,119 @@
}
}
+ .nav {
+ padding: 0 30rpx;
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+ width: 100%;
+ height: 90rpx;
+ background: #fff;
+ border-bottom: 1px solid #f3f3f3;
+ z-index: 10;
+
+ .nav-cont {
+ display: flex;
+ align-items: center;
+ height: 84rpx;
+
+ .item {
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ min-width: 0;
+
+ .cont {
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ width: 116rpx;
+ height: 44rpx;
+ border-radius: 22rpx;
+ font-weight: 500;
+ font-size: 24rpx;
+ color: #666666;
+
+ .arrow-icon {
+ margin-left: 10rpx;
+ font-size: 18rpx;
+ }
+
+ .layout-icon {
+ font-size: 32rpx;
+ }
+
+ .icon-pailie {
+ font-size: 32rpx;
+ }
+
+ image {
+ width: 15rpx;
+ height: 21rpx;
+ margin-left: 7rpx;
+ }
+ }
+ }
+
+ .active {
+ .cont {
+ font-size: 28rpx;
+ font-weight: bold;
+ color: var(--view-theme);
+ }
+ }
+ }
+
+ .guanzhu {
+ width: 146rpx;
+ height: 58rpx;
+ line-height: 58rpx;
+ background: #46B03A;
+ border-radius: 68rpx 68rpx 68rpx 68rpx;
+ font-weight: 600;
+ font-size: 28rpx;
+ color: #FFFFFF;
+ text-align: center;
+ }
+
+ .guanzhu-active {
+ background: transparent;
+ border: 2rpx solid #46B03A;
+ color: #46B03A;
+ }
+
+ .select {
+ position: absolute;
+ top: 100%;
+ left: 0;
+ z-index: 2;
+ width: 100%;
+ padding-right: 40rpx;
+ padding-bottom: 28rpx;
+ padding-left: 74rpx;
+ border-bottom-right-radius: 24rpx;
+ border-bottom-left-radius: 24rpx;
+ background-color: #FFFFFF;
+ box-shadow: 0px 2px 10px 0px rgba(0, 0, 0, 0.06);
+
+ .item {
+ margin-top: 28rpx;
+ font-size: 24rpx;
+ color: #454545;
+ }
+
+ .active {
+ color: var(--view-theme);
+
+ .iconfont {
+ color: var(--view-theme);
+ float: right;
+ font-size: 20rpx;
+ }
+ }
+ }
+ }
+
.main_count {
background-color: #ffffff;
padding: 30rpx 20rpx;
@@ -1583,117 +1685,6 @@
}
}
- .nav {
- position: relative;
- padding: 0 30rpx;
- display: flex;
- justify-content: space-between;
- align-items: center;
- background: #fff;
- border-bottom: 1px solid #f3f3f3;
-
- .nav-cont {
- display: flex;
- align-items: center;
- height: 84rpx;
-
- .item {
- display: flex;
- justify-content: center;
- align-items: center;
- min-width: 0;
-
- .cont {
- display: flex;
- justify-content: center;
- align-items: center;
- width: 116rpx;
- height: 44rpx;
- border-radius: 22rpx;
- font-weight: 500;
- font-size: 24rpx;
- color: #666666;
-
- .arrow-icon {
- margin-left: 10rpx;
- font-size: 18rpx;
- }
-
- .layout-icon {
- font-size: 32rpx;
- }
-
- .icon-pailie {
- font-size: 32rpx;
- }
-
- image {
- width: 15rpx;
- height: 21rpx;
- margin-left: 7rpx;
- }
- }
- }
-
- .active {
- .cont {
- font-size: 28rpx;
- font-weight: bold;
- color: var(--view-theme);
- }
- }
- }
-
- .guanzhu {
- width: 146rpx;
- height: 58rpx;
- line-height: 58rpx;
- background: #46B03A;
- border-radius: 68rpx 68rpx 68rpx 68rpx;
- font-weight: 600;
- font-size: 28rpx;
- color: #FFFFFF;
- text-align: center;
- }
-
- .guanzhu-active {
- background: transparent;
- border: 2rpx solid #46B03A;
- color: #46B03A;
- }
-
- .select {
- position: absolute;
- top: 100%;
- left: 0;
- z-index: 2;
- width: 100%;
- padding-right: 40rpx;
- padding-bottom: 28rpx;
- padding-left: 74rpx;
- border-bottom-right-radius: 24rpx;
- border-bottom-left-radius: 24rpx;
- background-color: #FFFFFF;
- box-shadow: 0px 2px 10px 0px rgba(0, 0, 0, 0.06);
-
- .item {
- margin-top: 28rpx;
- font-size: 24rpx;
- color: #454545;
- }
-
- .active {
- color: var(--view-theme);
-
- .iconfont {
- color: var(--view-theme);
- float: right;
- font-size: 20rpx;
- }
- }
- }
- }
-
.goods {
display: flex;
flex-wrap: wrap;
diff --git a/pages/users/order_confirm/index.vue b/pages/users/order_confirm/index.vue
index c340e5d..a86004a 100644
--- a/pages/users/order_confirm/index.vue
+++ b/pages/users/order_confirm/index.vue
@@ -1457,7 +1457,7 @@
title: res.message,
icon: 'success'
}, {
- tab: 4,
+ tab: 5,
url: goPages
});
}).catch(res => {
@@ -1486,7 +1486,7 @@
title: '支付成功',
icon: 'success'
}, {
- tab: 4,
+ tab: 5,
url: url
});
},
@@ -1496,7 +1496,7 @@
return that.$util.Tips({
title: '取消支付',
}, {
- tab: 4,
+ tab: 5,
url: url
});
},
@@ -1506,7 +1506,7 @@
return that.$util.Tips({
title: '',
}, {
- tab: 4,
+ tab: 5,
url: url
});
},
@@ -1564,7 +1564,7 @@
title: '下单成功,请上传支付凭证!'
}, {
tab: 5,
- url: "/pages/users/order_list/index?sale_type="+ this.sale_type
+ url: "/pages/users/order_list/index?sale_type=" + this.sale_type
});
break;
// #ifdef H5
diff --git a/pages/whole_sale/index.vue b/pages/whole_sale/index.vue
index 3759f95..fe31a5b 100644
--- a/pages/whole_sale/index.vue
+++ b/pages/whole_sale/index.vue
@@ -455,7 +455,7 @@
{{item.distance}}
- {{item.category_name}}
+ {{item.category_name}}