修改

pages.json

@@ -274,7 +274,10 @@
 					}
 				},
 				{
-					"path":"educationO-detail"//教育详情
+					"path":"educationO-detail",//教育详情
+					"style": {
+					    "navigationStyle": "custom"
+					}
 				}
             ]
         },

pages/order-submit/education-submit.vue

@@ -62,15 +62,19 @@
 					</view>
 				</template>
 				
-				<view class="liuyan">
-					<u-field padding="0px" label-width="80" input-align='right' v-model="BuyerMessage" label="姓名" placeholder="真实姓名"></u-field>
-				</view>
-				<view class="liuyan">
-					<u-field padding="0px" label-width="80" input-align='right' v-model="BuyerMessage" label="电话" placeholder="电话"></u-field>
-				</view>
-				<view class="liuyan">
-					<u-field padding="0px" label-width="80" input-align='right' v-model="BuyerMessage" label="留言" placeholder="建议留言前先与客服沟通确认"></u-field>
-				</view>
+				
+			</view>
+		</view>
+		<view class="discountbox" style="padding: 15px 10px 5px;">
+		
+			<view class="liuyan">
+				<u-field padding="0px" label-width="120" input-align='right' v-model="adressInfo.Consignee" label="联系人" placeholder="姓名"></u-field>
+			</view>
+			<view class="liuyan">
+				<u-field padding="0px" label-width="120" input-align='right' v-model="adressInfo.Mobile" label="联系电话" placeholder="电话"></u-field>
+			</view>
+			<view class="liuyan">
+				<u-field padding="0px" label-width="80" input-align='right' v-model="BuyerMessage" label="留言" placeholder="备注信息"></u-field>
 			</view>
 		</view>
 		
@@ -203,7 +207,10 @@
 				showGoodList: false,
 				DetailList: [],
 				IsFormShoppingCart: 2,
