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 @@
+
+
+
+
+
+
+
+
+
+
+ ¥10.00
+ 订货价
+
+ 商品名称
+ 店铺名称
+
+ 规格选中
+
+ 规格1
+ 规格2
+
+
+ 购买数量
+ 1
+
+
+ 商品库存 200
+
+
+
+
+ 采购车
+
+ 加入采购清单
+
+
+
+
+
+
+
+
+
+
\ 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 @@
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
- 供销综合云市场
-
-
- 供销综合云商品
-
-
- {{street||'定位中'}}
-
+
+
+ 供销综合云市场
+
+
+ 供销综合云商品
+
+
+ {{street||'定位中'}}
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 暂无店铺,切换其他位置试试
-
-
- 为你推荐
+
+
+
+
+
-
-
-
-
-
-
-
-
- {{item.mer_name}}
- {{item.type_name}}
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{item.cate_name}}
+
+
+
+
+ 综合
+
+ 销量
+ 价格
+
+
+
+
+
+
+
+
+ 暂无商品,切换其他分类或地区试试
+
+
+
+
+
+
+ {{item.product.store_name}}
+
+ {{item.product.store_info}}
+
+
+ ¥{{ item.product.price.split('.')[0] }}.{{item.product.price.split('.')[1]}}
+
+
- {{item.service_score}}
- 月销{{item.sales}}
- {{item.distance}}
-
-
-
-
- {{item.service_phone}}
-
-
- {{item.street_name}}
-
-
-
- {{item.mer_take_time[0]}}-{{item.mer_take_time[1]}}
-
-
-
- {{item.mer_address}}
-
-
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+ {{goodsNum}}
+
+
+
+
+ ¥{{totalMoney}}
+
+
+ 支持配送 售后无忧
+
+
+
+
+ 去结算
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
\ 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 @@
@@ -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 0000000..a5b8f17
Binary files /dev/null and b/static/images/icon/car.png differ
diff --git a/static/images/icon/plus.png b/static/images/icon/plus.png
new file mode 100644
index 0000000..bfe5c20
Binary files /dev/null and b/static/images/icon/plus.png differ