页面修改

pages/order-submit/order-submit.vue

@@ -442,13 +442,32 @@
 					var isCheck = false;
 					var tipMsg = "";
 					this.shanglvForm.forEach(item => {
-						if (item.CompData && item.CompData.IsRequire && item.CompData.TextValue && item.CompData.TextValue ==
-							'') {
-							isCheck = true;
+						if (item.CompData && item.CompData.IsRequire) {
+							if (item.CompKey == 'SingleLineText' || item.CompKey == 'MultiLineText') {
+								if (item.CompData.TextValue == '') {
+									tipMsg += "请填写" + item.CompData.Name + ";";
+									if (!isCheck) {
+										isCheck = true;
+									}
+								}
+							} else if (item.CompKey == "DorpDownList") {
+								if (item.CompData.OptionValue == "") {
+									tipMsg += "请选择" + item.CompData.Name + ";";
+									if (!isCheck) {
+										isCheck = true;
+									}
+								}
+							}
 						}
 					})
+					if (isCheck) {
+						this.$refs.uToast.show({
+							title: tipMsg,
+							type: 'warning'
+						});
+						return;
+					}
 				}
-
 				if (!this.submitOrder) {
 					this.submitOrder = true;
 					uni.requestSubscribeMessage({
@@ -666,7 +685,6 @@
 							this.payInfo.GoodsName = this.mchs[0].goods_list[0].name.slice(0, 10);
 							this.formdata.DeliveryMethod = this.mchs[0].delivery.send_type;
 							this.ds = res.data;
-							console.log("this.ds ", this.ds)
 							this.expressPrice = 0.0;
 							this.goodPrice = 0.0;
 							this.couponPrice = 0.0;
@@ -713,12 +731,10 @@
 								if (rootItem.GoodsRelevanceList && rootItem.GoodsRelevanceList.length > 0) {
 									rootItem.GoodsRelevanceList.forEach(qitem => {
 										tempRelevancePrice += parseFloat(qitem.RelevancePrice);
-										console.log("tempRelevancePrice1", tempRelevancePrice)
 									})
 								}
 							})
 						}
-						console.log("tempRelevancePrice2", tempRelevancePrice)
 						//HK 2022-10-11 新增结束
 						this.goodPrice += parseFloat(x.total_goods_price) + parseFloat(tempRelevancePrice);
 						this.expressPrice += parseFloat(x.express_price);