Merge branch 'main' of http://47.109.205.240:3000/Web/operation-system

.env.test

@@ -5,7 +5,7 @@ VITE_APP_TITLE = 运营云后台管理系统
 VITE_APP_ENV = 'production'
 
 # 测试环境
-VITE_APP_BASE_API = 'http://192.168.18.99:8080/'
+VITE_APP_BASE_API = 'http://192.168.18.99:8080'
 VITE_APP_PLATFORM = 'http://192.168.18.99/platform'
 
 # 是否在打包时开启压缩，支持 gzip 和 brotli

src/assets/styles/custom.scss

@@ -309,3 +309,6 @@
   background-color: #25bf82;
   border:none
 }
+.el-button-gry:hover{
+  background-color: #50e2a8 !important;
+}

src/router/index.js

@@ -94,6 +94,12 @@ export const constantRoutes = [
         name: 'editGoods',
         meta: { title: '编辑商品', icon: '' }
       },
+      {
+        path: 'goodsManage/seeDetails/:activeTab?',
+        component: () => import('@/views/goods/goodsManage/seeDetails'),
+        name: 'seeDetails',
+        meta: { title: '商品详情', icon: '' }
+      },
       {
         path: 'goodsReview/auditGoods/:activeTab?',
         component: () => import('@/views/goods/goodsReview/auditGoods'),

src/views/goods/contrabandManage/index.vue

@@ -286,7 +286,6 @@ const addItem = () => {
   dialogFormVisible.value = true;
 };
 const cancelDialog = () => {
-  dialogRef.value.resetFields();
   Object.assign(dialogForm, { // 保持响应性，手动清空字段
     id: "",
     violateGoodName: "",

src/views/goods/goodsCategory/index.vue

@@ -372,6 +372,7 @@ const onSaveCategory = () => {
         proxy.$modal.loading("正在保存...");
         let param = { ...dialogForm };
         param.level = dialogForm.selectedNode.level;
+        param.type = dialogForm.selectedNode.type;
         let response;
         if (dialogTitle.value == "编辑分类") {
           response = await categoryEdit(param);
@@ -400,10 +401,9 @@ const onSaveCategory = () => {
 const addCategory = () => {
   dialogTitle.value = "添加分类";
   getGoodTypeList();
-  dialogRef.value.resetFields();
   Object.assign(dialogForm, { // 保持响应性，手动清空字段
     id: "",
-    type: null,
+    type: 1,
     name: "",
     level: "",
     parentId: "",
@@ -412,7 +412,6 @@ const addCategory = () => {
   dialogFormVisible.value = true;
 };
 const cancelDialog = () => {
-  dialogRef.value.resetFields();
   Object.assign(dialogForm, { // 保持响应性，手动清空字段
     id: "",
     type: null,

src/views/goods/goodsManage/seeDetails.vue

@@ -135,9 +135,9 @@
         <el-form-item label="商品属性" prop="attribute" required>
           <div v-for="(item, index) in formInline.attribute" :key="index" class="attr-item">
             <el-input v-model="item.name" :value="item.name" class="attr-input" placeholder="请输入属性名称" />
-            <el-icon size="20px" v-if="index !== 0" @click="deleteAttr(index)" style="cursor: pointer;">
+            <!-- <el-icon size="20px" v-if="index !== 0" @click="deleteAttr(index)" style="cursor: pointer;">
               <Delete />
-            </el-icon>
+            </el-icon> -->
           </div>
           <!-- <el-button icon="plus" type="primary" plain style="margin: 0" @click="addAttr">添加属性</el-button> -->
         </el-form-item>

vite.config.js

@@ -33,9 +33,9 @@ export default defineConfig(({ mode, command }) => {
       chunkSizeWarningLimit: 2000,
       rollupOptions: {
         output: {
-          chunkFileNames: "static/js/[name]-[hash].js",
+          chunkFileNames: `static/js/[name]-${Date.now()}-[hash].js`,
-          entryFileNames: "static/js/[name]-[hash].js",
+          entryFileNames: `static/js/[name]-${Date.now()}-[hash].js`,
-          assetFileNames: "static/[ext]/[name]-[hash].[ext]",
+          assetFileNames: `static/[ext]/[name]-${Date.now()}-[hash].[ext]`,
         },
       },
     },