Merge branch 'master' of http://106.52.242.177:3000/askqvn/crm-app

manifest.json

@@ -2,7 +2,7 @@
     "name" : "小葫芦",
     "appid" : "__UNI__DDAE2E0",
     "description" : "",
-    "versionName" : "1.2.3",
+    "versionName" : "1.2.5",
     "versionCode" : 123,
     "transformPx" : false,
     "app-plus" : {
@@ -206,7 +206,9 @@
                     "target" : "https://crm.nanjingshiyu.com",
                     "changeOrigin" : true,
                     "secure" : false,
-                    "pathRewrite": { "^/prod-api": "" }
+                    "pathRewrite" : {
+                        "^/prod-api" : ""
+                    }
                 }
             }
         },

pages/orderDetailRefactored/components/PageFour.vue

@@ -148,7 +148,7 @@
         </u-row>
 
         <!-- 是否入库 -->
-        <!-- <u-row class="info-row">
+        <u-row class="info-row">
           <u-col span="12">
             <view @tap="selectIsWarehouse">
               <u-form-item label="是否入库" prop="isWarehouse">
@@ -160,7 +160,7 @@
                 @confirm="handleConfirmIsWarehouse" @cancel="showIsWarehousePicker = false" />
             </view>
           </u-col>
-        </u-row> -->
+        </u-row>
 
         <!-- 收单备注 -->
         <u-row class="info-row">
