From e1305e5e42e31d697ea1a5b76dc7f3a838765d4d Mon Sep 17 00:00:00 2001 From: weipengfei <2187978347@qq.com> Date: Wed, 25 Oct 2023 15:14:06 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug,=20=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/shoppinglist/shoppinglist.vue | 36 ++++++------------ pages.json | 20 ++++++++-- pages/index/index.vue | 9 +++-- pages/nongKe/supply_chain/merchant.vue | 2 +- .../nongKe/supply_chain/shopping_trolley.vue | 26 ++++++++----- pages/nongKe/supply_chain/supplierA.vue | 25 +++++++++--- static/tabbar_icon/d-a.png | Bin 0 -> 2311 bytes static/tabbar_icon/d.png | Bin 0 -> 1962 bytes 8 files changed, 71 insertions(+), 47 deletions(-) create mode 100644 static/tabbar_icon/d-a.png create mode 100644 static/tabbar_icon/d.png diff --git a/components/shoppinglist/shoppinglist.vue b/components/shoppinglist/shoppinglist.vue index 24de335..a125106 100644 --- a/components/shoppinglist/shoppinglist.vue +++ b/components/shoppinglist/shoppinglist.vue @@ -173,30 +173,21 @@ //价格 producrprice(e, i, item) { this.bought[i].price = e.detail.value - this.$set(item, 'check', false); - for (let i in this.checkedArr) { - if (this.checkedArr[i].product_id == item.product_id) { - this.checkedArr.splice(i, 1) - - } - } - - - + // this.$set(item, 'check', false); + // for (let i in this.checkedArr) { + // if (this.checkedArr[i].product_id == item.product_id) { + // this.checkedArr.splice(i, 1) + // } + // } }, incrementTotal(e, i, item) { // console.log(e, i, item) - this.$set(item, 'check', false); - for (let i in this.checkedArr) { - if (this.checkedArr[i].product_id == item.product_id) { - this.checkedArr.splice(i, 1) - } - } - - - - - + // this.$set(item, 'check', false); + // for (let i in this.checkedArr) { + // if (this.checkedArr[i].product_id == item.product_id) { + // this.checkedArr.splice(i, 1) + // } + // } }, // picker修改事件 bindPickerChange: function(e, storage, num) { @@ -300,8 +291,6 @@ this.checked = [] this.checkedArr.forEach((item, index) => { this.checkedArr.push(item) - - }) }, /*点击选中与否*/ @@ -318,7 +307,6 @@ this.checkedArr.push(item) } else { this.checkedArr.splice(this.checkedArr.findIndex(itemn => ((itemn.product_id == item.product_id))), 1) - } }, diff --git a/pages.json b/pages.json index fea5fbe..ab34caf 100644 --- a/pages.json +++ b/pages.json @@ -79,6 +79,12 @@ } } }, + { + "path": "pages/nongKe/supply_chain/shopping_trolley", + "style": { + "navigationBarTitleText": "采购车" + } + }, { "path": "pages/moreProject/moreProject", "style": { @@ -1456,12 +1462,18 @@ "text": "消息" }, { - "pagePath": "pages/product/list/index", - "iconPath": "static/tabbar_icon/c.png", - "selectedIconPath": "static/tabbar_icon/c-a.png", - "text": "商品" + "pagePath": "pages/nongKe/supply_chain/shopping_trolley", + "iconPath": "static/tabbar_icon/d.png", + "selectedIconPath": "static/tabbar_icon/d-a.png", + "text": "采购车" } // { + // "pagePath": "pages/product/list/index", + // "iconPath": "static/tabbar_icon/c.png", + // "selectedIconPath": "static/tabbar_icon/c-a.png", + // "text": "商品" + // }, + // { // "pagePath": "pages/supply_chains/supply_chains", // "iconPath": "static/tabbar_icon/d.png", // "selectedIconPath": "static/tabbar_icon/d-a.png", diff --git a/pages/index/index.vue b/pages/index/index.vue index a328445..026791d 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -1018,7 +1018,7 @@ switch (item.type) { case 1: - uni.switchTab({ + uni.navigateTo({ url: '/pages/product/list/index' }) break; @@ -1029,9 +1029,12 @@ }) break; case 3: + // uni.navigateTo({ + // url: '/pages/users/supply_procurement/index?type_id=12&isDetail=1&product_type=98&cate_id=' + + // this.userInfoData.mer_info.category_id + // }) uni.navigateTo({ - url: '/pages/users/supply_procurement/index?type_id=12&isDetail=1&product_type=98&cate_id=' + - this.userInfoData.mer_info.category_id + url: `/pages/nongKe/supply_chain/supplierA?tit=1&type_id=12&isDetail=1&product_type=98&cate_id=${this.userInfoData.mer_info.category_id}` }) break; case 4: diff --git a/pages/nongKe/supply_chain/merchant.vue b/pages/nongKe/supply_chain/merchant.vue index e137b68..86113da 100644 --- a/pages/nongKe/supply_chain/merchant.vue +++ b/pages/nongKe/supply_chain/merchant.vue @@ -38,7 +38,7 @@ - 采购清单 + 采购清单 diff --git a/pages/nongKe/supply_chain/shopping_trolley.vue b/pages/nongKe/supply_chain/shopping_trolley.vue index 64c020f..9f6802f 100644 --- a/pages/nongKe/supply_chain/shopping_trolley.vue +++ b/pages/nongKe/supply_chain/shopping_trolley.vue @@ -26,6 +26,7 @@ 优惠券 + 支持先货后款 + 供货采购 @@ -30,6 +31,8 @@ + + @@ -47,12 +50,12 @@ --> - + - @@ -433,6 +436,18 @@ }, mapGetters(['viewColor'])), }, methods: { + // 切换状态 + changeTabs(e){ + if(e.index==0){ + this.credit_buy = '' + this.sotreParam.page = 1; + }else if(e.index==1){ + this.credit_buy = 1 + this.sotreParam.page = 1; + } + this.storeList = []; + this.storeMerchantList(); + }, navGo(id) { uni.navigateTo({ url: `/pages/nongKe/supply_chain/supplierA?type_id=10&?merchant_category_id=${id}` @@ -877,9 +892,9 @@ margin: 20rpx 0; flex-wrap: wrap; // margin-top: 50rpx; - padding-top: 50rpx; + padding-top: 142rpx; /* #ifdef H5 */ - padding-top: 100rpx; + padding-top: 180rpx; /* #endif */ text { diff --git a/static/tabbar_icon/d-a.png b/static/tabbar_icon/d-a.png new file mode 100644 index 0000000000000000000000000000000000000000..69ef41b10fde54b1634aedbb4e0368f7848d4307 GIT binary patch literal 2311 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