From 9126f4476559e18b53b80225761d6e91579566e6 Mon Sep 17 00:00:00 2001 From: weipengfei <2187978347@qq.com> Date: Sat, 11 Nov 2023 18:40:57 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api/requesta.js | 4 + components/shortPopup.vue | 175 ++ pages/nongKe/cloud_entrepot/indexa.vue | 5 +- pages/nongKe/cloud_entrepot/indexb.vue | 3340 +++++++++++------------ pages/nongKe/supply_chain/supplierB.vue | 121 +- static/images/icon/car.png | Bin 0 -> 1539 bytes static/images/icon/plus.png | Bin 0 -> 1225 bytes 7 files changed, 1912 insertions(+), 1733 deletions(-) create mode 100644 components/shortPopup.vue create mode 100644 static/images/icon/car.png create mode 100644 static/images/icon/plus.png diff --git a/api/requesta.js b/api/requesta.js index bc734bc..8e5b287 100644 --- a/api/requesta.js +++ b/api/requesta.js @@ -3,6 +3,10 @@ import request from "@/utils/requesta.js"; export function getCityCloundShop(data) { return request.get("city/get_cloud_shop", data); } + +export function getCategoryListLevel(data) { + return request.get("category/list_level", data); +} export function cloudWarehouse(data) { return request.get("store/product/cloudWarehouse", data); } diff --git a/components/shortPopup.vue b/components/shortPopup.vue new file mode 100644 index 0000000..3ce2623 --- /dev/null +++ b/components/shortPopup.vue @@ -0,0 +1,175 @@ + + + + + \ No newline at end of file diff --git a/pages/nongKe/cloud_entrepot/indexa.vue b/pages/nongKe/cloud_entrepot/indexa.vue index 8bca6bd..0f67fb5 100644 --- a/pages/nongKe/cloud_entrepot/indexa.vue +++ b/pages/nongKe/cloud_entrepot/indexa.vue @@ -838,8 +838,7 @@ order: this.type, keyword: this.keyword, page: this.page_num, - location: this.location - + location: this.location, }).then(res => { this.goodsList = res.data.list this.showLoading = false @@ -937,7 +936,7 @@ townCloud({ street_code: this.street_code, category_id: this.cloudList[this.current].category_id, - location: this.location + location: this.location }).then(res => { this.trnList = [] this.goodsList = res.data.list diff --git a/pages/nongKe/cloud_entrepot/indexb.vue b/pages/nongKe/cloud_entrepot/indexb.vue index d9b07cf..46f403c 100644 --- a/pages/nongKe/cloud_entrepot/indexb.vue +++ b/pages/nongKe/cloud_entrepot/indexb.vue @@ -1,1764 +1,1726 @@ \ No newline at end of file diff --git a/pages/nongKe/supply_chain/supplierB.vue b/pages/nongKe/supply_chain/supplierB.vue index 20a8ea0..cff2b73 100644 --- a/pages/nongKe/supply_chain/supplierB.vue +++ b/pages/nongKe/supply_chain/supplierB.vue @@ -17,7 +17,7 @@ 供销综合云市场 供销综合云商品 @@ -87,11 +87,11 @@ - - - {{item.category_name}} + {{item.category_name}} @@ -121,7 +121,7 @@ {{item.type_name}} - + - {{item.service_score}} - 月销{{item.sales}} - {{item.distance}} - + {{item.service_score}} + 月销{{item.sales}} + {{item.distance}} { - this.menuList = res.data - }) - this.Area() - let that = this - setTimeout(() => { - uni.createSelectorQuery() - .in(this) - .select('.flags') - .boundingClientRect(rect => { - // console.log(this.cartTagInfo, 6666) - // that.cartTagInfo = rect - that.headTop = rect.top - console.log(that.headTop) - }) - .exec(); - }, 100) + this.menuList = res.data; + this.merchant_category_id = this.menuList[0].merchant_category_id; + this.storeParam.category_id = this.merchant_category_id; + if (this.mer_location == 1) { + this.selfLocation() + } + // this.storeMerchantList(); + this.getClassfication(); + this.getStoreType(); + this.Area() + let that = this + setTimeout(() => { + uni.createSelectorQuery() + .in(this) + .select('.flags') + .boundingClientRect(rect => { + // console.log(this.cartTagInfo, 6666) + // that.cartTagInfo = rect + that.headTop = rect.top + // console.log(that.headTop) + }) + .exec(); + }, 100) + }) }, computed: { downMenus: function() { @@ -387,7 +389,6 @@ methods: { selectLocation() { this.isSelectPlace ? this.showPicker = true : '' - }, confirm(e) { this.showPicker = false @@ -627,7 +628,10 @@ }, selfLocation() { let self = this - if (uni.getStorageSync('RejectTarget')) return; + if (uni.getStorageSync('RejectTarget')) { + this.storeMerchantList(); + return; + } if(this.$store?.state?.storage?.location?.lat){ this.latitude = this.$store?.state?.storage?.location?.lat; this.longitude = this.$store?.state?.storage?.location?.long; @@ -640,12 +644,14 @@ this.location_address = res.data.address; this.recommend_address = res.data.address.length > 4 ? res.data.address .slice(0, 4) + '...' : - res.data.address + res.data.address; + this.storeMerchantList(); }).catch(err => { uni.showToast({ title: err, icon: 'none' }) + this.storeMerchantList(); }) } else uni.getLocation({ @@ -671,11 +677,13 @@ this.recommend_address = res.data.address.length > 4 ? res.data.address .slice(0, 4) + '...' : res.data.address + this.storeMerchantList(); }).catch(err => { uni.showToast({ title: err, icon: 'none' }) + this.storeMerchantList(); }) }, fail: (res) => { @@ -684,6 +692,7 @@ icon: 'none', duration: 1000 }); + this.storeMerchantList(); }, }); }, @@ -728,7 +737,7 @@ page: this.storeParam.page, limit: 10, order: this.storeParam.order, - category_id: this.storeParam.category_id, + // category_id: this.storeParam.category_id, type_id: this.storeParam.type_id, credit_buy: this.credit_buy, } @@ -830,7 +839,10 @@ }, // 点击商户分类 changeMerchant(id){ - console.log(id); + this.merchant_category_id = id; + this.storeParam.category_id = this.merchant_category_id; + this.storeParam.page = 1; + this.storeMerchantList() } }, //刷新 @@ -930,20 +942,44 @@ // height: 199.77rpx; border-radius: 21.03rpx 21.03rpx 21.03rpx 21.03rpx; padding: 20rpx 20rpx 0 20rpx; + font-size: 26.29rpx; + height: 220rpx; .menu_li { - margin-right: 30rpx; + margin-right: 20rpx; // background-color: red; // width: 50vw; display: flex; flex-direction: column; align-items: center; - min-width: 15vw; - height: 140rpx; + min-width: 16vw; + height: auto; // width: 120rpx; // display: inline-block; + .image{ + border: 5rpx solid #fff; + } + .li_text{ + width: 100%; + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; + text-align: center; + padding: 4rpx 10rpx; + } } - + .menu_li_on{ + .image{ + border: 5rpx solid #ff6d20; + border-radius: 50%; + } + .li_text{ + background-color: #ff6d20; + border-radius: 2em; + color: #fff; + padding: 4rpx 10rpx; + } + } } @@ -976,6 +1012,7 @@ padding: 20rpx; // border-radius: 20rpx; display: flex; + border-radius: 21rpx 21rpx 21rpx 21rpx; // align-items: center; .left { @@ -988,16 +1025,18 @@ .right { flex: 1; + color: #737373; .head { font-weight: bold; // color: red; + color: #333; } .li { width: 100%; display: flex; - font-size: 26.29rpx; + font-size: 28.04rpx; margin-bottom: 10rpx; align-items: center; diff --git a/static/images/icon/car.png b/static/images/icon/car.png new file mode 100644 index 0000000000000000000000000000000000000000..a5b8f175d63bc37c54b8d63943b064f27c768d45 GIT binary patch literal 1539 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 literal 0 HcmV?d00001