Commit 3b4f5a8d authored by 黄奎's avatar 黄奎

样式修改

parent 82c23101
<template> <template>
<div class="templatePayURL" style="margin-right: 10px;"> <div class="templatePayURL" style="margin-right: 10px;">
<div style="color:red;font-size:16px;font-weight:bold;">请不要刷新页面,否则无法支付成功,订单自动取消!支付成功将自动刷新页面!</div>
<div> <div>
<template v-if="!isShowPic"> <template v-if="!isShowPic">
<div style="margin: 15px 0;"> <div style="margin: 15px 0;">
...@@ -26,7 +27,6 @@ ...@@ -26,7 +27,6 @@
<p class="fz12 color333">倒计时</p> <p class="fz12 color333">倒计时</p>
<p style="color: #E95252; font-weight: bold; font-size: 12px; margin: 8px 0;">{{descMin}}{{descSecond}}</p> <p style="color: #E95252; font-weight: bold; font-size: 12px; margin: 8px 0;">{{descMin}}{{descSecond}}</p>
</div> </div>
<div style="color:red;font-size:13px;margin-top:50px;">请不要刷新页面,否则无法支付成功,订单自动取消!</div>
</template> </template>
</div> </div>
</div> </div>
...@@ -90,21 +90,21 @@ ...@@ -90,21 +90,21 @@
OrderId: this.item.orderId OrderId: this.item.orderId
} }
var myPay = this.payWay; var myPay = this.payWay;
if(myPay==3){ if (myPay == 3) {
myPay=2 myPay = 2
} }
this.apipost('OnlinePay_post_CheckOrderPay', msg, res => { this.apipost('OnlinePay_post_CheckOrderPay', msg, res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
var data = res.data.data; var data = res.data.data;
let mallMsg={ let mallMsg = {
OrderId:this.item.orderId, OrderId: this.item.orderId,
MerchantsNo:data.Pay_Order, MerchantsNo: data.Pay_Order,
User_Id:this.item.User_Id, User_Id: this.item.User_Id,
Out_Trade_No:data.Trade_Order, Out_Trade_No: data.Trade_Order,
Transaction_Id:data.Third_Order, Transaction_Id: data.Third_Order,
PayWay:myPay, PayWay: myPay,
Money:this.item.TotalPrice, Money: this.item.TotalPrice,
Remarks:"支付赞羊商品订单:" + this.item.orderId Remarks: "支付赞羊商品订单:" + this.item.orderId
} }
this.mallapipost("/api/AppletOrder/UpdateERPGoodsOrderInfo", mallMsg, res => { this.mallapipost("/api/AppletOrder/UpdateERPGoodsOrderInfo", mallMsg, res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
...@@ -113,11 +113,11 @@ ...@@ -113,11 +113,11 @@
this.$emit('getGoodList'); this.$emit('getGoodList');
clearInterval(this.timer2); clearInterval(this.timer2);
clearInterval(this.timer); clearInterval(this.timer);
}else{ } else {
this.Error(res.data.message); this.Error(res.data.message);
} }
}) })
} }
}, err => {}) }, err => {})
}, },
descTime() { descTime() {
...@@ -128,7 +128,6 @@ ...@@ -128,7 +128,6 @@
hr = hr > 9 ? hr : '0' + hr hr = hr > 9 ? hr : '0' + hr
min = min > 9 ? min : '0' + min min = min > 9 ? min : '0' + min
sec = sec > 9 ? sec : '0' + sec sec = sec > 9 ? sec : '0' + sec
console.log("min",min)
// 控制台打印 // 控制台打印
if (this.chaTime > 0) { if (this.chaTime > 0) {
if (hr > 0) { if (hr > 0) {
...@@ -147,11 +146,12 @@ ...@@ -147,11 +146,12 @@
// 一秒后递归 // 一秒后递归
}, },
//取消清除 //取消清除
clearCount(){ clearCount() {
clearInterval(this.timer) clearInterval(this.timer)
} }
}, },
}; };
</script> </script>
<style> <style>
.templatePayURL .el-input--suffix .el-input__inner { .templatePayURL .el-input--suffix .el-input__inner {
......
...@@ -129,7 +129,7 @@ ...@@ -129,7 +129,7 @@
layout="total,prev, pager, next, jumper" :page-size="msg.pageSize" :total="msg.total"> layout="total,prev, pager, next, jumper" :page-size="msg.pageSize" :total="msg.total">
</el-pagination> </el-pagination>
<el-dialog title="下单" :visible.sync="orderDialog" custom-class="order_Dialog" width="400px"> <el-dialog title="下单" :visible.sync="orderDialog" custom-class="order_Dialog" width="400px">
<div style="margin-bottom:20px;"> <div style="margin-bottom:20px;font-size:16px;">
{{currentGoodsObj.name}} {{currentGoodsObj.name}}
</div> </div>
<el-form label-width="80px" size="small"> <el-form label-width="80px" size="small">
...@@ -660,7 +660,6 @@ ...@@ -660,7 +660,6 @@
this.$refs[formName].validate((valid) => { this.$refs[formName].validate((valid) => {
if (valid) { if (valid) {
delete this.AddressMsg.position //删除position 不传到后台 delete this.AddressMsg.position //删除position 不传到后台
console.log("AddressMsg",this.AddressMsg);
this.mallapipost("/api/AppletUser/ERPSetUserShippingAddress", this.AddressMsg, res => { this.mallapipost("/api/AppletUser/ERPSetUserShippingAddress", this.AddressMsg, res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.Success(res.data.message); this.Success(res.data.message);
......
...@@ -285,7 +285,6 @@ ...@@ -285,7 +285,6 @@
{ {
this.LineId=this.$route.query.LineId; this.LineId=this.$route.query.LineId;
} }
console.log("this.lineId",this.LineId);
this.GuestNum = this.$route.query.GuestNum; this.GuestNum = this.$route.query.GuestNum;
this.getList(); this.getList();
}, },
......
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