mod：列表页调整

frontend/src/views/Tpl/List/index.vue

@@ -47,7 +47,7 @@
     />
 
     <!-- 新增/编辑弹出框 -->
-    <el-dialog v-model="dialogVisible" :title="dialogTitle" width="50%">
+    <el-dialog v-model="dialogVisible" :title="dialogTitle" width="500px">
       <el-form :model="form" label-width="100px">
         <el-form-item label="模板名称">
           <el-input v-model="form.name" placeholder="请输入模板名称" maxlength="20" show-word-limit />
@@ -78,17 +78,23 @@
             <el-button type="primary">上传图片</el-button>
           </el-upload>
         </el-form-item>
-        <el-form-item label="示例鞋图">
+        <el-form-item label="EXCEL数据">
+          <el-upload
+              action="#"
+              :on-change="handleShoeImageChange"
+              multiple
+          >
+            <el-button type="primary">数据EXCEL</el-button>
+          </el-upload>
           <el-upload
             action="#"
             :auto-upload="false"
             :on-change="handleShoeImageChange"
-            :limit="5"
-            multiple
-          >
-            <el-button type="primary">上传图片</el-button>
-          </el-upload>
-          <div v-for="(image, index) in form.shoeImages" :key="index" style="margin-top: 10px;">
+            class="mar-left-10"
+        >
+          <el-button type="primary">EXCEL模板</el-button>
+        </el-upload>
+<!--          <div v-for="(image, index) in form.shoeImages" :key="index" style="margin-top: 10px;">
             <el-input
               v-model="image.name"
               placeholder="请输入图片名称"
@@ -97,7 +103,7 @@
               style="width: 200px; margin-right: 10px;"
             />
             <el-image :src="image.url" style="width: 100px; height: 100px;" />
-          </div>
+          </div>-->
         </el-form-item>
       </el-form>
       <template #footer>

frontend/src/views/components/PictureEditor/mixin/view/index.js

@@ -9,6 +9,7 @@ const viewMixins = {
         aspect: 1 // 宽高比  >1 横屏  ===1 正方形  小于1  竖屏
       },
       canvas: {
+        name: '画布1',
         width: 500,
         height: 500,
         color:'#fff',

frontend/src/views/components/marketingEdit/index.vue

@@ -87,7 +87,7 @@ export default {
 
     },
     handleAdjustCanvas() {
-      console.log(this.canvas)
+      this.canvasForm.name = this.canvas.name
       this.canvasForm.width = this.canvas.width
       this.canvasForm.height = this.canvas.height
       this.canvasForm.color = this.canvas.color
@@ -96,6 +96,7 @@ export default {
     submitCanvasInfo() {
       // 假设 this.canvasForm 包含最新的 width, height 和 color
 
+      this.canvas.name = this.canvasForm.name;
       this.canvas.width = this.canvasForm.width;
       this.canvas.height = this.canvasForm.height;
       this.canvas.color = this.canvasForm.color;

frontend/src/views/components/marketingEdit/tpl/add.js

@@ -10,28 +10,6 @@ let add = () => {
           <div class="flex left w-full">
           <div class="w-full" v-show="!disabled">
               <div class="text te-c fw-b add-action_title step-label"><div class="step-row_color small">调整工具</div></div>
-              <el-dropdown class="w-full">
-                    <el-button>
-                       <div class="icon flex w-full"><img src="${tianjia}" class="icon"></div>
-                        <div class="w-full">新增</div>
-                  </el-button>
-                <template #dropdown>
-                  <el-dropdown-menu>
-                    <el-dropdown-item>
-                      <UploadSlot background='none' ref="upload"
-                        class="upload-wrap " @input="addMaps">
-                            <div>新增图片</div>
-                      </UploadSlot>
-                    </el-dropdown-item>
-                    
-                    <el-dropdown-item  @click.native="addText"><div class="te-c">新增文字</div></el-dropdown-item>
-                    
-                    <el-dropdown-item  @click.native="addText"><div class="te-c">新增商品</div></el-dropdown-item>
-                
-                    
-                  </el-dropdown-menu>
-                </template>
-              </el-dropdown>
 
               <el-button @click="toSelect" :type=" action == 'select' ? 'primary' : ''" class="mar-left-10">
                         <div class="icon flex"><img src="${xz}" class="icon"></div>
@@ -46,6 +24,22 @@ let add = () => {
                         <div>重置</div>
               </el-button>
               
+              <div class="text te-c fw-b add-action_title step-label"><div class="step-row_color small">新增素材</div></div>
+       
+               <el-button @click="toReset">
+                               <UploadSlot background='none' ref="upload"
+                        class="upload-wrap " @input="addMaps"><div>新增图片</div>
+                         </UploadSlot>
+                </el-button>
+             
+              <el-button @click="addText">
+                        <div>新增文字</div>
+              </el-button>
+              
+     
+              
+        
+              
             </div>
           </div>
         

frontend/src/views/components/marketingEdit/tpl/header.js

@@ -6,6 +6,13 @@ export  default function tpl(){
            
            <div class="flex mar-left-10"> 
                 <div class="title">编辑信息</div>
+                <el-select v-model="canvas.name" class="mar-left-10" style="width: 100px;">
+                    <el-option>画布1</el-option>
+                    <el-option>画布2</el-option>
+                    <el-option>画布3</el-option>
+                    <el-option>画布4</el-option>
+                    <el-option>画布5</el-option>
+                </el-select>
            </div>
            
            <div class="button" style="margin-right: 10px;">
@@ -14,8 +21,11 @@ export  default function tpl(){
            </div>
            
             <!-- 新增：调整画布尺寸弹窗 -->
-            <el-dialog title="调整画布" v-model="canvasForm.visible" append-to-body width="30%">
+            <el-dialog title="调整画布" v-model="canvasForm.visible" append-to-body width="400px">
               <el-form :model="canvasForm" label-width="80px">
+                <el-form-item label="画布名称">
+                  <el-input v-model.number="canvasForm.name" placeholder="请输入宽度"></el-input>
+                </el-form-item>
                 <el-form-item label="宽度">
                   <el-input v-model.number="canvasForm.width" placeholder="请输入宽度"></el-input>
                 </el-form-item>