Merge branch 'bug' into 黄色

# Conflicts:
#	packageA/offers/addProjectOffer.js
#	packageA/offers/addSetclientOffer.js
#	packageA/offers/detail.js

packageA/offers/addProjectOffer.js

@@ -109,9 +109,10 @@ Page({
 		})
 	},
 	onLoad(options) {
-		sa_quotedpriceid = 0
-		quotedpricenotes = []
-		address = ""
+		source = 0;
+		sa_quotedpriceid = 0;
+		quotedpricenotes = [];
+		address = "";
 		let form = this.data.form;
 		/* 项目商机进入 */
 		if (options.sa_projectid) {
@@ -430,9 +431,6 @@ Page({
 			} else {
 				if (res.data.length) data.attinfos = res.data;
 				this.changeItem(data)
-				setTimeout(() => {
-					wx.navigateBack()
-				}, 500)
 			}
 		})
 	},
@@ -515,24 +513,35 @@ Page({
 					getApp().globalData.Language.showToast(s.code == '1' ? "创建成功" : s.msg)
 					try {
 						let attachmentids = this.selectComponent("#Yl_files").getFiles().attachmentids;
-						if (attachmentids.length) return this.handleFileLink(attachmentids, 'sa_quotedprice', res.data.sa_quotedpriceid, res.data);
+						if (attachmentids.length) {
+							this.handleFileLink(attachmentids, 'sa_quotedprice', res.data.sa_quotedpriceid, res.data)
+						} else {
+							setTimeout(() => {
+								this.changeItem(res.data)
+							}, 500)
+						}
 					} catch (error) {
-
+						setTimeout(() => {
+							this.changeItem(res.data)
+						}, 500)
 					}
-					setTimeout(() => {
-						this.changeItem(res.data)
-					}, 500)
+
 				})
 			} else {
 				try {
 					let attachmentids = this.selectComponent("#Yl_files").getFiles().attachmentids;
-					if (attachmentids.length) return this.handleFileLink(attachmentids, 'sa_quotedprice', res.data.sa_quotedpriceid, res.data);
+					if (attachmentids.length) {
+						this.handleFileLink(attachmentids, 'sa_quotedprice', res.data.sa_quotedpriceid, res.data)
+					} else {
+						setTimeout(() => {
+							this.changeItem(res.data)
+						}, 500)
+					}
 				} catch (error) {
-
+					setTimeout(() => {
+						this.changeItem(res.data)
+					}, 500)
 				}
-				setTimeout(() => {
-					this.changeItem(res.data)
-				}, 500)
 			}
 		})
 	},

packageA/offers/addSetclientOffer.js

@@ -111,9 +111,9 @@ Page({
 		})
 	},
 	onLoad(options) {
-		sa_quotedpriceid = 0
-		quotedpricenotes = []
-		address = ""
+		sa_quotedpriceid = 0;
+		quotedpricenotes = [];
+		address = "";
 		if (options.data) {
 			let data = JSON.parse(options.data);
 			let form = this.data.form;
@@ -318,9 +318,6 @@ Page({
 			} else {
 				if (res.data.length) data.attinfos = res.data;
 				this.changeItem(data)
-				setTimeout(() => {
-					wx.navigateBack()
-				}, 500)
 			}
 		})
 	},
@@ -400,24 +397,34 @@ Page({
 					getApp().globalData.Language.showToast(s.code == '1' ? "创建成功" : s.msg)
 					try {
 						let attachmentids = this.selectComponent("#Yl_files").getFiles().attachmentids;
-						if (attachmentids.length) return this.handleFileLink(attachmentids, 'sa_quotedprice', res.data.sa_quotedpriceid, res.data);
+						if (attachmentids.length) {
+							this.handleFileLink(attachmentids, 'sa_quotedprice', res.data.sa_quotedpriceid, res.data)
+						} else {
+							setTimeout(() => {
+								this.changeItem(res.data)
+							}, 500)
+						}
 					} catch (error) {
-
+						setTimeout(() => {
+							this.changeItem(res.data)
+						}, 500)
 					}
-					setTimeout(() => {
-						this.changeItem(res.data)
-					}, 500)
 				})
 			} else {
 				try {
 					let attachmentids = this.selectComponent("#Yl_files").getFiles().attachmentids;
-					if (attachmentids.length) return this.handleFileLink(attachmentids, 'sa_quotedprice', res.data.sa_quotedpriceid, res.data);
+					if (attachmentids.length) {
+						this.handleFileLink(attachmentids, 'sa_quotedprice', res.data.sa_quotedpriceid, res.data)
+					} else {
+						setTimeout(() => {
+							this.changeItem(res.data)
+						}, 500)
+					}
 				} catch (error) {
-
+					setTimeout(() => {
+						this.changeItem(res.data)
+					}, 500)
 				}
-				setTimeout(() => {
-					this.changeItem(res.data)
-				}, 500)
 			}
 		})
 	},

packageA/offers/detail.js

@@ -652,7 +652,7 @@ Page({
             id: '20221020165103',
             content
         }).then(res => {
-            console.log("更新市场报价单", res);
+            console.log("更新报价单", res);
             if (res.code == '1') page.setData({
                 list: res.data.map(v => {
                     v.progress = v.stage / v.totalstage * 100;