xiaohaizhao 2 месяцев назад
Родитель
Сommit
1d5eebc677

+ 1 - 1
packageA/fittings/modules/product/index.js

@@ -443,7 +443,7 @@ Component({
                             v.sa_orderitemsid = v.sa_orderitemsid || 0;
                             v.sa_orderitemsid = v.sa_orderitemsid || 0;
                             v.sa_promotion_itemsid = v.sa_promotion_itemsid || 0;
                             v.sa_promotion_itemsid = v.sa_promotion_itemsid || 0;
                             v.custamount = v.custamount || 0;
                             v.custamount = v.custamount || 0;
-                            v.price = this.data.type == '工具订单' ? v.marketprice : v.contractprice;
+                            v.price = v.price || 0;
                             v.delivery = this.data.delivery || this.data.deliverys[0].value
                             v.delivery = this.data.delivery || this.data.deliverys[0].value
                             v.amount = v.amount || 0;
                             v.amount = v.amount || 0;
                             return v
                             return v

+ 1 - 2
packageA/orderForm/modules/product/index.js

@@ -56,8 +56,6 @@ Component({
             let content = this.data.content;
             let content = this.data.content;
             content.sa_orderid = id;
             content.sa_orderid = id;
             sa_orderid = id;
             sa_orderid = id;
-            detail.sa_order_v = this.data.sa_order_v - 0;
-
             if (init) content.pageNumber = 1;
             if (init) content.pageNumber = 1;
             _Http.basic({
             _Http.basic({
                 "id": "20221109093902",
                 "id": "20221109093902",
@@ -90,6 +88,7 @@ Component({
                     sa_contractid: page.sa_contractid,
                     sa_contractid: page.sa_contractid,
                     type: page.type,
                     type: page.type,
                 };
                 };
+                console.log("base",base)
                 this.triggerEvent("returnProductCount", res.total)
                 this.triggerEvent("returnProductCount", res.total)
                 this.setData({
                 this.setData({
                     list: res.pageNumber == 1 ? res.data : this.data.list.concat(res.data),
                     list: res.pageNumber == 1 ? res.data : this.data.list.concat(res.data),

+ 8 - 1
project.private.config.json

@@ -27,10 +27,17 @@
         {
         {
           "name": "packageA/orderForm/detail",
           "name": "packageA/orderForm/detail",
           "pathName": "packageA/orderForm/detail",
           "pathName": "packageA/orderForm/detail",
-          "query": "id=2082889",
+          "query": "id=2122471",
           "scene": null,
           "scene": null,
           "launchMode": "default"
           "launchMode": "default"
         },
         },
+        {
+          "name": "packageA/orderForm/detail",
+          "pathName": "packageA/orderForm/detail",
+          "query": "id=2082889",
+          "launchMode": "default",
+          "scene": null
+        },
         {
         {
           "name": "/packageA/repair/index",
           "name": "/packageA/repair/index",
           "pathName": "/packageA/repair/detail",
           "pathName": "/packageA/repair/detail",

+ 2 - 2
utils/Http.js

@@ -11,8 +11,8 @@ class HTTP {
 		if (this.ENV === 'release') { // 正式版
 		if (this.ENV === 'release') { // 正式版
 			this.baseUrl = "https://crm.meida.com:16691";
 			this.baseUrl = "https://crm.meida.com:16691";
 		} else {
 		} else {
-			this.baseUrl = "http://61.164.207.46:8300";
-			// this.baseUrl = "https://crm.meida.com:16691";
+			// this.baseUrl = "http://61.164.207.46:8300";
+			this.baseUrl = "https://crm.meida.com:16691";
 		}
 		}