@@ -770,63 +770,44 @@ export default {
                 const brandId = brandObj ? brandObj.dictValue : ''
 
                 //建立入库data
+                // 获取 PageThree 的高清实物图的 fileUrl 数组
+                // 直接使用 imageUpload 获取图片列表，与 PageThree 保持一致
+                let goodPicFileUrls = []
+                if (this.currentReceipt.id && this.orderDetail.itemBrand) {
+                  try {
+                    const list = await imageUpload.getFileList(
+                      '2',
+                      '3',
+                      this.currentReceipt.id,
+                      this.orderDetail.itemBrand,
+                      this.currentReceipt.clueId
+                    )
+                    // 获取前6个图片的 fileUrl（与 PageThree 的 displayImages 保持一致）
+                    // goodPicFileUrls = (list || []).slice(0, 6).map(item => item.fileUrl).filter(url => url)
+                    goodPicFileUrls = (list || []).map(item => item.fileUrl).filter(url => url)
+                  } catch (error) {
+                    console.error('获取高清实物图失败:', error)
+                  }
+                }
+                
                 const warehouseData = {
-                  // goodPicFileList: [''],//商品图片 必填
-                  // desc: '',//商品描述 必填  
+                  goodPicFileList: goodPicFileUrls,//商品图片 page3的高清实物图的url数组
                   type: this.warehouseInfo.category || '',//商品分类 
-                  dictLabel: this.currentReceipt.brand || '',//品牌名称 必填
-                  dictValue: brandId || '',//品牌id 必填
-                  // series: '',//系列
-                  // model: this.warehouseInfo.model||'',//型号
-                  // dialType: '',//机芯类型
-                  // caseMaterial: '',//表壳材质
-                  // dialDiameter: '',//表盘直径
-                  // material: '',//材质
-                  // size: '',//尺寸
-                  // yardage: '',//尺码
-                  // price: '',//官方指导价
-                  // productCondition: '',//商品成色 必填 1-闲置未使用 2-二手 
-                  // detailPicFileList: [''],//细节图片
-                  // title: '',//商品标题
-                  // productNo: '',//商品货号
-                  // productAttribute: '1',//商品属性 必填 1-自有商品 2-寄卖商品 3-质押商品 4-其它
-                  // stock: '',//库存数量 必填
+                  dictLabel: this.currentReceipt.brand || '',//品牌名称 
+                  dictValue: brandId || '',//品牌id 
+                  indentifyCode:this.warehouseInfo.codeStorage|| '',//独立编码
                   costPrice: this.computedTotalCost || '',//总成本价
-                  // peerPrice: '',//同行价格
-                  // agentPrice: '',//代理价格
-                  // salePrice: '',//销售价格
-                  // productPosition: '',//商品位置
-                  // watchYear: '',//手表年份
-                  // identifyingPerson: '',//鉴定人员
-                  // identifyingPersonId: '',//鉴定人员id
-                  // recycleType: '1',//回收类型 1-线上 2-同行 3-门店 4-其它
-                  // label: '1', 1-完美 2-普通 3-瑕疵 4-假货 5-亏损
-                  // recyclePerson: '',//回收人员
-                  // recyclePersonId: '',//回收人员id
-                  // recycleBottomDesc: '',//回收留底图描述
-                  // recycleBottomFileList: [' '],//回收留底图
                   recycleTime: dayjs().format('YYYY-MM-DD'),//回收时间 必填
-                  // indentifyCode: '',//独立编码
-                  // targetAudience: 'general',// general-通用 man-男 woman-女
-                  // productCard: '',//商品保卡 has-有 no-无
-                  // cardYear: '',//保卡年份 如果有商品保卡就有这个字段，如果没有商品保卡，这个字段为空
-                  // productCardPicFileList: [''],//商品保卡图片留底
-                  // productTag: '',//商品标签  
-                  // productAttachment: '',//商品附件
-                  // productDesc: '',//商品备注
-                  // productDescPicFileList: [''],//商品备注图片
-                  // payType: '1',//付款方式 1：微信 2：支付宝 3：银行卡 4：现金 5：数字货币 6：挂账
-                  // submitType: 'inAndUp',//提交类型 onlyIn：仅入库 inAndUp：入库并上架
-                  // continuousWarehousing: '0',//是否连续入库 1：是 0：否
-
+                  stockStatus:0,//库存状态，0待入库，1已入库，因为是我们是预入库，所以是0
+                  origin:this.orderDetail.website//来源
                 }
                 if (!this.currentReceipt.warehouseId) {
                   //当没有仓库id的时候调用新增仓库接口
-                  await uni.$u.api.addWarehouse(warehouseData)
+                  await uni.$u.api.wareHouseAdd(warehouseData)
                 } else {
                   //当有仓库id的时候调用编辑仓库接口
                   warehouseData.id = this.currentReceipt.warehouseId
-                  await uni.$u.api.updateWarehouse(warehouseData)
+                  await uni.$u.api.wareHouseUpdate(warehouseData)
                 }
               } else if (this.isWarehouse == '2') {
                 //等于2的时候不放入仓库表

pages/orderDetailRefactored/components/PageThree.vue

@@ -12,14 +12,14 @@
         <u-col span="5.8">
           <view class="info-label">银行名称</view>
           <u-input v-model="paymentInfo.bankName" placeholder="请输入银行名称" class="info-input"
-            @blur="handleBankNameInput" />
+            :disabled="isAlipayPayment" @blur="handleBankNameInput" />
         </u-col>
       </u-row>
       <u-row class="info-row">
         <u-col span="12">
-          <view class="info-label">银行账号</view>
-          <u-input v-model="paymentInfo.bankAccount" placeholder="请输入银行账号" class="info-input" type="number"
-            @input="handleBankAccountInput" />
+          <view class="info-label">{{ bankAccountLabel }}</view>
+          <u-input v-model="paymentInfo.bankAccount" :placeholder="bankAccountPlaceholder" class="info-input"
+            :type="isAlipayPayment ? 'text' : 'number'" @input="handleBankAccountInput" />
         </u-col>
       </u-row>
       <u-row class="info-row">
@@ -35,6 +35,7 @@
           <u-radio-group iconPlacement="left" v-model="paymentMethodRadio" placement="row"
             @change="handlePaymentMethodRadioChange">
             <u-radio shape="circle" label="小葫芦线上支付" name="online" />
+            <u-radio shape="circle" label="小葫芦线上支付宝" name="online_alipay" />
             <u-radio shape="circle" label="线下支付" name="offline" />
           </u-radio-group>
         </u-col>
@@ -42,7 +43,7 @@
       <u-row class="info-row">
         <u-col span="12">
           <view class="info-label">支付方式</view>
-          <u-input :disabled="paymentMethodRadio === 'online'" v-model="paymentMethod" placeholder="请输入支付方式"
+          <u-input :disabled="paymentMethodRadio === 'online'||paymentMethodRadio === 'online_alipay'" v-model="paymentMethod" placeholder="请输入支付方式"
             class="info-input" />
         </u-col>
       </u-row>
@@ -72,6 +73,11 @@
               <u-icon name="plus" size="40rpx" color="#999" />
             </view>
           </view>
+          <view v-if="displayImages.length > 0" class="pricing-button-wrap">
+            <view class="pay-now-button pricing-button" @click.stop="handlePricing">
+              <text class="button-text">核价</text>
+            </view>
+          </view>
         </view>
       </view>
     </view>
@@ -126,6 +132,10 @@
       confirmText="确认并继续付款" :show="riskWarningModalVisible" title="付款警示" :content="'湖南耒阳地区身份证号请确认！'">
     </u-modal>
 
+    <!-- 核价对话框 -->
+    <add-inquiry-dialog ref="pricingDialog" :clueId="pricingClueId" :editOrAdd="pricingEditOrAdd"
+      :editInfo="pricingEditInfo" :type="2" />
+
     <u-modal :show="payNowModalVisible" title="确认支付信息" :showConfirmButton="false">
       <view class="modal-content">
         <view class="payment-amount-display">￥{{ paymentAmount }}</view>
@@ -162,11 +172,13 @@
 <script>
 import PicComp from './PicComp.vue'
 import imageUpload from '../utils/imageUpload.js'
+import addInquiryDialog from '@/components/add-inquiry-dialog/index.vue'
 
 export default {
   name: 'PageThree',
   components: {
-    PicComp
+    PicComp,
+    addInquiryDialog
   },
   props: {
     orderDetail: {
@@ -207,7 +219,11 @@ export default {
       payNowModalVisible: false,
       riskWarningModalVisible: false,
       unpaidRating: 0,
-      followUpNotes: ''
+      followUpNotes: '',
+      // 核价相关
+      pricingClueId: '',
+      pricingEditOrAdd: 'receptFormAdd',
+      pricingEditInfo: {}
     }
   },
   computed: {
@@ -222,6 +238,18 @@ export default {
         transform: `translate(${this.currentX - this.startX}px, ${this.currentY - this.startY}px)`,
         zIndex: 1000
       }
+    },
+    // 是否为支付宝支付
+    isAlipayPayment() {
+      return this.paymentMethodRadio === 'online_alipay'
+    },
+    // 银行账号标签
+    bankAccountLabel() {
+      return this.isAlipayPayment ? '支付宝账号' : '银行账号'
+    },
+    // 银行账号占位符
+    bankAccountPlaceholder() {
+      return this.isAlipayPayment ? '请输入支付宝账号' : '请输入银行账号'
     }
   },
   watch: {
@@ -303,6 +331,10 @@ export default {
       if (value === '小葫芦线上支付') {
         this.paymentMethod = '小葫芦线上支付'
         this.paymentMethodRadio = 'online'
+      } else if (value === '小葫芦线上支付宝') {
+        this.paymentMethod = '小葫芦线上支付宝'
+        this.paymentMethodRadio = 'online_alipay'
+        this.paymentInfo.bankName = '支付宝'
       } else {
         this.paymentMethod = value || ''
         this.paymentMethodRadio = 'offline'
@@ -315,8 +347,20 @@ export default {
     handlePaymentMethodRadioChange(value) {
       if (value === 'online') {
         this.paymentMethod = '小葫芦线上支付'
+        // 恢复银行名称输入框
+        if (this.paymentInfo.bankName === '支付宝') {
+          this.paymentInfo.bankName = ''
+        }
+      } else if (value === 'online_alipay') {
+        this.paymentMethod = '小葫芦线上支付宝'
+        // 自动设置银行名称为支付宝
+        this.paymentInfo.bankName = '支付宝'
       } else {
         this.paymentMethod = ''
+        // 恢复银行名称输入框
+        if (this.paymentInfo.bankName === '支付宝') {
+          this.paymentInfo.bankName = ''
+        }
       }
     },
 
@@ -579,8 +623,8 @@ export default {
         id: this.orderDetail.id,
         paymentMethod: this.paymentMethod || ''
       })
-      //如果是小葫芦线上刚支付就调用接口，如果不是小葫芦线上支付就不要调用接口，直接点击下一步
-      if (this.paymentMethod === '小葫芦线上支付') {
+      //如果是小葫芦线上支付或者小葫芦线上支付宝就调用接口，如果不是小葫芦线上支付就不要调用接口，直接点击下一步
+      if (this.paymentMethod === '小葫芦线上支付' || this.paymentMethod === '小葫芦线上支付宝') {
         this.$emit('confirm-pay')
       } else {
         this.handleNext()
@@ -658,7 +702,88 @@ export default {
           ...this.paymentInfo
         }
       })
-    }
+    },
+
+    /**
+     * 核价
+     */
+    async handlePricing() {
+      const brandList = await this.$getDicts("crm_form_brand");
+
+
+      if (!this.currentReceipt || !this.currentReceipt.clueId) {
+        uni.$u.toast('缺少线索ID')
+        return
+      }
+      if (!this.currentReceipt.brand) {
+        uni.$u.toast('缺少品牌信息')
+        return
+      }
+      if (!this.displayImages || this.displayImages.length === 0) {
+        uni.$u.toast('请先上传图片')
+        return
+      }
+
+      this.pricingClueId = this.currentReceipt.clueId
+
+      // brand 是品牌的 id（dictValue），itemBrand 是品牌的 label（dictLabel）
+      const brandDictLabel = this.currentReceipt.brand
+      const brandDictValue = brandList.find(item => item.dictLabel === this.currentReceipt.brand).dictValue;
+
+      // 将图片转换为 imgsUrl 格式
+      const imgsUrl = this.displayImages.map(item => item.fileUrl).filter(url => url)
+
+      // 检查是否已有核价记录
+      try {
+        const data = {
+          clueId: this.currentReceipt.clueId,
+          type: 2
+        }
+        const res = await uni.$u.api.inquiryDetail(data)
+        if (res.code === 200 && res.data) {
+          // 编辑模式：保留原有数据，但更新品牌和图片
+          this.pricingEditOrAdd = 'editForm'
+          this.pricingEditInfo = {
+            ...res.data,
+            dictLabel: brandDictLabel || res.data.dictLabel,
+            dictValue: brandDictValue || res.data.dictValue,
+            imgsUrl: imgsUrl.length > 0 ? imgsUrl : (res.data.imgsUrl || [])
+          }
+          this.$nextTick(() => {
+            this.$refs.pricingDialog.showDialog()
+          })
+        } else {
+          // 新增模式：设置品牌和图片
+          this.pricingEditOrAdd = 'editForm'
+          this.pricingEditInfo = {
+            dictLabel: brandDictLabel,
+            dictValue: brandDictValue,
+            imgsUrl: imgsUrl,
+            model: '',
+            code: '',
+            price: ''
+          }
+          this.$nextTick(() => {
+            this.$refs.pricingDialog.showDialog()
+          })
+        }
+      } catch (error) {
+        // 如果没有记录，则新增
+        this.pricingEditOrAdd = 'receptFormAdd'
+        this.pricingEditInfo = {
+          dictLabel: brandDictLabel,
+          dictValue: brandDictValue,
+          imgsUrl: imgsUrl,
+          model: '',
+          code: '',
+          price: ''
+        }
+        this.$nextTick(() => {
+          this.$refs.pricingDialog.showDialog()
+        })
+      }
+    },
+
   }
 }
 </script>
@@ -794,6 +919,15 @@ export default {
   cursor: pointer;
 }
 
+.pricing-button-wrap {
+  width: 100%;
+  margin-top: 20rpx;
+}
+
+.pricing-button {
+  margin-top: 0;
+}
+
 .payment-card {
   margin-top: 20rpx;
 }

utils/api.js

@@ -148,10 +148,6 @@ const install = (Vue, vm) => {
 
 
 
-		//新增仓库接口
-		addWarehouse: (data) => http.post(store.state.user.path + '/wareHouse/wareHouseAdd', data), 
-		//编辑仓库接口
-		updateWarehouse: (data) => http.post(store.state.user.path + '/wareHouse/wareHouseUpdate', data), 
 
 	}
 }