feat:仓库模块图片拖拽

components/add-inquiry-dialog/index.vue

@@ -1,58 +1,62 @@
 <template>
-	<view>
-		<u-modal :show="showModal" ref="uModal" :asyncClose="false" showCancelButton @cancel="closeDialog" cancelColor="#909399" :confirmText="'确定'" confirmColor="#2979ff" @confirm="confirm" @close="closeDialog" :closeOnClickOverlay="false">
+    <view>
+        <u-modal :show="showModal" ref="uModal" :asyncClose="false" showCancelButton @cancel="closeDialog"
+            cancelColor="#909399" :confirmText="'确定'" confirmColor="#2979ff" @confirm="confirm" @close="closeDialog"
+            :closeOnClickOverlay="false">
             <view class="title_wrap">
                 <view class="title">
                     {{ title }}
                 </view>
                 <view class="modal_wrap">
-                    <text @click="handleBrandClick" class="item" :class="info.dictLabel ? 'brand' : 'brand placeholder'">{{ info.dictLabel || '品牌' }}</text>
+                    <text @click="handleBrandClick" class="item"
+                        :class="info.dictLabel ? 'brand' : 'brand placeholder'">{{ info.dictLabel || '品牌' }}</text>
                     <text class="divider">|</text>
                     <u--input placeholder="型号" class="item" border="none" v-model="info.model" clearable></u--input>
                     <text class="divider">|</text>
-                    <u--input class="code-input item" placeholder="编码" border="none" v-model="info.code" clearable></u--input>
+                    <u--input class="code-input item" placeholder="编码" border="none" v-model="info.code"
+                        clearable></u--input>
                 </view>
             </view>
             <view class="img_wrap">
-                <imgs-row-scroll v-if="info.imgsUrl.length > 0" :isShowDeleteIcon="true" @deleteImgInfo="getDeleteImgInfo" imgMode="aspectFill" :totalWidth="400" :images="info.imgsUrl" :previewEnabled="true" :imageWidth="150" :imageHeight="150"></imgs-row-scroll>
-                <u-upload
-                    @afterRead="afterRead"
-                    name="3"
-                    multiple
-                    :maxCount="10"
-                ></u-upload>
+                <imgs-row-scroll v-if="info.imgsUrl.length > 0" :isShowDeleteIcon="true"
+                    @deleteImgInfo="getDeleteImgInfo" imgMode="aspectFill" :totalWidth="400" :images="info.imgsUrl"
+                    :previewEnabled="true" :imageWidth="150" :imageHeight="150"></imgs-row-scroll>
+                <u-upload @afterRead="afterRead" name="3" multiple :maxCount="10"></u-upload>
             </view>
-            <u--input v-if="editOrAdd === 'edit'" class="price" placeholder="价格" border="bottom" v-model="info.price" clearable></u--input>
+            <u--input v-if="editOrAdd === 'edit'" class="price" placeholder="价格" border="bottom" v-model="info.price"
+                clearable></u--input>
+            <qiun-data-charts v-if="isShowChart" type="column" :chartData="chartData" canvasId="priceChart" :opts="opts" :ontouch="true"
+                width="700rpx" height="600rpx" backgroundColor="#fff" />
         </u-modal>
         <brandList ref="brandListRef" @selectedBrand="handleSelectedBrand"></brandList>