-				adressInfo: {},
+				adressInfo: {
+					Consignee:'',
+					Mobile:'',
+				},
 				payInfo: {
 					OpenId: 'ow_7I5XC1-RGwwk8QANBmWKYKmOc',
 					OrderId: '',
@@ -275,10 +282,18 @@
 			},
 			// 提交订单
 			submitOrderHandler() {
+		
 				let that = this;
 				if (that.adressInfo.Consignee == '') {
 					this.$refs.uToast.show({
-						title: '请选择收货信息！',
+						title: '请输入联系人！',
+						type: 'warning'
+					});
+					return;
+				}
+				if (that.adressInfo.Mobile == '') {
+					this.$refs.uToast.show({
+						title: '请输入联系电话！',
 						type: 'warning'
 					});
 					return;
@@ -318,7 +333,9 @@
 								},
 								res => {
 									if (res.resultCode == 1) {
-										
+											uni.navigateTo({
+												url: '/pages/order-submit/education-success' 
+											})
 
 									} else {
 										that.$refs.uToast.show({
@@ -457,14 +474,14 @@
 							this.formatPrice();
 							this.initCoupon();
 							// this.formatAttr();
-							this.adressInfo = {
-								Consignee: this.address.name,
-								Mobile: this.address.mobile,
-								Province: this.address.province_id,
-								City: this.address.city_id,
-								District: this.address.district_id,
-								ShoppingAddress: this.address.detail
-							};
+							// this.adressInfo = {
+							// 	Consignee: this.address.name,
+							// 	Mobile: this.address.mobile,
+							// 	Province: this.address.province_id,
+							// 	City: this.address.city_id,
+							// 	District: this.address.district_id,
+							// 	ShoppingAddress: this.address.detail
+							// };
 						}
 
 						uni.hideNavigationBarLoading();
@@ -819,6 +836,6 @@
 		border-radius: 4px;
 	}
 	.educationsubmit .liuyan{
-		margin-bottom: 5px;
+		margin-bottom: 10px;
 	}
 </style>

pages/order-submit/education-success.vue

 <template>
+	<view class="edsucess">
+		<image src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/edsucess.png" style="width: 80px;height: auto;margin-top: 50px;" mode="widthFix"></image>
+		<text style="font-size: 18px;color: #111111;font-weight: bold;margin: 26px 0;">报名成功</text>
+		<text style="font-size: 14px;color: #333333;">稍后会有客服人员联系您，请耐心等待。</text>
+		<view class="btn" :style="{background:mainColor}" @click="gourl()">我知道了</view>
+	</view>
 </template>
 
 <script>
+	export default{
+		data(){
+			return{
+				mainColor:''
+			}
+			
+		},
+		onLoad() {
+			
+			
+		},
+		created(){
+			this.mainColor = this.$uiConfig.mainColor;
+		},
+		methods:{
+			gourl(){
+				uni.reLaunch({
+					url: "/pages/order/index/index?status=0",
+				});
+			}
+		}
+	}
 </script>
 
 <style>
+	.edsucess{
+		width: 100%;
+		height: 100vh;
+		background: #FFF;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		padding: 15px;
+	}
+	.btn{
+		width: 125px;
+		height: 40px;
+		margin-top: 35px;
+		border-radius: 20px;
+		color: #FFF;
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+		justify-content: center;
+		font-size: 15px;
+		
+	}
 </style>

pages/order/index/index.vue

@@ -12,13 +12,13 @@
 			<scroll-view :scroll-y="true" :enable-back-to-top="true" :enable-flex="true" @scrolltolower="lower" :style="{ height: '100%' }">
 				<view class="orderList">
 					<view class="listBox" v-for="(item, index) in g" :key="index">
-						<view class="listBox_t" @click="redirectToDetail(item.OrderId)">
+						<view class="listBox_t" @click="redirectToDetail(item)">
 							<Text>订单号：{{ item.OrderNo }}</Text>
 							<Text style="color: gray;">{{ item.OrderStatusName }}</Text>
 						</view>
 						<view class="listBox_c">
 							<template v-if="item.DetailList.length == 1">
-								<view v-for="(cx, ci) in item.DetailList" :key="ci" class="box_bottom" @click="redirectToDetail(item.OrderId)">
+								<view v-for="(cx, ci) in item.DetailList" :key="ci" class="box_bottom" @click="redirectToDetail(item)">
 									<image :src="cx.CoverImagePath" style="width: 80px; height: 80px; border-radius: 2px;" mode="aspectFill" />
 									<view style="margin-left: 15px; flex: 1;">
 										<Text class="topic_cont_text">{{cx.GoodsName}}</Text>
@@ -31,7 +31,7 @@
 								</view>
 							</template>
 							<template v-else>
-								<view class="goodboxmore" @click="redirectToDetail(item.OrderId)">
+								<view class="goodboxmore" @click="redirectToDetail(item)">
 									<view class="good-list">
 										<view style="white-space: nowrap;">
 											<image v-for="(y, yi) in item.DetailList" :key="yi" :src="y.CoverImagePath" mode="aspectFill" class="item" />
@@ -231,10 +231,18 @@
 					}
 				);
 			},
-			redirectToDetail(id) {
-				uni.navigateTo({
-					url: "/pages/order/order-detail?id=" + id,
-				});
+			redirectToDetail(item) {
+				if(item.VersionSource!=1){
+					uni.navigateTo({
+						url: "/pages/order/order-detail?id=" + item.OrderId,
+					});
+				}else{
+					uni.navigateTo({
+						url: "/pages/order/educationO-detail?id=" + item.OrderId,
+					});
+				}
+				
+				
 			},
 			shouhuoHandler(id) {
 				this.showReviceModal = true;
@@ -384,10 +392,18 @@
 					good.DetailList.push(g);
 				});
 				forms = good;
-				uni.navigateTo({
-					url: '/pages/order-submit/order-submit?formData=' + encodeURIComponent(JSON.stringify(forms)) +
-						'&IsFormShoppingCart=2&ShoppingCartIdList=' + JSON.stringify(ShoppingCartIdList)
-				});
+				if(y.VersionSource !=1){
+					uni.navigateTo({
+						url: '/pages/order-submit/order-submit?formData=' + encodeURIComponent(JSON.stringify(forms)) +
+							'&IsFormShoppingCart=2&ShoppingCartIdList=' + JSON.stringify(ShoppingCartIdList)
+					});
+				}else{
+					uni.navigateTo({
+						url: '/pages/order-submit/education-submit?formData=' + encodeURIComponent(JSON.stringify(forms)) +
+							'&IsFormShoppingCart=2&ShoppingCartIdList=' + JSON.stringify(ShoppingCartIdList)
+					});
+				}
+				
 			},
 			reloadUserinfo() {
 				this.u = uni.getStorageSync("mall_UserInfo");