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

pages/orderDetailRefactored/components/PageThree.vue

@@ -54,7 +54,7 @@
       <view class="detail-image-section">
         <view class="detail-image-header">
           <text class="detail-image-title">高清实物图（拖拽排序）</text>
-          <u-button type="primary" v-if="displayImages.length > 0" shape="circle" plain text="核价" size="small" @click.stop="handlePricing"></u-button>
+          <u-button type="primary" v-if="displayImages.length > 0" shape="circle" plain text="核价" size="small" @click="handlePricing"></u-button>
         </view>
         <view class="detail-image-content">
           <view class="detail-image-list">
@@ -720,7 +720,8 @@ export default {
         return
       }
 
-      this.pricingClueId = this.currentReceipt.clueId
+      //我这里询价要用receiptid来询价
+      this.pricingClueId = this.currentReceipt.id
 
       // brand 是品牌的 id（dictValue），itemBrand 是品牌的 label（dictLabel）
       const brandDictLabel = this.currentReceipt.brand
@@ -755,7 +756,7 @@ export default {
             dictLabel: brandDictLabel,
             dictValue: brandDictValue,
             imgsUrl: imgsUrl,
-            model: '',
+            model:  this.currentReceipt.model,
             code: '',
             price: ''
           }
@@ -770,7 +771,7 @@ export default {
           dictLabel: brandDictLabel,
           dictValue: brandDictValue,
           imgsUrl: imgsUrl,
-          model: '',
+          model:  this.currentReceipt.model,
           code: '',
           price: ''
         }

store/modules/user.js

@@ -28,8 +28,8 @@ export default {
 		netConfig: {
 			// http://59.42.9.166:9520/proxy
 			// http://10.0.7.100:9500
-			// ip: "https://crm.nanjingshiyu.com/prod-api", // ip
-			ip: "https://crmtest.nanjingshiyu.com/prod-api", // 测试环境ip
+			ip: "https://crm.nanjingshiyu.com/prod-api", // ip
+			// ip: "https://crmtest.nanjingshiyu.com/prod-api", // 测试环境ip
 			// ip : "/api", // 测试环境ip
 			// ip : "http://47.113.184.101", // 测试环境ip
 			// ip: "http://172.16.7.200", // ip