This commit is contained in:
DESKTOP-GMUNQ1B\k 2024-04-24 17:40:23 +08:00
parent eaacdabdc4
commit f37a2255f0
2 changed files with 353 additions and 357 deletions

View File

@ -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": {

View File

@ -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;