页面修改

pages/kotra/billboard/plugin/singleText.vue

@@ -23,7 +23,6 @@
 		onLoad() {},
 		methods: {
 			getvalue(){
-				
 				this.$emit('success',this.CompData,this.index)
 			}
 		}

pages/order-submit/order-submit.vue

@@ -116,6 +116,17 @@
 				</view>
 			</view>
 		</view>
+		<!--和平航旅联系人-->
+		<view class="goods" v-if="mallUserInfo.TenantId==29 && shanglvForm &&shanglvForm.length>0">
+			<template v-for="(sItem,sIndex) in shanglvForm">
+				<singleText v-if="sItem.CompKey=='SingleLineText'" :CompData="sItem.CompData" :index='sIndex' @success="datasuccess()"></singleText>
+				<multipleText v-if="sItem.CompKey=='MultiLineText'" :CompData="sItem.CompData" :index='sIndex' @success="datasuccess()"></multipleText>
+				<selectChoice v-if="sItem.CompKey=='DorpDownList'" :CompData="sItem.CompData" :index='sIndex' @success="datasuccess()"></selectChoice>
+				<pictureUpload v-if="sItem.CompKey=='ImageUploadComp'" :CompData="sItem.CompData" :index='sIndex' @success="datasuccess()"></pictureUpload>
+				<videoUpload v-if="sItem.CompKey=='VideoUploadComp'" :CompData="sItem.CompData" :index='sIndex' @success="datasuccess()"></videoUpload>
+				<fileType v-if="sItem.CompKey=='CommonUploadComp'" :CompData="sItem.CompData" :index='sIndex' @success="datasuccess()"></fileType>
+			</template>
+		</view>
 		<view class="discountbox">
 			<view class="filed">
 				<view class="left">优惠券</view>
@@ -257,13 +268,25 @@
 	import coupon from '@/components/coupon/index';
 	import cashCard from '@/components/coupon/cashCard'; //储蓄卡
 	import goodList from '@/components/goods/order-good-list';
+	import singleText from "@/pages/kotra/billboard/plugin/singleText.vue";
+	import multipleText from "@/pages/kotra/billboard/plugin/multipleText"
+	import selectChoice from "@/pages/kotra/billboard/plugin/selectChoice"
+	import pictureUpload from "@/pages/kotra/billboard/plugin/pictureUpload"
+	import videoUpload from "@/pages/kotra/billboard/plugin/videoUpload"
+	import fileType from "@/pages/kotra/billboard/plugin/fileType"
 	export default {
 		components: {
 			payCom,
 			peisong,
 			coupon,
 			goodList,
-			cashCard
+			cashCard,
+			singleText,
+			multipleText,
+			selectChoice,
+			pictureUpload,
+			videoUpload,
+			fileType,
 		},
 		data() {
 			return {
@@ -335,6 +358,8 @@
 				showcashcard: false,
 				onecoupon: true, //第一次进页面的时候选最优的优惠券
 				IsDeposit: 0, //是否开启储蓄卡功能
+				mallUserInfo: {}, //商城用户信息
+				shanglvForm: [], //商旅自定义表单
 			};
 		},
 		onLoad(option) {
@@ -352,7 +377,8 @@
 			if (option.ShoppingCartIdList) {
 				this.ShoppingCartIdList = JSON.parse(option.ShoppingCartIdList);
 			}
-			this.payInfo.OpenId = uni.getStorageSync('mall_UserInfo').OpenId;
+			this.mallUserInfo = uni.getStorageSync('mall_UserInfo')
+			this.payInfo.OpenId = this.mallUserInfo.OpenId;
 			this.IsDeposit = uni.getStorageSync('basedata') ? uni.getStorageSync('basedata').mall.setting.IsDeposit : 0
 			this.initPage();
 			this.mc = this.$uiConfig.mainColor;
@@ -367,6 +393,10 @@
 			}
 		},
 		methods: {
+			//自定义表单数据
+			datasuccess(data, index) {
+				this.shanglvForm[index].CompData = data;
+			},
 			onShareAppMessage() {
 				return {
 					title: this.zrName,
@@ -398,13 +428,17 @@
 			// 提交订单
 			submitOrderHandler() {
 				let that = this;
-				if (that.adressInfo.Consignee == '') {
-					this.$refs.uToast.show({
-						title: '请选择收货信息！',
-						type: 'warning'
-					});
-					return;
+				//和平商旅不验证收货地址
+				if (this.mallUserInfo.TenantId != 29) {
+					if (that.adressInfo.Consignee == '') {
+						this.$refs.uToast.show({
+							title: '请选择收货信息！',
+							type: 'warning'
+						});
+						return;
+					}
 				}
+
 				if (!this.submitOrder) {
 					this.submitOrder = true;
 					uni.requestSubscribeMessage({
@@ -428,10 +462,14 @@
 							form.CouponMoney = that.couponPrice;
 							form.FreightMoney = that.expressPrice;
 							form.Income = that.ds.total_price;
-
 							form.IsFormShoppingCart = that.IsFormShoppingCart;
 							form.Use_Integral = that.formdata.Use_Integral;
 							form.ShoppingCartIdList = that.ShoppingCartIdList;
+							if (that.shanglvForm && that.shanglvForm.length > 0) {
+								form.CustomFormInfo = that.shanglvForm;
+							} else {
+								form.CustomFormInfo = "";
+							}
 							form.AnchorName = uni.getStorageSync("AnchorName") ? uni.getStorageSync("AnchorName").AnchorName : ''; //直播名称
 							if (that.mchs && that.mchs.length > 0) {
 								that.deduction_commission = that.mchs[0].deduction_commission;
@@ -609,13 +647,16 @@
 							this.mchs = res.data.mch_list;
 							this.mchs.forEach(x => {
 								x.goods_list.forEach(j => {
-									j.marketingLogo = JSON.parse(j.marketingLogo)
+									j.marketingLogo = JSON.parse(j.marketingLogo);
+									if (j.form_data_json && j.form_data_json.length > 0 && this.shanglvForm && this.shanglvForm.length == 0) {
+										this.shanglvForm = j.form_data_json;
+									}
 								})
 							})
 							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 )
+							console.log("this.ds ", this.ds)
 							this.expressPrice = 0.0;
 							this.goodPrice = 0.0;
 							this.couponPrice = 0.0;