From 7b8574b97081d9022f4f97905305d5baac731401 Mon Sep 17 00:00:00 2001
From: sws <1141121512@qq.com>
Date: Wed, 16 Oct 2024 15:36:51 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/base/drag/index.vue             | 18 ++++++++----------
 src/components/base/icon/index.vue             |  2 +-
 .../common/product-show-config/index.vue       |  2 +-
 src/components/common/upload/index.vue         |  7 ++++++-
 src/utils/request.ts                           |  4 ++--
 5 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/src/components/base/drag/index.vue b/src/components/base/drag/index.vue
index 81cca228..98e52133 100644
--- a/src/components/base/drag/index.vue
+++ b/src/components/base/drag/index.vue
@@ -4,10 +4,14 @@
             <li v-for="(item, index) in from" :key="index" :class="className" class="flex gap-y-16 re" @click="on_click(item, index)">
                 <icon name="drag" size="16" class="cursor-move" />
                 <slot :row="item" :index="index" />
-                <icon v-if="type == 'card'" name="close-fillup" class="abs c-pointer cr-c top-de-5 right-de-5" size="18" color="6" @click="remove(index)" />
-                <icon v-if="type == 'line'" name="delete-o" class="c-pointer do-not-trigger" size="18" color="6" @click="remove(index)" />
+                <div class="abs c-pointer top-de-5 right-de-5" @click.stop="remove(index)">
+                    <icon v-if="type == 'card'" name="close-fillup" size="18" color="c" />
+                </div>
+                <div class="c-pointer do-not-trigger" @click.stop="remove(index)">
+                    <icon v-if="type == 'line'" name="delete-o" size="18" color="6" />
+                </div>
                 <el-dropdown v-if="isShowEdit" placement="bottom">
-                    <icon name="more-o" size="18" class="icon-edit-o" color="primary"></icon>
+                    <icon name="more-o" size="18" color="primary"></icon>
                     <template #dropdown>
                         <el-dropdown-menu>
                             <el-dropdown-item @click.stop="edit(index)">编辑</el-dropdown-item>
@@ -86,13 +90,7 @@ const on_sort = () => {
     padding-left: 1.6rem;
     padding-right: 2rem;
 }
-.size-16 {
-    font-size: 1.6rem !important;
-}
-.icon-del-o,
-.icon-edit-o {
-    cursor: pointer;
-}
+
 .cursor-move {
     color: #ddd;
     cursor: move;
diff --git a/src/components/base/icon/index.vue b/src/components/base/icon/index.vue
index 1ff945ce..9fc94ccd 100644
--- a/src/components/base/icon/index.vue
+++ b/src/components/base/icon/index.vue
@@ -1,5 +1,5 @@
 <template>
-    <i class="iconfont" :class="className" :style="'font-size:' + size + 'px;' + (props.color && (props.color.indexOf('#') != -1 || props.color.indexOf('rgba') != -1) ? 'color:' + props.color + ';' : '') + styles" @click.stop="onClick">
+    <i class="iconfont" :class="className" :style="'font-size:' + size + 'px;' + (props.color && (props.color.indexOf('#') != -1 || props.color.indexOf('rgba') != -1) ? 'color:' + props.color + ';' : '') + styles" @click="onClick">
         <slot></slot>
     </i>
 </template>
diff --git a/src/components/common/product-show-config/index.vue b/src/components/common/product-show-config/index.vue
index 10b0bd06..90206c52 100644
--- a/src/components/common/product-show-config/index.vue
+++ b/src/components/common/product-show-config/index.vue
@@ -25,7 +25,7 @@
                     <el-input v-model="form.shop_button_text" placeholder="请输入按钮文字" clearable></el-input>
                 </template>
                 <template v-else>
-                    <upload v-model:icon-value="form.shop_button_icon_class" is-icon type="icon" :limit="1" size="50"></upload>
+                    <upload v-model:icon-value="form.shop_button_icon_class" :is-delete="false" is-icon type="icon" :limit="1" size="50"></upload>
                 </template>
             </div>
         </el-form-item>
diff --git a/src/components/common/upload/index.vue b/src/components/common/upload/index.vue
index 3f6fb16e..7a2b055a 100644
--- a/src/components/common/upload/index.vue
+++ b/src/components/common/upload/index.vue
@@ -206,7 +206,7 @@
             </div>
             <template v-else>
                 <div :class="'upload-btn upload-btn-style-' + styles" :style="'height:' + upload_size + ';width:' + upload_size + ';'" @click="dialog_visible = true">
-                    <div v-if="!isEmpty(icon_value)" class="upload-del-icon" @click.stop="del_icon_event">
+                    <div v-if="isDelete && !isEmpty(icon_value)" class="upload-del-icon" @click.stop="del_icon_event">
                         <icon name="close-fillup" color="c" size="14"></icon>
                     </div>
                     <div class="flex-col gap-10 align-c">
@@ -244,6 +244,7 @@ const app = getCurrentInstance();
  * @param tipsText{String} 提示文字
  * @param size{Number|String} 上传图片大小
  * @param style{Number} 样式 0.默认样式 1.自定义样式1 2.自定义样式2
+ * @param isDelete{Boolean} 是否可以删除
  * @return {*} update:model_value_upload
  */
 const props = defineProps({
@@ -287,6 +288,10 @@ const props = defineProps({
         type: Number,
         default: 0,
     },
+    isDelete: {
+        type: Boolean,
+        default: true,
+    },
 });
 
 const model_value_upload = defineModel({ type: Array as PropType<uploadList[]>, default: [] });
diff --git a/src/utils/request.ts b/src/utils/request.ts
index 53738501..e748026f 100644
--- a/src/utils/request.ts
+++ b/src/utils/request.ts
@@ -12,7 +12,7 @@ const message_error = (info: string) => {
     messageInstance = ElMessage.error({
         type: 'error',
         message: info,
-        duration: 60000,
+        duration: 30000,
         showClose: true,
     });
 };
@@ -25,7 +25,7 @@ const index = window.location.href.lastIndexOf('?s=');
 const pro_url = window.location.href.substring(0, index);
 const service = axios.create({
     baseURL: import.meta.env.VITE_APP_BASE_API == '/dev-api' ? import.meta.env.VITE_APP_BASE_API : pro_url + '?s=',
-    timeout: 3000,
+    timeout: 60000,
     headers: { 'Content-Type': 'application/json;charset=utf-8' },
 });
 /** @ts-ignore  */