feat:询价、核价、仓库模块mock接口

components/custom-tab-select/index.vue

@@ -39,7 +39,11 @@ export default {
       type: String,
       default: "single",
       validator: (value) => ["single", "multiple"].includes(value)
-    }
+    },
+    echoInfo: {
+      type: [String, Number, Array],
+      default: ""
+    },
   },
   computed: {
     isMultiple() {
@@ -47,18 +51,49 @@ export default {
     }
   },
   data() {
+    // 优先使用 echoInfo，如果 echoInfo 不为空则使用它，否则使用 defaultActive
+    const initialValue = this.echoInfo || this.defaultActive;
     return {
-      activeValue: this.defaultActive,
-      activeValues: Array.isArray(this.defaultActive) ? this.defaultActive : []
+      activeValue: this.isMultiple ? '' : initialValue,
+      activeValues: this.isMultiple ? (Array.isArray(initialValue) ? initialValue : []) : []
     };
   },
   watch: {
     defaultActive: {
       handler(val) {
-        if (this.isMultiple) {
-          this.activeValues = Array.isArray(val) ? val : [];
+        // 只有当 echoInfo 为空时，才使用 defaultActive
+        if (!this.echoInfo) {
+          if (this.isMultiple) {
+            this.activeValues = Array.isArray(val) ? val : [];
+          } else {
+            this.activeValue = val;
+          }
+        }
+      },
+      immediate: true
+    },
+    echoInfo: {
+      handler(val) {
+        if (val !== undefined && val !== null) {
+          if (this.isMultiple) {
+            this.activeValues = Array.isArray(val) ? val : [];
+          } else {
+            this.activeValue = val;
+          }
+        }
+      },
+      immediate: true
+    },
+    mode: {
+      handler(newMode) {
+        // 当 mode 变化时，重新初始化选中值
+        const initialValue = this.echoInfo || this.defaultActive;
+        if (newMode === 'multiple') {
+          this.activeValues = Array.isArray(initialValue) ? initialValue : [];
+          this.activeValue = '';
         } else {
-          this.activeValue = val;
+          this.activeValue = initialValue;
+          this.activeValues = [];
         }
       },
       immediate: true

components/form-select-to-page/index.scss

@@ -6,4 +6,12 @@
     font-size: 28rpx;
     font-weight: 600;
     gap: 14rpx;
+    &.bottom{
+        padding-bottom: 10rpx;
+        border-bottom: 2rpx solid #dadbde;
+    }
+    .none{
+        padding-bottom: 0rpx;
+        border-bottom: none;
+    }
 }

components/form-select-to-page/index.vue

@@ -1,7 +1,9 @@
 <template>
-    <view class="form_select_to_page" @click="handleClickToPage">
+    <view :class="['form_select_to_page', borderType]" @click="handleClickToPage">
         <view>{{ val }}</view>
-        <!-- <u-icon size="13" name="close-circle" @click="clear" v-if="val"></u-icon> -->
+        <view @click.stop="clear" v-if="val && isDelete">
+            <u-icon size="13" name="close-circle"></u-icon>
+        </view>
         <u-icon size="20" name="arrow-right"></u-icon>
     </view>
 </template>
@@ -17,6 +19,14 @@ export default {
         url: {
             type: String,
             default: '',
+        },
+        isDelete: {
+            type: Boolean,
+            default: false,
+        },
+        borderType: {   
+            type: String,
+            default: 'none',//none,bottom
         }
     },
     emits: ['handleClear'],

components/imgs-row-scroll/index.scss

@@ -1,4 +1,7 @@
 .imgs-row-scroll {
+	::v-deep .uni-scroll-view {
+		height: 100% !important;
+	}
 	.img-list {
 		display: flex;
 		align-items: center;
@@ -30,6 +33,9 @@
 		align-items: center;
 		justify-content: center;
 		z-index: 10;
+		::v-deep .u-icon{
+			background-color: transparent !important;
+		}
 	}
 	// 使用indicator隐藏滚动条会报错，暂时使用样式隐藏
 	::v-deep .u-scroll-list__indicator{

components/inquiry-verification-list/index.vue

@@ -1,35 +1,35 @@
 <template>
     <view class="inquiry_wrap">
-        <u-navbar class="nav-bar" :title="type == '1' ? '询价中心' : '核价中心'" :autoBack="true" :placeholder="true" v-hideNav></u-navbar>
-        <scroll-view class="list" scroll-y @scrolltolower="getList" enable-back-to-top>
-            <transition-group name="order-move" tag="div">
-                <view class="list_item" v-for="(item, index) in list" :key="index" @click="handleClick(item)">
-                    <view class="list_item_top">
-                        <view class="top_left">
-                            <text class="name">{{ item.dictLabel }}</text>
-                            <text class="desc">{{ type == '1' ? '意向' : item.model }}</text>
-                        </view>
-                        <view class="top_right">
-                            <text :class="['status', type == '1' ? 'inquiry' : 'verification']">{{
-                                formtterStatus(item.status) }}</text>
-                        </view>
+        <u-navbar class="nav-bar" :title="type == '1' ? '询价中心' : '核价中心'" :autoBack="true" :placeholder="true"
+            v-hideNav></u-navbar>
+        <scroll-view class="list_wrap" scroll-y @scrolltolower="loadMore" enable-back-to-top>
+            <view class="list_item" v-for="(item, index) in list" :key="index" @click="handleClick(item)">
+                <view class="list_item_top">
+                    <view class="top_left">
+                        <text class="name">{{ item.dictLabel }}</text>
+                        <text class="desc">{{ type == '1' ? '意向' : item.model }}</text>
                     </view>
-                    <view class="imgs">
-                        <imgs-row-scroll :images="item.imgsUrl" :previewEnabled="true" :showIndicator="false"
-                            :imageWidth="140" :imageHeight="140"></imgs-row-scroll>
+                    <view class="top_right">
+                        <text :class="['status', type == '1' ? 'inquiry' : 'verification']">{{
+                            formtterStatus(item.status) }}</text>
                     </view>
-                    <view class="list_item_bottom">
-                        <view class="bottom">
-                            <u-icon name="bookmark" size="16" color="#9ca3af"></u-icon>
-                            <text class="code">编码：{{ item.code }}</text>
-                        </view>
-                        <view class="bottom">
-                            <u-icon name="clock" size="16" color="#9ca3af"></u-icon>
-                            <text class="time">{{ item.date }}</text>
-                        </view>
+                </view>
+                <view class="imgs">
+                    <imgs-row-scroll :images="item.imgsUrl" :previewEnabled="true" :showIndicator="false"
+                        :imageWidth="140" :imageHeight="140"></imgs-row-scroll>
+                </view>
+                <view class="list_item_bottom">
+                    <view class="bottom">
+                        <u-icon name="bookmark" size="16" color="#9ca3af"></u-icon>
+                        <text class="code">编码：{{ item.code }}</text>
+                    </view>
+                    <view class="bottom">
+                        <u-icon name="clock" size="16" color="#9ca3af"></u-icon>
+                        <text class="time">{{ item.date }}</text>
                     </view>
                 </view>
-            </transition-group>
+            </view>
+            <show-emtry v-if="list.length === 0"></show-emtry>
         </scroll-view>
 
         <add-inquiry-dialog ref="addInquiryDialog" editOrAdd="edit" :editInfo="editInfo" @success="handleInquirySuccess"

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

@@ -7,103 +7,11 @@ export default {
     },
     data() {
         return {
-            list: [
-        {
-          clueId:'',//线索公海id
-          id:'',//询价id
-          dictValue:'2',//品牌id
-          dictLabel:'Rolex',//品牌名称
-          model:'Submariner Date 126610LN',//型号
-          code:'123',//编码
-          price:'12345',//询价价格
-          desc:'意向',
-          date:'2026-2-1 10:00:00',//询价日期
-          status:'1',//询价列表：1-待询价 2-询价完成;   核价列表:1-待核价 2-核价完成
-          imgsUrl:['https://xiaohulu-crm.oss-cn-shanghai.aliyuncs.com/crm/2026/01/06/1767677335839-1767677330379.jpg','https://xiaohulu-crm.oss-cn-shanghai.aliyuncs.com/crm/2026/01/06/1767677335839-1767677330379.jpg']//询价图片数组
-        },
-        {
-          clueId:'',//线索公海id
-          id:'',//询价id
-          dictValue:'2',//品牌id
-          dictLabel:'Rolex',//品牌名称
-          model:'Submariner Date 126610LN',//型号
-          code:'123',//编码
-          price:'12345',//询价价格
-          desc:'意向',
-          date:'2026-2-1 10:00:00',//询价日期
-          status:'1',//询价列表：1-待询价 2-询价完成;   核价列表:1-待核价 2-核价完成
-          imgsUrl:['https://xiaohulu-crm.oss-cn-shanghai.aliyuncs.com/crm/2026/01/06/1767677335839-1767677330379.jpg','https://xiaohulu-crm.oss-cn-shanghai.aliyuncs.com/crm/2026/01/06/1767677335839-1767677330379.jpg']//询价图片数组
-        },
-        {
-          clueId:'',//线索公海id
-          id:'',//询价id
-          dictValue:'2',//品牌id
-          dictLabel:'Rolex',//品牌名称
-          model:'Submariner Date 126610LN',//型号
-          code:'123',//编码
-          price:'12345',//询价价格
-          desc:'意向',
-          date:'2026-2-1 10:00:00',//询价日期
-          status:'1',//询价列表：1-待询价 2-询价完成;   核价列表:1-待核价 2-核价完成
-          imgsUrl:['https://xiaohulu-crm.oss-cn-shanghai.aliyuncs.com/crm/2026/01/06/1767677335839-1767677330379.jpg','https://xiaohulu-crm.oss-cn-shanghai.aliyuncs.com/crm/2026/01/06/1767677335839-1767677330379.jpg']//询价图片数组
-        },
-        {
-          clueId:'',//线索公海id
-          id:'',//询价id
-          dictValue:'2',//品牌id
-          dictLabel:'Rolex',//品牌名称
-          model:'Submariner Date 126610LN',//型号
-          code:'123',//编码
-          price:'12345',//询价价格
-          desc:'意向',
-          date:'2026-2-1 10:00:00',//询价日期
-          status:'1',//询价列表：1-待询价 2-询价完成;   核价列表:1-待核价 2-核价完成
-          imgsUrl:['https://xiaohulu-crm.oss-cn-shanghai.aliyuncs.com/crm/2026/01/06/1767677335839-1767677330379.jpg','https://xiaohulu-crm.oss-cn-shanghai.aliyuncs.com/crm/2026/01/06/1767677335839-1767677330379.jpg']//询价图片数组
-        },
-        {
-          clueId:'',//线索公海id
-          id:'',//询价id
-          dictValue:'2',//品牌id
-          dictLabel:'Rolex',//品牌名称
-          model:'Submariner Date 126610LN',//型号
-          code:'123',//编码
-          price:'12345',//询价价格
-          desc:'意向',
-          date:'2026-2-1 10:00:00',//询价日期
-          status:'1',//询价列表：1-待询价 2-询价完成;   核价列表:1-待核价 2-核价完成
-          imgsUrl:['https://xiaohulu-crm.oss-cn-shanghai.aliyuncs.com/crm/2026/01/06/1767677335839-1767677330379.jpg','https://xiaohulu-crm.oss-cn-shanghai.aliyuncs.com/crm/2026/01/06/1767677335839-1767677330379.jpg']//询价图片数组
-        },
-        {
-          clueId:'',//线索公海id
-          id:'',//询价id
-          dictValue:'2',//品牌id
-          dictLabel:'Rolex',//品牌名称
-          model:'Submariner Date 126610LN',//型号
-          code:'123',//编码
-          price:'12345',//询价价格
-          desc:'意向',
-          date:'2026-2-1 10:00:00',//询价日期
-          status:'1',//询价列表：1-待询价 2-询价完成;   核价列表:1-待核价 2-核价完成
-          imgsUrl:['https://xiaohulu-crm.oss-cn-shanghai.aliyuncs.com/crm/2026/01/06/1767677335839-1767677330379.jpg','https://xiaohulu-crm.oss-cn-shanghai.aliyuncs.com/crm/2026/01/06/1767677335839-1767677330379.jpg']//询价图片数组
-        },
-        {
-          clueId:'',//线索公海id
-          id:'',//询价id
-          dictValue:'2',//品牌id
-          dictLabel:'Rolex',//品牌名称
-          model:'Submariner Date 126610LN',//型号
-          code:'123',//编码
-          price:'12345',//询价价格
-          desc:'意向',
-          date:'2026-2-1 10:00:00',//询价日期
-          status:'1',//询价列表：1-待询价 2-询价完成;   核价列表:1-待核价 2-核价完成
-          imgsUrl:['https://xiaohulu-crm.oss-cn-shanghai.aliyuncs.com/crm/2026/01/06/1767677335839-1767677330379.jpg','https://xiaohulu-crm.oss-cn-shanghai.aliyuncs.com/crm/2026/01/06/1767677335839-1767677330379.jpg']//询价图片数组
-        },
-      ],
+            list: [],
             editInfo: {},
             queryParams: {
                 pageSize: 10,
-                pageNum: 0,
+                pageNum: 1,
             },
             total: 0,
         }
@@ -112,38 +20,28 @@ export default {
         this.getList();
     },
     methods: {
-        getList(){
-            if (this.list.length > 0 && this.list.length >= this.total) {
-                uni.$u.toast('暂无更多数据');
-                return;
-            }
-            
-            if (this.queryParams.pageNum === 0) {
-                this.queryParams.pageNum = 1;
-                this.list = [];
-            } else {
-                this.queryParams.pageNum++;
-            }
-            
-            uni.$u.api.inquiryVerificationList(this.queryParams,{
+        getList() {
+            uni.$u.api.inquiryVerificationList(this.queryParams, {
                 type: this.type,
             }).then(res => {
-                this.total = res.total;
-                
-                if(this.total === 0){
-                    uni.$u.toast('暂无数据');
-                    return;
-                }
-                
                 if (this.queryParams.pageNum === 1) {
                     this.list = res.rows;
                 } else {
                     this.list = this.list.concat(res.rows);
                 }
+                this.total = res.total;
             })
         },
-        formtterStatus(status){
-            switch(status){
+        loadMore(){
+            if (this.list.length >= this.total) {
+                uni.$u.toast('没有更多了');
+                return;
+            }
+            this.queryParams.pageNum++;
+            this.getList();
+        },
+        formtterStatus(status) {
+            switch (status) {
                 case '1':
                     return this.type == '1' ? '待询价' : '待核价';
                 case '2':
@@ -158,6 +56,7 @@ export default {
             this.$refs.addInquiryDialog.closeDialog();
         },
         handleInquiryCancel() {
+            this.queryParams.pageNum = 1;
             this.getList();
             this.$refs.addInquiryDialog.closeDialog();
         },

components/inquiry-verification-list/styles/index.scss

@@ -1,98 +1,97 @@
 .inquiry_wrap {
     background-color: #f9fafb;
-    height: 100vh;
+    // height: 100vh;
     display: flex;
     flex-direction: column;
     box-sizing: border-box;
 
-    .list {
+    .list_wrap {
         flex: 1;
-        height: calc(100vh - 100rpx);
+
         ::v-deep .uni-scroll-view {
-            height:100%;
-            .list_item {
-                margin: 0 20rpx;
-                padding: 30rpx;
-                background-color: #fff;
-                border-radius: 20rpx;
-                margin-bottom: 20rpx;
-                box-shadow: 2px 2px 11px 1px #e7e7e7;
-
-                .list_item_top {
+            height: calc(100vh - 250rpx);
+        }
+
+        .list_item {
+            margin: 0 20rpx;
+            padding: 30rpx;
+            background-color: #fff;
+            border-radius: 20rpx;
+            margin-bottom: 20rpx;
+            box-shadow: 2px 2px 11px 1px #e7e7e7;
+
+            .list_item_top {
+                display: flex;
+                justify-content: space-between;
+                align-items: flex-start;
+
+                .top_left {
                     display: flex;
-                    justify-content: space-between;
-                    align-items: flex-start;
-
-                    .top_left {
-                        display: flex;
-                        flex-direction: column;
-                        justify-content: flex-start;
-
-                        .name {
-                            font-size: 32rpx;
-                            font-weight: bold;
-                            color: #111827;
-                        }
-
-                        .desc {
-                            font-size: 26rpx;
-                            color: #9ca3af;
-                        }
-                    }
+                    flex-direction: column;
+                    justify-content: flex-start;
 
-                    .top_right {
-                        display: flex;
-                        flex-direction: column;
-                        justify-content: flex-end;
-
-                        .status {
-                            font-size: 24rpx;
-                            padding: 6rpx 12rpx;
-                            border-radius: 12rpx;
-                            border: 2rpx solid #2563eb;
-                            font-weight: 600;
-                        }
-
-                        .inquiry {
-                            color: #2563eb;
-                            background-color: #eff6ff;
-                            border-color: #dceafe;
-                        }
-
-                        .verification {
-                            color: #ed590e;
-                            background-color: #fff7ed;
-                            border-color: #fff2e2;
-                        }
+                    .name {
+                        font-size: 32rpx;
+                        font-weight: bold;
+                        color: #111827;
                     }
 
+                    .desc {
+                        font-size: 26rpx;
+                        color: #9ca3af;
+                    }
                 }
 
-                .imgs {
-                    margin: 20rpx 0;
+                .top_right {
+                    display: flex;
+                    flex-direction: column;
+                    justify-content: flex-end;
+
+                    .status {
+                        font-size: 24rpx;
+                        padding: 6rpx 12rpx;
+                        border-radius: 12rpx;
+                        border: 2rpx solid #2563eb;
+                        font-weight: 600;
+                    }
+
+                    .inquiry {
+                        color: #2563eb;
+                        background-color: #eff6ff;
+                        border-color: #dceafe;
+                    }
+
+                    .verification {
+                        color: #ed590e;
+                        background-color: #fff7ed;
+                        border-color: #fff2e2;
+                    }
                 }
 
-                .list_item_bottom {
+            }
+
+            .imgs {
+                margin: 20rpx 0;
+            }
+
+            .list_item_bottom {
+                display: flex;
+                justify-content: space-between;
+                align-items: center;
+                font-size: 26rpx;
+                color: #9ca3af;
+                font-weight: 550;
+
+                .bottom {
                     display: flex;
-                    justify-content: space-between;
                     align-items: center;
-                    font-size: 26rpx;
-                    color: #9ca3af;
-                    font-weight: 550;
-
-                    .bottom {
-                        display: flex;
-                        align-items: center;
-                        gap: 8rpx;
-                    }
-                }
-                &:nth-of-type(1){
-                    margin-top: 20rpx;
+                    gap: 8rpx;
                 }
             }
-            // .uni-scroll-view-content{
-            //     height: calc(100% - 70px);
-            // }
+
+            &:nth-of-type(1) {
+                margin-top: 20rpx;
+            }
         }
 
     }

components/person-picker/index.vue

@@ -0,0 +1,74 @@
+<template>
+  <view class="">
+    <u-picker :show="show" :title="title" :columns="columns" keyName="label" ref="uPicker"
+                @confirm="recyclePersonConfirm" @change="recyclePersonChange" @cancel='close'></u-picker>
+  </view>
+</template>
+
+<script>
+export default {
+  name: 'personPicker',
+  data() {
+    return {
+        show: false,
+        columns: [],
+    }
+  },
+  props: {
+    title: {
+      type: String,
+      default: '请选择',
+    },
+  },
+  emits: ['selectPerson'],
+  methods: {
+    open() {
+        this.show = true;
+        this.recyclePersonClick();
+    },
+    close() {
+        this.columns = [];
+        this.show = false;
+    },
+    recyclePersonConfirm({ columnIndex, value, values }) {
+        this.$emit('selectPerson', value[value.length -1]);
+        this.close();
+    },
+    recyclePersonChange(e) {
+        const {
+              columnIndex,
+              value,
+              values,
+              picker = this.$refs.uPicker
+          } = e
+          // 当前项不是用户，且有子级，添加下一层
+          if(!value[columnIndex].isUser){
+            picker.setColumnValues(columnIndex+1, value[columnIndex].children);
+          }else{
+            // 当前是用户且同等级的其他项有子级，则添加下一层空数据
+            values[columnIndex].forEach((item, index) => {
+              if(!item.isUser){
+                picker.setColumnValues(columnIndex+1, []);
+              }
+            })
+          }
+        },
+    recyclePersonClick() {
+        uni.$u.api.getCustomerManagerAllList().then(res => {
+            this.columns = [res.data] || [];
+            
+            // 如果第一层只有一个选项，自动处理下一层级
+            if (res.data && res.data.length === 1) {
+                // 如果当前项不是用户且有子级，添加下一层
+                if (!res.data[0].isUser && res.data[0].children && res.data[0].children.length > 0) {
+                    this.columns.push(res.data[0].children);
+                }
+            }
+        })
+    },
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+</style>

mock/mockData.js

@@ -260,28 +260,316 @@ const mockDataList = {
       pageNum: 1,
     },
     data:{
-      category:'1',//品类：1-全部 2-腕表 3-箱包 4-珠宝  5-鞋靴 6-配饰 7-服饰
-      sort:'date',// 排序方式：date-按最近更新排序
+      searchString:'',//搜索编号、名称、品牌...
+      category:1,//品类：1-全部 2-腕表 3-箱包 4-珠宝  5-鞋靴 6-配饰 7-服饰 8-其它
+      sortType:4,// 排序方式：1-按最久未下载 2-按最近更新 3-按最久更新 4-按入库最新 5-按入库最久 6-按价格最高 7-按价格最低
+      dictLabel:'Rolex',//品牌名称
       dictValue:'2',//品牌id
       priceMin:'1000',//价格范围：最小价格
       priceMax:'10000',//价格范围：最大价格
       location:'',//位置
-      date:'2026-02-01',//回收时间，比如2026-02-01
-      recyclePerson:'',//回收人员
-      identifyingPerson:'',//鉴定人员
-      productAttribute:'',//产品属性：1-自有商品 2-寄卖商品 3-质押商品 4-其它
+      recycleTime:'2026-01-09',//回收时间，比如2026-02-01
+      recyclePerson:'张三',//回收人员
+      recyclePersonId:'',//回收人员id
+      identifyingPerson:'李四',//鉴定人员
+      identifyingPersonId:'',//鉴定人员id
+      productAttribute:['1','2'],//产品属性 多选：1-自有商品 2-寄卖商品 3-质押商品 4-其它
     },
     url: '/prod-api/crm/warehouse/wareHouseList',
     delay: 300,
     response: {
       code: 200,
       msg: 'success',
+      rows:[
+        {
+          id:'123456754',//商品库存id
+          name:'Rolex',//商品名称
+          model:'Submariner Date 126610LN',//型号
+          costPrice:'12345',//成本价格
+          salesPrice:'12345',//销售价格
+          peerPrice:'12345',//同行价格
+          agentPrice:'12345',//代理价格
+          stock:'12345',//库存数量
+          imgUrl:'https://xiaohulu-crm.oss-cn-shanghai.aliyuncs.com/crm/2026/01/06/1767677335839-1767677330379.jpg',//商品图片
+          platform:[]//同步平台，此功能暂时不做，先定义一个字段
+        
+        },
+        {
+          id:'',//商品库存id
+          name:'Rolex',//商品名称
+          model:'Submariner Date 126610LN',//型号
+          costPrice:'12345',//成本价格
+          salesPrice:'12345',//销售价格
+          peerPrice:'12345',//同行价格
+          agentPrice:'12345',//代理价格
+          stock:'12345',//库存数量
+          imgUrl:'https://xiaohulu-crm.oss-cn-shanghai.aliyuncs.com/crm/2026/01/06/1767677335839-1767677330379.jpg',//商品图片
+          platform:[]//同步平台，此功能暂时不做，先定义一个字段
+        
+        },
+        {
+          id:'',//商品库存id
+          name:'Rolex',//商品名称
+          model:'Submariner Date 126610LN',//型号
+          costPrice:'12345',//成本价格
+          salesPrice:'12345',//销售价格
+          peerPrice:'12345',//同行价格
+          agentPrice:'12345',//代理价格
+          stock:'12345',//库存数量
+          imgUrl:'https://xiaohulu-crm.oss-cn-shanghai.aliyuncs.com/crm/2026/01/06/1767677335839-1767677330379.jpg',//商品图片
+          platform:[]//同步平台，此功能暂时不做，先定义一个字段
+        
+        },
+        {
+          id:'',//商品库存id
+          name:'Rolex',//商品名称
+          model:'Submariner Date 126610LN',//型号
+          costPrice:'12345',//成本价格
+          salesPrice:'12345',//销售价格
+          peerPrice:'12345',//同行价格
+          agentPrice:'12345',//代理价格
+          stock:'12345',//库存数量
+          imgUrl:'https://xiaohulu-crm.oss-cn-shanghai.aliyuncs.com/crm/2026/01/06/1767677335839-1767677330379.jpg',//商品图片
+          platform:[]//同步平台，此功能暂时不做，先定义一个字段
+        },
+        {
+          id:'',//商品库存id
+          name:'Rolex',//商品名称
+          model:'Submariner Date 126610LN',//型号
+          costPrice:'12345',//成本价格
+          salesPrice:'12345',//销售价格
+          peerPrice:'12345',//同行价格
+          agentPrice:'12345',//代理价格
+          stock:'12345',//库存数量
+          imgUrl:'https://xiaohulu-crm.oss-cn-shanghai.aliyuncs.com/crm/2026/01/06/1767677335839-1767677330379.jpg',//商品图片
+          platform:[]//同步平台，此功能暂时不做，先定义一个字段
+        },
+        {
+          id:'',//商品库存id
+          name:'Rolex',//商品名称
+          model:'Submariner Date 126610LN',//型号
+          costPrice:'12345',//成本价格
+          salesPrice:'12345',//销售价格
+          peerPrice:'12345',//同行价格
+          agentPrice:'12345',//代理价格
+          stock:'12345',//库存数量
+          imgUrl:'https://xiaohulu-crm.oss-cn-shanghai.aliyuncs.com/crm/2026/01/06/1767677335839-1767677330379.jpg',//商品图片
+          platform:[]//同步平台，此功能暂时不做，先定义一个字段
+        },
+        {
+          id:'',//商品库存id
+          name:'Rolex',//商品名称
+          model:'Submariner Date 126610LN',//型号
+          costPrice:'12345',//成本价格
+          salesPrice:'12345',//销售价格
+          peerPrice:'12345',//同行价格
+          agentPrice:'12345',//代理价格
+          stock:'12345',//库存数量
+          imgUrl:'https://xiaohulu-crm.oss-cn-shanghai.aliyuncs.com/crm/2026/01/06/1767677335839-1767677330379.jpg',//商品图片
+          platform:[]//同步平台，此功能暂时不做，先定义一个字段
+        },
+        {
+          id:'',//商品库存id
+          name:'Rolex',//商品名称
+          model:'Submariner Date 126610LN',//型号
+          costPrice:'12345',//成本价格
+          salesPrice:'12345',//销售价格
+          peerPrice:'12345',//同行价格
+          agentPrice:'12345',//代理价格
+          stock:'12345',//库存数量
+          imgUrl:'https://xiaohulu-crm.oss-cn-shanghai.aliyuncs.com/crm/2026/01/06/1767677335839-1767677330379.jpg',//商品图片
+          platform:[]//同步平台，此功能暂时不做，先定义一个字段
+        },
+        {
+          id:'',//商品库存id
+          name:'Rolex',//商品名称
+          model:'Submariner Date 126610LN',//型号
+          costPrice:'12345',//成本价格
+          salesPrice:'12345',//销售价格
+          peerPrice:'12345',//同行价格
+          agentPrice:'12345',//代理价格
+          stock:'12345',//库存数量
+          imgUrl:'https://xiaohulu-crm.oss-cn-shanghai.aliyuncs.com/crm/2026/01/06/1767677335839-1767677330379.jpg',//商品图片
+          platform:[]//同步平台，此功能暂时不做，先定义一个字段
+        },
+        {
+          id:'',//商品库存id
+          name:'Rolex',//商品名称
+          model:'Submariner Date 126610LN',//型号
+          costPrice:'12345',//成本价格
+          salesPrice:'12345',//销售价格
+          peerPrice:'12345',//同行价格
+          agentPrice:'12345',//代理价格
+          stock:'12345',//库存数量
+          imgUrl:'https://xiaohulu-crm.oss-cn-shanghai.aliyuncs.com/crm/2026/01/06/1767677335839-1767677330379.jpg',//商品图片
+          platform:[]//同步平台，此功能暂时不做，先定义一个字段
+        }
+      ],
+      total: 20,//总条数
     }
-  }
+  },
+  // 仓库模块-详情
+  '/warehouse/wareHouseDetail': {
+    method: 'get',
+    params: {
+      id: '',
+      userId:'12345',//用户id
+    },
+    url: '/prod-api/crm/warehouse/wareHouseDetail',
+    delay: 300,
+    response: {
+      code: 200,
+      msg: 'success',
+      data: {
+        id:'12345',//商品库存id
+        imgsUrl:[{
+          url:'https://xiaohulu-crm.oss-cn-shanghai.aliyuncs.com/crm/2026/01/06/1767677335839-1767677330379.jpg',//商品图片
+        },
+        {
+          url:'https://xiaohulu-crm.oss-cn-shanghai.aliyuncs.com/crm/2026/01/06/1767677335839-1767677330379.jpg',//商品图片
+        }],//商品图片
+        dictLabel:'Rolex',//商品名称
+        dictValue:'12345',//商品名称id
+        model:'Submariner Date 126610LN',//型号
+        code:'12345',//独立编码
+        warehouseDate:'2026-01-06',//入库日期
+        payType:'1',//付款方式 1：微信 2：支付宝 3：银行卡 4：现金 5：数字货币 6：挂账
+        note:'单包 附件齐全 成色极好',//备注
+        originalCost:'12345',//原始成本
+        additionalCost:'12345',//附加成本
+        agentPrice:'12345',//代理价格
+        suggestedPrice:'12345',//建议价格
+        location:'上海',//商品位置
+        recyclePerson:'张三',//回收人员
+        recyclePersonId:'12345',//回收人员id
+        identifyingPerson:'张三',//鉴定人员
+        identifyingPersonId:'12345',//鉴定人员id
+        logTotal:12,//操作日志总数
+        lockStatus:'0',//锁单状态 0：未锁单 1：已锁单 
+        downStatus:'1',//下架状态 0：已下架 1：已上架
+      }
+    }
+  },
+  // 仓库模块-详情-操作日志-列表
+  '/warehouse/wareHouseLog': {
+    method: 'get',
+    params: {
+      id: '',//商品库存id
+      userId:'12345',//用户id
+    },
+    url: '/prod-api/crm/warehouse/wareHouseLog',
+    delay: 300,
+    response: {
+      code: 200,
+      msg: 'success',
+      data: [
+        {
+          id:1,//操作日志id
+          name:'张三',//操作人
+          createTime:'2026-01-06 12:00:00',//操作时间
+          operation:'修改名称为Rolex',//操作内容
+        },
+        {
+          id:2,//操作日志id
+          name:'张三',//操作人
+          createTime:'2026-01-06 12:00:00',//操作时间
+          operation:'修改型号为Submariner Date 126610LN',//操作内容
+        },
+        {
+          id:3,//操作日志id
+          name:'张三',//操作人
+          createTime:'2026-01-06 12:00:00',//操作时间
+          operation:'修改名称为Rolex',//操作内容
+        },
+        {
+          id:4,//操作日志id
+          name:'张三',//操作人
+          createTime:'2026-01-06 12:00:00',//操作时间
+          operation:'修改型号为Submariner Date 126610LN',//操作内容
+        },
+      ]
+    }
+  },
+  // 仓库模块-详情-编辑
+  '/warehouse/wareHouseUpdate': {
+    method: 'post',
+    data:{
+      id:'',//商品库存id
+      imgsUrl:[{
+        url:'https://xiaohulu-crm.oss-cn-shanghai.aliyuncs.com/crm/2026/01/06/1767677335839-1767677330379.jpg',//商品图片
+      },
+      {
+        url:'https://xiaohulu-crm.oss-cn-shanghai.aliyuncs.com/crm/2026/01/06/1767677335839-1767677330379.jpg',//商品图片
+      }],//商品图片
+      dictLabel:'Rolex',//商品名称
+      dictValue:'12345',//商品名称id
+      model:'Submariner Date 126610LN',//型号
+      code:'12345',//独立编码
+      warehouseDate:'2026-01-06',//入库日期
+      payType:'1',//付款方式 1：微信 2：支付宝 3：银行卡 4：现金 5：数字货币 6：挂账
+      note:'单包 附件齐全 成色极好',//备注
+      originalCost:'12345',//原始成本
+      additionalCost:'12345',//附加成本
+      agentPrice:'12345',//代理价格
+      suggestedPrice:'12345',//建议价格
+      location:'上海',//商品位置
+      recyclePerson:'张三',//回收人员
+      recyclePersonId:'12345',//回收人员id
+      identifyingPerson:'张三',//鉴定人员
+      identifyingPersonId:'12345',//鉴定人员id
+    },
+    url: '/prod-api/crm/warehouse/wareHouseUpdate',
+    delay: 300,
+    response: {
+      code: 200,
+      msg: 'success'
+    }
+  },
+  // 仓库模块-详情-锁单/解锁
+  '/warehouse/wareHouseLock': {
+    method: 'post',
+    data:{
+      id:'',//商品库存id
+      lockStatus:'1',//锁单状态 0：解锁 1：锁单
+    },
+    url: '/prod-api/crm/warehouse/wareHouseLock',
+    delay: 300,
+    response: {
+      code: 200,
+      msg: 'success'
+    }
+  },
+  // 仓库模块-详情-上架/下架
+  '/warehouse/wareHouseDown': {
+    method: 'post',
+    data:{
+      id:'',//商品库存id
+      downStatus:'1',//下架状态 0：下架 1：上架
+    },
+    url: '/prod-api/crm/warehouse/wareHouseDown',
+    delay: 300,
+    response: {
+      code: 200,
+      msg: 'success'
+    }
+  },
+  // 仓库模块-新增
+  '/warehouse/wareHouseAdd': {
+    method: 'post',
+    data:{
 
+    },
+    url: '/prod-api/crm/warehouse/wareHouseAdd',
+    delay: 300,
+    response: {
+      code: 200,
+      msg: 'success'
+    }
+  }
   
 
   
+
   
 };
 

pages.json

@@ -166,7 +166,7 @@
 			}
 		},
 		{
-			"path": "pages/wareHouse/detail",
+			"path": "pages/wareHouse/components/detail",
 			"style": {
 				"navigationBarTitleText": "仓库详情",
 				"enablePullDownRefresh": true,
@@ -174,7 +174,7 @@
 			}
 		},
 		{
-			"path": "pages/wareHouse/add",
+			"path": "pages/wareHouse/components/add",
 			"style": {
 				"navigationBarTitleText": "仓库新增",
 				"enablePullDownRefresh": true,
@@ -182,7 +182,7 @@
 			}
 		},
 		{
-			"path" : "pages/wareHouse/openOrder",
+			"path" : "pages/wareHouse/components/openOrder",
 			"style": {
 				"navigationBarTitleText": "销售业务开单",
 				"enablePullDownRefresh": true,

pages/inquiry/index.vue

@@ -19,7 +19,6 @@
 
 <style>
     .page-container {
-        height: 100vh;
         width: 100%;
         overflow: hidden;
     }

pages/verification/index.vue

@@ -19,7 +19,6 @@
 
 <style>
     .page-container {
-        height: 100vh;
         width: 100%;
         overflow: hidden;
     }

pages/wareHouse/add.vue

@@ -16,11 +16,14 @@
 实价：6500
 型号：L2.257.5.89.7
 编码：52356065
-日期：2021.11.09
+日期：2021-11-09
 备注：全套
-付款方式：线上' confirmType="done" height="170" :maxlength="-1" @blur='handleRecognition'>
+付款方式：微信/支付宝/银行卡/现金/数字货币/挂账' confirmType="done" height="170" :maxlength="-1">
                         </u--textarea>
-                        <u-button text="粘贴识别" @click="handleRecognition"></u-button>
+                        <view class="btn_group_recognition">
+                            <u-button text="清除" @click="clearRecognitionContent()"></u-button>
+                            <u-button text="粘贴识别" type="primary" @click="handlePasteRecognition(recognitionContent)"></u-button>
+                        </view>
                     </u-form-item>
                     <u-form-item label="商品图片" required prop="imgs" borderBottom>
                         <u-upload :fileList="goodPicFileList" @afterRead="afterReadGoodPic" @delete="deleteGoodPic"
@@ -119,7 +122,7 @@
                         </TabSelect>
                     </u-form-item>
                     <u-form-item label="回收人员" class="u-form-item-row" borderBottom>
-                        <u--input v-model="formData.recyclePerson" disabled clearable border="none"></u--input>
+                        <u--input v-model="formData.recyclePerson" disabledColor="#fff" disabled clearable border="none"></u--input>
                     </u-form-item>
                     <u-form-item label="回收留底图" borderBottom>
                         <view class="recycle_bottom_desc">
@@ -179,7 +182,7 @@
                         </view>
                     </u-form-item>
                     <u-form-item label="付款方式" borderBottom>
-                        <TabSelect :tabList="paymentTabList" :colNum="4" mode="single"
+                        <TabSelect :tabList="paymentTabList" :echoInfo="payTypeEcho" :colNum="4" mode="single"
                             @tabChange="handlePaymentTabChange">
                         </TabSelect>
                     </u-form-item>
@@ -376,7 +379,7 @@ export default {
                     value: 6,
                 },
             ],
-            brandToUrl: '/pages/wareHouse/brandList',
+            brandToUrl: '/pages/wareHouse/components/brandList',
             // 上传
             goodPicFileList: [{ url: 'https://uviewui.com/swiper/1.jpg' }],//商品图片
             detailPicFileList: [],//细节图片
@@ -384,6 +387,7 @@ export default {
             recycleBottomFileList: [],//回收留底图
             productCardFileList: [],//商品保卡图片或独立编码照片留底
             productTagFileList: [],//商品标签图片留底
+            payTypeEcho:''//付款方式识别回显
         }
     },
     methods: {
@@ -443,7 +447,6 @@ export default {
             this.recycleTimeShow = false;
         },
         closeRecycleTimePicker(val) {
-            console.log(val);
             this.recycleTimeShow = false;
         },
         cancelRecycleTimePicker(val) {
@@ -517,27 +520,91 @@ export default {
             console.log(event);
             // this.fileList5 = [...this.fileList5, ...event.fileList];
         },
-        async handleRecognition() {
+        async handlePasteRecognition(text) {
             // 品牌：浪琴
             // 来源：【麒麟】私信-杰3-3
             // 实价：6500
             // 型号：L2.257.5.89.7
             // 编码：52356065
-            // 日期：2021.11.09
+            // 日期：2021-11-09
             // 备注：全套
-            // 付款方式：线上
-            if (!this.recognitionContent) {
+            // 付款方式：微信
+            if (!text) {
                 return;
             }
             try {
-                uni.$u.toast("识别成功");
+                if (!text) return {};
+                
+                const result = {};
+                // 支持中文冒号和英文冒号
+                const lines = text.split(/[\n\r]+/);
+                
+                lines.forEach(line => {
+                const lineStr = line.trim();
+                if (!lineStr) return;
+                
+                // 尝试中文冒号
+                let separatorIndex = lineStr.indexOf('：');
+                // 如果没有中文冒号，尝试英文冒号
+                if (separatorIndex === -1) {
+                    separatorIndex = lineStr.indexOf(':');
+                }
+                
+                if (separatorIndex > 0) {
+                    const key = lineStr.substring(0, separatorIndex).trim();
+                    const value = lineStr.substring(separatorIndex + 1).trim();
+                    result[key] = value;
+                }
+                });
+                console.log(result);
+                if(result['品牌']){
+                    this.formData.brand = result['品牌'];
+                }
+                if(result['来源']){
+                    this.formData.desc = result['来源'];
+                }
+                if(result['实价']){
+                    this.formData.costPrice = result['实价'];
+                }
+                if(result['型号']){
+                    this.formData.model = result['型号'];
+                }
+                if(result['编码']){
+                    this.formData.indentifyCode = result['编码'];
+                }
+                if(result['日期']){
+                    this.formData.recycleTime = result['日期'];
+                }
+                if(result['备注']){
+                    this.formData.productDesc = result['备注'];
+                }
+                if(result['付款方式']){
+                    console.log(result['付款方式']);
+                    
+                    this.getPaymentType(result['付款方式'])
+                    this.formData.paymentType = result['付款方式'];
+
+                }
+                // return result;
             } catch (e) {
                 uni.$u.toast("文本识别异常");
             }
         },
+        clearRecognitionContent(){
+            this.recognitionContent = '';
+        },
+        getPaymentType(val) {
+            let arr = []
+            this.paymentTabList.filter(item=>{
+                if(item.name == val) arr.push(item.value)
+            })
+            if(arr.length > 0){
+                this.payTypeEcho = arr[0]
+            }
+        }
     }
 }
 </script>
 <style lang="scss" scoped>
-@import './styles/add.scss';
+@import '../styles/add.scss';
 </style>

pages/wareHouse/components/detail.vue

@@ -0,0 +1,531 @@
+<template>
+    <view class="detail" @click="handleClickOutside">
+        <u-navbar class="nav_bar" title="商品详情档案" :autoBack="true" :placeholder="true" rightIcon="more-dot-fill"
+            v-hideNav></u-navbar>
+        <u-swiper :list="imgsUrl" keyName="url" indicator indicatorMode="line" circular>
+            <!-- <template v-slot:item="{ item, index }">
+                <view style="width: 100%; height: 600rpx;">
+                    <image :src="item.url" mode="aspectFill" style="width: 100%; height: 100%; object-fit: cover;"></image>
+                </view>
+            </template> -->
+        </u-swiper>
+
+        <!-- 立即下架按钮 -->
+        <view class="immediate_off_shelf">
+            <u-button type="error" shape="circle" size="large" @click="handleOffShelf">
+                <u-icon :name="downStatus == '0' ? 'arrow-upward' : 'arrow-downward'" size="38rpx"
+                    color="#ffffff"></u-icon>
+                <text>{{ downStatus == '0' ? '立即上架' : '立即下架' }}</text>
+            </u-button>
+        </view>
+
+        <!-- 轮播图下方操作按钮 -->
+        <view class="swiper_actions">
+            <view class="action_item" @click="handleDownload">
+                <u-icon name="download" size="44rpx" color="#606266"></u-icon>
+                <text class="action_text">下载图文</text>
+            </view>
+            <view class="action_item">
+                <u-icon name="share" size="44rpx" color="#606266"></u-icon>
+                <text class="action_text">分享</text>
+            </view>
+            <view class="action_item" @click="handleEditImgs">
+                <u-icon name="camera" size="44rpx" color="#606266"></u-icon>
+                <text class="action_text">编辑图片</text>
+                <u-modal :show="showEditImgsModal" title="编辑图片" showCancelButton @confirm="confirmEditImgs" @cancel="cancelEditImgs">
+                    <imgs-row-scroll v-if="tempImgsUrl.length > 0" :isShowDeleteIcon="true" keyName="url"
+                        @deleteImgInfo="getDeleteImgInfo" imgMode="aspectFill" :totalWidth="400" :images="tempImgsUrl"
+                        :previewEnabled="true" :imageWidth="150" :imageHeight="150"></imgs-row-scroll>
+                    <u-upload @afterRead="afterRead" multiple></u-upload>
+                </u-modal>
+            </view>
+            <view class="action_item">
+                <u-icon name="cut" size="44rpx" color="#606266"></u-icon>
+                <text class="action_text">智能抠图</text>
+            </view>
+        </view>
+
+        <!-- 核心信息区域 -->
+        <view class="core_info">
+            <view class="section_title">核心信息</view>
+            <view class="info_row">
+                <view class="info_label">品牌</view>
+                <view class="info_value" @click.stop="showBrandlList()">
+                    <!-- <u-input v-if="editMode.dictLabel" v-model="tempValues.dictLabel" :autoFocus="true" @blur="!globalEditMode && saveEditField('dictLabel', tempValues.dictLabel, 'dictLabel')" /> -->
+                    <span>{{ coreInfo.dictLabel || '-' }}</span>
+                    <BrandList ref="brandListRef" @selectedBrand="handleSelectedBrand"></BrandList>
+                </view>
+            </view>
+            <view class="info_row">
+                <view class="info_label">型号</view>
+                <view class="info_value" @click.stop="toggleEditField('model', coreInfo.model)">
+                    <u-input v-if="editMode.model" v-model="tempValues.model" :autoFocus="true"
+                        @blur="!globalEditMode && saveEditField('model', tempValues.model, 'model')" />
+                    <span v-else>{{ coreInfo.model || '-' }}</span>
+                </view>
+            </view>
+            <view class="info_row">
+                <view class="info_label">独立编码</view>
+                <view class="info_value code" @click.stop="toggleEditField('code', coreInfo.code)">
+                    <u-input v-if="editMode.code" v-model="tempValues.code" :autoFocus="true"
+                        @blur="!globalEditMode && saveEditField('code', tempValues.code, 'code')" />
+                    <span v-else>{{ coreInfo.code || '-' }}</span>
+                </view>
+            </view>
+            <view class="info_row">
+                <view class="info_label">入库日期</view>
+                <view class="info_value">{{ coreInfo.warehouseDate || '-' }}</view>
+            </view>
+            <view class="info_row">
+                <view class="info_label">付款方式</view>
+                <view class="info_value">{{ coreInfo.payType || '-' }}</view>
+            </view>
+            <view class="info_row col">
+                <view class="info_label">备注信息</view>
+                <view class="info_value note" @click.stop="toggleEditField('note', coreInfo.note)">
+                    <textarea v-if="editMode.note" v-model="tempValues.note" :autoFocus="true" rows="3"
+                        @blur="!globalEditMode && saveEditField('note', tempValues.note, 'note')" />
+                    <span v-else>{{ coreInfo.note || '-' }}</span>
+                </view>
+            </view>
+        </view>
+
+        <!-- 财务与价格区域 -->
+        <view class="finance_price">
+            <view class="section_title">财务与价格</view>
+            <view class="price_group">
+                <view class="price_item">
+                    <view class="price_label">原始成本</view>
+                    <view class="price_value original"
+                        @click.stop="toggleEditField('originalCost', coreInfo.originalCost)">
+                        <u-input v-if="editMode.originalCost" v-model="tempValues.originalCost" :autoFocus="true"
+                            @blur="!globalEditMode && saveEditField('originalCost', tempValues.originalCost, 'originalCost')" />
+                        <span v-else>￥{{ coreInfo.originalCost || '-' }}</span>
+                    </view>
+                </view>
+                <view class="price_item">
+                    <view class="price_label">附加成本</view>
+                    <view class="price_value additional"
+                        @click.stop="toggleEditField('additionalCost', coreInfo.additionalCost)">
+                        <u-input v-if="editMode.additionalCost" v-model="tempValues.additionalCost" :autoFocus="true"
+                            @blur="!globalEditMode && saveEditField('additionalCost', tempValues.additionalCost, 'additionalCost')" />
+                        <span v-else>￥{{ coreInfo.additionalCost || '-' }}</span>
+                    </view>
+                </view>
+            </view>
+            <view class="price_group">
+                <view class="price_item">
+                    <view class="price_label">代理价格</view>
+                    <view class="price_value agent" @click.stop="toggleEditField('agentPrice', coreInfo.agentPrice)">
+                        <u-input v-if="editMode.agentPrice" v-model="tempValues.agentPrice" :autoFocus="true"
+                            @blur="!globalEditMode && saveEditField('agentPrice', tempValues.agentPrice, 'agentPrice')" />
+                        <span v-else>￥{{ coreInfo.agentPrice || '-' }}</span>
+                    </view>
+                </view>
+                <view class="price_item">
+                    <view class="price_label">建议售价</view>
+                    <view class="price_value suggested"
+                        @click.stop="toggleEditField('suggestedPrice', coreInfo.suggestedPrice)">
+                        <u-input v-if="editMode.suggestedPrice" v-model="tempValues.suggestedPrice" :autoFocus="true"
+                            @blur="!globalEditMode && saveEditField('suggestedPrice', tempValues.suggestedPrice, 'suggestedPrice')" />
+                        <span v-else>￥{{ coreInfo.suggestedPrice || '-' }}</span>
+                    </view>
+                </view>
+            </view>
+        </view>
+
+        <!-- 溯源与位置区域 -->
+        <view class="traceability_location">
+            <view class="section_title">溯源与位置</view>
+            <view class="info_row">
+                <view class="info_label">商品位置</view>
+                <view class="info_value" @click.stop="toggleEditField('location', coreInfo.location)">
+                    <u-input v-if="editMode.location" v-model="tempValues.location" :autoFocus="true"
+                        @blur="!globalEditMode && saveEditField('location', tempValues.location, 'location')" />
+                    <span v-else>{{ coreInfo.location || '-' }}</span>
+                </view>
+            </view>
+            <view class="info_row">
+                <view class="info_label">回收人员</view>
+                <view class="info_value" @click.stop="showRecyclePersonPicker">
+                    <!-- <u-input v-if="editMode.recyclePerson" v-model="tempValues.recyclePerson" :autoFocus="true" @blur="!globalEditMode && saveEditField('recyclePerson', tempValues.recyclePerson, 'recyclePerson')" /> -->
+                    <span>{{ coreInfo.recyclePerson || '-' }}</span>
+                    <personPicker ref="recyclePersonPickerRef" title="请选择回收人员"
+                        @selectPerson="handleSelectRecyclePerson">
+                    </personPicker>
+                </view>
+            </view>
+            <view class="info_row">
+                <view class="info_label">鉴定人员</view>
+                <view class="info_value" @click.stop="showIdentifyingPersonPicker">
+                    <!-- <u-input v-if="editMode.identifyingPerson" v-model="tempValues.identifyingPerson" :autoFocus="true" @blur="!globalEditMode && saveEditField('identifyingPerson', tempValues.identifyingPerson, 'identifyingPerson')" /> -->
+                    <span>{{ coreInfo.identifyingPerson || '-' }}</span>
+                    <personPicker ref="identifyingPersonPickerRef" title="请选择鉴定人员"
+                        @selectPerson="handleSelectIdentifyingPerson"></personPicker>
+                </view>
+            </view>
+            <view class="action_button">
+                <u-button type="primary" plain size="mini" @click="viewLog">查看操作日志({{ coreInfo.logTotal ||
+                    '-'}}条)</u-button>
+                <u-modal :show="logShow" title="日志" :closeOnClickOverlay="true" :showConfirmButton="false"
+                    @close="logShow = false">
+                    <view class="log_list">
+                        <view v-for="value in logList" :key="value.id" class="log_item">
+                            {{ value.createTime }}{{ value.name }}{{ value.operation }}
+                        </view>
+                    </view>
+                </u-modal>
+            </view>
+        </view>
+
+        <!-- 底部功能按钮栏 -->
+        <view class="bottom_bar">
+            <view class="bar_item" @click.stop="globalEditMode ? handleClickOutside() : enterGlobalEdit()">
+                <u-icon :name="globalEditMode ? 'checkbox-mark' : 'edit-pen'" size="46rpx"
+                    :color="globalEditMode ? '#10b981' : '#9ca3af'"></u-icon>
+                <text class="bar_text">{{ globalEditMode ? '确定' : '编辑' }}</text>
+            </view>
+            <view class="bar_item" @click.stop="lockGoods">
+                <u-icon :name="lockStatus === '1' ? 'lock-open' : 'lock'" size="46rpx" color="#9ca3af"></u-icon>
+                <text class="bar_text">{{ lockStatus === '1' ? '解锁' : '锁单' }}</text>
+            </view>
+            <view class="bar_item">
+                <i class="iconfont icon-crm-dayin" style="font-size:46rpx;color: #9ca3af;"></i>
+                <text class="bar_text">打印</text>
+            </view>
+            <view :class="['bar_item', { 'disabled': lockStatus === '1' }]" @click="handleOpenOrder">
+                <view class="primary">
+                    <u-icon name="bag" size="44rpx" color="#fff"></u-icon>
+                    <text class="bar_text">开单</text>
+                </view>
+            </view>
+        </view>
+    </view>
+</template>
+
+<script>
+import BrandList from '@/components/brand-list/index.vue'
+import personPicker from '@/components/person-picker/index.vue'
+import imgsRowScroll from '@/components/imgs-row-scroll/index.vue'
+export default {
+    components: {
+        BrandList,
+        personPicker,
+        imgsRowScroll,
+    },
+    data() {
+        return {
+            // 核心信息模拟数据
+            coreInfo: {},
+            // 编辑状态管理
+            editMode: {
+                model: false,
+                code: false,
+                note: false,
+                originalCost: false,
+                additionalCost: false,
+                agentPrice: false,
+                suggestedPrice: false,
+                location: false,
+            },
+            // 全局编辑模式
+            globalEditMode: false,
+            // 临时存储编辑值
+            tempValues: {},
+            goodsId: '',
+            logShow: false,
+            logList: [],
+            imgsUrl: [],
+            lockStatus: '',//锁单状态 0：未锁单 1：已锁单 
+            downStatus: '',//下架状态 0：已下架 1：已上架
+            showEditImgsModal: false,
+            tempImgsUrl: [],
+        }
+    },
+    onLoad(options) {
+        this.goodsId = options.id;
+        this.getGoodsDetail();
+    },
+    methods: {
+        // 锁单
+        lockGoods() {
+            uni.$u.api.wareHouseLock({
+                id: this.goodsId,
+                lockStatus: this.lockStatus === '1' ? '0' : '1',
+            }).then(res => {
+                uni.showToast({
+                    title: this.lockStatus === '1' ? '解锁成功' : '锁单成功',
+                    icon: 'success'
+                })
+                this.getGoodsDetail();
+            })
+        },
+        showRecyclePersonPicker() {
+            this.$refs.recyclePersonPickerRef.open();
+        },
+        // 处理选中回收人员
+        handleSelectRecyclePerson(person) {
+            this.coreInfo.recyclePerson = person.label;
+            this.coreInfo.recyclePersonId = person.id;
+            this.submitEdit(this.coreInfo)
+        },
+        // 显示鉴定人员选择器
+        showIdentifyingPersonPicker() {
+            this.$refs.identifyingPersonPickerRef.open();
+        },
+        // 处理选中鉴定人员
+        handleSelectIdentifyingPerson(person) {
+            this.coreInfo.identifyingPerson = person.label;
+            this.coreInfo.identifyingPersonId = person.id;
+            this.submitEdit(this.coreInfo)
+        },
+        // 显示品牌列表
+        showBrandlList() {
+            this.$refs.brandListRef.showBrandList();
+        },
+        // 处理选中品牌
+        handleSelectedBrand(info) {
+            this.coreInfo.dictLabel = info.dictLabel;
+            this.coreInfo.dictValue = info.dictValue;
+            this.submitEdit(this.coreInfo)
+        },
+        // 获取商品详情
+        getGoodsDetail() {
+            uni.$u.api.wareHouseDetail({
+                id: this.goodsId,
+                userId: this.$store.state.user.userInfo.userId,
+            }).then(res => {
+                this.coreInfo = res.data;
+                this.imgsUrl = res.data.imgsUrl || [];
+                this.lockStatus = res.data.lockStatus;
+                this.downStatus = res.data.downStatus;
+            });
+        },
+        // 打开销售业务开单页面
+        handleOpenOrder() {
+            if (this.lockStatus === '1') {
+                uni.showToast({
+                    title: '已锁单，不能开单',
+                    icon: 'none'
+                })
+                return
+            }
+            uni.navigateTo({
+                url: '/pages/wareHouse/components/openOrder?id=' + this.goodsId
+            });
+        },
+        viewLog() {
+            uni.$u.api.wareHouseLog({
+                id: this.goodsId,
+                userId: this.$store.state.user.userInfo.userId,
+            }).then(res => {
+                this.logList = res.data;
+                this.logShow = true;
+            });
+        },
+
+        // 立即下架按钮
+        handleOffShelf() {
+            uni.$u.api.wareHouseDown({
+                id: this.goodsId,
+                downStatus: this.downStatus === '1' ? '0' : '1',
+            }).then(res => {
+                uni.showToast({
+                    title: this.downStatus === '1' ? '上架成功' : '下架成功',
+                    icon: 'success'
+                })
+                this.getGoodsDetail();
+            })
+        },
+        // 切换单个字段的编辑状态
+        toggleEditField(field, value) {
+            // 如果不是全局编辑模式
+            if (!this.globalEditMode) {
+                // 重置所有编辑状态
+                this.resetEditMode();
+                // 设置当前字段为编辑状态
+                this.editMode[field] = true;
+                // 保存临时值
+                this.tempValues[field] = value;
+            }
+        },
+        // 保存单个字段的编辑值
+        saveEditField(field, newValue, fieldName) {
+            this.coreInfo[fieldName] = newValue;
+            this.editMode[field] = false;
+            delete this.tempValues[field];
+            console.log(`保存${field}字段值: ${newValue}`);
+            this.submitEdit(this.coreInfo);
+        },
+        // 进入全局编辑模式
+        enterGlobalEdit() {
+            this.globalEditMode = true;
+            // 设置所有可编辑字段为编辑状态
+            this.editMode = {
+                model: true,
+                code: true,
+                note: true,
+                originalCost: true,
+                additionalCost: true,
+                agentPrice: true,
+                suggestedPrice: true,
+                location: true,
+            };
+            // 保存所有字段的临时值
+            this.tempValues = { ...this.coreInfo }
+        },
+        // 重置所有编辑状态
+        resetEditMode() {
+            Object.keys(this.editMode).forEach(key => {
+                this.editMode[key] = false;
+            });
+        },
+        submitEdit(info) {
+            const data = {
+                id: this.goodsId,
+                imgsUrl: this.imgsUrl,
+                dictLabel: info.dictLabel,
+                dictValue: info.dictValue,
+                model: info.model,
+                code: info.code,
+                warehouseDate: info.warehouseDate,
+                payType: info.payType,
+                note: info.note,
+                originalCost: info.originalCost,
+                additionalCost: info.additionalCost,
+                agentPrice: info.agentPrice,
+                suggestedPrice: info.suggestedPrice,
+                location: info.location,
+                recyclePerson: info.recyclePerson,
+                recyclePersonId: info.recyclePersonId,
+                identifyingPerson: info.identifyingPerson,
+                identifyingPersonId: info.identifyingPersonId,
+            }
+            uni.$u.api.wareHouseUpdate(data).then(res => {
+                uni.showToast({
+                    title: '编辑成功',
+                    icon: 'success'
+                });
+                this.getGoodsDetail();
+                this.$emit('editSuccess')
+            })
+        },
+        // 点击页面其他地方保存所有编辑
+        handleClickOutside() {
+            if (this.globalEditMode) {
+                this.submitEdit(this.tempValues)
+                // 全局编辑模式下，点击外部区域重置所有编辑
+                this.globalEditMode = false;
+                // 退出所有编辑状态
+                this.resetEditMode();
+                // 清空临时值，恢复初始状态
+                this.tempValues = {};
+
+            } else {
+                // 保存当前正在编辑的字段
+                Object.keys(this.editMode).forEach(key => {
+                    if (this.editMode[key]) {
+                        this.saveEditField(key, this.tempValues[key], key);
+                    }
+                });
+            }
+
+        },
+        handleDownload() {
+            if (this.imgsUrl.length == 0) {
+                uni.showToast({
+                    title: '暂无图片',
+                    icon: 'none'
+                })
+                return;
+            }
+            uni.showModal({
+                title: '保存图片',
+                content: `是否将 ${this.imgsUrl.length} 张图片保存到本地相册？`,
+                confirmText: '保存',
+                success: (res) => {
+                    if (res.confirm) {
+                        this.saveImagesToLocal(this.imgsUrl);
+                    }
+                }
+            })
+
+        },
+        saveImagesToLocal(allUrls) {
+            uni.showToast({
+                title: '图片保存中...',
+                icon: 'loading'
+            })
+            allUrls.forEach((item, index) => {
+                uni.downloadFile({
+                    url: item.url,
+                    success: (res) => {
+                        if (res.statusCode === 200) {
+                            uni.saveImageToPhotosAlbum({
+                                filePath: res.tempFilePath,
+                                success() {
+                                    uni.showToast({
+                                        title: '保存成功'
+                                    })
+                                },
+                                fail: (err) => {
+                                    console.error('保存到相册失败:', err);
+                                    // 如果是权限问题，尝试请求权限
+                                    if (err.errMsg.includes('auth denied')) {
+                                        uni.showModal({
+                                            title: '权限不足',
+                                            content: '需要访问相册权限来保存图片，是否去设置？',
+                                            success: (modalRes) => {
+                                                if (modalRes.confirm) {
+                                                    // 打开设置页面
+                                                    uni.openSetting({
+                                                        success: (settingRes) => {
+                                                            console.log('设置页面结果:', settingRes);
+                                                        }
+                                                    });
+                                                }
+                                            }
+                                        });
+                                    }
+                                    reject(err);
+                                }
+                            })
+                        }
+                    }
+                })
+            })
+        },
+        handleEditImgs() {
+            this.showEditImgsModal = true;
+            this.tempImgsUrl = this.imgsUrl
+        },
+        getDeleteImgInfo(imgInfo) {
+            this.tempImgsUrl = imgInfo.newImages
+        },
+        afterRead(info) {
+            info.file.forEach(item=>{
+                uni.$u.api.uploadFile(item.url).then((res) => {
+                    this.tempImgsUrl.push({url:res.data.url});
+                    uni.$u.toast("文件上传成功");
+                    this.showEditImgsModal = false;
+                }).catch(() => {
+                    uni.$u.toast("上传文件失败");
+                })
+            })
+        },
+        confirmEditImgs() {
+            this.imgsUrl = this.tempImgsUrl
+            this.submitEdit(this.coreInfo)
+            this.showEditImgsModal = false;
+        },
+        cancelEditImgs() {
+            this.tempImgsUrl = []
+            this.showEditImgsModal = false;
+        }
+    }
+}
+</script>
+
+<style lang="scss" scoped>
+@import "../styles/detail.scss";
+</style>

pages/wareHouse/openOrder.vue

@@ -106,7 +106,7 @@ export default {
    data() {
       return {
          openOrderForm: {
-            url: require('./imgs/1.jpg'),
+            url: require('../imgs/1.jpg'),
             title: 'ROLEX',
             desc: 'SUBMSRINER DATE 126610LN',
             totalCost: '82500',
@@ -242,5 +242,5 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
-@import './styles/openOrder.scss';
+@import '../styles/openOrder.scss';
 </style>

pages/wareHouse/components/searchFilter.vue

@@ -0,0 +1,182 @@
+<template>
+    <u-popup mode="bottom" :round="10" :show="show" @close="close" @open="open" closeable>
+        <u--form labelPosition="left" :model="formData" ref="uForm">
+            <u-form-item label="品牌" @click="showBrandList" labelWidth="70">
+                <FormSelectToPage :val="formData.dictLabel" :isDelete="true" borderType="bottom" @handleClear="clear('dictLabel')"></FormSelectToPage>
+                <BrandList ref="brandListRef" @selectedBrand="handleSelectedBrand"></BrandList>
+            </u-form-item>
+            <u-form-item label="价格范围" labelWidth="70">
+                <u-input v-model="formData.minPrice" placeholder="最小价格" fontSize="14" border="bottom" clearable></u-input>
+                &nbsp;&nbsp;——&nbsp;&nbsp;
+                <u-input v-model="formData.maxPrice" placeholder="最大价格" fontSize="14" border="bottom" clearable></u-input>
+            </u-form-item>
+            <u-form-item label="位置" labelWidth="70">
+                <u-input v-model="formData.location" fontSize="14" clearable border="bottom"></u-input>
+            </u-form-item>
+            <u-form-item label="回收时间" labelWidth="70" @click="recycleTimeShow = true">
+                <FormSelectToPage :val="formData.recycleTime" :isDelete="true" borderType="bottom" @handleClear="clear('recycleTime')">  </FormSelectToPage>
+                <u-datetime-picker  :show="recycleTimeShow" v-model="recycleTimeDefault" mode="date"  @confirm="confirmRecycleTime" @close="recycleTimeShow = false"
+                            @cancel="recycleTimeShow = false"></u-datetime-picker>
+            </u-form-item>
+            <u-form-item label="回收人员" labelWidth="70" @click="recyclePersonClick">
+                <FormSelectToPage :val="formData.recyclePerson" :isDelete="true" borderType="bottom" @handleClear="clear('recyclePerson')"></FormSelectToPage>
+                <personPicker ref="recyclePersonPickerRef" title="请选择回收人员" @selectPerson="handleSelectRecyclePerson"></personPicker>
+            </u-form-item>
+            <u-form-item label="鉴定人员" labelWidth="70" @click="identifyingPersonClick">
+                <FormSelectToPage :val="formData.identifyingPerson" :isDelete="true" borderType="bottom" @handleClear="clear('identifyingPerson')"></FormSelectToPage>
+                <personPicker ref="identifyingPersonPickerRef" title="请选择鉴定人员" @selectPerson="handleSelectIdentifyingPerson"></personPicker>
+            </u-form-item>
+            <u-form-item label="商品属性" labelWidth="70">
+                <TabSelect :tabList="productAttributeList" :colNum="3" :echoInfo="formData.productAttribute" mode="multiple" @tabChange="handleTabChangeProductAttribute"></TabSelect>
+            </u-form-item>
+        </u--form>
+        <view class="btns">
+            <u-button text="重置" @click="resetForm"></u-button>
+            <u-button type="primary" text="确定" @click="handleSearch"></u-button>
+        </view>
+    </u-popup>
+</template>
+
+<script>
+import FormSelectToPage from '@/components/form-select-to-page/index.vue'
+import BrandList from '@/components/brand-list/index.vue'
+import personPicker from '@/components/person-picker/index.vue'
+import TabSelect from '@/components/custom-tab-select/index.vue'
+export default {
+    components: {
+        FormSelectToPage,
+        BrandList,
+        personPicker,
+        TabSelect,
+    },
+    name: 'searchFilter',
+    emits: ['confirm'],
+    data() {
+        return {
+            show: false,
+            formData: {
+                dictLabel: '',
+                dictValue: '',
+                minPrice: '',
+                maxPrice: '',
+                location: '',
+                recycleTime: '',
+                recyclePerson:'',
+                recyclePersonId: '',
+                identifyingPerson:'',
+                identifyingPersonId: '',
+                productAttribute: '',
+            },
+            recycleTimeDefault: new Date().getTime(),
+            recycleTimeShow: false,
+            recyclePersonList: [],
+            productAttributeList: [
+                {
+                    name: '自有商品',
+                    value: '1',
+                },
+                {
+                    name: '寄卖商品',
+                    value: '2',
+                },
+                {
+                    name: '质押商品',
+                    value: '3',
+                },
+                {
+                    name: '其它',
+                    value: '4',
+                },
+            ],
+        }
+    },
+    props: {
+    },
+    emits: [],
+    methods: {
+        handleSearch() {
+            this.$emit('confirm', this.formData);
+            this.close();
+        },
+        resetForm() {
+            this.formData = {
+                dictLabel: '',
+                dictValue: '',
+                minPrice: '',
+                maxPrice: '',
+                location: '',
+                recycleTime: '',
+                recyclePerson:'',
+                recyclePersonId: '',
+                identifyingPerson:'',
+                identifyingPersonId: '',
+                productAttribute: '',
+            };
+            this.recycleTimeDefault = new Date().getTime();
+        },
+        open() {
+            this.show = true
+            
+        },
+        close() {
+            this.show = false
+        },
+        showBrandList() {
+            this.$refs.brandListRef.showBrandList();
+        },
+        handleSelectedBrand(info) {
+            this.formData.dictLabel = info.dictLabel;
+            this.formData.dictValue = info.dictValue;
+        },
+        // 处理清空事件
+        clear(field) {
+            // 品牌
+            if(field == 'dictLabel'){
+                this.formData.dictLabel = '';
+                this.formData.dictValue = '';
+                return;
+            }
+            // 回收人
+            if(field == 'recyclePerson'){
+                this.formData.recyclePerson = '';
+                this.formData.recyclePersonId = '';
+                return;
+            }
+            // 鉴定人
+            if(field == 'identifyingPerson'){
+                this.formData.identifyingPerson = '';
+                this.formData.identifyingPersonId = '';
+                return;
+            }
+            this.formData[field] = '';
+        },
+        confirmRecycleTime(val) {
+            this.$nextTick(()=>{
+                this.formData.recycleTime = this.$dayjs(val.value).format('YYYY-MM-DD');
+            })
+            this.recycleTimeShow = false;
+        },
+        recyclePersonClick() {
+            this.$refs.recyclePersonPickerRef.open();
+        },
+        handleSelectRecyclePerson(info) {
+            this.formData.recyclePerson = info.label;
+            this.formData.recyclePersonId = info.id;
+        },
+        identifyingPersonClick() {
+            this.$refs.identifyingPersonPickerRef.open();
+        },
+        handleSelectIdentifyingPerson(info) {
+            this.formData.identifyingPerson = info.label;
+            this.formData.identifyingPersonId = info.id;
+        },
+        handleTabChangeProductAttribute(e) {
+            this.formData.productAttribute = e;
+        },
+    }
+}
+</script>
+
+<style lang="scss" scoped>
+    @import "../styles/searchFilter.scss";
+</style>

pages/wareHouse/detail.vue

@@ -1,382 +0,0 @@
-<template>
-    <view class="detail" @click="handleClickOutside">
-        <u-navbar class="nav-bar" title="商品详情档案" :autoBack="true" :placeholder="true" rightIcon="more-dot-fill" v-hideNav></u-navbar>
-        <u-swiper :list="imgs" keyName="url" indicator indicatorMode="line" circular>
-            <!-- <template v-slot:item="{ item, index }">
-                <view style="width: 100%; height: 600rpx;">
-                    <image :src="item.url" mode="aspectFill" style="width: 100%; height: 100%; object-fit: cover;"></image>
-                </view>
-            </template> -->
-        </u-swiper>
-        
-        <!-- 立即下架按钮 -->
-        <view class="immediate-off-shelf">
-            <u-button type="error" shape="circle" size="large" @click="handleOffShelf">
-                <u-icon name="download" size="38rpx" color="#ffffff"></u-icon>
-                <text>立即下架</text>
-            </u-button>
-        </view>
-        
-        <!-- 轮播图下方操作按钮 -->
-        <view class="swiper-actions">
-            <view class="action-item">
-                <u-icon name="download" size="44rpx" color="#606266"></u-icon>
-                <text class="action-text">下载图文</text>
-            </view>
-            <view class="action-item">
-                <u-icon name="share" size="44rpx" color="#606266"></u-icon>
-                <text class="action-text">分享</text>
-            </view>
-            <view class="action-item">
-                <u-icon name="camera" size="44rpx" color="#606266"></u-icon>
-                <text class="action-text">切换单图</text>
-            </view>
-            <view class="action-item">
-                <u-icon name="cut" size="44rpx" color="#606266"></u-icon>
-                <text class="action-text">智能抠图</text>
-            </view>
-        </view>
-        
-        <!-- 核心信息区域 -->
-        <view class="core-info">
-            <view class="section-title">核心信息</view>
-            <view class="info-row">
-                <view class="info-label">品牌</view>
-                <view class="info-value" @click.stop="toggleEditField('brand', coreInfo.brand)">
-                    <u-input v-if="editMode.brand" v-model="tempValues.brand" @blur="saveEditField('brand', tempValues.brand, 'core', 'brand')" :autoFocus="true" />
-                    <span v-else>{{ coreInfo.brand }}</span>
-                </view>
-            </view>
-            <view class="info-row">
-                <view class="info-label">型号</view>
-                <view class="info-value" @click.stop="toggleEditField('model', coreInfo.model)">
-                    <u-input v-if="editMode.model" v-model="tempValues.model" @blur="saveEditField('model', tempValues.model, 'core', 'model')" :autoFocus="true" />
-                    <span v-else>{{ coreInfo.model }}</span>
-                </view>
-            </view>
-            <view class="info-row">
-                <view class="info-label">独立编码</view>
-                <view class="info-value code" @click.stop="toggleEditField('code', coreInfo.code)">
-                    <u-input v-if="editMode.code" v-model="tempValues.code" @blur="saveEditField('code', tempValues.code, 'core', 'code')" :autoFocus="true" />
-                    <span v-else>{{ coreInfo.code }}</span>
-                </view>
-            </view>
-            <view class="info-row">
-                <view class="info-label">入库日期</view>
-                <view class="info-value">{{ coreInfo.warehouseDate }}</view>
-            </view>
-            <view class="info-row">
-                <view class="info-label">付款方式</view>
-                <view class="info-value">{{ coreInfo.paymentMethod }}</view>
-            </view>
-            <view class="info-row col">
-                <view class="info-label">备注信息</view>
-                <view class="info-value note" @click.stop="toggleEditField('note', coreInfo.note)">
-                    <textarea v-if="editMode.note" v-model="tempValues.note" @blur="saveEditField('note', tempValues.note, 'core', 'note')" :autoFocus="true" rows="3" />
-                    <span v-else>{{ coreInfo.note }}</span>
-                </view>
-            </view>
-        </view>
-        
-        <!-- 财务与价格区域 -->
-        <view class="finance-price">
-            <view class="section-title">财务与价格</view>
-            <view class="price-group">
-                <view class="price-item">
-                    <view class="price-label">原始成本</view>
-                    <view class="price-value original" @click.stop="toggleEditField('originalCost', financePrice.originalCost)">
-                        <u-input v-if="editMode.originalCost" v-model="tempValues.originalCost" @blur="saveEditField('originalCost', tempValues.originalCost, 'finance', 'originalCost')" :autoFocus="true" />
-                        <span v-else>￥{{ financePrice.originalCost }}</span>
-                    </view>
-                </view>
-                <view class="price-item">
-                    <view class="price-label">附加成本</view>
-                    <view class="price-value additional" @click.stop="toggleEditField('additionalCost', financePrice.additionalCost)">
-                        <u-input v-if="editMode.additionalCost" v-model="tempValues.additionalCost" @blur="saveEditField('additionalCost', tempValues.additionalCost, 'finance', 'additionalCost')" :autoFocus="true" />
-                        <span v-else>￥{{ financePrice.additionalCost }}</span>
-                    </view>
-                </view>
-            </view>
-            <view class="price-group">
-                <view class="price-item">
-                    <view class="price-label">代理价格</view>
-                    <view class="price-value agent" @click.stop="toggleEditField('agentPrice', financePrice.agentPrice)">
-                        <u-input v-if="editMode.agentPrice" v-model="tempValues.agentPrice" @blur="saveEditField('agentPrice', tempValues.agentPrice, 'finance', 'agentPrice')" :autoFocus="true" />
-                        <span v-else>￥{{ financePrice.agentPrice }}</span>
-                    </view>
-                </view>
-                <view class="price-item">
-                    <view class="price-label">建议售价</view>
-                    <view class="price-value suggested" @click.stop="toggleEditField('suggestedPrice', financePrice.suggestedPrice)">
-                        <u-input v-if="editMode.suggestedPrice" v-model="tempValues.suggestedPrice" @blur="saveEditField('suggestedPrice', tempValues.suggestedPrice, 'finance', 'suggestedPrice')" :autoFocus="true" />
-                        <span v-else>￥{{ financePrice.suggestedPrice }}</span>
-                    </view>
-                </view>
-            </view>
-        </view>
-        
-        <!-- 溯源与位置区域 -->
-        <view class="traceability-location">
-            <view class="section-title">溯源与位置</view>
-            <view class="info-row">
-                <view class="info-label">商品位置</view>
-                <view class="info-value" @click.stop="toggleEditField('location', traceability.location)">
-                    <u-input v-if="editMode.location" v-model="tempValues.location" @blur="saveEditField('location', tempValues.location, 'trace', 'location')" :autoFocus="true" />
-                    <span v-else>{{ traceability.location }}</span>
-                </view>
-            </view>
-            <view class="info-row">
-                <view class="info-label">回收人员</view>
-                <view class="info-value" @click.stop="toggleEditField('recoveryPerson', traceability.recoveryPerson)">
-                    <u-input v-if="editMode.recoveryPerson" v-model="tempValues.recoveryPerson" @blur="saveEditField('recoveryPerson', tempValues.recoveryPerson, 'trace', 'recoveryPerson')" :autoFocus="true" />
-                    <span v-else>{{ traceability.recoveryPerson }}</span>
-                </view>
-            </view>
-            <view class="info-row">
-                <view class="info-label">鉴定人员</view>
-                <view class="info-value" @click.stop="toggleEditField('authenticationPerson', traceability.authenticationPerson)">
-                    <u-input v-if="editMode.authenticationPerson" v-model="tempValues.authenticationPerson" @blur="saveEditField('authenticationPerson', tempValues.authenticationPerson, 'trace', 'authenticationPerson')" :autoFocus="true" />
-                    <span v-else>{{ traceability.authenticationPerson }}</span>
-                </view>
-            </view>
-            <view class="action-button">
-                <u-button type="primary" plain size="mini" @click="viewLog">查看操作日志(12条)</u-button>
-            </view>
-        </view>
-        
-        <!-- 底部功能按钮栏 -->
-        <view class="bottom-bar">
-            <view class="bar-item" @click.stop="enterGlobalEdit">
-                <u-icon name="edit-pen" size="46rpx" color="#9ca3af"></u-icon>
-                <text class="bar-text">编辑</text>
-            </view>
-            <view class="bar-item">
-                <u-icon name="lock" size="46rpx" color="#9ca3af"></u-icon>
-                <text class="bar-text">锁单</text>
-            </view>
-            <view class="bar-item">
-                <i class="iconfont icon-crm-dayin" style="font-size:46rpx;color: #9ca3af;"></i>
-                <text class="bar-text">打印</text>
-            </view>
-            <view class="bar-item" @click="handleOpenOrder">
-                <view class="primary">
-                    <u-icon name="bag" size="44rpx" color="#fff"></u-icon>
-                    <text class="bar-text">开单</text>
-                </view>
-            </view>
-        </view>
-    </view>
-</template>
-
-<script>
-    export default {
-        data() {
-            return {
-                imgs: [
-                    {
-                        url: 'https://img2.baidu.com/it/u=2737617573,3814711807&fm=253&fmt=auto&app=120&f=JPEG?w=800&h=800'
-                    },
-                    {
-                        url: 'https://img2.baidu.com/it/u=3621921167,4010012360&fm=253&fmt=auto?w=760&h=760'
-                    },
-                    {
-                        url: 'https://img2.baidu.com/it/u=1250952949,1454201719&fm=253&fmt=auto&app=138&f=JPEG?w=800&h=1067'
-                    }
-                ],
-                // 核心信息模拟数据
-                coreInfo: {
-                    brand: 'Rolex',
-                    model: 'Submariner Date 126610LN',
-                    code: 'AUTO_1002391',
-                    warehouseDate: '2025-12-14 10:00',
-                    paymentMethod: '线上转账',
-                    note: '单包 附件齐全 成色极好'
-                },
-                // 财务与价格模拟数据
-                financePrice: {
-                    originalCost: '82,000',
-                    additionalCost: '500',
-                    agentPrice: '85,500',
-                    suggestedPrice: '89,000'
-                },
-                // 溯源与位置模拟数据
-                traceability: {
-                    location: '上海A仓',
-                    recoveryPerson: 'IT秦',
-                    authenticationPerson: '中检-刘师傅'
-                },
-                // 编辑状态管理
-                editMode: {
-                    // 核心信息编辑状态
-                    brand: false,
-                    model: false,
-                    code: false,
-                    note: false,
-                    // 财务与价格编辑状态
-                    originalCost: false,
-                    additionalCost: false,
-                    agentPrice: false,
-                    suggestedPrice: false,
-                    // 溯源与位置编辑状态
-                    location: false,
-                    recoveryPerson: false,
-                    authenticationPerson: false
-                },
-                // 全局编辑模式
-                globalEditMode: false,
-                // 临时存储编辑值
-                tempValues: {}
-            }
-        },
-        methods: {
-            // 打开销售业务开单页面
-            handleOpenOrder() {
-                uni.navigateTo({
-                    url: '/pages/wareHouse/openOrder'
-                });
-            },
-            // 查看操作日志的方法
-            viewLog() {
-                // 查看操作日志的方法
-                console.log('查看操作日志');
-            },
-            
-            // 立即下架按钮处理方法
-            handleOffShelf() {
-                // 处理下架逻辑
-                uni.showModal({
-                    title: '确认下架',
-                    content: '确定要将此商品下架吗？',
-                    success: (res) => {
-                        if (res.confirm) {
-                            console.log('商品已下架');
-                            uni.showToast({
-                                title: '已下架',
-                                icon: 'success'
-                            });
-                        }
-                    }
-                });
-            },
-            // 切换单个字段的编辑状态
-            toggleEditField(field, value) {
-                // 如果不是全局编辑模式
-                if (!this.globalEditMode) {
-                    // 重置所有编辑状态
-                    this.resetEditMode();
-                    // 设置当前字段为编辑状态
-                    this.editMode[field] = true;
-                    // 保存临时值
-                    this.tempValues[field] = value;
-                }
-            },
-            // 保存单个字段的编辑值
-            saveEditField(field, newValue, type, fieldName) {
-                // 更新对应的数据
-                if (type === 'core') {
-                    this.coreInfo[fieldName] = newValue;
-                } else if (type === 'finance') {
-                    this.financePrice[fieldName] = newValue;
-                } else if (type === 'trace') {
-                    this.traceability[fieldName] = newValue;
-                }
-                // 退出编辑状态
-                this.editMode[field] = false;
-                // 清空临时值
-                delete this.tempValues[field];
-                // 模拟保存操作
-                console.log(`保存${field}字段值: ${newValue}`);
-            },
-            // 进入全局编辑模式
-            enterGlobalEdit() {
-                this.globalEditMode = true;
-                // 设置所有可编辑字段为编辑状态
-                this.editMode = {
-                    brand: true,
-                    model: true,
-                    code: true,
-                    note: true,
-                    originalCost: true,
-                    additionalCost: true,
-                    agentPrice: true,
-                    suggestedPrice: true,
-                    location: true,
-                    recoveryPerson: true,
-                    authenticationPerson: true
-                };
-                // 保存所有字段的临时值
-                this.tempValues = {
-                    brand: this.coreInfo.brand,
-                    model: this.coreInfo.model,
-                    code: this.coreInfo.code,
-                    note: this.coreInfo.note,
-                    originalCost: this.financePrice.originalCost,
-                    additionalCost: this.financePrice.additionalCost,
-                    agentPrice: this.financePrice.agentPrice,
-                    suggestedPrice: this.financePrice.suggestedPrice,
-                    location: this.traceability.location,
-                    recoveryPerson: this.traceability.recoveryPerson,
-                    authenticationPerson: this.traceability.authenticationPerson
-                };
-            },
-            // 保存全局编辑模式下的所有修改
-            saveGlobalEdit() {
-                // 保存所有临时值到原始数据
-                // 核心信息
-                if (this.tempValues.brand !== undefined) this.coreInfo.brand = this.tempValues.brand;
-                if (this.tempValues.model !== undefined) this.coreInfo.model = this.tempValues.model;
-                if (this.tempValues.code !== undefined) this.coreInfo.code = this.tempValues.code;
-                if (this.tempValues.note !== undefined) this.coreInfo.note = this.tempValues.note;
-                
-                // 财务与价格
-                if (this.tempValues.originalCost !== undefined) this.financePrice.originalCost = this.tempValues.originalCost;
-                if (this.tempValues.additionalCost !== undefined) this.financePrice.additionalCost = this.tempValues.additionalCost;
-                if (this.tempValues.agentPrice !== undefined) this.financePrice.agentPrice = this.tempValues.agentPrice;
-                if (this.tempValues.suggestedPrice !== undefined) this.financePrice.suggestedPrice = this.tempValues.suggestedPrice;
-                
-                // 溯源与位置
-                if (this.tempValues.location !== undefined) this.traceability.location = this.tempValues.location;
-                if (this.tempValues.recoveryPerson !== undefined) this.traceability.recoveryPerson = this.tempValues.recoveryPerson;
-                if (this.tempValues.authenticationPerson !== undefined) this.traceability.authenticationPerson = this.tempValues.authenticationPerson;
-                
-                this.globalEditMode = false;
-                // 退出所有编辑状态
-                this.resetEditMode();
-                // 清空临时值
-                this.tempValues = {};
-                // 模拟保存操作
-                console.log('保存所有字段值');
-            },
-            // 重置所有编辑状态
-            resetEditMode() {
-                Object.keys(this.editMode).forEach(key => {
-                    this.editMode[key] = false;
-                });
-            },
-            // 点击页面其他地方保存所有编辑
-            handleClickOutside() {
-                if (this.globalEditMode) {
-                    this.saveGlobalEdit();
-                } else {
-                    // 保存当前正在编辑的字段
-                    Object.keys(this.editMode).forEach(key => {
-                        if (this.editMode[key]) {
-                            // 根据字段名确定类型和字段名
-                            if (['brand', 'model', 'code', 'note'].includes(key)) {
-                                this.saveEditField(key, this.tempValues[key], 'core', key);
-                            } else if (['originalCost', 'additionalCost', 'agentPrice', 'suggestedPrice'].includes(key)) {
-                                this.saveEditField(key, this.tempValues[key], 'finance', key);
-                            } else if (['location', 'recoveryPerson', 'authenticationPerson'].includes(key)) {
-                                this.saveEditField(key, this.tempValues[key], 'trace', key);
-                            }
-                        }
-                    });
-                }
-            }
-        }
-    }
-</script>
-
-<style lang="scss" scoped>
-@import "./styles/detail.scss";
-</style>

pages/wareHouse/index.vue

@@ -29,8 +29,8 @@
 			</view>
 
 			<view class="search-wrapper">
-				<u-search placeholder="搜索编号、名称、品牌..." bg-color="#f9fafb" border-radius="4rpx"
-					:show-action="false" class="search-input-wrap"></u-search>
+				<u-search placeholder="搜索编号、名称、品牌..." v-model="searchString" bg-color="#f9fafb" border-radius="4rpx"
+					:show-action="false" class="search-input-wrap" showAction @clear="handleSearch" @custom="handleSearch"></u-search>
 			</view>
 
 			<view class="category-tabs-wrap">
@@ -39,55 +39,56 @@
 			</view>
 
 			<view class="filter-bar">
-				<view class="sort-btn">
-					<text class="sort-text">{{ currentSortText }}</text>
+				<view class="sort-btn" @click="sortPickerShow = true">
+					<text class="sort-text">{{ curSortType.label }}</text>
 					<u-icon name="arrow-down" size="12" color="#666666" class="sort-icon"></u-icon>
+					<u-picker :show="sortPickerShow" :columns="sortColumns" keyName="label" @confirm="handleSortChange" @cancel="sortPickerShow = false"></u-picker>
 				</view>
 
 				<view class="price-layout-btn">
-					<view class="price-btn" type="text">
-						<u-icon name="eye" size="18" color="#1890ff" class="price-icon"></u-icon>
+					<view class="price-btn" type="text" @click="priceVisibleChange">
+						<u-icon :name="priceVisible ? 'eye' : 'eye-off'" size="18" color="#1890ff" class="price-icon"></u-icon>
 						<text class="price-text">价格可见</text>
 					</view>
-
-					<view class="layout-btn" type="text" size="mini">
+					<view class="layout-btn" type="text" size="mini" @click="openSearchFilter">
 						<u-icon name="grid" size="20" color="#666666"></u-icon>
 						<!-- 筛选列 品牌、价格范围、位置、回收时间、回收人员、鉴定人员、商品属性 -->
 					</view>
+					<searchFilter ref="searchFilter" @confirm="handleSearch"></searchFilter>
 				</view>
 			</view>
 
-			<view class="goods-list">
-				<view @click="handleToDetail" class="goods-item" v-for="(goods, goodsIndex) in goodsList" :key="`goods-${goodsIndex}`">
+			<scroll-view class="goods-list" scroll-y @scrolltolower="handleLoadMore" enable-back-to-top>
+				<view @click="handleToDetail(goods)" class="goods-item" v-for="(goods, goodsIndex) in goodsList" :key="`goods-${goodsIndex}`">
 					<view class="goods-img-container">
 						<image class="goods-img" :src="goods.imgUrl" mode="aspectFill" lazy-load></image>
 						<view class="stock-indicator"
-							v-if="goods.stock !== null && goods.stock !== undefined && goods.stock > 0"></view>
+							v-if="goods.stock > 0"></view>
 					</view>
 
 					<view class="goods-info">
-						<text class="goods-brand">{{ goods.brand || '' }}</text>
-						<text class="goods-name">{{ goods.name || '' }}</text>
+						<text class="goods-brand">{{ goods.name || '' }}</text>
+						<text class="goods-name">{{ goods.model || '' }}</text>
 
 						<view class="price-group">
 							<view class="price-items">
 								<view class="price-item">
 									<text class="price-type">成本价</text>
-									<text class="price">¥{{ goods.costPrice }}</text>
+									<text class="price">¥{{ priceVisible ? goods.costPrice : '****' }}</text>
 								</view>
 								<view class="price-item">
 									<text class="price-type">销售价</text>
-									<text class="price sales">¥{{ goods.salesPrice }}</text>
+									<text class="price sales">¥{{ priceVisible ? goods.salesPrice : '****' }}</text>
 								</view>
 							</view>
 							<view class="price-items">
 								<view class="price-item">
 									<text class="price-type">同行价</text>
-									<text class="price">¥{{ goods.peerPrice }}</text>
+									<text class="price">¥{{ priceVisible ? goods.peerPrice : '****' }}</text>
 								</view>
 								<view class="price-item">
 									<text class="price-type">代理价</text>
-									<text class="price">¥{{ goods.agentPrice }}</text>
+									<text class="price">¥{{ priceVisible ? goods.agentPrice : '****' }}</text>
 								</view>
 							</view>
 						</view>
@@ -99,13 +100,15 @@
 						</view>
 					</view>
 					<view class="more">
-						<u-icon name="more-dot-fill" size="16" color="#666666"></u-icon>
+						<view></view>
+						<!-- <u-icon name="more-dot-fill" size="16" color="#666666"></u-icon> -->
 						<text class="goods-stock"
 							v-if="goods.stock !== null && goods.stock !== undefined && goods.stock > 0">数量:{{ goods.stock
 							}}</text>
 					</view>
 				</view>
-			</view>
+				<show-emtry v-if="goodsList.length === 0"></show-emtry>
+			</scroll-view>
 			
 		</view>
 		<!-- 添加按钮 -->
@@ -117,9 +120,21 @@
 </template>
 
 <script>
+	import searchFilter from './components/searchFilter.vue'
 export default {
+	components: {
+		searchFilter,
+	},
 	data() {
 		return {
+			searchString:'',//搜索编号、名称、品牌...
+			searchInfo:{},
+			pageNum:1,
+			pageSize:10,
+			curSortType:{
+				id:4,
+				label: '按入库最新',
+			},
 			wareHouseCard:{
 				totalCost: '-',
 				uploadCostToday: '-',
@@ -127,83 +142,113 @@ export default {
 				totalNum: '-'
 			},
 			tabList: [
-				{ name: "全部" },
-				{ name: "腕表" },
-				{ name: "箱包" },
-				{ name: "珠宝" },
-				{ name: "鞋靴" },
-				{ name: "配饰" },
-				{ name: "服饰" },
-				{ name: "其它" }
+				{ name: "全部", id: 1 },
+				{ name: "腕表", id: 2 },
+				{ name: "箱包", id: 3 },
+				{ name: "珠宝", id: 4 },
+				{ name: "鞋靴", id: 5 },
+				{ name: "配饰", id: 6 },
+				{ name: "服饰", id: 7 },
+				{ name: "其它", id: 8 }
 			],
-			currentSortText: '按最近更新排序',
 			goodsList: [
+				// {
+				// 	id:'123456754',//商品库存id
+				// 	name:'Rolex',//商品名称
+				// 	model:'Submariner Date 126610LN',//型号
+				// 	costPrice:'12345',//成本价格
+				// 	salesPrice:'12345',//销售价格
+				// 	peerPrice:'12345',//同行价格
+				// 	agentPrice:'12345',//代理价格
+				// 	stock:'12345',//库存数量
+				// 	imgUrl:'https://xiaohulu-crm.oss-cn-shanghai.aliyuncs.com/crm/2026/01/06/1767677335839-1767677330379.jpg',//商品图片
+				// 	platform:[]//同步平台，此功能暂时不做，先定义一个字段
+				// }
+			],
+			sortPickerShow: false,
+			sortColumns: [[
 				{
-					imgUrl: require("./imgs/1.jpg"),
-					brand: "ROLEX",
-					name: "Submariner Date 126610LN",
-					costPrice: "92,500",
-					salesPrice: "89,000",
-					peerPrice: "92,500",
-					agentPrice: "89,000",
-					stock: 1
+					label:'按最久未下载',
+					id:1
 				},
 				{
-					imgUrl: require("./imgs/1.jpg"),
-					brand: "ROLEX",
-					name: "Submariner Date 126610LN",
-					costPrice: "92,500",
-					salesPrice: "89,000",
-					peerPrice: "92,500",
-					agentPrice: "89,000",
-					stock: 1
+					label:'按最近更新',
+					id:2
 				},
 				{
-					imgUrl: require("./imgs/1.jpg"),
-					brand: "ROLEX",
-					name: "Submariner Date 126610LN",
-					costPrice: "92,500",
-					salesPrice: "89,000",
-					peerPrice: "92,500",
-					agentPrice: "89,000",
-					stock: 1
+					label:'按最久更新',
+					id:3
 				},
 				{
-					imgUrl: require("./imgs/1.jpg"),
-					brand: "ROLEX",
-					name: "Submariner Date 126610LN",
-					costPrice: "92,500",
-					salesPrice: "89,000",
-					peerPrice: "92,500",
-					agentPrice: "89,000",
-					stock: 1
+					label:'按入库最新',
+					id:4
 				},
 				{
-					imgUrl: require("./imgs/1.jpg"),
-					brand: "ROLEX",
-					name: "Submariner Date 126610LN",
-					costPrice: "92,500",
-					salesPrice: "89,000",
-					peerPrice: "92,500",
-					agentPrice: "89,000",
-					stock: 1
-				}
-			]
+					label:'按入库最久',
+					id:5
+				},
+				{
+					label:'按价格最高',
+					id:6
+				},
+				{
+					label:'按价格最低',
+					id:7
+				},
+			]],
+			priceVisible:true,
+			searchPopShow:false,
+			total:0
 		};
 	},
 	methods: {
-		switchTab(index) {
-			console.log("当前选中标签索引：", index);
+		getList(){
+			uni.$u.api.wareHouseList({
+				pageNum: this.pageNum,
+				pageSize: this.pageSize,
+			},
+			{
+				searchString:this.searchString,
+				sortType:this.curSortType.id,
+				...this.searchInfo,
+			}).then(res => {
+				if(this.pageNum == 1){
+					this.goodsList = res.rows;
+				}else{
+					this.goodsList = this.goodsList.concat(res.rows);
+				}
+				this.total = res.total;
+			});
+		},
+		// 加载更多
+		handleLoadMore() {
+			console.log("加载更多");
+			if(this.goodsList.length >= this.total){
+				uni.$u.toast("没有更多了");
+				return;
+			}
+			this.pageNum++;
+			this.getList();
 		},
-		handleToDetail() {
+		handleSearch(info){
+			this.pageNum = 1;
+			this.searchInfo = info;
+			this.goodsList = [];
+			this.getList();
+		},
+		switchTab(item) {
+			this.searchInfo.category = item.id;
+			this.handleSearch();
+		},
+		handleToDetail(item) {
 			uni.navigateTo({
-				url: `/pages/wareHouse/detail`
+				url: `/pages/wareHouse/components/detail?id=${item.id}`,
 			});
 		},
 		handleAdd() {
 			console.log("点击添加按钮");
 			uni.navigateTo({
-				url: `/pages/wareHouse/add`
+				url: `/pages/wareHouse/components/add`
 			});
 		},
 		// 获取仓库卡片数据
@@ -214,9 +259,21 @@ export default {
 				}
 			});
 		},
+		handleSortChange(e){
+			this.curSortType = e.value[0];
+			this.sortPickerShow = false;
+			this.handleSearch();
+		},
+		priceVisibleChange(){
+			this.priceVisible = !this.priceVisible;
+		},
+		openSearchFilter(){
+			this.$refs.searchFilter.open();
+		},
 	},
 	mounted() {
 		this.getCard();
+		this.getList();
 	}
 };
 </script>

pages/wareHouse/styles/add.scss

@@ -7,6 +7,11 @@
         background-color: #fff;
         padding: 0 20rpx;
         margin-bottom: 120rpx;
+        .btn_group_recognition{
+            padding-top:10rpx;
+            display: flex;
+            gap: 20rpx;
+        }
     }
 
 }

pages/wareHouse/styles/detail.scss

@@ -36,7 +36,7 @@
     }
     
     // 立即下架按钮
-    .immediate-off-shelf {
+    .immediate_off_shelf {
         position: fixed;
         bottom: 130rpx;
         right: 20rpx;
@@ -78,7 +78,7 @@
     }
     
     // 轮播图下方操作按钮
-    .swiper-actions{
+    .swiper_actions{
         display: flex;
         justify-content: space-around;
         align-items: center;
@@ -86,7 +86,7 @@
         background-color: #ffffff;
         border-bottom: 1rpx solid #e8e8e8;
         
-        .action-item{
+        .action_item{
             display: flex;
             flex-direction: column;
             align-items: center;
@@ -96,7 +96,7 @@
                 border-radius: 20rpx;
                 padding:20rpx;
             }
-            .action-text{
+            .action_text{
                 margin-top: 16rpx;
                 font-size: 22rpx;
                 font-weight: 500;
@@ -107,7 +107,7 @@
     
     
     // 底部功能按钮栏
-    .bottom-bar{
+    .bottom_bar{
         position: fixed;
         bottom: 0;
         left: 0;
@@ -119,7 +119,7 @@
         justify-content: space-around;
         box-shadow: 0 -2rpx 10rpx rgba(0, 0, 0, 0.1);
         
-        .bar-item{
+        .bar_item{
             flex: 1;
             height: 100%;
             display: flex;
@@ -135,32 +135,37 @@
                 border-radius: 20rpx;
                 background-color: #ca8a04;
                 box-shadow: 0 10px 15px -3px #fef08a, 0 4px 6px -4px #fef08a;
-                .bar-text{
+                .bar_text{
                     margin-top: 0;
                     color: #ffffff;
                     font-size: 23rpx;
                 }
             }
             
-            .bar-text{
+            .bar_text{
                 margin-top: 8rpx;
                 font-size: 20rpx;
                 font-weight: 500;
                 color: #9ca3af;
                 line-height: 32rpx;
             }
+
+            &.disabled{
+                cursor: not-allowed;
+                opacity: 0.5;
+            }
         }
     }
     
     // 核心信息区域样式
-    .core-info {
+    .core_info {
         background-color: #ffffff;
         margin: 20rpx 20rpx 0 20rpx;
         padding: 30rpx;
         border-radius: 16rpx;
         box-shadow: 0 2rpx 10rpx rgba(0, 0, 0, 0.05);
         
-        .section-title {
+        .section_title {
             font-size: 32rpx;
             font-weight: 600;
             color: #303133;
@@ -169,18 +174,18 @@
             border-bottom: 1rpx solid #e8e8e8;
         }
         
-        .info-row {
+        .info_row {
             display: flex;
             padding: 16rpx 0;
             
-            .info-label {
+            .info_label {
                 flex: 1;
                 color: #909399;
                 font-size: 28rpx;
                 line-height: 40rpx;
             }
             
-            .info-value {
+            .info_value {
                 flex: 2;
                 color: #303133;
                 font-size: 28rpx;
@@ -207,14 +212,14 @@
     }
     
     // 财务与价格区域样式
-    .finance-price {
+    .finance_price {
         background-color: #ffffff;
         margin: 20rpx 20rpx 0 20rpx;
         padding: 30rpx;
         border-radius: 16rpx;
         box-shadow: 0 2rpx 10rpx rgba(0, 0, 0, 0.05);
         
-        .section-title {
+        .section_title {
             font-size: 32rpx;
             font-weight: 600;
             color: #303133;
@@ -223,7 +228,7 @@
             border-bottom: 1rpx solid #e8e8e8;
         }
         
-        .price-group {
+        .price_group {
             display: flex;
             justify-content: space-between;
             margin-bottom: 24rpx;
@@ -233,7 +238,7 @@
             }
         }
         
-        .price-item {
+        .price_item {
             flex: 1;
             display: flex;
             flex-direction: column;
@@ -248,13 +253,13 @@
             }
         }
         
-        .price-label {
+        .price_label {
             color: #909399;
             font-size: 24rpx;
             margin-bottom: 12rpx;
         }
         
-        .price-value {
+        .price_value {
             font-size: 36rpx;
             font-weight: 600;
             
@@ -277,14 +282,14 @@
     }
     
     // 溯源与位置区域样式
-    .traceability-location {
+    .traceability_location {
         background-color: #ffffff;
         margin: 20rpx;
         padding: 30rpx;
         border-radius: 16rpx;
         box-shadow: 0 2rpx 10rpx rgba(0, 0, 0, 0.05);
         
-        .section-title {
+        .section_title {
             font-size: 32rpx;
             font-weight: 600;
             color: #303133;
@@ -293,18 +298,18 @@
             border-bottom: 1rpx solid #e8e8e8;
         }
         
-        .info-row {
+        .info_row {
             display: flex;
             padding: 16rpx 0;
             
-            .info-label {
+            .info_label {
                 flex: 1;
                 color: #909399;
                 font-size: 28rpx;
                 line-height: 40rpx;
             }
             
-            .info-value {
+            .info_value {
                 flex: 2;
                 color: #303133;
                 font-size: 28rpx;
@@ -341,7 +346,7 @@
             }
         }
         
-        .action-button {
+        .action_button {
             margin-top: 24rpx;
             text-align: center;
             
@@ -353,6 +358,16 @@
                 font-size: 24rpx;
                 padding: 34rpx 0;
             }
+            .log_list{
+                display: flex;
+                flex-direction: column;
+                gap:20rpx;
+                .log_item{
+                    display: flex;
+                    text-align: left;
+                    font-size:26rpx;
+                }
+            }
         }
     }
 }

pages/wareHouse/styles/index.scss

@@ -5,9 +5,9 @@
 }
 .page-container {
   // padding: 8rpx 15rpx;
-  // background-color: #f9fafb;
-  // background-color: red;
-  min-height: 100vh;
+  background-color: #f9fafb;
+  // min-height: 100vh;
+  padding-bottom:20rpx;
 }
 .nav-bar{
   border-bottom: 1px solid #f7f6f6 !important;
@@ -238,10 +238,12 @@
   flex-direction: column;
   gap: 10rpx;
   background-color: #f9fafb;
-  padding: 8rpx 15rpx;
+  ::v-deep .uni-scroll-view{
+    height: calc(100vh - 850rpx);
+  }
   .goods-item {
-    
-    background-color: #ffffff;
+    margin: 10rpx 15rpx;
+    background-color: #fff;
     border-radius: 20rpx;
     padding: 20rpx;
     box-sizing: border-box;

pages/wareHouse/styles/searchFilter.scss

@@ -0,0 +1,9 @@
+::v-deep .u-form{
+    margin-top: 66rpx;
+    padding: 20rpx 30rpx;
+}
+.btns{
+    display: flex;
+    gap:20rpx;
+    padding: 20rpx;
+}

utils/api.js

@@ -3,7 +3,7 @@ import qs from 'qs';
 
 import store from "../store/index.js";
 import config from '../uni_modules/uview-ui/libs/config/config.js';
-
+const mockApi = 'http://192.168.0.243:3001/mock-api/prod-api/crm';
 
 const install = (Vue, vm) => {
 	vm.$u.api = {
@@ -119,12 +119,18 @@ const install = (Vue, vm) => {
 		// 服务器地址: http://192.168.0.243:3001
 		// 手机预览时需要使用电脑局域网IP，不能用localhost
 		// 切换真实接口时，将 baseUrl 改为真实接口地址即可
-		getPersonCards:(params)=>http.get('http://192.168.0.243:3001/mock-api/prod-api/crm/personCenter/getPersonCards',{ params }),//个人中心-获取个人中心数据
-		getPersonLatestClue:(params)=>http.get('http://192.168.0.243:3001/mock-api/prod-api/crm/personCenter/getPersonLatestClue',{ params }),//个人中心-获取最新线索
-		getPersonRanking:(params)=>http.get('http://192.168.0.243:3001/mock-api/prod-api/crm/personCenter/getPersonRanking',{ params }),//个人中心-获取个人排名
-		getWareHouseCard:(params)=>http.get('http://192.168.0.243:3001/mock-api/prod-api/crm/warehouse/getWareHouseCard',{ params }),//仓库中心-获取仓库信息
-		addInquiry:(data)=>http.post('http://192.168.0.243:3001/mock-api/prod-api/crm/inquiryCenter/addInquiry',data),//添加询价
-		inquiryVerificationList:(params,data)=>http.post('http://192.168.0.243:3001/mock-api/prod-api/crm/inquiryCenter/inquiryVerificationList?' + qs.stringify(params), data),//  询价/核价列表
+		getPersonCards:(params)=>http.get(mockApi+'/personCenter/getPersonCards',{ params }),//个人中心-获取个人中心数据
+		getPersonLatestClue:(params)=>http.get(mockApi+'/personCenter/getPersonLatestClue',{ params }),//个人中心-获取最新线索
+		getPersonRanking:(params)=>http.get(mockApi+'/personCenter/getPersonRanking',{ params }),//个人中心-获取个人排名
+		getWareHouseCard:(params)=>http.get(mockApi+'/warehouse/getWareHouseCard',{ params }),//仓库中心-获取仓库信息
+		addInquiry:(data)=>http.post(mockApi+'/inquiryCenter/addInquiry',data),//添加询价
+		inquiryVerificationList:(params,data)=>http.post(mockApi+'/inquiryCenter/inquiryVerificationList?' + qs.stringify(params), data),//  询价/核价列表
+		wareHouseList:(params,data)=>http.post(mockApi+'/warehouse/wareHouseList?' + qs.stringify(params), data),//仓库中心-获取仓库列表
+		wareHouseDetail:(params)=>http.get(mockApi+'/warehouse/wareHouseDetail',{ params }),//仓库中心-获取仓库详情
+		wareHouseLog:(params)=>http.get(mockApi+'/warehouse/wareHouseLog',{ params }),//仓库中心-获取仓库操作日志
+		wareHouseUpdate:(data)=>http.post(mockApi+'/warehouse/wareHouseUpdate',data),//仓库中心-编辑商品库存
+		wareHouseLock:(data)=>http.post(mockApi+'/warehouse/wareHouseLock',data),//仓库中心-锁单
+		wareHouseDown:(data)=>http.post(mockApi+'/warehouse/wareHouseDown',data),//仓库中心-下架