Commit c3ace032 authored by 黄奎's avatar 黄奎

parent b971f629
...@@ -241,7 +241,7 @@ ...@@ -241,7 +241,7 @@
<view class="notOption" v-if="submitOrder"></view> <view class="notOption" v-if="submitOrder"></view>
<good-list :list="goodData" v-if="showGoodList" @close="closeGoodListHandler"></good-list> <good-list :list="goodData" v-if="showGoodList" @close="closeGoodListHandler"></good-list>
<payCom v-if="payBtn" :payInfo="payInfo" :isAlipay="isAlipay" :StuId='JJSWStuId' :TeacherIds='mrk' <payCom v-if="payBtn" :payInfo="payInfo" :isAlipay="isAlipay" :StuId='JJSWStuId' :TeacherIds='EduTeacherId'
@closePay="closePay"></payCom> @closePay="closePay"></payCom>
<u-toast ref="uToast" /> <u-toast ref="uToast" />
...@@ -342,9 +342,11 @@ ...@@ -342,9 +342,11 @@
limits: false, limits: false,
AlipayMask: false, AlipayMask: false,
IsQZJC: 0, IsQZJC: 0,
mrk: '', EduTeacherId: '',
mrk2: '', ClassId: '',
mrk3: '', PaperId:'',
PublishId:'',
// mrk3: '',
isAlipay: 2, //1微信 2微信支付宝 isAlipay: 2, //1微信 2微信支付宝
JJSWStuId: "", JJSWStuId: "",
Thename2: '', Thename2: '',
...@@ -523,12 +525,12 @@ ...@@ -523,12 +525,12 @@
Registration() { Registration() {
let postMsg = { let postMsg = {
StuId: this.JJSWStuId, StuId: this.JJSWStuId,
ClassIds: this.mrk2 ClassIds: this.ClassId
} }
let that = this let that = this
let info={ let obj={
PaperId:this.mrk, PaperId:this.PaperId,
PublishId:this.mrk2, PublishId:this.PublishId,
GuestId:this.JJSWStuId GuestId:this.JJSWStuId
} }
this.requestJJSWAdmin("/api/WeChatPublic/CheckStuSubmitOrder", postMsg, this.requestJJSWAdmin("/api/WeChatPublic/CheckStuSubmitOrder", postMsg,
...@@ -539,26 +541,35 @@ ...@@ -539,26 +541,35 @@
title: res.data.Message, title: res.data.Message,
type: 'warning' type: 'warning'
}); });
// 跳转入学考试
uni.redirectTo({ uni.redirectTo({
url: `/pages/webbox/webbox?limit=${JSON.stringify(info)}` url: `/pages/webbox/webbox?limit=${JSON.stringify(obj)}`
}); });
} else { } else {
that.limits = false that.limits = false
this.submitOrderHandler2() this.OrderInterface()
} }
// console.log('llll',that.limits) // console.log('llll',that.limits)
} }
); );
}, },
// 报名限制 // 提交订单接口
// 提交订单 OrderInterface() {
submitOrderHandler2() { // that.adressInfo.Consignee = '测试'
// that.adressInfo.ShoppingAddress = '四川成都龙泉驿1'
// that.JJSWStuId = '10724';
// that.Thename="HK";
// if (that.adressInfo.Consignee == '') {
// this.$refs.uToast.show({
// title: '请选择收货信息!',
// type: 'warning'
// });
// return;
// }
let that =this let that =this
// 报名限制
if (!this.submitOrder && !that.limits) { if (!this.submitOrder && !that.limits) {
this.submitOrder = true; this.submitOrder = true;
uni.requestSubscribeMessage({ uni.requestSubscribeMessage({
tmplIds: this.ds.template_message_list, tmplIds: this.ds.template_message_list,
...@@ -609,7 +620,7 @@ ...@@ -609,7 +620,7 @@
OrderId: that.payInfo.OrderId, OrderId: that.payInfo.OrderId,
total_price: that.ds.total_price, total_price: that.ds.total_price,
StuId: that.JJSWStuId, StuId: that.JJSWStuId,
TeacherIds: that.mrk, TeacherIds: that.EduTeacherId,
} }
uni.reLaunch({ uni.reLaunch({
url: '/pages/order-submit/pay-success2?payInfo=' + url: '/pages/order-submit/pay-success2?payInfo=' +
...@@ -664,6 +675,7 @@ ...@@ -664,6 +675,7 @@
}); });
} }
}, },
// 提交订单按钮
submitOrderHandler() { submitOrderHandler() {
let that = this; let that = this;
if (that.JJSWStuId == '' || that.Thename == '') { if (that.JJSWStuId == '' || that.Thename == '') {
...@@ -674,19 +686,6 @@ ...@@ -674,19 +686,6 @@
return; return;
} }
that.Registration() that.Registration()
// that.adressInfo.Consignee = '测试'
// that.adressInfo.ShoppingAddress = '四川成都龙泉驿1'
// that.JJSWStuId = '10724';
// that.Thename="HK";
// if (that.adressInfo.Consignee == '') {
// this.$refs.uToast.show({
// title: '请选择收货信息!',
// type: 'warning'
// });
// return;
// }
}, },
closeCouponHandler(e) { closeCouponHandler(e) {
if (e != -1) { if (e != -1) {
...@@ -808,9 +807,10 @@ ...@@ -808,9 +807,10 @@
}); });
}, },
init() { init() {
let list = [] // 获取跳转接口
let list2 = [] let EduTeacherIdlist = []
let list3 = [] let ClassIdlist = []
// let list3 = []
this.loading = true; this.loading = true;
this.request2({ this.request2({
url: '/api/AppletOrder/GetAppletGoodsSettlementInfoForZY', url: '/api/AppletOrder/GetAppletGoodsSettlementInfoForZY',
...@@ -825,14 +825,15 @@ ...@@ -825,14 +825,15 @@
this.mchs.forEach(x => { this.mchs.forEach(x => {
x.goods_list.forEach(j => { x.goods_list.forEach(j => {
j.marketingLogo = JSON.parse(j.marketingLogo) j.marketingLogo = JSON.parse(j.marketingLogo)
list.push(j.EduTeacherId) EduTeacherIdlist.push(j.EduTeacherId)
list2.push(j.EduData.ClassId) ClassIdlist.push(j.EduData.ClassId)
list3.push(j.EduData.ClassPersion) // list3.push(j.EduData.ClassPersion)
}) })
}) })
this.mrk = list.toString()
this.mrk2 = list2.toString() this.EduTeacherId = list.toString()
this.mrk3 = list3.toString() this.ClassId = list2.toString()
// this.mrk3 = list3.toString()
this.payInfo.GoodsName = this.mchs[0].goods_list[0].name.slice(0, 10); this.payInfo.GoodsName = this.mchs[0].goods_list[0].name.slice(0, 10);
this.formdata.DeliveryMethod = this.mchs[0].delivery.send_type; this.formdata.DeliveryMethod = this.mchs[0].delivery.send_type;
this.ds = res.data; this.ds = res.data;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment