From d8fd1c728ebfd1579e14e1dc5c9532171e1c065f Mon Sep 17 00:00:00 2001 From: hufflzp <1395188856@qq.com> Date: Tue, 30 Dec 2025 18:19:55 +0800 Subject: [PATCH 1/4] =?UTF-8?q?update:=E5=B9=B3=E5=8F=B0=E6=96=B0=E5=A2=9E?= =?UTF-8?q?'=E5=95=86=E5=93=81=E8=AE=A2=E5=8D=95'=E6=89=93=E5=8C=85?= =?UTF-8?q?=E8=B4=B9=E5=AD=97=E6=AE=B5=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/order/base/components/OnlineOrderItem.vue | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/views/order/base/components/OnlineOrderItem.vue b/src/views/order/base/components/OnlineOrderItem.vue index 283ff42..ba04acc 100644 --- a/src/views/order/base/components/OnlineOrderItem.vue +++ b/src/views/order/base/components/OnlineOrderItem.vue @@ -129,6 +129,12 @@ {{ detail.order_points_fee }} + + + {{ __('打包费：￥') }} + + {{ detail.packing_fee }} + {{ __('运费：￥') }} From 31e9e0dd35b83e1c0573c87f252fab5ea632937a Mon Sep 17 00:00:00 2001 From: hufflzp <1395188856@qq.com> Date: Wed, 31 Dec 2025 11:46:00 +0800 Subject: [PATCH 2/4] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8D=E5=95=86=E5=93=81?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E2=80=98=E5=95=86=E5=93=81=E7=B1=BB=E5=88=AB?= =?UTF-8?q?=E2=80=99=E6=98=BE=E7=A4=BA=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/product/productList/components/addProductEdit.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/src/views/product/productList/components/addProductEdit.vue b/src/views/product/productList/components/addProductEdit.vue index 2c7ab81..3f62d7c 100644 --- a/src/views/product/productList/components/addProductEdit.vue +++ b/src/views/product/productList/components/addProductEdit.vue @@ -23,6 +23,7 @@ label: 'category_name', value: 'category_id', children: 'sub', + checkStrictly: true }" :style="{ width: '90%' }" @change="onCategoryChange" From ff1596bb9210dc39ced7bdaf2af5df78126790a9 Mon Sep 17 00:00:00 2001 From: hufflzp <1395188856@qq.com> Date: Mon, 12 Jan 2026 16:48:41 +0800 Subject: [PATCH 3/4] =?UTF-8?q?update:=20=E4=BF=AE=E6=94=B9=E5=95=86?= =?UTF-8?q?=E5=93=81=E6=B7=BB=E5=8A=A0=E6=97=B6=E5=88=86=E7=B1=BB=E9=80=89?= =?UTF-8?q?=E6=8B=A9=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package-lock.json | 35 +++++++- package.json | 1 + src/main.js | 5 +- src/views/product/addProduct/index.vue | 114 +++++++++++++++++-------- 4 files changed, 114 insertions(+), 41 deletions(-) diff --git a/package-lock.json b/package-lock.json index 512e3fd..b57c550 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,16 +1,16 @@ { - "name": "lancer-admin", + "name": "xiaofa-admin", "version": "2.0.12-dev", "lockfileVersion": 3, "requires": true, "packages": { "": { - "name": "lancer-admin", + "name": "xiaofa-admin", "version": "2.0.12-dev", - "license": "Mozilla Public License Version 2.0", "dependencies": { "@logicflow/core": "^1.0.2", "@logicflow/extension": "^1.0.2", + "@smallwei/avue": "^2.13.2", "@vuemap/vue-amap": "^0.1.17", "axios": "^0.26.1", "clipboard": "^2.0.10", @@ -2809,6 +2809,23 @@ "@sinonjs/commons": "^1.7.0" } }, + "node_modules/@smallwei/avue": { + "version": "2.13.2", + "resolved": "https://repo.huaweicloud.com/repository/npm/@smallwei/avue/-/avue-2.13.2.tgz", + "integrity": "sha512-ctd8ul96xAdBXU6PJ2QkKlvZ89pVCha/aHM6rflLVD5HHU0N9KHvz0e2R52yyE87YuYpqiSO+OH7lckyVR+4kQ==", + "license": "MIT", + "dependencies": { + "countup.js": "^1.9.3", + "dayjs": "^1.10.4", + "lodash": "^4.17.21", + "nprogress": "^0.2.0", + "vue-cropper": "^0.5.8" + }, + "peerDependencies": { + "element-ui": ">=2.15.3", + "vue": ">=2.5.17" + } + }, "node_modules/@soda/friendly-errors-webpack-plugin": { "version": "1.8.1", "resolved": "https://registry.npmmirror.com/@soda/friendly-errors-webpack-plugin/-/friendly-errors-webpack-plugin-1.8.1.tgz", @@ -8127,6 +8144,12 @@ "node": ">=4" } }, + "node_modules/countup.js": { + "version": "1.9.3", + "resolved": "https://repo.huaweicloud.com/repository/npm/countup.js/-/countup.js-1.9.3.tgz", + "integrity": "sha512-UHf2P/mFKaESqdPq+UdBJm/1y8lYdlcDd0nTZHNC8cxWoJwZr1Eldm1PpWui446vDl5Pd8PtRYkr3q6K4+Qa5A==", + "license": "MIT" + }, "node_modules/cp-file": { "version": "7.0.0", "resolved": "https://registry.npmmirror.com/cp-file/-/cp-file-7.0.0.tgz", @@ -28983,6 +29006,12 @@ "vue": "^2.1.8" } }, + "node_modules/vue-cropper": { + "version": "0.5.11", + "resolved": "https://repo.huaweicloud.com/repository/npm/vue-cropper/-/vue-cropper-0.5.11.tgz", + "integrity": "sha512-UeA3qL2BLCTGkOEAxEsxSNFO+qLYAn6YRHv4oS32cP9lMhF1vFmnAf/z+ZamtR0/Fh3sbZeZUCLVR2Ol2/dpTQ==", + "license": "ISC" + }, "node_modules/vue-eslint-parser": { "version": "8.3.0", "resolved": "https://registry.npmmirror.com/vue-eslint-parser/-/vue-eslint-parser-8.3.0.tgz", diff --git a/package.json b/package.json index 96812ab..20e29df 100644 --- a/package.json +++ b/package.json @@ -26,6 +26,7 @@ "dependencies": { "@logicflow/core": "^1.0.2", "@logicflow/extension": "^1.0.2", + "@smallwei/avue": "^2.13.2", "@vuemap/vue-amap": "^0.1.17", "axios": "^0.26.1", "clipboard": "^2.0.10", diff --git a/src/main.js b/src/main.js index 44fc0ee..a10a6bb 100644 --- a/src/main.js +++ b/src/main.js @@ -27,6 +27,9 @@ import { sprintf, translateTitle as __ } from '@/utils/i18n' */ import { baseURL, pwa } from './config' import { isExternal } from 'vue-plugin-utils' +import Avue from '@smallwei/avue'; +import '@smallwei/avue/lib/index.css'; +Vue.use(Avue); if (process.env.NODE_ENV === 'production' && !isExternal(baseURL)) { /* @@ -48,4 +51,4 @@ new Vue({ router, baiduMap, render: (h) => h(App), -}) +}) \ No newline at end of file diff --git a/src/views/product/addProduct/index.vue b/src/views/product/addProduct/index.vue index ec3ceef..3595a7f 100644 --- a/src/views/product/addProduct/index.vue +++ b/src/views/product/addProduct/index.vue @@ -41,22 +41,41 @@
-
- - 确认发布 +
+
+
+ + 确认发布 + +
+
+ +
+
@@ -84,23 +103,48 @@ list: [], listLoading: true, layout: 'total, sizes, prev, pager, next, jumper', + treeOption:{ + addBtn: false, + editBtn: false, + delBtn:false, + filter:false, + props:{ label: 'category_name', value: 'category_id', children:'sub' } + }, } }, created() { this.fetchData() }, mounted() { - // 在组件挂载后立即获取焦点 - this.$nextTick(() => { - // 获取 el-cascader 的输入框元素 - const inputEl = this.$refs.cascader.$el.querySelector('.el-input__inner'); - // 设置焦点 - if (inputEl) { - inputEl.click(); - } - }); + // 挂载后强制关闭下拉，且监听防止弹出 + this.$nextTick(() => { + const cascader = this.$refs.cascaderRef; + if (cascader) { + // 禁用下拉显示 + cascader.dropdownVisible = false; + // 重写下拉显示方法，直接返回false + cascader.showPopper = () => false; + } + }); }, methods: { + //当搜索框失去焦点 + searchOutFocus(){ + this.$refs.cascader.destroyPopper() + this.$refs.cascader.dropDownVisible = false + }, + //当搜索框成为焦点 + searchOnFocus(){ + this.$refs.cascader.destroyPopper() + this.$refs.cascader.dropDownVisible = false + this.$refs.tree.filterValue = '' + this.$refs.cascader.inputValue = '' + }, + //当节点被点击 + treeNodeClick(row){ + this.category_id = row.category_id + console.log(row.category_id) + }, showEdit(row) { const sub = row.sub if (sub && sub.length > 0) return false @@ -115,16 +159,13 @@ const { data } = await categoryTree() this.list = this.tree(data); - this.listLoading = false }, - async onCategoryChange(row) { - if (row.length > 0) { - this.category_id = row[row.length-1]; - } else { - this.category_id = null; - } + async onCategoryChange() { + this.$refs.cascader.destroyPopper() + this.$refs.cascader.dropDownVisible = false + this.$refs.tree.filterValue = this.$refs.cascader.inputValue }, tree(data) { @@ -162,9 +203,9 @@ }, submit() { const category = this.findTree(this.list, this.category_id) - - if (category != null) { - this.handleEdit(category) + console.log(this.category_id) + if (this.category_id != null) { + this.handleEdit(this.category_id) } else { this.$baseMessage("请选择商品分类", 'error') } @@ -180,9 +221,8 @@ align-items: center; /* 垂直居中 */ height: 80vh; /* 100%视窗高度 */ } - .centered { /* 可以添加其他样式 */ } - + \ No newline at end of file From 2a825e765f1407298c598c8eb42718d598f0bf8f Mon Sep 17 00:00:00 2001 From: hufflzp <1395188856@qq.com> Date: Mon, 12 Jan 2026 16:49:07 +0800 Subject: [PATCH 4/4] =?UTF-8?q?update:=20=E6=96=B0=E5=A2=9E=E5=95=86?= =?UTF-8?q?=E5=93=81=E5=9B=BE=E7=89=87=E6=96=B0=E5=A2=9E=E5=9B=BE=E5=BA=93?= =?UTF-8?q?=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/product/goodsImg/goodsImgs.vue | 17 +- src/views/product/goodsImg/imgAdd.vue | 193 +++++++++++++++++++++++ 2 files changed, 209 insertions(+), 1 deletion(-) create mode 100644 src/views/product/goodsImg/imgAdd.vue diff --git a/src/views/product/goodsImg/goodsImgs.vue b/src/views/product/goodsImg/goodsImgs.vue index db2ca0c..6990231 100644 --- a/src/views/product/goodsImg/goodsImgs.vue +++ b/src/views/product/goodsImg/goodsImgs.vue @@ -32,6 +32,14 @@ 批量编辑
+ + 新增图库 +
+
@@ -155,11 +164,13 @@ import GoodsToolApi from '@/api/goodsTool' import batchEditBarcode from './batchEditBarcode.vue' import imgEdit from './imgEdit.vue' +import imgAdd from './imgAdd.vue' export default { components: { batchEditBarcode, - imgEdit + imgEdit, + imgAdd, }, data() { return { @@ -315,6 +326,10 @@ export default { handleEdit(row) { this.$refs.imgEditRef?.open(row); }, + + handleAdd() { + this.$refs.imgAddRef.init(); + }, }, } diff --git a/src/views/product/goodsImg/imgAdd.vue b/src/views/product/goodsImg/imgAdd.vue new file mode 100644 index 0000000..a4962bf --- /dev/null +++ b/src/views/product/goodsImg/imgAdd.vue @@ -0,0 +1,193 @@ + + +