+
+
+
+
+
+
+
+
+
+
@@ -53,6 +83,7 @@ let list = reactive([
// goodPrice: '25',
// },
]);
+let searchName = ref('');
let params = reactive({
current: 1,
size: 10,
@@ -65,6 +96,24 @@ let pagination = reactive({
total: 4,
});
let bannerList = reactive(['images/ecommerce/' + 'banner1.png', 'images/ecommerce/' + 'banner1.png']);
+const changeTabs = (paramsArr) => {
+ console.log('tabs选项', paramsArr);
+ let level1Id = 0;
+ let level2Id = 0;
+ let level3Id = 0;
+
+ if (paramsArr.length >= 1) {
+ level1Id = paramsArr[0]?.name == '全部' ? 0 : paramsArr[0]?.id || 0;
+ }
+ if (paramsArr.length >= 2) {
+ level2Id = paramsArr[1]?.name == '全部' ? 0 : paramsArr[1]?.id || 0;
+ }
+ if (paramsArr.length >= 3) {
+ level3Id = paramsArr[2]?.name == '全部' ? 0 : paramsArr[2]?.id || 0;
+ }
+
+ console.log('处理后的ID:', level1Id, level2Id, level3Id);
+};
const getList = (data) => {
if (data) {
params.goodName = data.searchName;
@@ -84,6 +133,9 @@ onMounted(() => {
getTree();
});
+const onQuery = () => {
+ getList({ searchName: searchName.value });
+};
const search = (data) => {
getList(data);
};
@@ -151,4 +203,54 @@ const selected = (data) => {
flex: auto;
}
}
+
+// 顶部筛选条件背景容器
+.filter-container {
+ padding: 16px 16px 6px 16px;
+ width: 100%;
+ border-radius: 16px;
+ text-align: left;
+ background: $color-fff;
+ // 搜索框样式
+ .search-container {
+ display: flex;
+ justify-content: center;
+ padding: 0 16px 0 0;
+ .search-box {
+ position: relative;
+ width: 100%;
+ max-width: 600px;
+ }
+ .search-input {
+ width: 100%;
+ padding: 10px;
+ border: 1px solid black;
+ border-radius: 14px;
+ font-size: 14px;
+ color: #333;
+ outline: none;
+ transition: border-color 0.3s;
+ }
+ .search-input:focus {
+ border-color: #409eff;
+ }
+ .search-input::placeholder {
+ color: #999;
+ }
+ .search-button {
+ position: absolute;
+ right: -10px;
+ top: 55%;
+ transform: translateY(-50%);
+ background: transparent;
+ border: none;
+ cursor: pointer;
+ padding: 4px;
+ color: #000;
+ }
+ .search-button:hover {
+ color: #409eff;
+ }
+ }
+}
diff --git a/sub-operation-service/src/views/farmingService/farmingConsult/index.vue b/sub-operation-service/src/views/farmingService/farmingConsult/index.vue
index 2a8bfdf..60e653e 100644
--- a/sub-operation-service/src/views/farmingService/farmingConsult/index.vue
+++ b/sub-operation-service/src/views/farmingService/farmingConsult/index.vue
@@ -92,7 +92,7 @@ const queryList = () => {
if (tableData.value[i].content.length > 80) {
tableData.value[i].content += '......';
}
- console.log(tableData.value[i].content, tableData.value[i].content.length);
+ // console.log(tableData.value[i].content, tableData.value[i].content.length);
}
}
});
diff --git a/sub-operation-service/src/views/shoppingCarts/components/leftMenu.vue b/sub-operation-service/src/views/shoppingCarts/components/leftMenu.vue
index cab4b07..a3e0266 100644
--- a/sub-operation-service/src/views/shoppingCarts/components/leftMenu.vue
+++ b/sub-operation-service/src/views/shoppingCarts/components/leftMenu.vue
@@ -2,7 +2,7 @@
{
+ router.push('/sub-operation-service/smartFarm/main');
+};
let currentIndex = ref(0);
diff --git a/sub-operation-service/src/views/shoppingCarts/components/userHeader.vue b/sub-operation-service/src/views/shoppingCarts/components/userHeader.vue
index 82ce71c..a364036 100644
--- a/sub-operation-service/src/views/shoppingCarts/components/userHeader.vue
+++ b/sub-operation-service/src/views/shoppingCarts/components/userHeader.vue
@@ -50,10 +50,22 @@ watch(
}
);
+import menuList from '@/layouts/component/header/menu.js';
+const meuns = ref(menuList);
+import { useMenuStore } from '@/store/modules/menuStore';
+const menuStore = useMenuStore();
const toLink = (item) => {
currentLink.value = item.name;
- if (item.path && item.path != '') {
+ if (item.name == 'home') {
+ menuStore.setMenuLabel('智慧种植');
+ menuStore.setMenuPath('/sub-operation-service/smartFarm');
router.push(item.path);
+ } else {
+ let obj = meuns.value.find((el) => el.name == item.name);
+ console.log('obj', obj);
+ menuStore.setMenuLabel(obj.label);
+ menuStore.setMenuPath(obj.path);
+ router.push(obj.path);
}
};
diff --git a/sub-operation-service/src/views/shoppingCarts/shoppingCarts.vue b/sub-operation-service/src/views/shoppingCarts/shoppingCarts.vue
index 6e54887..c09efcd 100644
--- a/sub-operation-service/src/views/shoppingCarts/shoppingCarts.vue
+++ b/sub-operation-service/src/views/shoppingCarts/shoppingCarts.vue
@@ -44,30 +44,32 @@
-
- ![]()
+ ![]()
-
- ![]()
-
-
-
-
{{ g.productName || '--' }}
+
+
-
+
+ ![]()
-
-
-
{{ g.netWeightInfoVO?.goodSpecs }}
- {{ (g.price * g.quantity).toFixed(2) }}
-
-
{
+ router.push('/sub-operation-service/smartFarm/main');
+};
+
let currentIndex = ref(0);
watch(
diff --git a/sub-operation-service/src/views/userCenter/components/userHeader.vue b/sub-operation-service/src/views/userCenter/components/userHeader.vue
index 82ce71c..a364036 100644
--- a/sub-operation-service/src/views/userCenter/components/userHeader.vue
+++ b/sub-operation-service/src/views/userCenter/components/userHeader.vue
@@ -50,10 +50,22 @@ watch(
}
);
+import menuList from '@/layouts/component/header/menu.js';
+const meuns = ref(menuList);
+import { useMenuStore } from '@/store/modules/menuStore';
+const menuStore = useMenuStore();
const toLink = (item) => {
currentLink.value = item.name;
- if (item.path && item.path != '') {
+ if (item.name == 'home') {
+ menuStore.setMenuLabel('智慧种植');
+ menuStore.setMenuPath('/sub-operation-service/smartFarm');
router.push(item.path);
+ } else {
+ let obj = meuns.value.find((el) => el.name == item.name);
+ console.log('obj', obj);
+ menuStore.setMenuLabel(obj.label);
+ menuStore.setMenuPath(obj.path);
+ router.push(obj.path);
}
};
diff --git a/sub-operation-service/src/views/userCenter/userOrders.vue b/sub-operation-service/src/views/userCenter/userOrders.vue
index 19ba984..30389d8 100644
--- a/sub-operation-service/src/views/userCenter/userOrders.vue
+++ b/sub-operation-service/src/views/userCenter/userOrders.vue
@@ -37,7 +37,7 @@
-
-
- {{ g.unit }}
-
-
-
+
+
@@ -170,6 +172,16 @@ const pagination = (value) => {
});
};
+const jumpType = ref('1'); //这个需要在商品详情中添加商品的类型，1为农资，2为农产品
+const goDetail = (item, indexg) => {
+ console.log(item, indexg);
+ if (jumpType.value === 2) {
+ router.push('/sub-operation-service/ecommerce-supplier/detail?id=' + item.productId + '&type=' + 2);
+ } else {
+ router.push('/sub-operation-service/ecommerce-agricultural/ecommerce-agriculturalDetail?id=' + item.productId + '&type=' + 1);
+ }
+};
+
function addIsCheckProperty(data) {
if (!data) return;
@@ -584,6 +596,11 @@ function removeCheckedItems(data) {
width: 100%;
gap: 16px;
}
+ .good-row-info {
+ flex: 1;
+ display: flex;
+ gap: 16px;
+ }
.good-do,
.good-img,
.good-info,
@@ -630,7 +647,7 @@ function removeCheckedItems(data) {
}
.price {
font-weight: 400;
- width: 200px;
+ width: 180px;
}
.total {
font-weight: 700;
diff --git a/sub-operation-service/src/views/userCenter/components/leftMenu.vue b/sub-operation-service/src/views/userCenter/components/leftMenu.vue
index ab3696e..b2f9240 100644
--- a/sub-operation-service/src/views/userCenter/components/leftMenu.vue
+++ b/sub-operation-service/src/views/userCenter/components/leftMenu.vue
@@ -2,7 +2,7 @@
+
- {{ g.productName || '--' }}
- 删除
+
+
+
+
{{ g.netWeightInfoVO?.goodSpecs }}
+ {{ (g.price * g.quantity).toFixed(2) }}
+
+
+
+
+
+
+
+
+ 删除
+
- ![]()
+ ![]()
-
+
![]()