-	</view>
+    </view>
 </template>
 
 <script>
 import imgsRowScroll from '@/components/imgs-row-scroll/index.vue'
 import brandList from '@/components/brand-list/index.vue'
 export default {
-	name: 'AddInquiryDialog',
+    name: 'AddInquiryDialog',
     components: {
         imgsRowScroll,
         brandList
     },
-	props: {
+    props: {
         clueId: {
             type: String,
             default: ''
         },
-		show: {
-			type: Boolean,
-			default: false
-		},
+        show: {
+            type: Boolean,
+            default: false
+        },
         editOrAdd: {
             type: String,
             default: ''// edit 编辑(有价格), editForm 编辑询价单(无价格), add 新增询价单, receptFormAdd 新增接收询价单   线索页面：第一次点击是新增（不需要回显），status传1，第二次点击是无价格编辑status传1；接单中心:第一次点击是新增（需要回显）status传1，第二次点击是无价格编辑status传1；只有edit是有价格编辑status传2
         },
         editInfo: {
             type: Object,
-            default: () => {}
+            default: () => { }
         },
         type: {
             type: Number,
@@ -62,50 +66,104 @@ export default {
             type: Boolean,
             default: false
         },
-        title:{
+        title: {
             type: String,
             default: ''
+        },
+        isShowChart: {
+            type: Boolean,
+            default: false
         }
-	},
+    },
     emits: ['submitSuccess'],
     inject: {
         refreshData: {
             default: null
         }
     },
-	data() {
-		return {
-			showModal: false,
+    data() {
+        return {
+            showModal: false,
             info: {
-                model:'',
-                code:'',
-                id:'',
-                price:'',
-                dictLabel:'',
-                dictValue:'',
-                imgsUrl:[]
+                model: '',
+                code: '',
+                id: '',
+                price: '',
+                dictLabel: '',
+                dictValue: '',
+                imgsUrl: []
             },
             rules: {
                 brand: [
                     { required: true, message: '请输入品牌', trigger: 'blur' }
                 ]
             },
-            
-		}
-	},
-	watch: {
-		show: {
-			handler(newVal) {
-				this.showModal = newVal;
-			},
-			immediate: true
-		}
-	},
-	methods: {
+            opts: {
+                color: [this.getRandomColor()],
+                padding: [15, 15, 0, 5],
+                touchMoveLimit: 24,
+                enableScroll: true,
+                legend: {},
+                xAxis: {
+                    disableGrid: true,
+                    scrollShow: true,
+                    itemCount: 4
+                },
+                yAxis: {
+                    data: [
+                        {
+                            min: 0
+                        }
+                    ]
+                },
+                extra: {
+                    column: {
+                        type: "group",
+                        width: 30,
+                        activeBgColor: "#000000",
+                        activeBgOpacity: 0.08,
+                        seriesGap: 5,
+                        barBorderRadius: [6,6,6,6]
+                    }
+                }
+            },
+            chartData:{}
+
+        }
+    },
+    watch: {
+        show: {
+            handler(newVal) {
+                this.showModal = newVal;
+            },
+            immediate: true
+        }
+    },
+    methods: {
+        getRandomColor() {
+            var letters = '0123456789ABCDEF';
+            var color = '#';
+            for (var i = 0; i < 6; i++) {
+                color += letters[Math.floor(Math.random() * 16)];
+            }
+            return color;
+        },
         // 编辑回显
         initData() {
-            this.$nextTick(()=>{
+            this.$nextTick(() => {
                 this.info = JSON.parse(JSON.stringify(this.editInfo))
+                console.log(this.info)
+                if(this.isShowChart){
+                    this.chartData = {
+                        categories: this.info.priceChart.map((item, index) => item.userName),
+                        series: [
+                            {
+                                name: "价格",
+                                data: this.info.priceChart.map(item => item.price)
+                            }
+                        ]
+                    };
+                }
                 this.showModal = true;
             })
         },
@@ -122,7 +180,7 @@ export default {
         },
         // 上传图片
         afterRead(info) {
-            info.file.forEach(item=>{
+            info.file.forEach(item => {
                 uni.$u.api.uploadFile(item.url).then((res) => {
                     this.info.imgsUrl.push(res.data.url);
                     uni.$u.toast("文件上传成功");
@@ -154,14 +212,14 @@ export default {
                 })
                 return
             }
-            if(this.info.imgsUrl.length == 0){
+            if (this.info.imgsUrl.length == 0) {
                 uni.showToast({
                     title: '请上传图片',
                     icon: 'none'
                 })
                 return
             }
-            if(this.editOrAdd === 'edit' && !this.info.price){
+            if (this.editOrAdd === 'edit' && !this.info.price) {
                 uni.showToast({
                     title: '请输入价格',
                     icon: 'none'
@@ -176,7 +234,7 @@ export default {
                 code: this.info.code,
                 id: (this.editOrAdd === 'edit' || this.editOrAdd === 'editForm') ? this.info.id : '',
                 price: this.editOrAdd === 'edit' ? this.info.price : '',
-                imgsUrl:this.info.imgsUrl,
+                imgsUrl: this.info.imgsUrl,
                 status: this.editOrAdd === 'edit' ? '2' : '1',
                 type: this.type
             }
@@ -184,7 +242,7 @@ export default {
                 uni.$u.toast('保存成功')
                 this.closeDialog()
                 this.$emit('submitSuccess')
-                if(this.isClue && this.refreshData) this.refreshData.resetData(); //线索公海页面需要刷新列表
+                if (this.isClue && this.refreshData) this.refreshData.resetData(); //线索公海页面需要刷新列表
             }).catch((err) => {
                 uni.$u.toast(err)
             })
@@ -192,30 +250,30 @@ export default {
         showDialog() {
             if (this.editOrAdd === 'edit' || this.editOrAdd === 'editForm' || this.editOrAdd === 'receptFormAdd') {
                 this.initData();
-            }else if(this.editOrAdd === 'add'){
+            } else if (this.editOrAdd === 'add') {
                 this.clearForm()
                 this.showModal = true;
             }
         },
         clearForm() {
             this.info = {
-                dictLabel:'',
-                dictValue:'',
-                model:'',
-                code:'',
-                id:'',
-                price:'',
-                imgsUrl:[]
+                dictLabel: '',
+                dictValue: '',
+                model: '',
+                code: '',
+                id: '',
+                price: '',
+                imgsUrl: []
             }
         },
         closeDialog() {
             this.showModal = false;
         },
-        
-	}
+
+    }
 };
 </script>
 
 <style lang="scss" scoped>
-    @import './index.scss'
+@import './index.scss'
 </style>

components/drag-upload/PicComp.vue

@@ -0,0 +1,43 @@
+<template>
+  <view class="pic-comp-container">
+    <image 
+      class="pic-comp-image" 
+      :src="src" 
+      mode="aspectFill" 
+      @click="handleClick"
+    />
+  </view>
+</template>
+
+<script>
+export default {
+  name: 'PicComp',
+  props: {
+    src: {
+      type: String,
+      default: ''
+    }
+  },
+  methods: {
+    handleClick() {
+      this.$emit('needPreviewPic', this.src)
+    }
+  }
+}
+</script>
+
+<style scoped lang="scss">
+.pic-comp-container {
+  width: 100%;
+  height: 100%;
+  box-sizing: border-box;
+  overflow: hidden;
+  border-radius: 30rpx;
+}
+
+.pic-comp-image {
+  width: 100% !important;
+  height: 100% !important;
+  object-fit: cover;
+}
+</style>

components/drag-upload/imageUpload.js

@@ -0,0 +1,327 @@
+/**
+ * 图片上传和下载工具类
+ */
+export default {
+  /**
+   * 获取文件列表
+   * @param {String} type - 类型
+   * @param {String} orderFileType - 订单文件类型 (1:聊天记录, 2:实物图, 3:细节图)
+   * @param {String} receiptId - 收单ID
+   * @param {String} itemBrand - 物品品牌
+   * @param {String} clueId - 线索ID
+   */
+  async getFileList(type, orderFileType, receiptId, itemBrand, clueId) {
+    try {
+      const params = {
+        clueId,
+        sourceId: receiptId,
+        type,
+        orderFileType,
+        isDuplicate: '1',
+        pageNum: 1,
+        pageSize: 1000
+      }
+      const response = await uni.$u.api.selectClueFileByDto(params)
+      const rows = response.rows || []
+      
+      // 如果品牌包含逗号，说明是多个品牌，需要过滤
+      // if (itemBrand && itemBrand.indexOf(',') !== -1) {
+        return rows.filter(item => item.sourceId === receiptId)
+      // }
+      // return rows
+    } catch (error) {
+      console.error('获取文件列表失败:', error)
+      uni.$u.toast('获取文件列表失败')
+      return []
+    }
+  },
+
+  /**
+   * 选择图片
+   * @param {Number} count - 最多选择数量
+   * @returns {Promise<Array>} 图片路径数组
+   */
+  chooseImage(count = 9) {
+    return new Promise((resolve, reject) => {
+      uni.chooseImage({
+        count,
+        sizeType: ['compressed'],
+        sourceType: ['album', 'camera'],
+        success: (res) => {
+          resolve(res.tempFilePaths)
+        },
+        fail: (err) => {
+          console.error('选择图片失败:', err)
+          reject(err)
+        }
+      })
+    })
+  },
+
+  /**
+   * 上传文件
+   * @param {String} filePath - 文件路径
+   * @returns {Promise<Object>} 上传结果
+   */
+  async uploadFile(filePath) {
+    try {
+      uni.showLoading({
+        title: '上传中...',
+        mask: true
+      })
+      const { data } = await uni.$u.api.uploadFile(filePath)
+      return {
+        fileSize: data.fileSize,
+        fileSuffix: data.fileSuffix,
+        fileName: data.name,
+        fileUrl: data.url
+      }
+    } catch (error) {
+      console.error('文件上传失败:', error)
+      uni.$u.toast('上传失败，请重试')
+      throw error
+    } finally {
+      uni.hideLoading()
+    }
+  },
+
+  /**
+   * 批量上传文件
+   * @param {Array<String>} filePaths - 文件路径数组
+   * @returns {Promise<Array>} 上传结果数组
+   */
+  async uploadFiles(filePaths) {
+    try {
+      const uploadPromises = filePaths.map(filePath => this.uploadFile(filePath))
+      return await Promise.all(uploadPromises)
+    } catch (error) {
+      console.error('批量上传失败:', error)
+      throw error
+    }
+  },
+
+  /**
+   * 绑定订单文件
+   * @param {String} clueId - 线索ID
+   * @param {String} receiptId - 收单ID
+   * @param {String} orderFileType - 订单文件类型
+   * @param {Array} fileList - 文件列表
+   */
+  async bindOrderFile(clueId, receiptId, orderFileType, fileList) {
+    try {
+      const list = fileList.map(file => ({
+        fileSize: file.fileSize,
+        fileSuffix: file.fileSuffix,
+        fileName: file.fileName,
+        fileUrl: file.fileUrl,
+        orderFileType
+      }))
+      
+      await uni.$u.api.saveClueFile({
+        clueId,
+        list,
+        sourceId: receiptId,
+        type: '2',
+        orderFileType
+      })
+      uni.$u.toast('上传成功')
+    } catch (error) {
+      console.error('绑定订单文件失败:', error)
+      uni.$u.toast('上传失败')
+      throw error
+    }
+  },
+
+  /**
+   * 删除文件
+   * @param {String|Array} fileIds - 文件ID或ID数组
+   */
+  async deleteFile(fileIds) {
+    try {
+      const ids = Array.isArray(fileIds) ? fileIds : [fileIds]
+      await uni.$u.api.deleteClueFile(ids)
+      uni.showToast({
+        title: '删除成功',
+        icon: 'success',
+        duration: 2000
+      })
+    } catch (error) {
+      console.error('删除文件失败:', error)
+      uni.showToast({
+        title: '删除失败',
+        icon: 'error',
+        duration: 2000
+      })
+      throw error
+    }
+  },
+
+  /**
+   * 保存图片到本地相册
+   * @param {String} url - 图片URL
+   * @returns {Promise}
+   */
+  saveImageToLocal(url) {
+    return new Promise((resolve, reject) => {
+      this._doSaveImage(url, resolve, reject)
+    })
+  },
+
+  /**
+   * 执行保存图片操作
+   * @private
+   */
+  _doSaveImage(url, resolve, reject) {
+    uni.downloadFile({
+      url,
+      success: (res) => {
+        if (res.statusCode === 200 && res.tempFilePath) {
+          uni.saveImageToPhotosAlbum({
+            filePath: res.tempFilePath,
+            success: () => {
+              resolve()
+            },
+            fail: (err) => {
+              console.error('保存到相册失败:', err)
+              // 错误代码 12 通常表示权限问题
+              const isPermissionError = err.code === 12 || 
+                                       err.errCode === 12 || 
+                                       err.errMsg.includes('auth denied') || 
+                                       err.errMsg.includes('permission') ||
+                                       err.errMsg.includes('UNKOWN ERROR')
+              
+              if (isPermissionError) {
+                uni.showModal({
+                  title: '权限不足',
+                  content: '需要访问相册权限来保存图片，是否前往设置开启权限？',
+                  confirmText: '去设置',
+                  cancelText: '取消',
+                  success: (modalRes) => {
+                    if (modalRes.confirm) {
+                      uni.openSetting({
+                        success: (settingRes) => {
+                          // 检查是否开启了相册权限
+                          const hasPermission = settingRes.authSetting && 
+                                              settingRes.authSetting['scope.writePhotosAlbum']
+                          if (hasPermission) {
+                            uni.showToast({
+                              title: '权限已开启，请重试保存',
+                              icon: 'none',
+                              duration: 2000
+                            })
+                          } else {
+                            uni.showToast({
+                              title: '请在设置中开启相册权限',
+                              icon: 'none',
+                              duration: 2000
+                            })
+                          }
+                        },
+                        fail: () => {
+                          uni.showToast({
+                            title: '无法打开设置',
+                            icon: 'none'
+                          })
+                        }
+                      })
+                    }
+                  }
+                })
+              } else {
+                uni.showToast({
+                  title: '保存失败，请稍后重试',
+                  icon: 'none'
+                })
+              }
+              reject(err)
+            }
+          })
+        } else {
+          const errorMsg = `下载失败，状态码: ${res.statusCode}`
+          console.error(errorMsg)
+          uni.showToast({
+            title: '下载图片失败',
+            icon: 'none'
+          })
+          reject(new Error(errorMsg))
+        }
+      },
+      fail: (err) => {
+        console.error('下载图片失败:', err)
+        uni.showToast({
+          title: '下载图片失败，请检查网络',
+          icon: 'none'
+        })
+        reject(err)
+      }
+    })
+  },
+
+  /**
+   * 批量保存图片到本地
+   * @param {Array<String>} urls - 图片URL数组
+   */
+  async saveImagesToLocal(urls) {
+    try {
+      uni.showLoading({
+        title: '正在保存图片...',
+        mask: true
+      })
+
+      const savedImages = []
+      const failedImages = []
+
+      for (let i = 0; i < urls.length; i++) {
+        const url = urls[i]
+        try {
+          await this.saveImageToLocal(url)
+          savedImages.push(url)
+        } catch (error) {
+          console.error(`保存图片失败: ${url}`, error)
+          failedImages.push(url)
+        }
+
+        uni.showLoading({
+          title: `正在保存图片... (${i + 1}/${urls.length})`,
+          mask: true
+        })
+      }
+
+      uni.hideLoading()
+
+      let message = `成功保存 ${savedImages.length} 张图片`
+      if (failedImages.length > 0) {
+        message += `，${failedImages.length} 张保存失败`
+      }
+
+      uni.showToast({
+        title: message,
+        icon: 'none',
+        duration: 3000
+      })
+    } catch (error) {
+      uni.hideLoading()
+      console.error('保存图片过程中发生错误:', error)
+      uni.showToast({
+        title: '保存图片失败',
+        icon: 'error'
+      })
+    }
+  },
+
+  /**
+   * 复制图片链接
+   * @param {Array<String>} urls - 图片URL数组
+   */
+  copyImageUrls(urls) {
+    uni.setClipboardData({
+      data: JSON.stringify(urls),
+      success: () => {
+        uni.showToast({
+          title: '图片链接已复制',
+          icon: 'none'
+        })
+      }
+    })
+  }
+}

components/drag-upload/index.vue

@@ -0,0 +1,256 @@
+<template>
+    <view class="detail-image-content">
+        <view class="detail-image-list">
+            <view v-for="(item, index) in displayImages" :key="`detail-${index}`" class="detail-image-item"
+                :class="{
+                    'dragging': draggingIndex === index,
+                    'can-drop': canDropIndex === index && draggingIndex !== index
+                }" :style="draggingIndex === index ? draggingStyle : ''" @touchstart.stop="onTouchStart($event, index)"
+                @touchmove.stop="onTouchMove($event, index)" @touchend.stop="onTouchEnd">
+                <PicComp :src="item" @needPreviewPic="previewImageDetail" />
+                <!-- <view class="image-type-tag">{{ getImageType(index) }}</view> -->
+                <view class="detail-delete-btn" @click.stop="handleHideImage(item, index)" v-if="isDelete">
+                    ×
+                </view>
+            </view>
+            <view class="detail-upload-btn" @click="handleUploadImage">
+                <u-icon name="plus" size="40rpx" color="#999" />
+            </view>
+        </view>
+    </view>
+</template>
+
+<script>
+import PicComp from './PicComp.vue'
+import imageUpload from './imageUpload.js'
+export default {
+    name: 'ComponentName',
+    components: {
+        PicComp
+    },
+    data() {
+        return {
+            draggingIndex: -1,
+            canDropIndex: -1,
+            startX: 0,
+            startY: 0,
+            currentX: 0,
+            currentY: 0,
+            currentImgs: []
+        }
+    },
+    watch: {
+        images: {
+            immediate: true,
+            handler(newVal) {
+                this.currentImgs = [...newVal]
+            }
+        }
+    },
+    computed: {
+        displayImages() {
+            return this.currentImgs
+        },
+        // 拖拽时的样式
+        draggingStyle() {
+            if (this.draggingIndex === -1) return ''
+            return {
+                transform: `translate(${this.currentX - this.startX}px, ${this.currentY - this.startY}px)`,
+                zIndex: 1000
+            }
+        },
+    },
+    props: {
+        images: {
+            type: Array,
+            default: () => []
+        },
+        isDelete: {
+            type: Boolean,
+            default: false
+        },
+        isPreview: {
+            type: Boolean,
+            default: false
+        }
+    },
+    emits: ['imagesChanged', 'uploadComplete'],
+    methods: {
+        // 触摸开始
+        onTouchStart(event, index) {
+            if (this.draggingIndex !== -1) return
+            this.draggingIndex = index
+            const touch = event.touches[0]
+            this.startX = touch.clientX
+            this.startY = touch.clientY
+            this.currentX = touch.clientX
+            this.currentY = touch.clientY
+        },
+
+        // 触摸移动
+        onTouchMove(event, index) {
+            if (this.draggingIndex === -1 || this.draggingIndex !== index) return
+            const touch = event.touches[0]
+            this.currentX = touch.clientX
+            this.currentY = touch.clientY
+            this.findTargetIndex(touch.clientX, touch.clientY)
+        },
+
+        // 触摸结束
+        async onTouchEnd() {
+            if (this.draggingIndex === -1) return
+
+            if (this.canDropIndex !== -1 && this.canDropIndex !== this.draggingIndex) {
+                // 交换位置
+                const images = [...this.currentImgs]
+                const temp = images[this.draggingIndex]
+                images[this.draggingIndex] = images[this.canDropIndex]
+                images[this.canDropIndex] = temp
+                this.currentImgs = images
+            }
+
+            this.resetDragState()
+
+            //每次拖拽结束后把新的顺序传给父组件
+            this.$emit('imagesChanged', [...this.currentImgs])
+        },
+        // 查找目标索引
+        findTargetIndex(x, y) {
+            const query = uni.createSelectorQuery().in(this)
+            query.selectAll('.detail-image-item').boundingClientRect((rects) => {
+                if (!rects || rects.length === 0) return
+                let targetIndex = -1
+                for (let i = 0; i < rects.length; i++) {
+                    if (i === this.draggingIndex) continue
+                    const rect = rects[i]
+                    if (x >= rect.left && x <= rect.right && y >= rect.top && y <= rect.bottom) {
+                        targetIndex = i
+                        break
+                    }
+                }
+                this.canDropIndex = targetIndex
+            }).exec()
+        },
+
+        // 重置拖拽状态
+        resetDragState() {
+            this.draggingIndex = -1
+            this.canDropIndex = -1
+            this.startX = 0
+            this.startY = 0
+            this.currentX = 0
+            this.currentY = 0
+        },
+        // 预览图片
+        previewImageDetail(src) {
+            if(!this.isPreview){
+                return false
+            }
+            const urlList = this.currentImgs.map(item => item)
+            uni.previewImage({
+                urls: urlList,
+                current: src
+            })
+        },
+        // 隐藏图片
+        handleHideImage(item, index) {
+            const itemIndex = this.currentImgs.findIndex(img => item === img)
+            if (itemIndex !== -1) {
+                this.currentImgs.splice(itemIndex, 1)
+                // 将更新后的图片数组传给父组件
+                this.$emit('imagesChanged', [...this.currentImgs])
+                uni.$u.toast('图片已隐藏')
+            }
+        },
+        // 上传图片
+        async handleUploadImage() {
+            try {
+                const filePaths = await imageUpload.chooseImage(9)
+                const uploadResults = await imageUpload.uploadFiles(filePaths)
+                uploadResults.forEach(item => {
+                    this.currentImgs.push(item.fileUrl)
+                })
+                this.$emit('uploadComplete', this.currentImgs)
+            } catch (error) {
+                console.error('上传失败:', error)
+            }
+        },
+    }
+}
+</script>
+
+<style lang="scss" scoped>
+.detail-image-list {
+    display: flex;
+    flex-wrap: wrap;
+    gap: 20rpx;
+    position: relative;
+
+    .detail-image-item {
+        position: relative;
+        width: 200rpx;
+        height: 200rpx;
+        touch-action: none;
+        transition: transform 0.2s ease, opacity 0.2s ease;
+        z-index: 1;
+        box-sizing: border-box;
+
+        &.dragging {
+            opacity: 0.6;
+            transform: scale(1.05);
+            z-index: 999;
+            box-shadow: 0 8rpx 24rpx rgba(0, 0, 0, 0.2);
+        }
+
+        &.can-drop {
+            outline: 2rpx dashed #108cff;
+            outline-offset: -2rpx;
+            background-color: rgba(16, 140, 255, 0.1);
+            border-radius: 8rpx;
+        }
+
+        // .image-type-tag {
+        //     position: absolute;
+        //     top: 10rpx;
+        //     left: 10rpx;
+        //     background-color: rgba(0, 0, 0, 0.6);
+        //     color: white;
+        //     padding: 5rpx 10rpx;
+        //     border-radius: 12rpx;
+        //     font-size: 22rpx;
+        //     z-index: 1;
+        // }
+
+        .detail-delete-btn {
+            position: absolute;
+            top: -10rpx;
+            right: -10rpx;
+            width: 40rpx;
+            height: 40rpx;
+            background-color: #ff4d4f;
+            color: #fff;
+            border-radius: 50%;
+            display: flex;
+            align-items: center;
+            justify-content: center;
+            font-weight: bold;
+            z-index: 10;
+            cursor: pointer;
+        }
+
+
+    }
+
+    .detail-upload-btn {
+        width: 200rpx;
+        height: 200rpx;
+        border: 8rpx dashed #ddd;
+        border-radius: 30rpx;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        background-color: #f9f9f9;
+        cursor: pointer;
+    }
+}
+</style>

components/imgs-row-scroll/index.scss

@@ -16,12 +16,22 @@
 		background-color: #f5f5f5;
 		position: relative;
 		border: 4rpx solid transparent;
-		transition: border-color 0.3s;
+		transition: border-color 0.3s, transform 0.3s, box-shadow 0.3s;
 		
 		&.is-active {
 			border-color: #3c9cff; // uView 的 primary 颜色
 			box-shadow: 0 0 12rpx rgba(60, 156, 255, 0.5);
 		}
+		
+		&.dragging {
+			opacity: 0.5;
+			transform: scale(1.05);
+			box-shadow: 0 4rpx 20rpx rgba(0, 0, 0, 0.2);
+		}
+		
+		&:hover {
+			cursor: move;
+		}
 	}
 	
 	.img-content {

components/remote-search-select/index.scss

@@ -86,158 +86,8 @@
 }
 .img-preview-container{
   margin:70rpx 40rpx;
-  transition: all 0.3s ease;
-  
-  .image-section {
-    transition: all 0.3s ease;
-    margin-bottom: 30rpx;
-    
-    &.expanded {
-      margin-bottom: 40rpx;
-    }
-    
-    .image-container {
-      position: relative;
-      margin-bottom: 20rpx;
-      overflow: hidden;
-      border-radius: 10rpx;
-      
-      .preview-image {
-        width: 100%;
-        height: 300rpx;
-        object-fit: cover;
-        transition: all 0.3s ease;
-        
-        &.zoomed {
-          height: 500rpx;
-          box-shadow: 0 4rpx 20rpx rgba(0, 0, 0, 0.15);
-        }
-      }
-      
-      .crop-overlay {
-        position: absolute;
-        top: 0;
-        left: 0;
-        right: 0;
-        bottom: 0;
-        background-color: rgba(0, 0, 0, 0.5);
-        display: flex;
-        flex-direction: column;
-        justify-content: center;
-        align-items: center;
-        
-        .crop-area {
-          position: absolute;
-          border: 2rpx solid #409eff;
-          background-color: rgba(64, 158, 255, 0.2);
-          cursor: move;
-          
-          .resize-handle {
-            position: absolute;
-            width: 20rpx;
-            height: 20rpx;
-            border: 2rpx solid #409eff;
-            background-color: #fff;
-            border-radius: 50%;
-            touch-action: none;
-            
-            &.top-left {
-              top: -10rpx;
-              left: -10rpx;
-              cursor: nw-resize;
-            }
-            
-            &.top-right {
-              top: -10rpx;
-              right: -10rpx;
-              cursor: ne-resize;
-            }
-            
-            &.bottom-left {
-              bottom: -10rpx;
-              left: -10rpx;
-              cursor: sw-resize;
-            }
-            
-            &.bottom-right {
-              bottom: -10rpx;
-              right: -10rpx;
-              cursor: se-resize;
-            }
-            
-            &.top {
-              top: -10rpx;
-              left: 50%;
-              transform: translateX(-50%);
-              cursor: n-resize;
-            }
-            
-            &.bottom {
-              bottom: -10rpx;
-              left: 50%;
-              transform: translateX(-50%);
-              cursor: s-resize;
-            }
-            
-            &.left {
-              left: -10rpx;
-              top: 50%;
-              transform: translateY(-50%);
-              cursor: w-resize;
-            }
-            
-            &.right {
-              right: -10rpx;
-              top: 50%;
-              transform: translateY(-50%);
-              cursor: e-resize;
-            }
-          }
-        }
-        
-        .crop-controls {
-          position: absolute;
-          top: 20rpx;
-          left: 0;
-          right: 0;
-          display: flex;
-          flex-direction: column;
-          align-items: center;
-          gap: 10rpx;
-          
-          .crop-hint {
-            color: #fff;
-            font-size: 24rpx;
-            margin-bottom: 10rpx;
-            background-color: rgba(0, 0, 0, 0.5);
-            padding: 5rpx 15rpx;
-            border-radius: 20rpx;
-          }
-        }
-        
-        
-      }
-      .confirm-crop-btn {
-        position: absolute;
-        bottom: 20rpx;
-        right: 20rpx;
-        z-index: 999;
-      }
-    }
-    .img-result-container{
-      display: flex;
-      justify-content: space-between;
-    }
-  }
-  
   .img-result-list {
-    max-height: 1000rpx;
-    transition: all 0.3s ease;
-    
-    &.compressed {
-      max-height: 600rpx;
-    }
-    
+    max-height: 1200rpx;
     ::v-deep .uni-scroll-view-content{
       display: grid;
       grid-template-columns: 1fr 1fr;
@@ -254,20 +104,12 @@
     border-radius: 10rpx;
     padding-bottom: 20rpx;
     text-align: center;
-    transition: transform 0.2s ease, box-shadow 0.2s ease;
-    
-    &:hover {
-      transform: translateY(-5rpx);
-      box-shadow: 0 4rpx 12rpx rgba(0, 0, 0, 0.1);
-    }
   }
   
   .img-result-thumb {
     width: 100%;
     height: 250rpx;
     object-fit: cover;
-    border-top-left-radius: 10rpx;
-    border-top-right-radius: 10rpx;
   }
   
   .img-result-info {

components/remote-search-select/index.vue

@@ -51,6 +51,8 @@
                         </view>
                     </view>
                 </scroll-view>
+                <!-- 空 -->
+                <u-empty v-if="imgResults.length === 0"></u-empty>
             </view>
 		</u-popup>
     </view>
@@ -293,7 +295,7 @@ export default {
                     // const fileName = `crop_${Date.now()}.${this.fileType || 'png'}`
                     // const file = new File([blob], fileName, { type: blob.type })
                     // console.log(response,blob,fileName,file)
-                    console.log(res)
+                    // console.log(res)
                     this.$emit('select-crop-img', res)
                 } else {
                     uni.showToast({
@@ -312,6 +314,7 @@ export default {
         handleImgClick({ item, index }) {
             this.activeIndex = index
             this.currentImg = item
+            this.$emit('select-crop-img', item)
         }
     }
 }

pages.json

@@ -198,7 +198,7 @@
 			}
 		},
 		{
-			"path": "pages/wareHouse/fieldPermissions",
+			"path": "pages/wareHouse/components/fieldPermissions",
 			"style": {
 				"navigationBarTitleText": "字段权限",
 				"enablePullDownRefresh": true,

pages/clue/components/trend.vue

@@ -208,7 +208,6 @@ export default {
         handleSelectCropImg(file) {
             this.imgPageNum = 1
             this.imgTotal = 0
-            console.log(file);
             
             const data = {
                 tempFilePaths:[file]
@@ -316,7 +315,6 @@ export default {
         uploadImage(res) {
             this.$nextTick(()=>{
                 this.searchImgInfo = res;
-                console.log(res,this.searchImgInfo.tempFilePaths[0]);
                 uni.$u.api.searchModelByImage(
                     this.searchImgInfo.tempFilePaths[0],
                     {

pages/clue/post/index.vue

@@ -77,7 +77,7 @@
 				<view>发单</view>
 			</view>
 		</view>
-		<add-inquiry-dialog ref="inquiryDialog" :clueId="clueId" :isClue="true" :editOrAdd="editOrAdd" :editInfo="editInfo" title="询价" @cancel="handleInquiryCancel" :type="1"/>
+		<add-inquiry-dialog ref="inquiryDialog" :clueId="clueId" :isShowChart="true" :isClue="true" :editOrAdd="editOrAdd" :editInfo="editInfo" title="询价" @cancel="handleInquiryCancel" :type="1"/>
 		<!-- 最新跟进记录详情弹窗；关闭时记时间戳，避免蒙层点击冒泡触发详情跳转 -->
 		<u-popup :show="followPopupVisible" mode="bottom" round="16" @close="onFollowPopupClose"
 			:closeOnClickOverlay="true" @open="loadFollowList">

pages/wareHouse/components/edit.vue

@@ -26,14 +26,15 @@
                                 @click="handlePasteRecognition(recognitionContent)"></u-button>
                         </view>
                     </u-form-item>
-                    <u-form-item :label="'商品图片(' + (formData.goodPicFileList.length || 0) + '张)'" required prop="goodPicFileList" borderBottom>
+                    <u-form-item :label="'商品图片('+formData.goodPicFileList.length+'张)'" required prop="goodPicFileList" borderBottom>
                         <view class="imgs_scroll">
-                            <ImgsRowScroll v-if="formData.goodPicFileList.length > 0" :isShowDeleteIcon="true"
+                            <DragUpload ref="dragUpload" :images="formData.goodPicFileList" :isDelete="true" :isPreview="true" @imagesChanged="goodPicFileListImagesChanged" @uploadComplete="goodPicFileListUploadComplete"></DragUpload>
+                            <!-- <ImgsRowScroll  v-if="formData.goodPicFileList.length > 0" :isShowDeleteIcon="true"
                                 @deleteImgInfo="getDeleteGoodPicInfo" imgMode="aspectFill" :totalWidth="400"
                                 :images="formData.goodPicFileList" :previewEnabled="true" :imageWidth="150"
                                 :imageHeight="150"></ImgsRowScroll>
                             <u-upload @afterRead="afterReadGoodPic" name="3" multiple :maxCount="9"
-                                :previewFullImage="true"></u-upload>
+                                :previewFullImage="true"></u-upload> -->
                         </view>
                     </u-form-item>
                     <u-form-item label="商品描述（详细的描述让用户更好的了解您的产品）" required prop="desc" borderBottom>
@@ -85,7 +86,7 @@
                         <!-- <view class="detail_pic_container"> -->
                         <!-- <view>
                                 <text class="tip">视频：</text>
-                                <ImgsRowScroll v-if="formData.detailVideoFileList.length > 0" :isShowDeleteIcon="true"
+                                <ImgsRowScroll  v-if="formData.detailVideoFileList.length > 0" :isShowDeleteIcon="true"
                                     @deleteVideoInfo="getDeleteDetailVideoInfo" imgMode="aspectFill" :totalWidth="400"
                                     :videos="formData.detailVideoFileList" :previewEnabled="true" :imageWidth="150"
                                     :imageHeight="150" accept="video"></ImgsRowScroll>
@@ -94,11 +95,12 @@
                         <!-- <view> -->
                         <!-- <text class="tip">图片：</text> -->
                         <view class="imgs_scroll">
-                            <ImgsRowScroll v-if="formData.detailPicFileList.length > 0" :isShowDeleteIcon="true"
+                            <DragUpload ref="dragUpload" :images="formData.detailPicFileList" :isDelete="true" :isPreview="true" @imagesChanged="detailPicFileListImagesChanged" @uploadComplete="detailPicFileListUploadComplete"></DragUpload>
+                            <!-- <ImgsRowScroll v-if="formData.detailPicFileList.length > 0" :isShowDeleteIcon="true"
                                 @deleteImgInfo="getDeleteDetailPicInfo" imgMode="aspectFill" :totalWidth="400"
                                 :images="formData.detailPicFileList" :previewEnabled="true" :imageWidth="150"
                                 :imageHeight="150"></ImgsRowScroll>
-                            <u-upload @afterRead="afterReadDetailPic" name="1" multiple :maxCount="10"></u-upload>
+                            <u-upload @afterRead="afterReadDetailPic" name="1" multiple :maxCount="10"></u-upload> -->
                         </view>
                         <!-- </view> -->
                         <!-- </view> -->
@@ -183,12 +185,13 @@
                             <u--textarea v-model="formData.recycleBottomDesc" clearable count autoHeight maxlength="250"
                                 height="100" confirmType="done"></u--textarea>
                             <view class="imgs_scroll">
-                                <ImgsRowScroll v-if="formData.recycleBottomFileList.length > 0" :isShowDeleteIcon="true"
+                                <DragUpload ref="dragUpload" :images="formData.recycleBottomFileList" :isDelete="true" :isPreview="true" @imagesChanged="recycleBottomFileListImagesChanged" @uploadComplete="recycleBottomFileListUploadComplete"></DragUpload>
+                                <!-- <ImgsRowScroll  v-if="formData.recycleBottomFileList.length > 0" :isShowDeleteIcon="true"
                                     @deleteImgInfo="getDeleteRecycleBottomPicInfo" imgMode="aspectFill"
                                     :totalWidth="400" :images="formData.recycleBottomFileList" :previewEnabled="true"
                                     :imageWidth="150" :imageHeight="150"></ImgsRowScroll>
-                                <u-upload @afterRead="afterReadRecycleBottom" name="1" multiple :maxCount="1"
-                                    accept="image"></u-upload>
+                                <u-upload @afterRead="afterReadRecycleBottom" name="1" multiple :maxCount="10"
+                                    accept="image"></u-upload> -->
                             </view>
                         </view>
                     </u-form-item>
@@ -222,12 +225,13 @@
                     </u-form-item>
                     <u-form-item :label="'保卡图片或独立编码照片留底(' + (formData.productCardPicFileList.length || 0) + '张)'" borderBottom>
                         <view class="imgs_scroll">
-                            <ImgsRowScroll v-if="formData.productCardPicFileList.length > 0" :isShowDeleteIcon="true"
+                            <DragUpload ref="dragUpload" :images="formData.productCardPicFileList" :isDelete="true" :isPreview="true" @imagesChanged="productCardPicFileListImagesChanged" @uploadComplete="productCardPicFileListUploadComplete"></DragUpload>
+                            <!-- <ImgsRowScroll  v-if="formData.productCardPicFileList.length > 0" :isShowDeleteIcon="true"
                                 @deleteImgInfo="getDeleteProductCardPicInfo" imgMode="aspectFill" :totalWidth="400"
                                 :images="formData.productCardPicFileList" :previewEnabled="true" :imageWidth="150"
                                 :imageHeight="150"></ImgsRowScroll>
-                            <u-upload @afterRead="afterReadProductCardPic" name="3" multiple :maxCount="9"
-                                :previewFullImage="true"></u-upload>
+                            <u-upload @afterRead="afterReadProductCardPic" name="3" multiple :maxCount="10"
+                                :previewFullImage="true"></u-upload> -->
                         </view>
                     </u-form-item>
                     <u-form-item label="商品标签" class="u-form-item-row" borderBottom>
@@ -242,12 +246,13 @@
                             <u--textarea v-model="formData.productDesc" clearable count autoHeight maxlength="250"
                                 height="100" confirmType="done"></u--textarea>
                             <view class="imgs_scroll">
-                                <ImgsRowScroll v-if="formData.productDescPicFileList.length > 0"
+                                <DragUpload ref="dragUpload" :images="formData.productDescPicFileList" :isDelete="true" :isPreview="true" @imagesChanged="productDescPicFileListImagesChanged" @uploadComplete="productDescPicFileListUploadComplete"></DragUpload>
+                                <!-- <ImgsRowScroll  v-if="formData.productDescPicFileList.length > 0"
                                     :isShowDeleteIcon="true" @deleteImgInfo="getDeleteProductDescPicInfo"
                                     imgMode="aspectFill" :totalWidth="400" :images="formData.productDescPicFileList"
                                     :previewEnabled="true" :imageWidth="150" :imageHeight="150"></ImgsRowScroll>
-                                <u-upload @afterRead="afterReadProductDescPic" name="1" multiple :maxCount="1"
-                                    accept="image"></u-upload>
+                                <u-upload @afterRead="afterReadProductDescPic" name="1" multiple :maxCount="10"
+                                    accept="image"></u-upload> -->
                             </view>
                         </view>
                     </u-form-item>
@@ -271,6 +276,7 @@ import TabSelect from '@/components/custom-tab-select/index.vue'
 import Cell from '@/components/custom-cell/index.vue'
 import BrandList from '@/components/brand-list/index.vue'
 import ImgsRowScroll from '@/components/imgs-row-scroll/index.vue'
+import DragUpload from '@/components/drag-upload/index.vue'
 import PersonPicker from '@/components/person-picker/index.vue'
 import { permissionCheck,getRoles } from '@/utils/util.js'
 import moreInfo from './moreInfo.vue'
@@ -282,7 +288,8 @@ export default {
         BrandList,
         ImgsRowScroll,
         PersonPicker,
-        moreInfo
+        moreInfo,
+        DragUpload
     },
     data() {
         return {
@@ -522,6 +529,8 @@ export default {
                             uni.$u.toast('操作成功');
                             if (data.continuousWarehousing == '0') {
                                 setTimeout(() => {
+                                    // 发送事件通知列表页刷新数据
+                                    uni.$emit('warehouse-data-updated');
                                     uni.navigateBack({
                                         delta: 1
                                     });
@@ -537,6 +546,8 @@ export default {
                             uni.$u.toast('操作成功');
                             if (data.continuousWarehousing == '0') {
                                 setTimeout(() => {
+                                    // 发送事件通知列表页刷新数据
+                                    uni.$emit('warehouse-data-updated');
                                     uni.navigateBack({
                                         delta: 1
                                     });
@@ -716,81 +727,121 @@ export default {
             this.formData.recyclePerson = info.label;
             this.formData.recyclePersonId = info.id;
         },
-        // 新增商品图片
-        async afterReadGoodPic(event) {
-            event.file.forEach(item => {
-                uni.$u.api.uploadFile(item.url).then((res) => {
-                    this.formData.goodPicFileList.push(res.data.url);
-                    uni.$u.toast("文件上传成功");
-                }).catch(() => {
-                    uni.$u.toast("上传文件失败");
-                })
-            })
+        // 商品图片拖拽完成
+        goodPicFileListImagesChanged(info) {
+            this.formData.goodPicFileList = info
         },
-        // 获取删除商品图片信息
-        getDeleteGoodPicInfo(info) {
-            this.formData.goodPicFileList = info.newImages
-        },
-        // 获取删除细节图片信息
-        getDeleteDetailPicInfo(info) {
-            this.formData.detailPicFileList = info.newImages
-        },
-        // 新增细节图片
-        async afterReadDetailPic(event) {
-            event.file.forEach(item => {
-                uni.$u.api.uploadFile(item.url).then((res) => {
-                    this.formData.detailPicFileList.push(res.data.url);
-                    uni.$u.toast("文件上传成功");
-                }).catch(() => {
-                    uni.$u.toast("上传文件失败");
-                })
-            })
+        // 商品图片上传完成
+        goodPicFileListUploadComplete(info) {
+            this.formData.goodPicFileList = info
         },
-        // 获取删除回收留底图信息
-        getDeleteRecycleBottomPicInfo(info) {
-            this.formData.recycleBottomFileList = info.newImages
-        },
-        // 新增回收留底图
-        async afterReadRecycleBottom(event) {
-            event.file.forEach(item => {
-                uni.$u.api.uploadFile(item.url).then((res) => {
-                    this.formData.recycleBottomFileList.push(res.data.url);
-                    uni.$u.toast("文件上传成功");
-                }).catch(() => {
-                    uni.$u.toast("上传文件失败");
-                })
-            })
+        // 细节图片拖拽完成
+        detailPicFileListImagesChanged(info) {
+            this.formData.detailPicFileList = info
         },
-        // 删除商品保卡图片或独立编码照片留底
-        getDeleteProductCardPicInfo(info) {
-            this.formData.productCardPicFileList = info.newImages
-        },
-        // 新增商品保卡图片或独立编码照片留底
-        async afterReadProductCardPic(event) {
-            event.file.forEach(item => {
-                uni.$u.api.uploadFile(item.url).then((res) => {
-                    this.formData.productCardPicFileList.push(res.data.url);
-                    uni.$u.toast("文件上传成功");
-                }).catch(() => {
-                    uni.$u.toast("上传文件失败");
-                })
-            })
+        // 细节图片上传完成
+        detailPicFileListUploadComplete(info) {
+            this.formData.detailPicFileList = info
         },
-        // 获取删除商品备注图片信息
-        getDeleteProductDescPicInfo(info) {
-            this.formData.productDescPicFileList = info.newImages
-        },
-        // 新增商品备注图片
-        async afterReadProductDescPic(event) {
-            event.file.forEach(item => {
-                uni.$u.api.uploadFile(item.url).then((res) => {
-                    this.formData.productDescPicFileList.push(res.data.url);
-                    uni.$u.toast("文件上传成功");
-                }).catch(() => {
-                    uni.$u.toast("上传文件失败");
-                })
-            })
+        // 回收留底图拖拽完成
+        recycleBottomFileListImagesChanged(info) {
+            this.formData.recycleBottomFileList = info
+        },
+        // 回收留底图上传完成
+        recycleBottomFileListUploadComplete(info) {
+            this.formData.recycleBottomFileList = info
+        },
+        // 商品保卡图片拖拽完成
+        productCardPicFileListImagesChanged(info) {
+            this.formData.productCardPicFileList = info
+        },
+        // 商品保卡图片上传完成
+        productCardPicFileListUploadComplete(info) {
+            this.formData.productCardPicFileList = info
         },
+        // 商品描述图片拖拽完成
+        productDescPicFileListImagesChanged(info) {
+            this.formData.productDescPicFileList = info
+        },
+        // 商品描述图片上传完成
+        productDescPicFileListUploadComplete(info) {
+            this.formData.productDescPicFileList = info
+        },
+        // 新增商品图片
+        // async afterReadGoodPic(event) {
+        //     event.file.forEach(item => {
+        //         uni.$u.api.uploadFile(item.url).then((res) => {
+        //             this.formData.goodPicFileList.push(res.data.url);
+        //             uni.$u.toast("文件上传成功");
+        //         }).catch(() => {
+        //             uni.$u.toast("上传文件失败");
+        //         })
+        //     })
+        // },
+        // // 获取删除商品图片信息
+        // getDeleteGoodPicInfo(info) {
+        //     this.formData.goodPicFileList = info.newImages
+        // },
+        // // 获取删除细节图片信息
+        // getDeleteDetailPicInfo(info) {
+        //     this.formData.detailPicFileList = info
+        // },
+        // // 新增细节图片
+        // async afterReadDetailPic(event) {
+        //     event.file.forEach(item => {
+        //         uni.$u.api.uploadFile(item.url).then((res) => {
+        //             this.formData.detailPicFileList.push(res.data.url);
+        //             uni.$u.toast("文件上传成功");
+        //         }).catch(() => {
+        //             uni.$u.toast("上传文件失败");
+        //         })
+        //     })
+        // },
+        // 获取删除回收留底图信息
+        // getDeleteRecycleBottomPicInfo(info) {
+        //     this.formData.recycleBottomFileList = info.newImages
+        // },
+        // // 新增回收留底图
+        // async afterReadRecycleBottom(event) {
+        //     event.file.forEach(item => {
+        //         uni.$u.api.uploadFile(item.url).then((res) => {
+        //             this.formData.recycleBottomFileList.push(res.data.url);
+        //             uni.$u.toast("文件上传成功");
+        //         }).catch(() => {
+        //             uni.$u.toast("上传文件失败");
+        //         })
+        //     })
+        // },
+        // // 删除商品保卡图片或独立编码照片留底
+        // getDeleteProductCardPicInfo(info) {
+        //     this.formData.productCardPicFileList = info.newImages
+        // },
+        // // 新增商品保卡图片或独立编码照片留底
+        // async afterReadProductCardPic(event) {
+        //     event.file.forEach(item => {
+        //         uni.$u.api.uploadFile(item.url).then((res) => {
+        //             this.formData.productCardPicFileList.push(res.data.url);
+        //             uni.$u.toast("文件上传成功");
+        //         }).catch(() => {
+        //             uni.$u.toast("上传文件失败");
+        //         })
+        //     })
+        // },
+        // // 获取删除商品备注图片信息
+        // getDeleteProductDescPicInfo(info) {
+        //     this.formData.productDescPicFileList = info.newImages
+        // },
+        // // 新增商品备注图片
+        // async afterReadProductDescPic(event) {
+        //     event.file.forEach(item => {
+        //         uni.$u.api.uploadFile(item.url).then((res) => {
+        //             this.formData.productDescPicFileList.push(res.data.url);
+        //             uni.$u.toast("文件上传成功");
+        //         }).catch(() => {
+        //             uni.$u.toast("上传文件失败");
+        //         })
+        //     })
+        // },
         async handlePasteRecognition(text) {
             // 品牌：浪琴
             // 来源：【麒麟】私信-杰3-3

pages/wareHouse/fieldPermissions.vue

@@ -1,10 +1,10 @@
 <template>
 	<view class="page">
-		<u-navbar class="nav-bar" title="字段权限配置" :autoBack="true" :placeholder="true" v-hideNav></u-navbar>
+		<u-navbar class="nav-bar" title="仓库字段权限配置" :autoBack="true" :placeholder="true" v-hideNav></u-navbar>
 		<view class="content">
 			<view class="tip-card">
 				<u-icon name="setting" size="18" color="#108cff"></u-icon>
-				<text class="tip-text">为指定角色配置仓库各字段的「可读」「可编辑」权限，保存后该角色用户将按此配置在列表/详情中看到并可编辑对应字段。</text>
+				<text class="tip-text">为指定角色配置仓库各字段的「可查看」「可编辑」权限，保存后该角色用户将按此配置在列表/详情中看到并可编辑对应字段。</text>
 			</view>
 
 			<!-- 选择角色 -->
@@ -29,8 +29,8 @@
 					</view>
 				</view>
 				<view class="btn-row">
-					<u-button type="primary" size="small" :loading="loadConfigLoading" @click="loadConfig">加载配置</u-button>
 					<u-button type="error" plain size="small" :disabled="!currentRoleId" @click="clearConfig">清空该角色配置</u-button>
+					<u-button type="primary" size="small" :loading="loadConfigLoading" @click="loadConfig">加载配置</u-button>
 				</view>
 			</view>
 
@@ -53,7 +53,7 @@
 							</view>
 							<view class="field-switches">
 								<view class="switch-cell">
-									<text class="switch-label">读</text>
+									<text class="switch-label">查看</text>
 									<u-switch v-model="item.read" size="20" active-color="#108cff"></u-switch>
 								</view>
 								<view class="switch-cell">
@@ -284,6 +284,10 @@ export default {
 	.section-title {
 		margin-bottom: 0;
 	}
+	.u-button {
+		width:auto;
+		margin: 0;
+	}
 }
 
 .role-section {
@@ -325,7 +329,7 @@ export default {
 	.btn-row {
 		display: flex;
 		gap: 20rpx;
-		flex-wrap: wrap;
+		// flex-wrap: wrap;
 	}
 }
 

pages/wareHouse/styles/index.scss

@@ -112,9 +112,8 @@
 
 /* 搜索框区域 */
 .search-wrapper {
-  padding: 8rpx 15rpx;
+  padding: 0 15rpx;
   height: 80rpx;
-  padding-bottom: 20rpx;
   display: flex;
   justify-content: space-between;
   align-items: center;
@@ -147,8 +146,7 @@
 
 /* 分类标签 */
 .category-tabs-wrap {
-  padding: 8rpx 15rpx;
-  margin-bottom: 20rpx;
+  padding: 0 15rpx;
   background: #ffffff !important;
 
   .u-tabs-custom {
@@ -172,6 +170,14 @@
       display: none;
     }
   }
+
+  ::v-deep .u-tabs__wrapper__nav__item{
+    height: 70rpx !important;
+  }
+}
+
+::v-deep .u-notice-bar{
+  flex:auto;
 }
 
 /* 筛选栏 */
@@ -513,3 +519,7 @@
     transform: scale(0.95);
   }
 }
+
+.custom-notice-bar {
+  flex: none;
+}