-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
@@ -204,16 +135,18 @@
diff --git a/sub-operation-service/src/views/ecommerce/purchaser.vue b/sub-operation-service/src/views/ecommerce/purchaser.vue
index 81805a5..2820323 100644
--- a/sub-operation-service/src/views/ecommerce/purchaser.vue
+++ b/sub-operation-service/src/views/ecommerce/purchaser.vue
@@ -74,53 +74,69 @@ const route = useRoute();
const router = useRouter();
let treeList = reactive([
+ {
+ id: '03',
+ name: '水果',
+ children: [
+ {
+ parentId: '03',
+ id: '0301',
+ name: '甘蔗',
+ children: [],
+ },
+ ],
+ },
+ {
+ id: '02',
+ name: '中药材',
+ children: [
+ {
+ parentId: '02',
+ id: '0201',
+ name: '石斛',
+ children: [],
+ },
+ ],
+ },
{
id: '01',
- name: '农产品',
+ name: '蔬菜',
children: [
{
parentId: '01',
id: '0101',
- name: '植物性农产品',
- children: [
- { parentId: '0101', id: '010101', name: '谷物' },
- { parentId: '0101', id: '010102', name: '蔬菜' },
- { parentId: '0101', id: '010103', name: '水果' },
- { parentId: '0101', id: '010104', name: '坚果与油料作物' },
- { parentId: '0101', id: '010105', name: '糖料作物' },
- { parentId: '0101', id: '010106', name: '纤维作物' },
- { parentId: '0101', id: '010107', name: '茶叶' },
- { parentId: '0101', id: '010108', name: '咖啡' },
- { parentId: '0101', id: '010109', name: '香料' },
- ],
+ name: '豆菜类',
+ children: [],
},
{
parentId: '01',
id: '0102',
- name: '动物性农产品',
- children: [
- { parentId: '0102', id: '010201', name: '肉类' },
- { parentId: '0102', id: '010202', name: '奶制品' },
- { parentId: '0102', id: '010203', name: '蛋类' },
- { parentId: '0102', id: '010204', name: '蜂蜜' },
- { parentId: '0102', id: '010205', name: '水产品' },
- ],
+ name: '根茎菜类',
+ children: [],
},
{
parentId: '01',
id: '0103',
- name: '特殊农产品',
- children: [
- { parentId: '0103', id: '010301', name: '花卉与苗木' },
- { parentId: '0103', id: '010302', name: '药材' },
- { parentId: '0103', id: '010303', name: '菌类' },
- ],
+ name: '叶菜类',
+ children: [],
},
{
parentId: '01',
id: '0104',
- name: '其他',
- children: [{ parentId: '0104', id: '010401', name: '饲料' }],
+ name: '茄果菜类',
+ children: [],
+ },
+ {
+ parentId: '01',
+ id: '0105',
+ name: '葱姜蒜类',
+ children: [],
+ },
+ {
+ parentId: '01',
+ id: '0106',
+ name: '食用菌',
+ children: [],
},
],
},
@@ -168,14 +184,15 @@ let filter = ref({
});
let tableData = reactive([
- { id: '01', title: '西红柿', region: '耿马镇', buyer: '盛源农业', buyNum: 5000, time: '2025-04-02 12:25:36' },
- { id: '02', title: '白菜', region: '孟定镇', buyer: '星悦农业', buyNum: 6000, time: '2025-04-01 12:25:36' },
- { id: '03', title: '西蓝花', region: '孟勇镇', buyer: '盛源农业', buyNum: 7000, time: '2025-04-02 13:25:36' },
- { id: '04', title: '鸡蛋', region: '勐简乡', buyer: '上好佳农业', buyNum: 8000, time: '2025-04-02 12:25:36' },
- { id: '05', title: '牛肉', region: '四排山乡', buyer: '尚嘉农业', buyNum: 5000, time: '2025-03-31 12:25:36' },
- { id: '06', title: '氮肥', region: '大兴乡', buyer: '信誉农资', buyNum: 6000, time: '2025-04-02 12:25:36' },
- { id: '07', title: '白菜种子', region: '贺派乡', buyer: '佳佳农业', buyNum: 5000, time: '2025-04-02 12:25:36' },
- { id: '08', title: '西红柿种子', region: '勐撒镇', buyer: '佳佳农业', buyNum: 8000, time: '2025-04-02 12:25:36' },
+ { id: '01', title: '西红柿', region: '耿马镇', buyer: '盛源农业', buyNum: 870, time: '2025-04-02 12:25:36' },
+ { id: '02', title: '大米', region: '孟定镇', buyer: '天辰大米', buyNum: 1000, time: '2025-04-01 12:25:36' },
+ { id: '03', title: '黄瓜', region: '孟勇镇', buyer: '盛源农业', buyNum: 2000, time: '2025-04-02 13:25:36' },
+ { id: '04', title: '苹果', region: '勐简乡', buyer: '桂香浓云加工', buyNum: 1800, time: '2025-04-02 12:25:36' },
+ { id: '05', title: '小葱', region: '四排山乡', buyer: '横鲜农工', buyNum: 380, time: '2025-03-31 12:25:36' },
+ { id: '06', title: '豇豆', region: '大兴乡', buyer: '绿康农产', buyNum: 1570, time: '2025-04-02 12:25:36' },
+ { id: '07', title: '大蒜', region: '贺派乡', buyer: '丰瑞农产加工', buyNum: 875, time: '2025-04-02 12:25:36' },
+ { id: '08', title: '毛荔枝', region: '勐撒镇', buyer: '绿康农业', buyNum: 1570, time: '2025-04-02 12:25:36' },
+ { id: '09', title: '毛荔枝', region: '大兴乡', buyer: '丰瑞农产加工', buyNum: 875, time: '2025-04-02 12:25:36' },
]);
const rowClick = (data) => {
@@ -192,7 +209,7 @@ const handleUpdate = (data) => {
onMounted(() => {
console.info('onMounted');
getTree();
- getTreeList();
+ // getTreeList();
});
diff --git a/sub-operation-service/src/views/packaging/index.vue b/sub-operation-service/src/views/packaging/index.vue
index 8626435..460137b 100644
--- a/sub-operation-service/src/views/packaging/index.vue
+++ b/sub-operation-service/src/views/packaging/index.vue
@@ -1,19 +1,475 @@
-
+
+
+
+ 首选商家:
+ {{ diodescription }}
+
+
+ 选择服务:
+ {{ diotext }}
+
+
+
+
+
+
+ kg
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
塑料类包装
+
+ {{ item }}
+
+
+
+
纸类包装
+
+ {{ item }}
+
+
+
+
金属类包装
+
+ {{ item }}
+
+
+
+
+
+
+
+
+
+
![]()
+
+
{{ item.title }}
+
+
{{ item.description }}
+
![]()
+
![]()
+
+
+ 高品质
+ 食品级
+ 塑料
+
+
+
+ {{ item.location }}
+
+
+
+
+
+ 报价
+ ¥{{ item.price }}/m
+
+
+
+ 联系卖家
+
+
+
+
+
![]()
+
+
+
+
+
+
+
+
+
+
+
+// 弹窗整体样式
+:deep(.custom-inquiry-dialog) {
+ border-radius: 8px;
+ box-shadow: 0 4px 12px rgba(0, 0, 0, 0.15);
+
+ .el-dialog__header {
+ padding: 20px;
+ border-bottom: 1px solid #f2f6fc;
+ .el-dialog__title {
+ font-size: 18px;
+ color: $text-dark;
+ font-weight: 600;
+ }
+ }
+
+ .el-dialog__body {
+ padding: 20px 28px;
+ }
+
+ .el-form-item__label {
+ color: $text-regular;
+ font-size: 14px;
+ padding-bottom: 6px;
+ }
+}
+
+.info-section {
+ padding: 0px 50px;
+ margin-bottom: 24px;
+ .info-item {
+ margin-bottom: 12px;
+ .label {
+ color: $text-regular;
+ margin-right: 8px;
+ font-size: 20px;
+ }
+ .value {
+ color: $text-dark;
+ font-weight: 500;
+ font-size: 20px;
+ }
+ }
+}
+
+// 输入框样式覆盖
+:deep(.el-input) {
+ .el-input__inner {
+ height: 40px;
+ line-height: 40px;
+ border-radius: 4px;
+ &:focus {
+ border-color: $primary-color;
+ }
+ }
+ .el-input__suffix {
+ color: $text-regular;
+ right: 12px;
+ }
+}
+
+// 下拉菜单样式
+:deep(.custom-select-dropdown) {
+ .el-select-dropdown__item {
+ color: $text-regular;
+ &.selected {
+ color: $primary-color;
+ }
+ }
+}
+
+// 按钮组样式
+.dialog-footer {
+ text-align: right;
+ .el-button {
+ padding: 10px 24px;
+ border-radius: 4px;
+ font-size: 14px;
+ }
+ .cancel-btn {
+ color: $text-regular;
+ &:hover {
+ color: $primary-color;
+ border-color: $primary-color;
+ }
+ }
+ .submit-btn {
+ color: #fff;
+ background: $primary-color;
+ &:hover {
+ background: mix($primary-color, #fff, 85%);
+ }
+ }
+}
+.tabs {
+ height: 160px;
+ line-height: 50px;
+ display: flex;
+ flex-direction: column;
+ font-size: 18px;
+ align-items: flex-start;
+ justify-content: space-between;
+ padding: 0 20px;
+}
+.tab {
+ height: 100px;
+ width: 850px;
+ display: flex;
+ align-items: center;
+ justify-content: flex-start;
+ overflow-x: auto;
+ overflow: auto; /* 启用滚动 */
+ white-space: nowrap; /* 强制单行显示 */
+ -ms-overflow-style: none; /* IE/Edge 兼容 */
+ scrollbar-width: none; /* 隐藏滚动条 */
+ .tab_list {
+ color: #999999;
+ font-size: 20px;
+ font-weight: 400;
+ }
+ .tab_list_li {
+ margin-left: 40px;
+ color: #000000;
+ font-size: 20px;
+ font-weight: 400;
+ }
+ .tab_list_li.active {
+ color: rgba(37, 191, 130, 1);
+ }
+}
+.cursor {
+ cursor: pointer;
+}
+.active {
+ color: rgba(37, 191, 130, 1);
+}
+.storage-card {
+ position: relative;
+ overflow: hidden;
+ margin-bottom: 20px;
+ border: 0;
+ border-radius: 24px;
+}
+.storage-content {
+ @include flex-column;
+
+ gap: 16px;
+ &-top {
+ @include flex-row;
+
+ align-items: center;
+ }
+}
+.storage-image {
+ margin-right: 16px;
+ width: 120px;
+ height: 120px;
+ border-radius: 8px;
+ object-fit: cover;
+}
+.storage-info {
+ padding-right: 50px;
+ flex: 1;
+ cursor: pointer;
+}
+.storage-title,
+.storage-desc,
+.storage-tags,
+.storage-location {
+ overflow: hidden;
+ margin: 10px 0;
+ width: 100%;
+ text-align: left;
+}
+.storage-title {
+ font-size: 20px;
+ font-weight: 700;
+ color: #000000;
+ @include ellipsis;
+}
+.storage-desc {
+ font-size: 16px;
+ color: #999999;
+ @include ellipsis;
+ i {
+ display: inline-block;
+ width: 20px;
+ height: 20px;
+ }
+}
+.storage-tags {
+ span {
+ margin-right: 10px;
+ }
+}
+.storage-location {
+ display: flex;
+ align-items: center;
+ font-size: 16px;
+ font-weight: 400;
+ color: #000000;
+}
+.storage-price {
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+ &-left {
+ color: #25bf82;
+ }
+}
+.price-label {
+ margin-right: 10px;
+ font-size: 16px;
+ color: #999999;
+}
+.price-amount {
+ font-size: 20px;
+ font-weight: 700;
+ color: #25bf82;
+}
+.contact-btn {
+ width: 152px;
+ height: 48px;
+ font-size: 20px;
+ border-radius: 8px;
+ background: #25bf82 !important;
+ :deep(.el-icon) {
+ margin-right: 10px;
+ }
+}
+.rank-badge {
+ position: absolute;
+ top: 0;
+ right: 20px;
+ width: 80px;
+ height: 80px;
+}
+
diff --git a/sub-operation-service/src/views/packaging/sorting.vue b/sub-operation-service/src/views/packaging/sorting.vue
index 1583740..1c7edc2 100644
--- a/sub-operation-service/src/views/packaging/sorting.vue
+++ b/sub-operation-service/src/views/packaging/sorting.vue
@@ -1,16 +1,88 @@
+
+
+
+ 首选商家:
+ {{ diodescription }}
+
+
+ 选择服务:
+ {{ diotext }}
+
+
+
+
+
+
+ kg
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
仓储分类
-
普通仓库
-
恒温仓库
-
冷库
-
气调仓库
-
+
+
蔬菜分拣
+
+ {{ item }}
+
+
+
+
水果分拣
+
+ {{ item }}
+
+
+
@@ -18,7 +90,7 @@
-
+
{{ item.title }}
@@ -27,8 +99,9 @@
- 延长仓储
- 保鲜储存
+ 高品质
+ 杀菌灭毒
+ 绿色
@@ -39,9 +112,9 @@
报价
- ¥{{ item.price }}/间/月
+ ¥{{ item.price }}/kg
-
+
联系卖家
@@ -54,7 +127,7 @@
-
+
@@ -69,6 +142,9 @@ import Common from './components/common.vue';
const route = useRoute();
const router = useRouter();
+const tab1 = reactive(['叶菜类', '豆菜类', '根茎类', '茄果菜类', '食用菌类', '其他类蔬菜']);
+const tab2 = reactive(['甘蔗', '热带水果', '其他类水果']);
+const tab3 = reactive(['水产', '其他类']);
const state = reactive({
menus: warehouseLogisticsRoutes[0].children,
query: {
@@ -76,78 +152,227 @@ const state = reactive({
},
data: [
{
- imageUrl: '/storage1.jpg',
- title: '果蔬保鲜仓储',
- description: '绿鲜蔬选果蔬仓储中心 ',
+ title: '蔬菜分拣服务',
+ description: '绿鲜甄选蔬菜分拣中心 ',
location: '临沧市-耿马县',
- price: '600.0',
+ price: '150',
rank: '1',
+ imageUrl: 'images/vegetable.png',
},
{
- imageUrl: '/storage2.jpg',
- title: '果蔬保鲜仓储',
- description: '绿鲜蔬选果蔬仓储中心',
+ title: '水果分拣服务',
+ description: '果韵鲜享分拣站',
location: '临沧市-耿马县',
- price: '600.0',
+ price: '150',
rank: '2',
+ imageUrl: 'images/fruit.png',
},
{
- imageUrl: '/storage3.jpg',
- title: '果蔬保鲜仓储',
- description: '绿鲜蔬选果蔬仓储中心 ',
+ title: '水果分拣服务',
+ description: '好果分拣站 ',
location: '临沧市-耿马县',
- price: '600.0',
+ price: '150',
rank: '3',
+ imageUrl: 'images/fruit.png',
},
{
- imageUrl: '/storage3.jpg',
- title: '果蔬保鲜仓储',
- description: '绿鲜蔬选果蔬仓储中心 ',
+ title: '水果分拣服务',
+ description: '果美分拣站 ',
location: '临沧市-耿马县',
- price: '600.0',
+ price: '150',
rank: '',
+ imageUrl: 'images/fruit.png',
},
{
- imageUrl: '/storage3.jpg',
- title: '果蔬保鲜仓储',
- description: '绿鲜蔬选果蔬仓储中心 ',
+ title: '水果分拣服务',
+ description: '好果存分拣站 ',
location: '临沧市-耿马县',
- price: '600.0',
- rank: '',
- },
- {
- imageUrl: '/storage3.jpg',
- title: '果蔬保鲜仓储',
- description: '绿鲜蔬选果蔬仓储中心 ',
- location: '临沧市-耿马县',
- price: '600.0',
+ price: '150',
rank: '',
+ imageUrl: 'images/fruit.png',
},
],
});
-const currentTab = ref(0);
+const currentTab1 = ref(0);
+const currentTab2 = ref(0);
+const currentTab3 = ref(0);
+const dialogVisible = ref(false);
+const formRef = ref(null);
+
+const form = reactive({
+ quantity: '',
+ title: '',
+ phone: '',
+ name: '',
+});
+
+const diotext = ref('');
+const diodescription = ref('');
+
+const goDei = (data) => {
+ diodescription.value = data.description;
+ diotext.value = data.title;
+ dialogVisible.value = true;
+};
+
+const handleSubmit = () => {
+ formRef.value.validate((valid) => {
+ if (valid) {
+ console.log('提交数据:', form);
+ dialogVisible.value = false;
+ }
+ });
+};
const currentChange = (current) => {
state.query.current = current;
};
const toLink = (row) => {
+ row.data = ['高品质', '杀菌灭毒', '绿色'];
router.push({
- path: '/sub-operation-service/warehouse-detail',
- query: { id: row?.id ?? '100' },
+ path: '/sub-operation-service/packaging/details',
+ query: row,
});
};
diff --git a/sub-operation-service/src/views/userCenter/components/leftMenu.vue b/sub-operation-service/src/views/userCenter/components/leftMenu.vue
index dd85883..d1f2552 100644
--- a/sub-operation-service/src/views/userCenter/components/leftMenu.vue
+++ b/sub-operation-service/src/views/userCenter/components/leftMenu.vue
@@ -34,8 +34,10 @@ const leftMenu = reactive([
{ name: 'agricultural', title: '我的购物车', icon: 'menu1.png', path: '/sub-operation-service/userCenter' },
{ name: 'supplier', title: '我的订单', icon: 'menu2-1.png', path: '/sub-operation-service/userOrders' },
// { name: 'purchaser', title: '我的土地', icon: 'menu3-1.png', path: '/sub-operation-service/userLands' },
- { name: 'mySource', title: '我的溯源', icon: 'menu3-1.png', path: '/sub-operation-service/mySource' },
- { name: 'myFinance', title: '我的金融', icon: 'menu3-1.png', path: '/sub-operation-service/myFinance' },
+ { name: 'mySource', title: '我的溯源', icon: 'menu4-1.png', path: '/sub-operation-service/mySource' },
+ // { name: 'myFinance', title: '我的金融', icon: 'menu5-1.png', path: '/sub-operation-service/myFinance' },
+ { name: 'myBrand', title: '我的品牌', icon: 'menu6-1.png', path: '/sub-operation-service/myBrand' },
+ { name: 'addressList', title: '我的地址', icon: 'menu7-1.png', path: '/sub-operation-service/addressList' },
]);
let currentIndex = ref(0);
@@ -114,15 +116,20 @@ const toLink = (n, index) => {
}
.item-img {
display: inline-block;
- width: 32px;
- height: 32px;
+ width: 40px;
+ height: 40px;
+ img {
+ width: 100%;
+ height: auto;
+ display: block;
+ }
}
.item-title {
display: -webkit-inline-box;
font-size: 20px;
font-weight: 400;
line-height: 40px;
- padding-left: 20px;
+ padding-left: 10px;
}
}
}
diff --git a/sub-operation-service/src/views/userCenter/components/tableComponent.vue b/sub-operation-service/src/views/userCenter/components/tableComponent.vue
index 03b63cc..6b10cc7 100644
--- a/sub-operation-service/src/views/userCenter/components/tableComponent.vue
+++ b/sub-operation-service/src/views/userCenter/components/tableComponent.vue
@@ -29,7 +29,7 @@
:prop="column.prop"
:label="column.label"
:width="column.width"
- :align="column.align || 'center'"
+ :align="column.align || 'left'"
:sortable="column.sortable"
:header-class-name="column.headerClassName"
>
diff --git a/sub-operation-service/src/views/userCenter/myBrand.vue b/sub-operation-service/src/views/userCenter/myBrand.vue
new file mode 100644
index 0000000..89587e8
--- /dev/null
+++ b/sub-operation-service/src/views/userCenter/myBrand.vue
@@ -0,0 +1,410 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ -
+
+
+
+
+
+
+
+ 查询
+ 重置
+
+
+
+
+
+
+
+
+ 审核中
+ 已通过
+ 审核驳回
+ 已失效
+
+
+
+
+ 无法使用
+ 正常通过
+ 暂未使用
+
+
+
+
+
+
+
+
+
+
+ Action 1
+ Action 2
+ Action 3
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/sub-operation-service/src/views/userCenter/myFinance.vue b/sub-operation-service/src/views/userCenter/myFinance.vue
index 8e41880..d2bc72f 100644
--- a/sub-operation-service/src/views/userCenter/myFinance.vue
+++ b/sub-operation-service/src/views/userCenter/myFinance.vue
@@ -1,6 +1,6 @@
-
+
@@ -23,11 +23,13 @@
-
-
+
+
-
-
+
+
+
+
@@ -59,10 +61,11 @@
@selection-change="handleSelectionChange"
>
-
-
- {{ slotProps.row.status === 1 ? '已通过' : '已申请' }}
-
+
+ 未申请
+ 已申请
+ 已通过
+ 未通过
@@ -98,7 +101,7 @@ const formInline = reactive({
productName: '',
applicant: '',
guarantor: '',
- status: '99',
+ applyStatus: '99',
startDate: '',
endDate: '',
});
@@ -111,6 +114,11 @@ let bottomList = reactive([
]);
const tabChange = () => {
console.log(activeCurrent.value);
+ if (activeCurrent.value == '3') {
+ columns.value = columns2.value;
+ } else {
+ columns.value = columns1.value;
+ }
};
const searchForm = ref(null);
@@ -124,12 +132,19 @@ const resetForm = () => {
// 表格数据
const tableData = ref([]);
// 列配置
-const columns = ref([
- { prop: 'id', label: 'ID', width: '80' },
+const columns = ref([]);
+const columns1 = ref([
+ { prop: 'productName', label: '产品名称' },
+ { prop: 'applicant', label: '申请人' },
+ { prop: 'applyStatus', label: '申请状态', slotName: 'applyStatus' },
+ { prop: 'applyTime', label: '申请日期', width: '180px' },
+ { prop: 'action', label: '操作', slotName: 'action', width: '180' },
+]);
+const columns2 = ref([
{ prop: 'productName', label: '产品名称' },
{ prop: 'guarantor', label: '担保人' },
{ prop: 'applicant', label: '申请人' },
- { prop: 'status', label: '申请状态', slotName: 'status' },
+ { prop: 'applyStatus', label: '申请状态', slotName: 'applyStatus' },
{ prop: 'applyTime', label: '申请日期', width: '180px' },
{ prop: 'action', label: '操作', slotName: 'action', width: '180' },
]);
@@ -141,8 +156,8 @@ const generateMockData = () => {
'id|+1': 1,
productName: '惠农e贷', //产品名称 水果 蔬菜
applyTime: '@datetime',
- 'status|1': [1, 1, 1, 0], //0待检测 1已检测
- guarantor: '@cname',
+ 'applyStatus|1': [0, 1, 2, 3], //0未申请 1已申请 2已通过 3未通过
+ guarantor: '惠农有限公司',
applicant: '@cname',
},
],
@@ -199,6 +214,7 @@ const calculateTableHeight = () => {
};
// 组件挂载时加载数据
onMounted(() => {
+ columns.value = columns1.value;
loadData();
calculateTableHeight();
@@ -389,5 +405,18 @@ onBeforeUnmount(() => {
cursor: pointer;
transition: all 0.3s;
}
+ // 表格中文本的颜色
+ .color-gray {
+ color: $color-5a;
+ }
+ .color-orange {
+ color: $color-warning;
+ }
+ .color-green {
+ color: $color-success;
+ }
+ .color-red {
+ color: $color-danger;
+ }
}
diff --git a/sub-operation-service/src/views/userCenter/mySource.vue b/sub-operation-service/src/views/userCenter/mySource.vue
index a6c5a50..81e57fa 100644
--- a/sub-operation-service/src/views/userCenter/mySource.vue
+++ b/sub-operation-service/src/views/userCenter/mySource.vue
@@ -1,6 +1,6 @@
-
+
@@ -50,9 +50,8 @@
>
-
- {{ slotProps.row.status === 1 ? '已检测' : '待检测' }}
-
+ 待检测
+ 已检测
@@ -154,7 +153,6 @@ const resetForm = () => {
const tableData = ref([]);
// 列配置
const columns = ref([
- { prop: 'id', label: 'ID', width: '80' },
{ prop: 'productName', label: '产品名称', width: '180px' },
{ prop: 'applyTime', label: '申请时间', width: '180px' },
{ prop: 'status', label: '申请状态', slotName: 'status' },
@@ -205,7 +203,6 @@ const handleSelectionChange = (selection) => {
let nowClickRow = ref(null);
const dialogVisible = ref(false);
let codeUrl = ref('');
-codeUrl.value = getAssetsFile('images/userCenter/检测报告.png').href ?? '';
// 编辑操作
const handleEdit = (row, num) => {
nowClickRow.value = row;
@@ -223,7 +220,7 @@ const seeReportImg = (row) => {
if (row.reportUrl) {
// 支持相对路径处理
// const imgUrl = row.reportUrl.startsWith('http') ? row.reportUrl : `${import.meta.env.VITE_API_BASE}${row.reportUrl}`;
- const imgUrl = codeUrl.value;
+ const imgUrl = getAssetsFile('images/userCenter/检测报告.png').href ?? '';
previewImageUrl.value = imgUrl;
showPreview.value = true;
@@ -484,5 +481,15 @@ onBeforeUnmount(() => {
cursor: pointer;
transition: all 0.3s;
}
+ // 表格中文本的颜色
+ .color-gray {
+ color: $color-5a;
+ }
+ .color-green {
+ color: $color-success;
+ }
+ .color-red {
+ color: $color-danger;
+ }
}
diff --git a/sub-operation-service/src/views/userCenter/orderDetails.vue b/sub-operation-service/src/views/userCenter/orderDetails.vue
new file mode 100644
index 0000000..c99e641
--- /dev/null
+++ b/sub-operation-service/src/views/userCenter/orderDetails.vue
@@ -0,0 +1,615 @@
+
+
+
+
+
+
+
+
+
+
订单信息
+
+
订单编号:{{ datalist[0]?.orderNo }}
+
创建时间:{{ datalist[0]?.orderNo }}
+
支付时间:{{ datalist[0]?.orderNo }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
{{ g.productName || '--' }}
+
+
+
+
+
{{ g.unitPrice }} / {{ g.unit }}
+
{{ g.unitPrice }}
+
+
+
+
+ {{ g.unit }}
+
+
+
+
+
+ {{ (g.unitPrice * g.quantity).toFixed(2) }}
+
+
+
+
+
+
+
+
+
+
+ 共
+ {{ totalNum }}件商品
+
+
+
+ 商品总价:
+ {{ totalAmout.toFixed(2) }}
+
+
+ 运费:
+ {{ carriage.toFixed(2) }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/sub-operation-service/src/views/userCenter/orderSuccess.vue b/sub-operation-service/src/views/userCenter/orderSuccess.vue
index f68f304..59f7458 100644
--- a/sub-operation-service/src/views/userCenter/orderSuccess.vue
+++ b/sub-operation-service/src/views/userCenter/orderSuccess.vue
@@ -64,7 +64,7 @@
{{ currentIndex > -1 ? styleList[currentIndex].title + '扫码' : '扫码' }},支付
-
{{ payAmout.toFixed(2) }}
+
{{ totalAmout.toFixed(2) }}
@@ -82,22 +82,55 @@
+
diff --git a/sub-operation-service/src/views/warehouseLogistics/logistics/index.vue b/sub-operation-service/src/views/warehouseLogistics/logistics/index.vue
index a848ceb..55a9c47 100644
--- a/sub-operation-service/src/views/warehouseLogistics/logistics/index.vue
+++ b/sub-operation-service/src/views/warehouseLogistics/logistics/index.vue
@@ -1,18 +1,460 @@
- 物流
+
+
+
+
+
农产品类型
+
+ 粮食作物物流
+
+
+ 经济作物物流
+
+
+ 果蔬物流
+
+
+ 畜牧产品物流
+
+
+ 水产品物流
+
+
+
+
运输方式
+
+ 公路
+
+
+ 铁路
+
+
+ 水路
+
+
+ 航空
+
+
+
+
+
+
+
+
+
+
![]()
+
+
{{ item.name }}
+
+
{{ item.parentTitle }}
+
![]()
+
![]()
+
+
+
+ {{ tags }}
+
+
+
+
+ {{ item.address }}
+
+
+
+
+
+ 报价
+ ¥{{ item.price }}/{{ item.priceSpec === 1 ? 'kg' : item.priceSpec === 2 ? '件' : item.priceSpec === 3 ? 'm³' : '' }}
+
+
+
+
+ 联系卖家
+
+
+
+
![]()
+
+
+
+
+
+
+
+
+
+
+ {{ state.query.current.parentTitle }}
+
+
+ {{ state.query.current.name }}
+
+
+
+ kg
+
+
+
+
+
+ 先生
+ 女士
+
+
+
+
+
+
+
+
+
+
+
-
-
-
+
diff --git a/sub-operation-service/src/views/warehouseLogistics/warehouse/detail.vue b/sub-operation-service/src/views/warehouseLogistics/warehouse/detail.vue
index d0dd3e6..9eb1011 100644
--- a/sub-operation-service/src/views/warehouseLogistics/warehouse/detail.vue
+++ b/sub-operation-service/src/views/warehouseLogistics/warehouse/detail.vue
@@ -1,19 +1,341 @@
- 详情123
+
+
+
+
+
+
+
+
+
+
![]()
+
+
+
{{ state.data.name }}
+
+
{{ state.data.parentTitle }}
+
![]()
+
![]()
+
+
+
+ {{ tags }}
+
+
+
+
联系人:{{ state.data.contactName }}
+
联系电话:{{ state.data.contactPhone }}
+
+ {{ state.data.address }}
+
+
+
+
+ 报价:
+
+ ¥{{ state.data.price }}/{{
+ state.data.priceSpec === 1 ? 'm³' : state.data.priceSpec === 2 ? '间' : state.data.priceSpec === 3 ? '㎡' : ''
+ }}/{{ state.data.timeSpec === 1 ? '天' : state.data.timeSpec === 2 ? '月' : state.data.timeSpec === 3 ? '年' : '' }}
+
+
+
+
+
+ 留下信息
+
+
+
+
+
+
+
+
+
+
-
-
+
diff --git a/sub-operation-service/src/views/warehouseLogistics/warehouse/index.vue b/sub-operation-service/src/views/warehouseLogistics/warehouse/index.vue
index 7e957d7..8dad955 100644
--- a/sub-operation-service/src/views/warehouseLogistics/warehouse/index.vue
+++ b/sub-operation-service/src/views/warehouseLogistics/warehouse/index.vue
@@ -5,11 +5,29 @@
-
仓储分类({{ data.title }})
-
普通仓库
-
恒温仓库
-
冷库
-
气调仓库
+
仓储分类
+
+ 普通仓库
+
+
+
+ 冷库
+
+
@@ -18,55 +36,111 @@
-
+
-
{{ item.title }}
+
{{ item.name }}
-
{{ item.description }}
+
{{ item.parentTitle }}
- 延长仓储
- 保鲜储存
+
+ {{ tags }}
+
+
- {{ item.location }}
+ {{ item.address }}
报价
- ¥{{ item.price }}/间/月
+ ¥{{ item.price }}/{{ item.priceSpec === 1 ? 'm³' : item.priceSpec === 2 ? '间' : item.priceSpec === 3 ? '㎡' : '' }}/{{
+ item.timeSpec === 1 ? '天' : item.timeSpec === 2 ? '月' : item.timeSpec === 3 ? '年' : ''
+ }}
+
-
+
联系卖家
-
-
-
![]()
+
+
+
-
+
+
+
+ {{ state.query.current.parentTitle }}
+
+
+ {{ state.query.current.name }}
+
+
+
+ kg
+
+
+
+
+
+ 先生
+ 女士
+
+
+
+
+
+
+
+
+
+
-