Browse Source

修复完善订单信息的问题

xiaohaizhao 1 month ago
parent
commit
83df6eedcb

+ 3 - 11
packageA/activity/selectProduct/cart/index.js

@@ -147,17 +147,9 @@ Page({
 						});
 						getApp().globalData.getCollectCount()
 						that.getList();
-						wx.showModal({
-							title: '提示',
-							content: '生成成功!是否立即前往',
-							complete: (s) => {
-								if (s.confirm) {
-									wx.navigateTo({
-										url: '/packageA/orderForm/detail?id=' + res.data.sa_orderid,
-									})
-								}
-							}
-						});
+						wx.navigateTo({
+							url: '/packageA/orderForm/detail?id=' + res.data.sa_orderid,
+						})
 					})
 				}
 			}

+ 3 - 9
packageA/favorites/index.js

@@ -263,15 +263,9 @@ Page({
           results: [],
           isAll: false
         })
-        wx.showModal({
-          title: '提示',
-          content: '生成成功!是否立即前往',
-          complete: (s) => {
-            if (s.confirm) wx.navigateTo({
-              url: '/packageA/orderForm/detail?id=' + res.data.sa_orderid,
-            })
-          }
-        });
+        wx.navigateTo({
+          url: '/packageA/orderForm/detail?id=' + res.data.sa_orderid,
+        })
       })
     })
   },

+ 2 - 11
packageA/market/detail.js

@@ -337,17 +337,8 @@ Page({
 			content,
 		}).then(res => {
 			console.log("创建订单", res)
-			wx.showModal({
-				title: '提示',
-				content: res.msg == '成功' ? '订单创建成功!是否立即查看' : res.msg,
-				showCancel: res.msg == '成功',
-				complete: ({
-					confirm
-				}) => {
-					if (res.msg == '成功' && confirm) wx.navigateTo({
-						url: '/packageA/orderForm/detail?id=' + res.data.sa_orderid,
-					})
-				}
+			if (res.msg == '成功') wx.navigateTo({
+				url: '/packageA/orderForm/detail?id=' + res.data.sa_orderid,
 			})
 		})
 

+ 1 - 0
packageA/orderForm/detail.js

@@ -137,6 +137,7 @@ Page({
 							res.data.invoicename = item.enterprisename;
 							res.data.invoicetaxno = item.taxno;
 							res.data.invoiceaddress = item.address;
+							res.data.finance = item;
 							console.log("开票单位", item)
 							change = true
 						}

+ 3 - 11
pages/index/collect/index.js

@@ -175,17 +175,9 @@ Component({
 						icon: "none"
 					});
 					getApp().globalData.getCollectCount()
-					wx.showModal({
-						title: '提示',
-						content: '生成成功!是否立即前往',
-						complete: (s) => {
-							if (s.confirm) {
-								wx.navigateTo({
-									url: '/packageA/orderForm/detail?id=' + res.data.sa_orderid,
-								})
-							}
-						}
-					});
+					wx.navigateTo({
+						url: '/packageA/orderForm/detail?id=' + res.data.sa_orderid,
+					})
 					this.getList();
 				})
 			})

+ 9 - 2
project.private.config.json

@@ -24,12 +24,19 @@
   "condition": {
     "miniprogram": {
       "list": [
+        {
+          "name": "/packageA/repair/index",
+          "pathName": "/packageA/repair/detail",
+          "query": "id=272515",
+          "scene": null,
+          "launchMode": "default"
+        },
         {
           "name": "packageA/orderForm/detail",
           "pathName": "packageA/orderForm/detail",
           "query": "id=2079456",
-          "scene": null,
-          "launchMode": "default"
+          "launchMode": "default",
+          "scene": null
         },
         {
           "name": "packageA/orderForm/detail",