修改

pages/index/index.vue

@@ -18,7 +18,7 @@
 						<u-icon name="arrow-left" size="44"></u-icon>
 					</view>
 				</view>
-				<view @click='yj' style="width: 200px;height: 50px;">活动</view>
+				<!-- <view @click='yj' style="width: 200px;height: 50px;">活动</view> -->
 				<u-tabs v-if="myPageData.home_pages && myPageData.home_pages.navs.length > 1" name="name" :list="myPageData.home_pages.navs"
 				 :is-scroll="true" :active-color="mainColor" :current="active" :bar-width="80" :font-size="32" :bold="false" @change="changeHandler"></u-tabs>
 				<template v-for="(item, i) in myPageData.home_pages.navs">

pages/order-submit/neweducation-submit.vue

@@ -127,7 +127,7 @@
 					 placeholder="电话"></u-field>
 				</view>
 				<view class="liuyan" style="margin-top: 10px;">
-					<u-field padding="0px" label-width="80" v-model="BuyerMessage" label="留言" placeholder="建议留言前先与客服沟通确认"></u-field>
+					<u-field padding="0px" input-align='right' label-width="80" v-model="BuyerMessage" label="留言" placeholder="建议留言前先与客服沟通确认"></u-field>
 				</view>
 			</view>
 		</view>
@@ -440,10 +440,11 @@
 							form.Mobile = that.adressInfo.Mobile;
 							form.Province = that.adressInfo.Province;
 							form.City = that.adressInfo.City;
+							form.VersionSource = 1;
 							form.District = that.adressInfo.District;
 							form.ShoppingAddress = that.adressInfo.ShoppingAddress;
 							form.BuyerMessage = that.BuyerMessage;
-							form.DeliveryMethod = that.formdata.DeliveryMethod;
+							form.DeliveryMethod = 2;
 							form.DetailList = that.DetailList;
 							form.User_Coupon_Id = that.formdata.User_Coupon_Id;
 							form.Use_Deposit_Id = that.formdata.Use_Deposit_Id;

pages/order/educationO-detail.vue

@@ -80,19 +80,79 @@
 					</view>
 					<view class="field">
 						<view class="label">备注：</view>
-						<view class="content">{{ orders.BuyerMessage }}</view>
+						<view class="content">{{ orders.BuyerMessage?orders.BuyerMessage :'无' }}</view>
 					</view>
 				</view>
 				<view class="order-info-item">
 					<view class="field">
 						<view class="label">支付方式：</view>
-						<view class="content">线下支付</view>
+						<view class="content">微信支付</view>
 					</view>
 				</view>
+				
 			</view>
+			<view class="block" style="margin-bottom: 50px;">
+				<view class="order-info-item">
+					<view class="field">
+						<view class="label">商品总额</view>
+						<view class="content right">￥{{ orders.PreferPrice }}</view>
+					</view>
+					<view class="field">
+						<view class="label">优惠</view>
+						<view class="content right">-￥{{ orders.CouponMoney }}</view>
+					</view>
+				
+					
+					<view style="width: 100%;height: 1px;background: #f5f5f5;margin: 5px 0;"></view>
+					<view class="field">
+						<view class="label">&nbsp;</view>
+						<view class="content right">
+							<text style="margin-right: 10px;">实付款：</text>
+							<text style="font-size: 11px; font-weight: 700;" :style="{ color: mc }">￥</text>
+							<text style="font-size: 17px;" :style="{ color: mc }">{{String(orders.Income).split(".")[0]}}</text>
+							<text style="font-size: 12px;" :style="{ color: mc }">.{{String(orders.Income).split(".")[1] || "00" }}</text>
+						</view>
+					</view>
+				</view>
+			</view>
+			<view class="btn-box" v-if="orders.OrderStatus != '5'&&isShowBtn">
 			
+				<view class="item" v-if="orders.OrderStatus == '1'">
+					<u-button shape="circle" size="medium" :custom-style="themCustomStyle" v-on:click.stop="payment(orders)">立即支付</u-button>
+				</view>
+				
 			
+				<view class="item" v-if="orders.OrderStatus == '1' || (orders.OrderStatus == '2' && orders.PresentFXGrade!=1)">
+					<u-button shape="circle" size="medium" :custom-style="customStyle" @click="cancel">取消订单</u-button>
+				</view>
+				<view class="item" style="line-height: 34px;" v-if="orders.OrderStatus == 6">
+					待处理
+				</view>
+				<view class="item" style="line-height: 34px;font-size: 16px;color: gray;font-weight: 600;" v-if="orders.OrderStatus == 7">
+					已取消
+				</view>
+			</view>
 			
+			<u-popup v-model="showModal" mode="center" length="80%">
+				<view style='display: flex;flex-direction: column;align-items: center;background: #fff;'>
+					<view style="display: flex;align-items: center;justify-content: center;height:70px ;">
+						<Text>是否取消订单？</Text>
+					</view>
+					<view style="display: flex;flex-direction: column;height:80px ;margin-left: 15px;width: 100%;" v-if='orders.OrderStatus==2'>
+						<Text style='margin-left: 10px;margin-top: 5px;'>备注</Text>
+						<input class="uni-input inputM" style='margin-left: 10px;margin-top: 5px;' v-model="Cancelmsg.Remark" placeholder="输入备注" />
+					</view>
+					<view style="display: flex;flex-direction: row;align-items: center;height: 50px;border-top: 1px solid #F5F5F5;width: 100%;">
+						<view style="width: 50%;display: flex;align-items: center;justify-content: center" @click="showModal=false">
+							<Text>取消</Text>
+						</view>
+						<view style="width: 50%;color: #a0cfff;display: flex;align-items: center;justify-content: center" @click="confirm">
+							<Text>确定</Text>
+						</view>
+					</view>
+				</view>
+			</u-popup>
+			<payCom v-if="payBtn" :payInfo="payInfo" @closePay="closePay"></payCom>
 			
 		</view>
 		
@@ -101,10 +161,10 @@
 </template>
 
 <script>
-
+import payCom from '@/components/pay/pay';
 	export default {
 		components: {
-			
+			payCom
 		},
 		data() {
 			return {
@@ -143,7 +203,8 @@
 					OpenId: '',
 					OrderId: '',
 					OrderPayType: 1,
-					GoodsName: ''
+					GoodsName: '',
+					type:2
 				},
 				showAfter: false,
 				showModal: false,