1
This commit is contained in:
parent
eaacdabdc4
commit
f37a2255f0
@ -2,8 +2,8 @@
|
|||||||
"name": "惠农生活",
|
"name": "惠农生活",
|
||||||
"appid": "__UNI__3A527D1",
|
"appid": "__UNI__3A527D1",
|
||||||
"description": "",
|
"description": "",
|
||||||
"versionName" : "2.0.35",
|
"versionName": "2.0.37",
|
||||||
"versionCode" : 2035,
|
"versionCode": 2037,
|
||||||
"transformPx": false,
|
"transformPx": false,
|
||||||
/* 5+App特有相关 */
|
/* 5+App特有相关 */
|
||||||
"app-plus": {
|
"app-plus": {
|
||||||
|
@ -665,7 +665,7 @@
|
|||||||
const param = {
|
const param = {
|
||||||
mer_type: 2,
|
mer_type: 2,
|
||||||
sale_type: this.where.sale_type,
|
sale_type: this.where.sale_type,
|
||||||
mer_id: '',
|
mer_id: this.id,
|
||||||
mer_type: '',
|
mer_type: '',
|
||||||
pid: pid
|
pid: pid
|
||||||
};
|
};
|
||||||
@ -673,11 +673,10 @@
|
|||||||
// 云商品(不查询分类下边没有商品的分类)
|
// 云商品(不查询分类下边没有商品的分类)
|
||||||
if (this.tabActive == 7) {
|
if (this.tabActive == 7) {
|
||||||
param.mer_type = 1;
|
param.mer_type = 1;
|
||||||
param.mer_id = '';
|
|
||||||
}
|
}
|
||||||
|
|
||||||
//一般商品(不查询分类下边没有商品的分类)
|
//一般商品(不查询分类下边没有商品的分类)
|
||||||
if (this.tabActive == 3) {
|
if (this.tabActive == 3) {
|
||||||
param.mer_id = this.id;
|
|
||||||
param.mer_type = 2;
|
param.mer_type = 2;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -733,7 +732,6 @@
|
|||||||
|
|
||||||
// 商铺首页滚动 navbar 吸顶
|
// 商铺首页滚动 navbar 吸顶
|
||||||
scrollHome: function(e) {
|
scrollHome: function(e) {
|
||||||
console.log(1)
|
|
||||||
// uni.$emit('scroll');
|
// uni.$emit('scroll');
|
||||||
// this.navShow = e.detail.scrollTop >= 50;
|
// this.navShow = e.detail.scrollTop >= 50;
|
||||||
},
|
},
|
||||||
@ -1325,8 +1323,6 @@
|
|||||||
position: fixed;
|
position: fixed;
|
||||||
left: 0;
|
left: 0;
|
||||||
z-index: 2;
|
z-index: 2;
|
||||||
display: flex;
|
|
||||||
flex-wrap: wrap;
|
|
||||||
width: 152rpx;
|
width: 152rpx;
|
||||||
overflow-y: auto;
|
overflow-y: auto;
|
||||||
background-color: #F4F4F4;
|
background-color: #F4F4F4;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user