feat:价格趋势

components/add-inquiry-dialog/index.scss

@@ -1,38 +1,49 @@
 ::v-deep .u-modal__content{
 	flex-direction: column;
 	gap: 30rpx;
-	.modal_wrap{
-		border-radius: 40rpx;
-		padding: 10rpx 20rpx;
-		box-shadow: 0 2rpx 10rpx rgba(0, 0, 0, 0.1);
+	.title_wrap{
 		display: flex;
 		align-items: center;
-		.item{
-			width: 33%;
+		gap: 8rpx;
+		.title{
+			font-size: 26rpx;
+			color: #333;
+			white-space: nowrap;
+			flex-shrink: 0;
 		}
-		.brand{
-			font-size: 30rpx;
-			color: #111827;
-			text-align: center;
-			font-weight: 550;
-		}
-		.placeholder{
-			font-size:30rpx;
-			color: #c0c4cc;
-			text-align: center;
-		}
-		.divider{
-			color: #ddd;
-			font-size: 28rpx;
-		}
-		.uni-input-wrapper{
-			text-align: center;
-		}
-		.code-input {
-			.u-input__content__field-wrapper__field{
-				color: blueviolet !important;
+		.modal_wrap{
+			border-radius: 40rpx;
+			padding: 10rpx 20rpx;
+			box-shadow: 0 2rpx 10rpx rgba(0, 0, 0, 0.1);
+			display: flex;
+			align-items: center;
+			.item{
+				width: 33%;
+			}
+			.brand{
+				font-size: 30rpx;
+				color: #111827;
+				text-align: center;
 				font-weight: 550;
 			}
+			.placeholder{
+				font-size:30rpx;
+				color: #c0c4cc;
+				text-align: center;
+			}
+			.divider{
+				color: #ddd;
+				font-size: 28rpx;
+			}
+			.uni-input-wrapper{
+				text-align: center;
+			}
+			.code-input {
+				.u-input__content__field-wrapper__field{
+					color: blueviolet !important;
+					font-weight: 550;
+				}
+			}
 		}
 	}
 	.img_wrap{

components/add-inquiry-dialog/index.vue

@@ -1,12 +1,17 @@
 <template>
 	<view>
-		<u-modal :show="showModal" ref="uModal" :title="(editOrAdd === 'add' || editOrAdd === 'receptFormAdd') ? '新增' : '编辑'" :asyncClose="false" showCancelButton @cancel="closeDialog" cancelColor="#909399" :confirmText="'确定'" confirmColor="#2979ff" @confirm="confirm" @close="closeDialog" :closeOnClickOverlay="false">
-            <view class="modal_wrap">
-                <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-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 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>
+                </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>
@@ -57,6 +62,10 @@ export default {
             type: Boolean,
             default: false
         },
+        title:{
+            type: String,
+            default: ''
+        }
 	},
     emits: ['submitSuccess'],
     inject: {
@@ -172,7 +181,7 @@ export default {
                 type: this.type
             }
             uni.$u.api.addInquiry(data).then(res => {
-                uni.$u.toast(this.type == 1 ? "询价成功" : "核价成功")
+                uni.$u.toast('保存成功')
                 this.closeDialog()
                 this.$emit('submitSuccess')
                 if(this.isClue && this.refreshData) this.refreshData.resetData(); //线索公海页面需要刷新列表

components/imgs-row-scroll/index.scss

@@ -15,6 +15,13 @@
 		overflow: hidden;
 		background-color: #f5f5f5;
 		position: relative;
+		border: 4rpx solid transparent;
+		transition: border-color 0.3s;
+		
+		&.is-active {
+			border-color: #3c9cff; // uView 的 primary 颜色
+			box-shadow: 0 0 12rpx rgba(60, 156, 255, 0.5);
+		}
 	}
 	
 	.img-content {

components/imgs-row-scroll/index.vue

@@ -4,6 +4,7 @@
 			<view class="img-list">
 				<view 
 					class="img-item" 
+					:class="{ 'is-active': highlightActive && index === localActiveIndex }"
 					v-for="(item, index) in imageUrls" 
 					:key="index"
 					@click.stop="handleImageClick(item, index)"
@@ -100,6 +101,29 @@ export default {
 		isShowDeleteIcon: {
 			type: Boolean,
 			default: false
+		},
+		// 是否开启高亮当前选中项
+		highlightActive: {
+			type: Boolean,
+			default: false
+		},
+		// 当前选中的索引 (外部控制)
+		activeIndex: {
+			type: Number,
+			default: -1
+		}
+	},
+	data() {
+		return {
+			localActiveIndex: -1
+		}
+	},
+	watch: {
+		activeIndex: {
+			handler(val) {
+				this.localActiveIndex = val;
+			},
+			immediate: true
 		}
 	},
 	computed: {
@@ -133,6 +157,10 @@ export default {
 	},
 	methods: {
 		handleImageClick(item, index) {
+			if (this.highlightActive) {
+				this.localActiveIndex = index;
+			}
+			this.$emit('clickImg', { item, index });
 			if (!this.previewEnabled) {
 				return;
 			}

components/inquiry-verification-list/index.vue

@@ -36,7 +36,7 @@
             </view>
         </scroll-view>
 
-        <add-inquiry-dialog ref="addInquiryDialog" editOrAdd="edit" :editInfo="editInfo" :type="type" @submitSuccess="onRefresh"/>
+        <add-inquiry-dialog ref="addInquiryDialog" editOrAdd="edit" :editInfo="editInfo" :type="type" :title="type == '1' ? '询价' : '核价'" @submitSuccess="onRefresh" />
     </view>
 </template>
 <script>

components/inquiry-verification-list/mixins/inquiryVerificationList.js

@@ -51,6 +51,7 @@ export default {
         },
         handleClick(item) {
             this.editInfo = item;
+            this.editInfo.price = item.myPrice
             this.$nextTick(() => {
                 this.$refs.addInquiryDialog.showDialog();
             })

components/remote-search-select/index.scss

@@ -0,0 +1,303 @@
+// 远程搜索选择组件样式
+.remote-search-select {
+  width: 100%;
+  position: relative;
+  .search-container {
+    display: flex;
+    gap: 10rpx;
+  }
+  // 搜索结果列表
+  .result-list {
+    height: 400rpx;
+    margin-top: 8rpx;
+    border-radius: 8px;
+    overflow-y: auto;
+    overflow-x: hidden;
+    box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
+    position: absolute;
+    left: 0rpx;
+    right: 20rpx;
+    // top:0;
+    z-index: 20000;
+    background-color: #fff;
+    
+    ::v-deep .u-cell {
+      transition: background-color 0.2s ease;
+      
+      &:hover {
+        background-color: #f5f7fa;
+      }
+    }
+    
+    // 滚动条样式
+    &::-webkit-scrollbar {
+      width: 4px;
+    }
+    
+    &::-webkit-scrollbar-track {
+      background: #f1f1f1;
+      border-radius: 4px;
+    }
+    
+    &::-webkit-scrollbar-thumb {
+      background: #c1c1c1;
+      border-radius: 4px;
+    }
+    
+    &::-webkit-scrollbar-thumb:hover {
+      background: #a8a8a8;
+    }
+  }
+  
+  // 空结果提示
+  .empty-result {
+    margin-top: 8px;
+    padding: 20px;
+    border-radius: 8px;
+    background-color: #fff;
+    box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
+    position: absolute;
+    left: 0;
+    right: 0;
+    z-index: 999;
+  }
+  
+  // 加载状态
+  .loading-state {
+    margin-top: 8px;
+    padding: 16px;
+    border-radius: 8px;
+    background-color: #fff;
+    box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
+    position: absolute;
+    left: 0;
+    right: 0;
+    z-index: 999;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    
+    .loading-text {
+      margin-left: 8px;
+      font-size: 14px;
+      color: #909399;
+    }
+  }
+}
+.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;
+    }
+    
+    ::v-deep .uni-scroll-view-content{
+      display: grid;
+      grid-template-columns: 1fr 1fr;
+      gap: 20rpx;
+      
+    }
+  }
+  
+  .img-result-item {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    background-color: #f8f8f8;
+    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 {
+    width: 100%;
+  }
+  
+  .img-result-title {
+    display: block;
+    background-color: #333;
+    color: white;
+    padding: 8rpx 12rpx;
+    font-size: 22rpx;
+    margin-bottom: 10rpx;
+  }
+  
+  .img-result-desc {
+    display: block;
+    font-size: 24rpx;
+    margin-bottom: 10rpx;
+    line-height: 1.3;
+    text-align: left;
+    padding: 0 20rpx;
+  }
+  
+  .img-result-price {
+    display: block;
+    font-size: 26rpx;
+    font-weight: bold;
+    color: #ff4d4f;
+    text-align: left;
+    padding: 0 20rpx;
+  }
+}

components/remote-search-select/index.vue

@@ -0,0 +1,322 @@
+<template>
+    <view class="remote-search-select">
+        <view class="search-container">
+            <u-search :placeholder="placeholder" :value="value" :disabled="disabled" :maxlength="maxlength"
+            :show-action="showAction" :action-text="actionText" :shape="shape" :bg-color="bgColor"
+            :border-radius="borderRadius" :clearabled="clearabled" :prefix-icon="prefixIcon" :suffix-icon="suffixIcon"
+            @input="handleInput" @clear="handleClear" @focus="handleFocus" @blur="handleBlur"/>
+            <u-icon name="camera" v-if="cameraEnabled" @click="handleCameraClick" size="30"></u-icon>
+        </view>
+
+        <scroll-view v-if="resultsShow && searchResults.length > 0" class="result-list" scroll-y
+            @scrolltolower="handleScrollToLower">
+            <u-cell-group>
+                <u-cell v-for="(item, index) in searchResults" :key="index" :title="item.model"
+                    @click="handleSelectItem(item)" />
+            </u-cell-group>
+        </scroll-view>
+        <!-- 空 -->
+        <u-empty v-if="searchResults.length === 0 && !value"></u-empty>
+        <!-- 加载状态 -->
+        <view v-if="loading" class="loading-state">
+            <u-loading-icon mode="circle" size="20"></u-loading-icon>
+            <text class="loading-text">搜索中...</text>
+        </view>
+        <!-- 图片识别结果 -->
+        <u-popup title="图片识别结果" :show="show" @open="openImgPopup" mode="bottom" :round="10" :closeOnClickOverlay="false">
+            <view class="img-preview-container" @touchstart="handleTouchStart" @touchmove="handleTouchMove" @touchend="handleTouchEnd">
+                <view class="image-section" :class="{ 'expanded': isImageExpanded }">
+                    <view class="image-container" v-if="currentImg" :style="isImageExpanded ? 'height: 500rpx; width: 670rpx;' : ''">
+                        <image v-show="!isImageExpanded" :src="currentImg" class="preview-image" :class="{ 'zoomed': isImageExpanded }" @load="handleImageLoad" id="previewImage"></image>
+                        <bt-cropper v-if="isImageExpanded" ref="cropper" :imageSrc="currentImg" :ratio="0" :fileType="fileType" :key="currentImg" :containerSize="{width: 670, height: 500}" @loadFail="handleCropLoadFail"></bt-cropper>
+                        <view v-if="isImageExpanded" class="confirm-crop-btn">
+                            <u-button type="primary" size="mini" @click="confirmCrop">确认裁剪</u-button>
+                        </view>
+                    </view>
+
+                    <view class="img-result-container">
+                        <imgsRowScroll :previewEnabled="false" :images="croppedImages" :highlightActive="true" :activeIndex="activeIndex" :imageWidth="150" :imageHeight="150" @clickImg="handleImgClick"></imgsRowScroll>
+                        <view @click="closeImgPopup">
+                            <u-icon name="close" size="30"></u-icon>
+                        </view>
+                    </view>
+                </view>
+                <scroll-view class="img-result-list" scroll-y @scrolltolower="handleScrollToLowerImg" :class="{ 'compressed': isImageExpanded }">
+                    <view v-for="(item, index) in imgResults" :key="index" class="img-result-item" @click="handleSelectImg(item)">
+                        <image :src="item.record.goodPicFileList[0] || ''" class="img-result-thumb"></image>
+                        <view class="img-result-info">
+                            <text class="img-result-title">{{ item.record.model || '-'}}</text>
+                            <text class="img-result-desc">{{ item.record.dictLabel || '-'}}</text>
+                            <text class="img-result-price">¥ {{ item.record.price || '-'}} 元</text>
+                        </view>
+                    </view>
+                </scroll-view>
+            </view>
+		</u-popup>
+    </view>
+</template>
+
+<script>
+import imgsRowScroll from '@/components/imgs-row-scroll/index.vue'
+export default {
+    name: 'RemoteSearchSelect',
+    components: {
+        imgsRowScroll
+    },
+    data() {
+        return {
+            searchValue: '',
+            show: false,
+            // 滚动相关
+            startY: 0,
+            currentY: 0,
+            isImageExpanded: false,
+            // 图片裁剪相关
+            croppedImages: [],
+            imageWidth: 0,
+            imageHeight: 0,
+            // 选中的索引
+            activeIndex: 0,
+            localCurrentImg: ''
+        }
+    },
+    props: {
+        // 搜索框属性
+        placeholder: {
+            type: String,
+            default: '请输入关键词搜索'
+        },
+        value: {
+            type: String,
+            default: ''
+        },
+        disabled: {
+            type: Boolean,
+            default: false
+        },
+        maxlength: {
+            type: [String, Number],
+            default: 100
+        },
+        showAction: {
+            type: Boolean,
+            default: false
+        },
+        actionText: {
+            type: String,
+            default: '搜索'
+        },
+        shape: {
+            type: String,
+            default: 'square'
+        },
+        bgColor: {
+            type: String,
+            default: '#f5f5f5'
+        },
+        borderRadius: {
+            type: [String, Number],
+            default: 4
+        },
+        clearabled: {
+            type: Boolean,
+            default: true
+        },
+        prefixIcon: {
+            type: String,
+            default: 'search'
+        },
+        suffixIcon: {
+            type: String,
+            default: ''
+        },
+        // 搜索结果
+        searchResults: {
+            type: Array,
+            default: () => []
+        },
+        resultsShow: {
+            type: Boolean,
+            default: false
+        },
+        // 加载状态
+        loading: {
+            type: Boolean,
+            default: false
+        },
+        cameraEnabled: {
+            type: Boolean,
+            default: false
+        },
+        currentUrl: {
+            type: String,
+            default: ''
+        },
+        imgResults: {
+            type: Array,
+            default: () => []
+        },
+        fileType: {
+            type: String,
+            default: 'png',
+            validator: (value) => ['png', 'jpg'].includes(value)
+        }
+    },
+    watch: {
+        currentUrl: {
+            handler(val) {
+                this.localCurrentImg = val
+            },
+            immediate: true
+        }
+    },
+    computed: {
+        currentImg:{
+            get(){
+                return this.localCurrentImg || ''
+            },
+            set(val){
+                this.localCurrentImg = val
+            }
+        }
+    },
+    emits: ['clear', 'confirm', 'select', 'search', 'load-more', 'focus', 'blur', 'upload', 'load-more-img','select-img','select-crop-img'],
+    methods: {
+        handleCameraClick() {
+            uni.chooseImage({
+                count: 1,
+                sizeType: ['compressed'],
+                sourceType: ['album', 'camera'],
+                success: (res) => {
+                    this.$emit('upload',res)
+                }
+            })
+        },
+        handleInput(val) {
+            this.searchValue = val
+            this.$emit('search', { keyword: val })
+        },
+        handleClear() {
+            this.searchValue = ''
+            this.$emit('clear')
+        },
+
+        // 选择结果项
+        handleSelectItem(item) {
+            this.searchValue = item.model
+            this.$emit('select', item)
+        },
+
+        // 处理滚动到底部事件
+        handleScrollToLower() {
+            this.$emit('load-more')
+        },
+        // 处理滚动到底部事件 图片列表
+        handleScrollToLowerImg() {
+            this.$emit('load-more-img')
+        },
+        // 处理获取焦点事件
+        handleFocus() {
+            this.$emit('focus')
+        },
+        // 处理失去焦点事件
+        handleBlur() {
+            this.$emit('blur')
+        },
+        // 打开图片识别结果弹窗
+        openImgPopup() {
+            this.show = true
+            this.$nextTick(()=>{
+                // 只有当列表为空时（说明是第一次打开或重新打开），才初始化列表
+                if (this.croppedImages.length == 0) {
+                    this.croppedImages = [this.currentUrl]
+                    this.activeIndex = 0
+                }
+            })
+        },
+        // 关闭图片识别结果弹窗
+        closeImgPopup() {
+            this.show = false
+            this.croppedImages = []
+        },
+        handleSelectImg(item) {
+            this.$emit('select-img', item)
+            this.closeImgPopup()
+        },
+        // 触摸开始事件
+        handleTouchStart(e) {
+            this.startY = e.touches[0].clientY
+        },
+        // 触摸移动事件
+        handleTouchMove(e) {
+            this.currentY = e.touches[0].clientY
+            const diffY = this.currentY - this.startY
+            
+            // 向下滑动超过100px时展开图片
+            if (diffY > 100 && !this.isImageExpanded) {
+                this.isImageExpanded = true
+            }
+            // 向上滑动超过50px时收起图片
+            else if (diffY < -50 && this.isImageExpanded) {
+                this.isImageExpanded = false
+            }
+        },
+        // 触摸结束事件
+        handleTouchEnd() {
+            this.startY = 0
+            this.currentY = 0
+        },
+        // 图片加载完成事件
+        handleImageLoad(e) {
+            this.imageWidth = e.detail.width
+            this.imageHeight = e.detail.height
+        },
+        handleCropLoadFail(err) {
+            console.error('bt-cropper loadFail:', err)
+            uni.showToast({
+                title: '裁剪器加载图片失败',
+                icon: 'none'
+            })
+        },
+        // 确认裁剪
+        async confirmCrop() {
+            try {
+                const res = await this.$refs.cropper.crop()
+                if (res) {
+                    this.croppedImages.push(res)
+                    this.activeIndex = this.croppedImages.length - 1
+                    this.currentImg = res
+                    
+                    // 将 blob URL 转为 File 对象
+                    // const response = await fetch(res)
+                    // const blob = await response.blob()
+                    // 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)
+                    this.$emit('select-crop-img', res)
+                } else {
+                    uni.showToast({
+                        title: '裁剪失败',
+                        icon: 'none'
+                    })
+                }
+            } catch (err) {
+                console.error('裁剪失败:', err)
+                uni.showToast({
+                    title: '裁剪失败',
+                    icon: 'none'
+                })
+            }
+        },
+        handleImgClick({ item, index }) {
+            this.activeIndex = index
+            this.currentImg = item
+        }
+    }
+}
+</script>
+
+<style lang="scss" scoped>
+@import './index.scss';
+</style>

pages.json

@@ -153,7 +153,7 @@
 			"path": "pages/publicClue/index",
 			"style": {
 				"navigationBarTitleText": "线索公海",
-				"enablePullDownRefresh": true,
+				"enablePullDownRefresh": false,
 				"navigationStyle": "custom"
 			}
 		},

pages/clue/components/trend.vue

@@ -1,12 +1,12 @@
 <template>
-    <u-modal :show="trendModal" title="价格趋势" @confirm="closeTrendModal" confirmText="关闭弹窗" height="80%">
-        <view class="trend_modal">
-            <u-search placeholder="请输入型号" v-model="model" @blur="searchTrend" @custom="searchTrend"></u-search>
+    <u-modal :show="trendModal" title="价格趋势" @confirm="closeTrendModal" confirmText="关闭弹窗" height="93%"><view class="trend_modal">
+            <RemoteSearchSelect ref="searchSelect" :value="model" placeholder="请输入关键词" :resultsShow="resultsShow" :currentUrl="currentImg" :searchResults="searchResults" :imgResults="imgResults" :loading="loading"
+                :cameraEnabled="true" @search="handleSearch" @select="handleSelect" @select-img="handleSelectImg" @select-crop-img="handleSelectCropImg" @load-more="loadMore" @load-more-img="loadMoreImg" @clear="handleClear" @focus="handleFocus" @upload="uploadImage"></RemoteSearchSelect>
             <view class="charts_box" v-if="chartShow">
                 <u--text type="primary" :text="`最大价格：${Math.max(...maxPrice)}元`"></u--text>
                 <u--text type="warning" :text="`最小价格：${Math.min(...minPrice)}元`"></u--text>
                 <qiun-data-charts type="line" :chartData="chartData" canvasId="trendChart" :opts="opts" :ontouch="true"
-                    tooltipFormat="tooltipFormatPrice" width="700rpx" height="500rpx" backgroundColor="#ffffff"
+                    tooltipFormat="tooltipFormatPrice" width="700rpx" height="600rpx" backgroundColor="#ffffff"
                     @getIndex="handleChartClick" />
             </view>
 
@@ -19,7 +19,7 @@
                     </view>
                     <view class="card-row">
                         <span class="card-label">日期：</span>
-                        <span class="card-value">{{ formatTime(item.recycleTime) }}</span>
+                        <span class="card-value">{{ item.recycleTime }}</span>
                     </view>
                     <view class="card-row">
                         <span class="card-label">价格：</span>
@@ -27,7 +27,7 @@
                     </view>
                     <view class="card-row">
                         <span class="card-label">回收情况：</span>
-                        <span class="card-value">{{ formatRecycleSituation(item.recycleSituation) }}</span>
+                        <span class="card-value">{{ item.recycleSituation }}</span>
                     </view>
                     <view class="card-row">
                         <span class="card-label">备注：</span>
@@ -41,8 +41,12 @@
 
 <script>
 import { recycleSituationList } from '@/pages/wareHouse/js/public.js'
+import RemoteSearchSelect from '@/components/remote-search-select/index.vue'
 export default {
     name: 'ComponentName',
+    components: {
+        RemoteSearchSelect,
+    },
     data() {
         return {
             trendModal: false,
@@ -50,7 +54,7 @@ export default {
             color: [],
             opts: {
                 color: this.color,
-                padding: [20, 10, 20, 0],
+                padding: [20, 10, 40, 0],
                 dataLabel: true,
                 dataPointShape: true,
                 enableScroll: true,
@@ -100,86 +104,247 @@ export default {
             minPrice: [],
             chartShow: false,
             cardData: [],
-            date: '',
+            // date: '',
             recycleSituationList: recycleSituationList,
+            searchResults: [],
+            loading: false,
+            pageNum: 1,
+            total: 0,
+            resultsShow: false,
+            isSelecting: false,
+            imgResults: [],
+            currentImg: '',
+            imgPageNum: 1,
+            imgTotal: 0,
+            searchImgInfo: {},
         }
     },
     props: {
     },
     emits: [],
     methods: {
-        openTrendModal() {
-            this.trendModal = true;
+        handleSearch({ keyword }) {
+            if (this.isSelecting) {
+                this.isSelecting = false
+                return
+            }
+            if (!keyword) {
+                this.searchResults = []
+                return
+            }
+            this.model = keyword
+            this.loading = true
+            uni.$u.api.selectModelList({
+                inputValue: keyword,
+                pageNum: this.pageNum,
+                pageSize: 10,
+            }).then(res=>{
+                this.loading = false
+                this.total = Number(res.total) || 0
+                if (this.pageNum == 1){
+                    this.searchResults = res.rows || []
+                }else{
+                    this.searchResults = [...this.searchResults, ...res.rows || []]
+                }
+                this.resultsShow = true
+            })
         },
-        closeTrendModal() {
+        handleFocus() {
+            this.resultsShow = true
+            this.handleSearch({ keyword: this.model })
+        },
+        handleClear() {
+            this.resultsShow = false
+            this.searchResults = []
+            this.total = 0
+            this.pageNum = 1
+            this.imgResults = []
+            this.imgTotal = 0
+            this.imgPageNum = 1
+            this.currentImg = ''
             this.model = ""
-            this.date = ""
+            this.minPrice = []
+            this.maxPrice = []
+            this.chartData = []
             this.cardData = []
             this.chartShow = false
+        },
+        loadMore() {
+            if (this.searchResults.length >= this.total) {
+                uni.$u.toast("没有更多数据了")
+                return
+            }
+            this.pageNum++
+            this.handleSearch({ keyword: this.model })
+        },
+        // 处理图片列表滚动到底部事件
+        loadMoreImg() {
+            if (this.imgResults.length >= this.imgTotal) {
+                uni.$u.toast("没有更多数据了")
+                return
+            }
+            this.imgPageNum++
+            this.uploadImage(this.searchImgInfo)
+        },
+        handleSelect(item) {
+            this.isSelecting = true
+            this.model = item.model
+            this.resultsShow = false
+            this.chartShow = false
+            this.$nextTick(() => {
+                this.searchTrend(item.model)
+            })
+        },
+        handleSelectImg(item) {
+            this.model = item.record.model
+            this.chartShow = false
+            this.isSelecting = true
+            this.pageNum = 1
+            this.total = 0
+            this.$nextTick(() => {
+                this.searchTrend(item.record.model)
+            })
+        },
+        handleSelectCropImg(file) {
+            this.imgPageNum = 1
+            this.imgTotal = 0
+            console.log(file);
+            
+            const data = {
+                tempFilePaths:[file]
+            }
+            this.uploadImage(data)
+        },
+        openTrendModal() {
+            this.trendModal = true;
+        },
+        closeTrendModal() {
+            this.handleClear()
             this.trendModal = false;
         },
         searchTrend(val) {
-                if (val !== '') {
-                    uni.$u.api.inquiryChart({
-                        model: val,
-                    }).then(res => {
-                        if (res.data.length == 0) {
-                            uni.$u.toast("暂无数据")
-                            this.minPrice = []
-                            this.maxPrice = []
-                            this.chartShow = false
-                            return
-                        }
-                        const response = res.data
-                        this.maxPrice = []
+            if (val !== '') {
+                uni.$u.api.inquiryChart({
+                    model: val,
+                }).then(res => {
+                    if (res.data.length == 0) {
+                        uni.$u.toast("暂无数据")
                         this.minPrice = []
-                        this.color = []
-                        const categories = []
-                        const dateMap = {}
-                        response.forEach(item => {
-                            this.maxPrice.push(item.max)
-                            this.minPrice.push(item.min)
-                            item.list.forEach(i => {
-                                i.recycleTime = this.formatTime(i.recycleTime)
-                                if (!dateMap[i.recycleTime]) {
-                                    dateMap[i.recycleTime] = true
-                                    categories.push(i.recycleTime)
-                                }
-                            })
-                        })
-                        const series = response.map((item) => {
-                            const color = this.getRandomColor()
-                            this.color.push(color)
-                            const data = categories.map(date => {
-                                const itemData = item.list.find(i => this.formatTime(i.recycleTime) == date)
-                                return itemData ? itemData.price : null
-                            })
-                            return {
-                                name: item.model,
-                                data: data,
-                                list: item.list,
-                                setShadow: [
-                                    3,
-                                    8,
-                                    15,
-                                    color
-                                ],
+                        this.maxPrice = []
+                        this.chartShow = false
+                        this.cardData = []
+                        return
+                    }
+                    this.maxPrice = []
+                    this.minPrice = []
+                    this.color = []
+                    const categories = []
+                    const dateMap = {}
+                    const recycleData = res.data[0].list
+                    recycleData.forEach(i => {
+                        i.recycleTime = this.formatTime(i.recycleTime)
+                        if (!dateMap[i.recycleTime]) {
+                            dateMap[i.recycleTime] = true
+                            categories.push(i.recycleTime)
+                        }
+                    })
+                    const situationMap = {}
+                    recycleData.forEach(i => {
+                        const key = `${i.recycleTime}-${i.recycleSituation}`
+                        if (!situationMap[key]) {
+                            situationMap[key] = {
+                                recycleTime: i.recycleTime,
+                                recycleSituation: i.recycleSituation,
+                                prices: []
                             }
+                        }
+                        situationMap[key].prices.push(i.price)
+                        this.maxPrice.push(i.price)
+                        this.minPrice.push(i.price)
+                    })
+                    const situationGroups = {}
+                    Object.values(situationMap).forEach(item => {
+                        const avgPrice = item.prices.reduce((sum, price) => sum + price, 0) / item.prices.length
+                        if (!situationGroups[item.recycleSituation]) {
+                            situationGroups[item.recycleSituation] = []
+                        }
+                        situationGroups[item.recycleSituation].push({
+                            recycleTime: item.recycleTime,
+                            price: avgPrice
+                        })
+                    })
+                    const series = Object.entries(situationGroups).map(([situation, data]) => {
+                        const color = this.getRandomColor()
+                        this.color.push(color)
+                        const seriesData = categories.map(date => {
+                            const itemData = data.find(i => i.recycleTime == date)
+                            return itemData ? itemData.price : null
                         })
-                        this.opts.color = this.color
-                        const chartData = {
-                            categories: categories,
-                            series: series
+                        return {
+                            name: this.formatRecycleSituation(situation),
+                            data: seriesData,
+                            list: data,
+                            setShadow: [
+                                3,
+                                8,
+                                15,
+                                color
+                            ],
                         }
-                        this.chartData = JSON.parse(JSON.stringify(chartData))
-                        this.cardData = []
-                        this.chartShow = true
-                    }).catch((err) => {
-                        uni.$u.toast(err)
                     })
-                }
-            },
-        formatTime(date){
+                    this.opts = {
+                        ...this.opts,
+                        color: [...this.color]
+                    }
+                    const chartData = {
+                        categories: categories,
+                        series: series
+                    }
+                    this.chartData = chartData
+                    this.cardData = []
+                    this.chartShow = true
+                }).catch((err) => {
+                    uni.$u.toast(err)
+                })
+            } else {
+                this.minPrice = []
+                this.maxPrice = []
+                this.chartShow = false
+                this.cardData = []
+            }
+        },
+        uploadImage(res) {
+            this.$nextTick(()=>{
+                this.searchImgInfo = res;
+                console.log(res,this.searchImgInfo.tempFilePaths[0]);
+                uni.$u.api.searchModelByImage(
+                    this.searchImgInfo.tempFilePaths[0],
+                    {
+                        pageNum: this.imgPageNum,
+                        pageSize: 10
+                    }
+                ).then(res => {
+                    if (res.data) {
+                        this.imgTotal = Number(res.data.total)
+                        this.currentImg = this.searchImgInfo.tempFilePaths[0]
+                        if(this.imgPageNum == 1){
+                            this.imgResults = res.data.rows
+                        }else{
+                            this.imgResults = [...this.imgResults, ...res.data.rows]
+                        }
+                        this.$refs.searchSelect.openImgPopup()
+                    } else {
+                        uni.$u.toast('未匹配到型号，请换一张图或手动输入');
+                    }
+                }).catch((err) => {
+    
+                    console.log(err);
+                    
+                    uni.$u.toast('识别失败，请重试');
+                });
+            })
+        },
+        formatTime(date) {
             return this.$dayjs(date).format('YYYY-MM-DD')
         },
         formatRecycleSituation(situation) {
@@ -190,20 +355,19 @@ export default {
             const index = event.currentIndex.index;
             // 获取点击的日期
             const date = this.chartData.categories[index];
-            this.date = date;
+            // this.date = date;
 
-            // 构建该日期的所有型号价格数据
+            // 构建该日期的所有回收情况价格数据
             const cardData = [];
             this.chartData.series.forEach(series => {
                 const price = series.data[index];
                 if (price !== null) {
-                    // 查找对应日期的完整数据
-                    const itemData = series.list.find(i => i.recycleTime === date);
                     cardData.push({
-                        model: series.name,
+                        model: this.model,
                         price: price,
-                        recycleSituation: itemData?.recycleSituation || '',
-                        remark: itemData?.remark || ''
+                        recycleSituation: series.name,
+                        remark: '',
+                        recycleTime: date,
                     });
                 }
             });
@@ -223,58 +387,68 @@ export default {
 
 <style lang="scss" scoped>
 .trend_modal {
-	width: 100%;
-	display: flex;
-	flex-direction: column;
-	gap: 20rpx;
+    width: 100%;
+    min-height: 500rpx;
+    max-height: 100%;
+    height: 100%;
+    display: flex;
+    flex-direction: column;
+    gap: 20rpx;
+    overflow-y: auto;
+}
+
+.charts_box {
+    width: 100%;
+    max-height: 600rpx;
+    overflow: hidden;
 }
 
 .card-container {
-	display: flex;
-	flex-direction: column;
-	gap: 16rpx;
-	max-height: 500rpx;
-	overflow-y: auto;
-    font-size:26rpx;
+    display: flex;
+    flex-direction: column;
+    gap: 16rpx;
+    max-height: 200rpx;
+    overflow-y: auto;
+    font-size: 26rpx;
 
-	&::-webkit-scrollbar {
-		width: 6rpx;
-	}
+    &::-webkit-scrollbar {
+        width: 6rpx;
+    }
 
-	&::-webkit-scrollbar-track {
-		background: #f1f1f1;
-		border-radius: 3rpx;
-	}
+    &::-webkit-scrollbar-track {
+        background: #f1f1f1;
+        border-radius: 3rpx;
+    }
 
-	&::-webkit-scrollbar-thumb {
-		background: #c1c1c1;
-		border-radius: 3rpx;
+    &::-webkit-scrollbar-thumb {
+        background: #c1c1c1;
+        border-radius: 3rpx;
 
-		&:hover {
-			background: #a8a8a8;
-		}
-	}
+        &:hover {
+            background: #a8a8a8;
+        }
+    }
 }
 
 .card-item {
-	background-color: #f5f5f5;
-	border-radius: 8rpx;
-	padding: 16rpx;
-	box-shadow: 0 2rpx 4rpx rgba(0, 0, 0, 0.1);
+    background-color: #f5f5f5;
+    border-radius: 8rpx;
+    padding: 16rpx;
+    box-shadow: 0 2rpx 4rpx rgba(0, 0, 0, 0.1);
 }
 
 .card-row {
-	display: flex;
-	margin-bottom: 10rpx;
-	align-items: flex-start;
+    display: flex;
+    margin-bottom: 10rpx;
+    align-items: flex-start;
 
-	.card-label {
-		flex-shrink: 0;
-	}
+    .card-label {
+        flex-shrink: 0;
+    }
 
-	.card-value {
-		flex: 1;
-		word-break: break-all;
-	}
+    .card-value {
+        flex: 1;
+        word-break: break-all;
+    }
 }
 </style>

pages/clue/post/index.vue

@@ -6,6 +6,9 @@
 				<view v-if="item.price" class="price">
 					<u-icon name="rmb-circle"></u-icon>
 					{{ item.price }}
+					<view class="more" v-if="item.hasMoreInquiryPrice" @click.stop="handleInquiry(item)">
+						更多
+					</view>
 				</view>
 			</view>
 			<view class="top_right">{{ item.assignStateCode === '1' ? "已分配" : "未分配" }}</view>
@@ -13,7 +16,7 @@
 		<view class="post_info">
 			<view class="telPhone">
 				<view class="phone">
-					<text>电话: </text>
+					<text>电话:</text>
 					<show-real-text :real="item.telephone" :type='type'
 						:style="{ color: item.repetitionOperationName ? 'red' : 'black' }"></show-real-text>
 					<template v-if="item.telAddr">
@@ -23,8 +26,8 @@
 				</view>
 				<view class="copy_btn" @click.stop="handleCopy(item)" v-if="type != '1'">复制</view>
 			</view>
-			<view class="telPhone" v-if="item.weixin">
-				<text>微信: </text>
+			<view class="info" v-if="item.weixin">
+				<text>微信:</text>
 				<view class="phone">
 					<text :style="{ color: item.repetitionOperWeixinName ? 'red' : 'black' }">{{ item.weixin }}</text>
 					<text v-if="item.repetitionOperWeixinName">( 撞 : {{ item.repetitionOperWeixinName }})</text>
@@ -37,10 +40,10 @@
 				<view>{{ item.appName }}</view>
 			</view>
 			<view class="info">
-				<view class="owner">所属人 {{ item.clueOwnerName ? item.clueOwnerName : "-" }}</view>
+				<view class="owner">所属人:{{ item.clueOwnerName ? item.clueOwnerName : "-" }}</view>
 			</view>
 			<view class="info">
-				<view class="operation">运营人 {{ item.clueOperationName ? item.clueOperationName : "-" }}</view>
+				<view class="operation">运营人:{{ item.clueOperationName ? item.clueOperationName : "-" }}</view>
 			</view>
 			<view class="info latest_follow_row" @click.stop="handleShowFollowDetail(item)">
 				<view class="label">最新跟进记录:</view>
@@ -64,15 +67,17 @@
 				</view>
 			</view>
 		</view>
-		<view class="sendOrder inquiry" @click.stop="handleInquiry(item)">
-			<image src='/static/publicClue/inquiry.png' mode="aspectFit" class="sendOrder_img"></image>
-			<view>询价</view>
-		</view>
-		<view class="sendOrder" @click.stop="handleSendOrder(item)">
-			<image src='/static/publicClue/littlePlane.png' mode="aspectFit" class="sendOrder_img"></image>
-			<view>发单</view>
+		<view class="sendOrder_wrap">
+			<view class="sendOrder inquiry" @click.stop="handleInquiry(item)">
+				<image src='/static/publicClue/inquiry.png' mode="aspectFit" class="sendOrder_img"></image>
+				<view>询价</view>
+			</view>
+			<view class="sendOrder" @click.stop="handleSendOrder(item)">
+				<image src='/static/publicClue/littlePlane.png' mode="aspectFit" class="sendOrder_img"></image>
+				<view>发单</view>
+			</view>
 		</view>
-		<add-inquiry-dialog ref="inquiryDialog" :clueId="clueId" :isClue="true" :editOrAdd="editOrAdd" :editInfo="editInfo" @cancel="handleInquiryCancel" :type="1"/>
+		<add-inquiry-dialog ref="inquiryDialog" :clueId="clueId" :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">
@@ -296,6 +301,14 @@ export default {
 			.price{
 				display: flex;
 				align-items: center;
+				gap: 8rpx;
+				.more{
+					font-size: 20rpx;
+					border: 1px solid #3c9cff;
+					border-radius:10rpx;
+					padding: 3rpx 8rpx;
+					color: #3c9cff;
+				}
 			}
 		}
 
@@ -306,10 +319,12 @@ export default {
 
 	.post_info {
 		font-size: 14px;
-
+		display: grid;
+		grid-template-columns: 1fr 1fr;
+		gap: 10rpx;
 		.telPhone {
 			display: flex;
-			margin-bottom: 6px;
+			grid-column: 1 / -1;
 
 			.copy_btn {
 				color: #4fa5fe;
@@ -319,7 +334,15 @@ export default {
 
 		.info {
 			display: flex;
-			margin-bottom: 10px;
+			// margin-bottom: 10px;
+			overflow: hidden;
+
+			> view {
+				white-space: nowrap;
+				overflow: hidden;
+				text-overflow: ellipsis;
+				flex: 1;
+			}
 
 			.createTime {
 				margin-right: 10px;
@@ -334,29 +357,27 @@ export default {
 		.latest_follow_row {
 			align-items: flex-start;
 			flex-wrap: wrap;
+			grid-column: 1 / -1;
 
 			.label {
 				flex: 0 0 90px;
-				color: #666;
 			}
 
 			.latest_follow_content {
 				flex: 1;
 				min-width: 0;
 				display: flex;
-				flex-direction: column;
 				gap: 4px;
+				flex-direction: column;
 			}
 
 			.latest_follow_text {
 				font-size: 13px;
-				color: #333;
 				word-break: break-all;
 			}
 
 			.latest_follow_time {
 				font-size: 12px;
-				color: #999;
 			}
 
 			.latest_follow_add {
@@ -390,39 +411,38 @@ export default {
 	}
 
 
-
-	.sendOrder {
-		width: 50px;
-		height: 50px;
-		background-color: rgb(36, 98, 234);
-		color: #fff;
-		border-radius: 50%;
+	.sendOrder_wrap {
 		display: flex;
-		flex-direction: column;
-		justify-content: center;
-		align-items: center;
-
-		font-size: 10px;
-		font-weight: 700;
-		font-family: "uicon";
-
-		position: absolute;
-		right: 20px;
-		bottom: 115px;
-
-
-		.sendOrder_img {
-			width: 20px;
-			height: 20px;
+		justify-content: space-between;
+		gap: 20rpx;
+		.sendOrder {
+			width: 50%;
+			height: 40px;
+			background-color: rgb(36, 98, 234);
+			color: #fff;
+			border-radius: 20rpx;
+			display: flex;
+			justify-content: center;
+			align-items: center;
+			gap: 20rpx;
+			font-size: 28rpx;
+			font-weight: 700;
+			font-family: "uicon";
+			margin-top: 10rpx;
+			.sendOrder_img {
+				width: 20px;
+				height: 20px;
+			}
+		}
+	
+		.inquiry {
+			right: 140rpx;
+			color: #2563eb;
+			border: 1px solid #2563eb;
+			background-color: #fff;
 		}
 	}
-
-	.inquiry {
-		right: 140rpx;
-		color: #2563eb;
-		border: 1px solid #2563eb;
-		background-color: #fff;
-	}
+	
 }
 
 .follow_popup {

pages/orderDetailRefactored/components/PageThree.vue

@@ -153,7 +153,7 @@
 
     <!-- 核价对话框 -->
     <add-inquiry-dialog ref="pricingDialog" :clueId="pricingClueId" :editOrAdd="pricingEditOrAdd"
-      :editInfo="pricingEditInfo" :type="2" />
+      :editInfo="pricingEditInfo" :type="2" title="询价"/>
 
     <u-modal :show="payNowModalVisible" title="确认支付信息" :showConfirmButton="false">
       <view class="modal-content">
@@ -869,7 +869,7 @@ export default {
         const res = await uni.$u.api.inquiryDetail(data)
         if (res.code === 200 && res.data) {
           // 编辑模式：保留原有数据，但更新品牌和图片
-          this.pricingEditOrAdd = 'editForm'
+          this.pricingEditOrAdd = 'edit'
           this.pricingEditInfo = {
             ...res.data,
             dictLabel: brandDictLabel || res.data.dictLabel,
@@ -881,7 +881,7 @@ export default {
           })
         } else {
           // 新增模式：设置品牌和图片
-          this.pricingEditOrAdd = 'editForm'
+          this.pricingEditOrAdd = 'edit'
           this.pricingEditInfo = {
             dictLabel: brandDictLabel,
             dictValue: brandDictValue,

pages/wareHouse/index.vue

@@ -55,6 +55,9 @@
 						<text class="price-text">价格可见</text>
 					</view>
 					<view class="dept-btn" @click="recycleDeptClick">
+						<view class="dept-name" v-if="deptName">
+							{{ deptName }}
+						</view>
 						<image src="/static/icons/dept.png" mode="aspectFill"></image>
 					</view>
 					<ba-tree-picker :selectParent="true" ref="recycleDeptRef" :multiple='false' @select-change="deptSeletchang"
@@ -496,6 +499,7 @@ export default {
 			return false;
 		},
 	},
+	
 	onShow() {
 		// 尝试恢复页面状态
 		if (!this.restorePageState()) {

pages/wareHouse/styles/index.scss

@@ -248,10 +248,17 @@
     }
     .dept-btn {
       margin-left: 18rpx;
+      display: flex;
+      align-items: center;
+      gap: 8rpx;
       image {
         width: 30rpx;
         height: 30rpx;
       }
+      .dept-name{
+        color: #333;
+        font-size: 24rpx;
+      }
     }
   }
 }

uni_modules/bt-cropper/changelog.md

@@ -0,0 +1,29 @@
+## 3.0.2（2023-06-06）
+更新了文档
+
+## 3.0.1（2022-11-03）
+修复 撤销和重做不生效的问题
+## 3.0.0（2022-11-03）
+使用wxs重构代码，性能大提升
+新增 支持蒙版裁剪，可以裁剪任何形状的图形（详情见demo示例）
+新增 支持在弹窗中使用（详情见demo示例）
+移除 由于插槽会导致许多问题，实际上开发者自己封装组件反而更简单，所以3.0版本以后移除插槽，2.0迁移教程见 demo:全屏裁剪
+## 2.0.3（2022-08-21）
+修复 在vue3 程序中报错的问题
+新增 新增了图片初始化完成和加载失败的事件
+## 2.0.2（2022-08-18）
+新增 增加了原像素裁剪功能，即使用用户在裁剪框取景的大小作为输出像素，换句话说，输出的图片分辨率与输入图片分辨率一样
+新增 增加了change事件，会在图像和裁剪框位置变化后触发
+新增 增加了compress参数 压缩图片，压缩图片是为了提升流畅度，所以只会针对用户拖动的那张图片进行压缩，最终输出的图像品质并不会受到影响
+修复 用户在没有传入图像时报错的问题
+修复 ios在某些机型上拖动出现残留的问题
+## 2.0.1（2022-07-20）
+修复：ios打包成app的时候有几率裁剪不成功的问题
+## 2.0.0（2022-07-13）
+更新了2.0版本，增加了图片放大功能
+## bt-cropper 图片裁切
+========
+### 2022年7月13日 发布2.0版本
+* 1.完全重构了代码，并且优化了性能
+* 2.支持app
+* 3.修复demo在H5的情况下高度错误的问题

uni_modules/bt-cropper/components/bt-cropper/iconfont.css

@@ -0,0 +1,22 @@
+@font-face {
+  font-family: "iconfont"; /* Project id 3311610 */
+  src: url('//at.alicdn.com/t/font_3311610_7wh8injedpd.woff2?t=1649382821379') format('woff2'),
+       url('//at.alicdn.com/t/font_3311610_7wh8injedpd.woff?t=1649382821379') format('woff'),
+       url('//at.alicdn.com/t/font_3311610_7wh8injedpd.ttf?t=1649382821379') format('truetype');
+}
+
+.iconfont {
+  font-family: "iconfont" !important;
+  font-size: 16px;
+  font-style: normal;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+}
+
+.icon-reset:before {
+  content: "\e611";
+}
+
+.icon-move:before {
+  content: "\e67b";
+}

uni_modules/bt-cropper/components/bt-cropper/js/touchs.js

@@ -0,0 +1,253 @@
+var startTouchs = [];
+var touchType = ''
+var startDistance = 0;
+var touchCenter = [];
+var cropperRect = null;
+var imageRect = null;
+var directionX = 0;
+var directionY = 0;
+var ratio = 0;
+// 操作时改变的对象
+var changes = {
+	imageRect: null,
+	cropperRect: null
+}
+// 计算旋转后真实的图片大小
+function getRealSize(){
+	var w = changes.imageRect.width
+	var h = changes.imageRect.height
+	var l =  changes.imageRect.left
+	var t =  changes.imageRect.top
+	// 内斜边
+	var R = Math.sqrt(w*w+h*h)
+	var angle = Math.atan(h/w) / Math.PI * 180
+	var rorate = rotateAngle%90
+	var direct = Math.floor(rotateAngle/90)
+	var width = R*Math.cos(ang2deg(angle-rorate))
+	var height = R*Math.sin(ang2deg(angle+rorate))
+	if(direct % 2 === 1){
+		var temp = width
+		width = height
+		height = temp
+	}
+	return {
+		width: width,
+		height: height,
+		left: l - (width - w)/2,
+		top: t - (height - h)/2,
+		dw: width - w,
+		dh: height - h
+	}
+}
+export default {
+	computed: {
+		imageStyle() {
+			const imageRect = this.imageRect
+			if (imageRect) {
+				return {
+					left: imageRect.left + 'px',
+					top: imageRect.top + 'px',
+					width: imageRect.width + 'px',
+					height: imageRect.height + 'px'
+				}
+			} else {
+				return {}
+			}
+		},
+		cropperStyle() {
+			const cropperRect = this.cropperRect
+			if (cropperRect) {
+				return {
+					left: cropperRect.left + 'px',
+					top: cropperRect.top + 'px',
+					width: cropperRect.width + 'px',
+					height: cropperRect.height + 'px'
+				}
+			} else {
+				return {}
+			}
+		}
+	},
+	methods: {
+		touchStart() {
+			let ev;
+			if (arguments.length == 3) {
+				directionX = arguments[0];
+				directionY = arguments[1];
+				ev = arguments[2];
+				touchType = "controller";
+			} else {
+				touchType = "image";
+				ev = arguments[0];
+			}
+			startTouchs = ev.touches;
+			changes = {
+				imageRect: this.imageRect,
+				cropperRect: this.cropperRect
+			};
+			ratio = this.ratio;
+			cropperRect = {
+				...changes.cropperRect
+			}
+			imageRect = {
+				...changes.imageRect
+			}
+			if (startTouchs.length == 2) {
+				const imageRect = this.imageRect
+				var x1 = startTouchs[0].clientX
+				var y1 = startTouchs[0].clientY
+				var x2 = startTouchs[1].clientX
+				var y2 = startTouchs[1].clientY
+				var distance = Math.pow(x2 - x1, 2) + Math.pow(y2 - y1, 2)
+				startDistance = Math.sqrt(distance)
+				var leftPercent = ((x1 + x2) / 2 - imageRect.left) / imageRect.width
+				var topPercent = ((y1 + y2) / 2 - imageRect.top) / imageRect.height
+				touchCenter = [leftPercent, topPercent]
+			}
+		},
+		touchMove(ev) {
+			if(startTouchs.length!==ev.touches.length) return
+			var touches = ev.touches;
+			var changeX1 = touches[0].clientX - startTouchs[0].clientX;
+			var changeY1 = touches[0].clientY - startTouchs[0].clientY;
+			if (startTouchs.length == 1) {
+				if (touchType === 'image') {
+					changes.imageRect.left = imageRect.left + changeX1;
+					changes.imageRect.top = imageRect.top + changeY1;
+					// console.log(startTouchs.length,ev.touches.length)
+				} else if (touchType === 'controller') {
+					var changeX = changeX1 * directionX;
+					var changeY = changeY1 * directionY;
+					// 比例缩放控制
+					if (ratio !== 0) {
+						if (directionX * directionY !== 0) {
+							if (changeX / ratio > changeY) {
+								changeY = changeX / ratio
+								changeX = changeY * ratio
+							} else {
+								changeX = changeY * ratio
+								changeY = changeX / ratio
+							}
+						} else {
+							if (directionX == 0) {
+								changeX = changeY * ratio
+							} else {
+								changeY = changeX / ratio
+							}
+						}
+					}
+					var realSize = getRealSize()
+					var width = cropperRect.width + changeX
+					var height = cropperRect.height + changeY
+					var imageRight = realSize.left+realSize.width
+					var imageBottom = realSize.top+realSize.height
+					if (directionX != -1) {
+						if (cropperRect.left + width > imageRight) {
+							width = imageRight - cropperRect.left
+							if (ratio !== 0) {
+								height = width / ratio
+							}
+						}
+					} else {
+						var cLeft = cropperRect.left - changeX
+						if (cLeft < realSize.left) {
+							width = cropperRect.left + cropperRect.width - realSize.left
+							if (ratio !== 0) {
+								height = width / ratio
+							}
+						}
+					}
+					// 判断是否触底
+					if (directionY != -1) {
+						if (cropperRect.top + height > imageBottom) {
+							height = imageBottom - cropperRect.top
+							if (ratio !== 0) {
+								width = height * ratio
+							}
+						}
+					} else {
+						var cTop = cropperRect.top - changeY
+						if (cTop < realSize.top) {
+							height = cropperRect.top + cropperRect.height - realSize.top
+							if (ratio !== 0) {
+								width = height * ratio
+							}
+						}
+					}
+					if (directionX == -1) {
+						changes.cropperRect.left = cropperRect.left + cropperRect.width - width
+					}
+					if (directionY == -1) {
+						changes.cropperRect.top = cropperRect.top + cropperRect.height - height
+					}
+					// 边界控制
+					changes.cropperRect.width = width
+					changes.cropperRect.height = height
+				}
+			} else if (touches.length == 2 && startTouchs.length == 2) {
+				var changeX2 = touches[0].clientX - touches[1].clientX;
+				var changeY2 = touches[0].clientY - touches[1].clientY;
+				var distance = Math.pow(changeX2, 2) + Math.pow(changeY2, 2)
+				distance = Math.sqrt(distance)
+				// 放大比例
+				var scaleRate = distance / startDistance
+				this.imageScale(scaleRate)
+			}
+		},
+		touchEnd(ev) {
+			// console.log('end',ev)
+			if(ev.touches.length!==0) return
+			if (touchType === "image") {
+				var cropperLeft = cropperRect.left
+				var cropperRight = cropperRect.left + cropperRect.width
+				var cropperTop = cropperRect.top
+				var cropperBottom = cropperTop + cropperRect.height
+				var cropperRate = cropperRect.width / cropperRect.height
+				var realSize = getRealSize()
+				var rate = realSize.width / realSize.height
+				if (realSize.width < cropperRect.width || realSize.height < cropperRect.height) {
+					var scale = 1
+					if (rate < cropperRate) {
+						scale = cropperRect.width / realSize.width
+					} else {
+						scale = cropperRect.height / realSize.height
+					}
+					imageRect.width = changes.imageRect.width
+					imageRect.height = changes.imageRect.height
+					this.imageScale(scale)
+				}
+				// 边界控制start
+				if (cropperLeft < realSize.left) {
+					changes.imageRect.left = cropperLeft + realSize.dw/2
+				}
+				if (cropperRight > realSize.left + realSize.width) {
+					changes.imageRect.left = cropperRight - realSize.width + realSize.dw/2
+				}
+				if (cropperTop < realSize.top) {
+					changes.imageRect.top = cropperTop + realSize.dh/2
+				}
+				if (cropperBottom > realSize.top + realSize.height) {
+					changes.imageRect.top = cropperBottom - realSize.height + realSize.dh/2
+				}
+				// 边界控制end
+			}
+			this.updateData({
+				cropperRect: changes.cropperRect,
+				imageRect: changes.imageRect,
+			})
+			touchType = ""
+			startTouchs = []
+			return false;
+		},
+		imageScale(scaleRate) {
+			var cw = imageRect.width * (scaleRate - 1)
+			var ch = imageRect.height * (scaleRate - 1)
+			changes.imageRect = {
+				width: imageRect.width + cw,
+				height: imageRect.height + ch,
+				left: imageRect.left - cw * (touchCenter[0]),
+				top: imageRect.top - ch * (touchCenter[1])
+			}
+		}
+	}
+}

uni_modules/bt-cropper/components/bt-cropper/utils/tools.js

@@ -0,0 +1,43 @@
+export function getTouchPoints(touchs) {
+	return Array.from(touchs).map(ev => {
+		return [ev.clientX, ev.clientY]
+	})
+}
+// 函数防抖
+export function debounce(fn, wait = 200) {
+	var timer = null;
+	return function (){
+		if (timer !== null) {
+			clearTimeout(timer);
+		}
+		timer = setTimeout(fn.bind(this), wait);
+	}
+}
+
+/**
+ * @description 睡眠
+ * @param {number} time 等待时间毫秒数
+ */
+export function sleep(time = 200) {
+	return new Promise(resolve => {
+		setTimeout(resolve, time)
+	})
+}
+const systemInfo = uni.getSystemInfoSync();
+
+export function parseUnit(size){
+	if(typeof size == 'number' || !isNaN(Number(size))){
+		return uni.upx2px(size)
+	}else if(typeof size === 'string') {
+		if(size.endsWith('rpx')){
+			return parseUnit(size.replace('rpx',''))
+		}else if(size.endsWith('px')){
+			return Number(size.replace('px',''))
+		}else if(size.endsWith('vw')){
+			return Number(size.replace('vw',''))*systemInfo.screenWidth/100
+		}else if(size.endsWith('vh')){
+			return Number(size.replace('vh',''))*systemInfo.screenHeight/100
+		}
+	}
+	return 0
+}

uni_modules/bt-cropper/package.json

@@ -0,0 +1,81 @@
+{
+	"id": "bt-cropper",
+	"displayName": "bt-cropper图片裁剪插件",
+	"version": "3.0.2",
+	"description": "一款好用的图片裁剪插件",
+	"keywords": [
+        "图片",
+        "图片裁剪",
+        "图片裁剪",
+        "头像裁剪",
+        "cropper"
+    ],
+	"repository": "",
+	"engines": {
+		"HBuilderX": "^3.4.9"
+	},
+    "dcloudext": {
+        "sale": {
+			"regular": {
+				"price": "0.00"
+			},
+			"sourcecode": {
+				"price": "0.00"
+			}
+		},
+		"contact": {
+			"qq": "1097122362"
+		},
+		"declaration": {
+			"ads": "无",
+			"data": "插件不采集任何数据",
+			"permissions": "无"
+		},
+        "npmurl": "",
+        "type": "component-vue"
+	},
+	"uni_modules": {
+		"dependencies": [],
+		"encrypt": [],
+		"platforms": {
+			"cloud": {
+				"tcb": "y",
+				"aliyun": "y"
+			},
+			"client": {
+				"Vue": {
+					"vue2": "y",
+					"vue3": "y"
+				},
+				"App": {
+					"app-vue": "y",
+					"app-nvue": "n"
+				},
+				"H5-mobile": {
+					"Safari": "y",
+					"Android Browser": "y",
+					"微信浏览器(Android)": "y",
+					"QQ浏览器(Android)": "y"
+				},
+				"H5-pc": {
+					"Chrome": "n",
+					"IE": "n",
+					"Edge": "n",
+					"Firefox": "n",
+					"Safari": "n"
+				},
+				"小程序": {
+					"微信": "y",
+					"阿里": "u",
+					"百度": "u",
+					"字节跳动": "y",
+					"QQ": "y"
+				},
+				"快应用": {
+					"华为": "n",
+					"联盟": "n"
+				}
+			}
+		}
+	}
+}

uni_modules/bt-cropper/readme.md

@@ -0,0 +1,108 @@
+
+
+## bt-cropper 图片裁切
+> **组件名：bt-cropper**
+
+图片裁切组件，在页面中裁切图片，输出裁切后的图片，支持app，小程序，H5
+### [在线体验](https://static-mp-8cc5bb7c-7831-45bf-a4e1-a71b10d3319c.next.bspapp.com/h5)
+
+## 将demo编译为微信小程序的时候，一定要填写appid！！！不然无法使用！！
+ 
+
+> **注意事项**
+> 为了避免错误使用，给大家带来不好的开发体验，请在使用组件前仔细阅读下面的注意事项，可以帮你避免一些错误。
+> - 组件需要依赖 `sass` 插件 ，请自行手动安装
+> - 只测试了头条小程序，app-vue 安卓，微信小程序和H5 大部分平台应该都没问题了
+> - 包裹层或裁剪器需要手动指定高度和宽度，推荐手动指定裁剪器的大小，尤其是头条小程序，js有时候获取不到容器的大小
+> - 如使用过程中有任何问题，或者您有一些好的建议，欢迎联系作者微信:1097122362
+
+
+
+### 安装方式
+
+本组件符合[easycom](https://uniapp.dcloud.io/collocation/pages?id=easycom)规范，`HBuilderX 2.5.5`起，只需将本组件导入项目，在页面`template`中即可直接使用，无需在页面中`import`和注册`components`。
+
+### 基本用法 
+
+**示例**
+
+```html
+<template>
+	<view class="container">
+		<bt-cropper ref="cropper" :imageSrc="imageSrc"></bt-cropper>
+		<button @click="crop">裁切</button>
+	</view>
+</template>
+<style>
+	.container{
+		/** 外层一定要指定大小 */
+		height:100vh;
+	}
+</style>
+```
+
+
+```javascript
+export default {
+   methods:{
+      crop(){
+        // 通过组件定义的ref调用cropper方法，返回一个promise对象
+        this.$refs.cropper.crop().then((res)=>{
+			console.log(res)
+		})
+      }
+   }
+}
+
+```
+
+### 限定裁切比例
+
+bt-cropper，指定ratio即可设置裁切框的宽高比，如果你想让用户自由缩放，将ratio设置为0即可
+
+**示例**
+
+```html
+<bt-cropper ref="cropper" :ratio="16/9":imageSrc="imageSrc"></bt-cropper>
+```
+
+## API
+
+### cropper Props 
+
+|属性名|类型|默认值|说明|
+|:-:|:-:|:-:|:-:|
+|ratio|number|0|裁切图像的宽高比，0表示自由比例|
+|dWidth|number|0|生成的图片的宽度,单位：px,如果传入0的话就是按原像素的比例裁剪，也就是说，输出图片的清晰度和输入图片的清晰度一样|
+|imageSrc|String|''|原图的路径，支持本地路径和网络路径，如果是网络路径，小程序要注意配置下载域名，H5要注意跨域问题|
+|mask|String|''| 裁剪的蒙版url，配合蒙版可以裁剪出任何形状的图形 (示例见全屏裁剪demo) |
+|fileType|String|'jpg'|目标文件的类型，只支持 'jpg' 或 'png'。默认为 'jpg'|
+|quality|Number|1|图片的质量，取值范围为 (0, 1]，不在范围内时当作1.0处理|
+|showGrid|Boolean|false|是否显示中心网格线，默认不显示|
+|initPosition|object|null|图片自定义的初始的位置，内容格式见change事件|
+|autoZoom|Boolean|true|是否开启操作结束后自动放大到窗口大小|
+|containerSize|object|null|手动指定容器大小，如果裁剪器放在大小会移动或缩放的dom中，则必须手动指定大小，可以带上单位，如果不带单位默认px，支持的单位有：rpx，px，vw，vm,示例：{width:100,height:1100}或者：{width:'100rpx',height:'100rpx'}|
+|canvas2d|Boolean|false| 是开启 2d canvas |
+
+
+
+### cropper Methods
+
+|方法名称|说明|参数|
+|:-:|:-:|:-:|
+|crop|裁剪图片|开始绘制并开始裁剪图片，返回Promise对象|
+|init|初始化,图片路径变化的时候自动调用此方法，如果包裹的dom大小变化了，你需要手动调用此方法|-|
+|initCropper|重置裁剪框和图片的位置和大小到初始的位置和大小|-|
+|undo|撤销，最多可以回退10步|-|
+|resume|重做|-|
+
+
+### cropper Events
+
+|方法名称|说明|返回值|
+|:-:|:-:|:-:|
+|change|当裁剪框和图片的相对位置发生变化的时候触发，返回裁剪框与图片的相对位置|ev={left:number,top:number,width:number,height:number}|
+|loadFail|当图片加载失败时触发| - |
+|cropStart|当裁开始时触发| - |
+## 帮助
+在使用中如遇到无法解决的问题，请提 [Issues](https://gitee.com/xiaojiang1996/better-uni-cropper/issues) 或者加我 微信:1097122362。

utils/api.js

@@ -144,6 +144,8 @@ const install = (Vue, vm) => {
 		wareHouseOrderUpdate:(data)=>http.put(store.state.user.path+'/wareHouseOrder',data),//开单编辑
 		wareHouseDelete:(data)=>http.delete(store.state.user.path+'/warehouse/' + data.id ),//仓库删除
 		saveOrderFileAndTransfer: (data = {}) => http.post(store.state.user.path + '/storeInfo/saveOrderFileAndTransfer', data),
+		selectModelList: (data) => http.post(store.state.user.path+'/warehouse/selectModelList' , data),// 价格趋势筛选
+		searchModelByImage:(filePath, params = {})=>http.upload(store.state.user.path+'/warehouse/searchModelByImage',{ filePath, name: "file", params, timeout: 60000, custom: { loadingText: '识别中...' } }),//询价中心-以图搜型号
 
 		// 删除订单分成数据
 		deleteClueCommissionForm: (id, config = {}) => http.delete(store.state.user.path + '/clueCommissionForm/' + id),