first

src/api/mes/job.js

@@ -1334,7 +1334,7 @@ export const productDetail = (params) => {
   })
 }
 
-//模版
+//查询模版
 export const product_template = (params) => {
   return service({
     url: '/mes_server/work_order/product_template',
@@ -1371,16 +1371,15 @@ export const getMerchantId = (params) => {
   })
 }
 
-// 删除产品
-export const productDelete = (params) => {
+// 产品删除
+export const Product_Del = (data) => {
   return service({
-    url: '/mes_server/product/productDelete',
+    url: '/mes_server/product/Product_Del',
     method: 'post',
-    params
+    data
   })
 }
 
-
 //查询获取任务数据
 export const GetImageStatus = (params) => {
   return service({
@@ -1420,7 +1419,7 @@ export const Template_Material_Add = (data) => {
   })
 }
 
-// 更新模版（预览后修正调整并保存）
+// 修改模版
 export const Template_Material_Update = (data) => {
   return service({
     url: '/mes_server/Material/Template_Material_Update',
@@ -1439,19 +1438,28 @@ export const Template_Material_Delete = (params) => {
 }
 
 // 发布模版（release=1）
-export const Template_Material_Publish = (params) => {
+export const Template_Material_Publish = (data) => {
   return service({
     url: '/mes_server/Material/Template_Material_Publish',
     method: 'post',
-    params
+    data
   })
 }
 
 // 取消发布模版（release=0）
-export const Template_Material_Unpublish = (params) => {
+export const Template_Material_Unpublish = (data) => {
   return service({
     url: '/mes_server/Material/Template_Material_Unpublish',
     method: 'post',
-    params
+    data
   })
 }
+
+// 素材图片上传
+export const Material_Upload = (data) => {
+  return service({
+    url: '/mes_server/Material/Material_Upload',
+    method: 'post',
+    data
+  })
+}

src/view/Product/ProductTemplateReplace.vue

@@ -97,7 +97,7 @@
                         <el-icon><EditPen /></el-icon>
                         产品设计
                       </el-button>
-                      <el-button type="primary" link size="small" @click="handleDeleteProduct(row)">
+                      <el-button type="primary" link size="small" class="delete-link-btn" @click="handleDeleteProduct(row)">
                         <el-icon><Delete /></el-icon>
                         删除
                       </el-button>
@@ -1106,7 +1106,7 @@
 import { ref, reactive, computed, toRaw, onMounted, watch } from 'vue'
 import { ElMessage, ElMessageBox, ElLoading } from 'element-plus'
 import { getTable, imageToText, Template_ids,txttoimg_moxing,txttoimg_update, getSide,merchantGetab,productList,productDetail,
-  product_template,GetTxtToTxt,GetProductFind,productAdd,productDelete,getMerchantId,GetImageStatus } from '@/api/mes/job'
+  product_template,GetTxtToTxt,GetProductFind,productAdd,Product_Del,getMerchantId,GetImageStatus } from '@/api/mes/job'
 import { useUserStore } from '@/pinia/modules/user'
 import { ZoomIn, Camera, SuccessFilled, WarningFilled, More, ArrowRight, ArrowDown, Loading, Plus, Upload, Picture, EditPen, Delete } from '@element-plus/icons-vue'
 import { Layout, LayoutHeader, LayoutSider, LayoutContent } from '@arco-design/web-vue'
@@ -1470,7 +1470,7 @@ const handleDeleteProduct = async (row) => {
         type: 'warning'
       }
     )
-    const res = await productDelete({ id: row.id })
+    const res = await Product_Del({ id: row.id })
     if (res?.code === 0) {
       ElMessage.success('删除成功')
       await refreshProductList()
@@ -2491,7 +2491,7 @@ defineExpose({
   }
   /* 商户树：选中节点文字变红 */
   .JKWTree-tree :deep(.el-tree-node.is-current > .el-tree-node__content) {
-    color: #f56c6c !important;
+    color: red !important;
     font-weight: 600;
   }
   
@@ -2897,4 +2897,11 @@ defineExpose({
     margin: 0;
     font-size: 14px;
   }
+  
+  .delete-link-btn {
+    color: #f56c6c !important;
+  }
+  .delete-link-btn:hover {
+    color: #f78989 !important;
+  }
   </style>

src/view/Product/Shop.vue

@@ -119,6 +119,12 @@
           fixed="right"
         >
           <template #default="scope">
+            <el-button
+              type="primary"
+              link
+              icon="edit"
+              @click="openEdit(scope.row)"
+            >编辑</el-button>
             <el-popover
               v-model:visible="scope.row.visible"
               placement="top"
@@ -141,15 +147,10 @@
                   type="primary"
                   link
                   icon="delete"
+                  class="delete-link-btn"
                 >删除</el-button>
               </template>
             </el-popover>
-            <el-button
-              type="primary"
-              link
-              icon="edit"
-              @click="openEdit(scope.row)"
-            >编辑</el-button>
           </template>
         </el-table-column>
 
@@ -542,4 +543,10 @@ const openEdit = async(row) => {
   .header-img-box {
     @apply w-52 h-52 border border-solid border-gray-300 rounded-xl flex justify-center items-center cursor-pointer;
  }
+  .delete-link-btn {
+    color: #f56c6c !important;
+  }
+  .delete-link-btn:hover {
+    color: #f78989 !important;
+  }
 </style>

src/view/TemplateManagement/CreateTemplate.vue

@@ -3,7 +3,7 @@
     <!-- 创建/编辑模版页：左侧工具栏 -->
     <div class="toolbar">
       <div class="design-toolbar">
-        <button type="button" class="back-to-records" @click="$emit('back')">
+        <button type="button" class="back-to-records" @click="handleBack">
           <el-icon><ArrowLeft /></el-icon>
           <span>返回</span>
         </button>
@@ -695,6 +695,7 @@
 import { ref, computed, reactive, onMounted, onUnmounted, onActivated, onDeactivated, watch, nextTick } from 'vue'
 import { ElMessage } from 'element-plus'
 import { Rank, ArrowUp, ArrowDown, Delete, View, Hide, Plus, Picture, Upload, Search, ArrowLeft, EditPen, Document, Box, MagicStick, InfoFilled, Lock, Unlock, List, Setting } from '@element-plus/icons-vue'
+import { useRouter } from 'vue-router'
 import { emitter } from '@/utils/bus.js'
 import { useUserStore } from '@/pinia/modules/user'
 import { Material_List, Template_Material_Add, Template_Material_Update, Template_Material_Relation } from '@/api/mes/job'
@@ -706,6 +707,13 @@ const props = defineProps({
   mode: { type: String, default: 'create' }
 })
 const emit = defineEmits(['back'])
+const router = useRouter()
+
+// 返回：始终导航到 TemplateDesign 模版列表页，不使用 router.back()
+const handleBack = () => {
+  emit('back')
+  router.replace('/layout/TemplateManagement/TemplateDesign')
+}
 
 const canvasRef = ref(null)
 const canvasAreaRef = ref(null)