From 4d837466d0c8f96ddd10a014cb290506e3e5ba6f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BB=96=E5=BE=B7=E4=BA=91?= Date: Tue, 9 Dec 2025 00:29:39 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8D=95=E4=BD=8D=E5=8A=A0?= =?UTF-8?q?=E8=BD=BD=EF=BC=8C=E5=8A=A0=E5=B0=8F=E7=A8=8B=E5=BA=8F=E5=85=BC?= =?UTF-8?q?=E5=AE=B9=EF=BC=8C=E6=9C=AA=E6=88=90=E5=8A=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/unitConverter/sysUnitConverter.js | 15 + src/config.js | 2 +- src/pages.json | 12 +- src/pages/index.vue | 83 +- src/pages_geek/pages/index/index.vue | 22 +- src/pages_mine/pages/about/index.vue | 4 +- .../components/card-swiper/card-swiper.vue | 6 +- src/pages_template/pages/comment/index.vue | 2 +- .../pages/coupon/components/taobao-coupon.vue | 2 +- src/pages_template/pages/login/index2.vue | 2 +- src/static/caltools/DpMeter.jpg | Bin 7974 -> 0 bytes src/static/favicon.ico | Bin 16958 -> 0 bytes src/static/images/banner/banner01.jpg | Bin 39640 -> 0 bytes src/static/images/banner/banner02.jpg | Bin 37061 -> 0 bytes src/static/images/banner/banner03.jpg | Bin 38123 -> 0 bytes src/static/images/icon/dialogue.png | Bin 4846 -> 0 bytes src/static/images/icon/knowledge.png | Bin 4372 -> 0 bytes src/static/images/icon/message.png | Bin 4338 -> 0 bytes src/static/images/icon/phone.png | Bin 5320 -> 0 bytes src/static/images/icon/rocket.png | Bin 5530 -> 0 bytes src/static/images/profile.jpg | Bin 81131 -> 0 bytes src/static/logo.png | Bin 30284 -> 0 bytes src/store/modules/unitData.ts | 373 +++++++++ src/store/modules/user.ts | 6 +- .../a-yjly-inputunit/a-yjly-inputunit.vue | 750 +++++++++--------- 25 files changed, 794 insertions(+), 485 deletions(-) delete mode 100644 src/static/caltools/DpMeter.jpg delete mode 100644 src/static/favicon.ico delete mode 100644 src/static/images/banner/banner01.jpg delete mode 100644 src/static/images/banner/banner02.jpg delete mode 100644 src/static/images/banner/banner03.jpg delete mode 100644 src/static/images/icon/dialogue.png delete mode 100644 src/static/images/icon/knowledge.png delete mode 100644 src/static/images/icon/message.png delete mode 100644 src/static/images/icon/phone.png delete mode 100644 src/static/images/icon/rocket.png delete mode 100644 src/static/images/profile.jpg delete mode 100644 src/static/logo.png create mode 100644 src/store/modules/unitData.ts diff --git a/src/api/system/unitConverter/sysUnitConverter.js b/src/api/system/unitConverter/sysUnitConverter.js index b5187f2..de425f6 100644 --- a/src/api/system/unitConverter/sysUnitConverter.js +++ b/src/api/system/unitConverter/sysUnitConverter.js @@ -4,6 +4,9 @@ import request from '@/utils/request' export function listConvert(query) { return request({ url: '/system/convert/list', + headers: { + isToken: false + }, method: 'get', params: query }) @@ -13,6 +16,9 @@ export function listConvert(query) { export function getConvert(id) { return request({ url: '/system/convert/' + id, + headers: { + isToken: false + }, method: 'get' }) } @@ -21,6 +27,9 @@ export function getConvert(id) { export function addConvert(data) { return request({ url: '/system/convert', + headers: { + isToken: false + }, method: 'post', data: data }) @@ -30,6 +39,9 @@ export function addConvert(data) { export function updateConvert(data) { return request({ url: '/system/convert', + headers: { + isToken: false + }, method: 'put', data: data }) @@ -39,6 +51,9 @@ export function updateConvert(data) { export function delConvert(id) { return request({ url: '/system/convert/' + id, + headers: { + isToken: false + }, method: 'delete' }) } diff --git a/src/config.js b/src/config.js index ef7d21f..699f306 100644 --- a/src/config.js +++ b/src/config.js @@ -11,7 +11,7 @@ const config = { // 应用版本 version: "1.1.0", // 应用logo - logo: "/static/logo.png", + logo: "https://ngtools.cn:3000/static/logo.png", // 官方网站 site_url: "http://ruoyi.vip", // 政策协议 diff --git a/src/pages.json b/src/pages.json index 5b68fe7..7626a63 100644 --- a/src/pages.json +++ b/src/pages.json @@ -284,20 +284,20 @@ "list": [ { "pagePath": "pages/index", - "iconPath": "static/images/tabbar/work.png", - "selectedIconPath": "static/images/tabbar/work_.png", + "iconPath": "/static/images/tabbar/work.png", + "selectedIconPath": "/static/images/tabbar/work_.png", "text": "首页" }, { "pagePath": "pages/template", - "iconPath": "static/images/tabbar/work.png", - "selectedIconPath": "static/images/tabbar/work_.png", + "iconPath": "/static/images/tabbar/work.png", + "selectedIconPath": "/static/images/tabbar/work_.png", "text": "资料" }, { "pagePath": "pages/mine", - "iconPath": "static/images/tabbar/mine.png", - "selectedIconPath": "static/images/tabbar/mine_.png", + "iconPath": "/static/images/tabbar/mine.png", + "selectedIconPath": "/static/images/tabbar/mine_.png", "text": "我的" } ] diff --git a/src/pages/index.vue b/src/pages/index.vue index 9fa4683..98c8b30 100644 --- a/src/pages/index.vue +++ b/src/pages/index.vue @@ -33,97 +33,38 @@ ref, onMounted } from "vue"; - import modal from "@/plugins/modal" - import { - listConvert - } from '@/api/system/unitConverter/sysUnitConverter.js'; + import modal from "@/plugins/modal" import { storage } from '@/utils/storageUnit.ts'; import { extractModuleData } from '@/utils/moudlesData.ts'; + import useUnitStore from '@/store/modules/unitData.ts'; + const unitStore = useUnitStore(); const current = ref(0); const swiperDotIndex = ref(0); const data = ref([{ - image: '/static/images/banner/banner01.jpg' + image: 'https://ngtools.cn:3000/static/images/banner/banner01.jpg' }, { - image: '/static/images/banner/banner02.jpg' + image: 'https://ngtools.cn:3000/static/images/banner/banner02.jpg' }, { - image: '/static/images/banner/banner03.jpg' + image: 'https://ngtools.cn:3000/static/images/banner/banner03.jpg' } ]); // 核心数据：计算分组和功能项定义 const moudlesGroups = ref([]); - const queryParams = ref({ - pageNum: 1, - pageSize: 1000, - unitType: null, - unitName: null, - baseUnit: null, - conversionFactor: null, - unitTypeName: null, - status: null, - unitOrder: null - }); - - // 保留原有单位换算方法 - const groupByUnitType = (data) => { - if (!data || !Array.isArray(data)) { - console.warn('groupByUnitType: 数据为空或不是数组'); - return {}; - } - - return data.reduce((acc, unit) => { - const type = unit.unitType; - if (!acc[type]) acc[type] = []; - acc[type].push({ - id: unit.id, - unitType: unit.unitType, - unitName: unit.unitName, - conversionFactor: unit.conversionFactor, - unitOrder: unit.unitOrder, - baseUnit: unit.baseUnit, - status: unit.status, - unitTypeName: unit.unitTypeName - }); - return acc; - }, {}); - }; - - const getList = () => { - try { - console.log('开始请求单位数据...'); - const response = listConvert(queryParams.value); - console.log('API响应:', JSON.stringify(response)); - - if (!response || !response.rows) { - console.error('API响应格式错误'); - return; - } - - if (response.rows.length === 0) { - console.warn('单位数据为空数组'); - return; - } - - const unitDataGrouped = groupByUnitType(response.rows); - console.log('分组后的单位数据:', unitDataGrouped); - // 使用统一的存储方法 - storage.setItem('unitData', unitDataGrouped); - console.log('数据存储成功'); - - } catch (error) { - console.error('获取单位数据失败:', error); - } - }; - onMounted(() => { + + onMounted(async() => { moudlesGroups.value = extractModuleData(['流量计算', '参数计算'], false) - getList(); + // 优先从本地缓存恢复，再请求最新数据 + unitStore.restoreUnitDataFromLocal(); + await unitStore.getList(); + }) function navigateToMoudles(item) { diff --git a/src/pages_geek/pages/index/index.vue b/src/pages_geek/pages/index/index.vue index 7dfb832..9e33f42 100644 --- a/src/pages_geek/pages/index/index.vue +++ b/src/pages_geek/pages/index/index.vue @@ -67,28 +67,28 @@ function getcolor(color: { hex: string, rgba: { r: number, g: number, b: number, } const menus: Array = reactive([ - { icon: "/static/images/icon/rocket.png", label: '抢单' }, - { icon: "/static/images/icon/phone.png", label: '回访' }, - { icon: "/static/images/icon/message.png", label: '消息' }, - { icon: "/static/images/icon/dialogue.png", label: '公告' }, - { icon: "/static/images/icon/knowledge.png", label: '知识库' } + { icon: "https://ngtools.cn:3000/static/images/icon/rocket.png", label: '抢单' }, + { icon: "https://ngtools.cn:3000/static/images/icon/phone.png", label: '回访' }, + { icon: "https://ngtools.cn:3000/static/images/icon/message.png", label: '消息' }, + { icon: "https://ngtools.cn:3000/static/images/icon/dialogue.png", label: '公告' }, + { icon: "https://ngtools.cn:3000/static/images/icon/knowledge.png", label: '知识库' } ]); const commodityList: Array = reactive([ { - img: '/static/images/banner/banner01.jpg', + img: 'https://ngtools.cn:3000/static/images/banner/banner01.jpg', title: '商品1', subTitle: '商品1简介', price: 100, }, { - img: '/static/images/banner/banner02.jpg', + img: 'https://ngtools.cn:3000/static/images/banner/banner02.jpg', title: '商品2', subTitle: '商品2简介商品2简介商品2简介商品2简介商品2简介商品2简介商品2简介商品2简介商品2简介商品2简介商品2简介商品2简介商品2简介商品2简介商品2简介商品2简介商品2简介商品2简介商品2简介商品2简介商品2简介商品2简介商品2简介商品2简介商品2简介商品2简介商品2简介商品2简介', price: 300, }, { - img: '/static/images/banner/banner03.jpg', + img: 'https://ngtools.cn:3000/static/images/banner/banner03.jpg', title: '商品3', subTitle: '商品3简介', price: 200, @@ -99,7 +99,7 @@ const orderList: Array = [ { shop: 'geek自营旗舰店', status: '完成', - img: '/static/images/banner/banner01.jpg', + img: 'https://ngtools.cn:3000/static/images/banner/banner01.jpg', title: '商品1', label: '商品1简介', price: 100.32, @@ -108,7 +108,7 @@ const orderList: Array = [ { shop: 'geek自营旗舰店', status: '已取消', - img: '/static/images/banner/banner03.jpg', + img: 'https://ngtools.cn:3000/static/images/banner/banner03.jpg', title: '商商商商商商商商商商商商商商商商商商商商商商商商商商商商商商商商商商品3', label: '商品3简介', price: 2000.67, @@ -117,7 +117,7 @@ const orderList: Array = [ { shop: 'geek自营旗舰店', status: '已取消', - img: '/static/images/banner/banner03.jpg', + img: 'https://ngtools.cn:3000/static/images/banner/banner03.jpg', title: '商商商商商商商商商商商商商商商商商商商商商商商商商商商商商商商商商商品3', label: '商品3简介', price: 10.67, diff --git a/src/pages_mine/pages/about/index.vue b/src/pages_mine/pages/about/index.vue index 73aa352..7f8e2dc 100644 --- a/src/pages_mine/pages/about/index.vue +++ b/src/pages_mine/pages/about/index.vue @@ -1,9 +1,9 @@