提示bug

src/mycomponents/common/comMessage.vue

@@ -153,11 +153,14 @@
 			},
 
 			// 打开疑问弹框(取消+确定）
-			showQuestionMessage(mContent,textColor, callback) {
-				// this.textColor = textColor?textColor:'#000'
-				this.showSelectModal("疑问", mContent, callback,textColor);
+			showQuestionMessage(mContent, callback) {
+				this.showSelectModal("疑问", mContent, callback);
+			},
+			// 打开疑问弹框(取消+确定）
+			showQuestionMessage1(mContent,textColor, callback) {
+				console.log(textColor)
+				this.showSelectModal1("疑问", mContent, callback,textColor);
 			},
-
 			// 打开警告弹框(确定+倒计时)
 			showWarningMessage(mContent, callback) {
 				this.showConfirmCountdownModal("警告", mContent, callback);
@@ -249,11 +252,10 @@
 			},
 
 			// 初始化弹框并打开(取消+确定）
-			showSelectModal(mIconType, mContent, callback,textColor) {
+			showSelectModal(mIconType, mContent, callback) {
 				this.showModal({
 					iconType: mIconType,
 					content: mContent,
-					textColor:textColor,
 					success: function(res) {
 						if (callback != undefined) {
 							if (res.confirm == true) {
@@ -268,6 +270,26 @@
 					}
 				});
 			},
+			// 初始化弹框并打开(取消+确定）
+			showSelectModal1(mIconType, mContent, callback,textColor) {
+				this.showModal({
+					iconType: mIconType,
+					content: mContent,
+					textColor:textColor,
+					success: function(res) {
+						if (callback != undefined) {
+							if (res.confirm == true) {
+								callback(true);
+								console.log('用户点击确定')
+							} else {
+								callback(false);
+								console.log('用户点击取消')
+							}
+						}
+			
+					}
+				});
+			},
 
 			// 打开疑问弹框(确定+倒计时)
 			showConfirmCountdownQuestionModal(mContent, callback) {

src/pages/customerReturn/job/returnDetail.vue

@@ -350,7 +350,7 @@
 				})
 				if (str) {
 					str += '，是否确认提交?'
-					this.$refs.comMessage.showQuestionMessage(str, 'red', res => {
+					this.$refs.comMessage.showQuestionMessage1(str, 'red', res => {
 						if (res) {
 							this.submitJob()
 						}

src/pages/inventoryMove/job/inventoryMoveDetail.vue

@@ -365,7 +365,7 @@
 				})
 				if (str) {
 					str += '，是否确认提交?'
-					this.$refs.comMessage.showQuestionMessage(str, 'red', res => {
+					this.$refs.comMessage.showQuestionMessage1(str, 'red', res => {
 						if (res) {
 							this.submitJob()
 						}

src/pages/productReceipt/job/scrapReceiptDetail.vue

@@ -306,7 +306,7 @@
 				})
 				if (str) {
 					str += '，是否确认提交?'
-					this.$refs.comMessage.showQuestionMessage(str, 'red', res => {
+					this.$refs.comMessage.showQuestionMessage1(str, 'red', res => {
 						if (res) {
 							this.submitJob()
 						}

src/pages/productRecycle/job/productRecycleJobDetail.vue

@@ -329,7 +329,7 @@
 				})
 				if (str) {
 					str += '，是否确认提交?'
-					this.$refs.comMessage.showQuestionMessage(str, 'red', res => {
+					this.$refs.comMessage.showQuestionMessage1(str, 'red', res => {
 						if (res) {
 							this.submitJob()
 						}

src/pages/purchaseReturn/job/returnDetail.vue

@@ -361,7 +361,7 @@
 				})
 				if (str) {
 					str += '，是否确认提交?'
-					this.$refs.comMessage.showQuestionMessage(str, 'red', res => {
+					this.$refs.comMessage.showQuestionMessage1(str, 'red', res => {
 						if (res) {
 							this.submitJob()
 						}

src/pages/scrap/job/scrapJobDetail.vue

@@ -297,7 +297,7 @@
 				})
 				if (str) {
 					str += '，是否确认提交?'
-					this.$refs.comMessage.showQuestionMessage(str, 'red', res => {
+					this.$refs.comMessage.showQuestionMessage1(str, 'red', res => {
 						if (res) {
 							this.submitJob()
 						}

src/pages/unPlanned/job/issueJobDetail.vue

@@ -291,7 +291,7 @@
 				})
 				if (str) {
 					str += '，是否确认提交?'
-					this.$refs.comMessage.showQuestionMessage(str, 'red', res => {
+					this.$refs.comMessage.showQuestionMessage1(str, 'red', res => {
 						if (res) {
 							this.submitJob()
 						}