朱兆平 / vue_cli · 提交

转到一个项目

作者 shenhailong
提交 1b93f7fe80847fe741e6a4a485fbd70483c76953 1 个父辈 36d4f1cd

支付成功后前端接收消息 修改订单状态 

公寓管理 编辑 搜索select选择器没有创建
订单页面添加水表充值操作显示字段
用户水表充值 后 成功失败信息 入库
内嵌 并排对比
正在显示 4 个修改的文件 包含 46 行增加 和 21 行删除
... ... @@ -6,7 +6,7 @@ export const getOrder = params => { return axios.get(`${base}/list`, { params: p
export const addOrder=params=>{return http.post(`${base}/add`, params);};
export const ediOrder=params=>{return http.put(`${base}/edi`, params);};
// export const ediOrder=params=>{return http.put(`${base}/edi`, params);};
export const remove = params => { return axios({
method: 'DELETE',
... ... @@ -15,4 +15,13 @@ export const remove = params => { return axios({
headers: {
'Content-Type': 'application/json;charset=UTF-8'
}
})};
export const ediOrder = params => { return axios({
method: 'PUT',
url: `${base}/edi`,
data: params,
headers: {
'Content-Type': 'application/json;charset=UTF-8'
}
})};
\ No newline at end of file
... ...
... ... @@ -283,6 +283,7 @@
filterable
remote
default-first-option
allow-create
placeholder="请输入关键词"
:remote-method="waterMeterAlls"
:loading="listLoading" clearable>
... ... @@ -584,7 +585,6 @@
},
//删除
handleDel: function (row) {
console.log(row.id);
this.$confirm('确认删除该记录吗?', '提示', {
type: 'warning'
}).then(() => {
... ... @@ -652,7 +652,6 @@
//NProgress.start();
let para = Object.assign({}, this.addLocationForm);
add(para).then((res) => {
console.log(res.data.code);
this.addLoading = false;
if (res.data.code == 200) {
this.$message({
... ... @@ -702,7 +701,6 @@
this.$confirm('确认提交吗？', '提示', {}).then(() => {
this.addLoading = true;
let para = Object.assign({}, this.editLocationForm);
this.addLoading = false;
editLocation(para).then((res) => {
if(res.data.code == 200){
//NProgress.done();
... ... @@ -712,7 +710,9 @@
});
this.$refs['editLocationForm'].resetFields();
this.editFormLocationVisible = false;
this.addLoading = false;
this.getList();
}else {
this.$message({
message: '编辑失败',
... ...
... ... @@ -56,13 +56,18 @@
<div v-else="scope.row.paytype === true" style="color: #42d885">电</div>
</template>
</el-table-column>
<el-table-column prop="paystatus" label="支付状态" width="100">
<template slot-scope="scope">
<div v-if="scope.row.paystatus === false" style="color:#ff4d51">未完成</div>
<div v-else="scope.row.paystatus === true" style="color: #42d885">已完成</div>
</template>
</el-table-column>
<el-table-column prop="reamke3" label="水表充值操作" width="150">
<template slot-scope="scope">
<div v-if="scope.row.reamke3 === '1'" style="color:#42d885">水表充值成功</div>
<div v-else="scope.row.reamke3 === '0'" style="color: #ff4d51">水表充值失败</div>
</template>
</el-table-column>
<el-table-column
fixed="right"
label="操作">
... ...
... ... @@ -64,7 +64,7 @@
<el-col :span="24">
<el-form-item v-if="Edistatus=='create'" label="充值金额" prop="payFees">
<el-input type="number" style="width:200px" oninput ="value=value.replace(/[^0-9.]/g,'')" v-model.number="waterForm.payFees"></el-input>
<el-input type="number" style="width:200px" oninput ="value=value.replace(/[^0-9.(0-9)]/g,'')" v-model.number="waterForm.payFees"></el-input>
</el-form-item>
<el-form-item v-else label="充值金额" prop="payFees">
<el-input type="number" style="width: 802px" oninput ="value=value.replace(/[^0-9.]/g,'')" v-model.number="waterForm.payFees"></el-input>
... ... @@ -79,6 +79,8 @@
title="扫码支付 "
:visible.sync="dialogVisible"
width="15%"
close-on-press-escape
close-on-click-modal
>
<template>
<span style="font-size: 20px"> 请在15分钟内进行支付</span>
... ... @@ -94,6 +96,7 @@
import loginUserInfo from '@/api/base';
import {getList, add, qrCode} from '../../api/empt/userPayOrder';
import ElCol from "element-ui/packages/col/src/col";
import {ediOrder, remove} from '../../api/empt/PayOrder'
// import QRCode from 'qrcodejs2'
import Vue from 'vue';
import VueQriously from 'vue-qriously';
... ... @@ -107,7 +110,7 @@
return{
loading:false,
filters:{
roomNumber:'三号楼一层卫生间'
roomNumber:''
},
electricityForm:{
overdraftthreshold:'',
... ... @@ -146,18 +149,15 @@
methods:{
getdefaultData() {
let para = {
roomNumber: this.filters.roomNumber
};
this.loading=true;
getList(para).then((res) => {
let resData = res.data;
if (resData.length > 0) {
for (var i = 0; i < resData.length; i++) {
if (resData[i].wmId === null) {
this.electricityForm = resData[i];
this.electricityForm.payTime = new Date();
} else {
... ... @@ -169,7 +169,7 @@
}
this.loading=false;
} else {
this.$alert('请输入正确的房间号', '提示', {
this.$alert('未查询到该房间的设备信息', '提示', {
confirmButtonText: '确定',
callback: action => {
}
... ... @@ -184,7 +184,7 @@
if (null != error.response && error.response !== undefined) {
let status = error.response.status;
let msg = error.response.statusText;
alert("请输入所查询的房号1");
alert("请输入所查询的房号");
} else {
this.$alert('请输入房间号', '提示', {
confirmButtonText: '确定',
... ... @@ -198,7 +198,7 @@
//充值水费
topUpWater: function () {
let _this = this;
this.$refs.waterForm.validate((valid) => {
if (valid) {
this.$confirm('确认充值吗？', '提示', {}).then(() => {
... ... @@ -209,25 +209,36 @@
this.addLoading = false;
if (res.data.code == 200) {
this.dialogVisible=true;
this.Qrcode = res.data.url;
this.Qrcode = res.data.data.url;
this.loading=false;
// var socket_ = openSocket.openSocket(res.data.data.orderNum);
createSocket();
// 监听ws数据响应
const getDataFunc = function(e) {
console.log(e.detail.data.data)
console.log(res.data.data.orderNumber)
console.log(e.detail.data.data.orderNumber)
console.log(e);
if (e.detail.data.data!==undefined){
let resultMessage = JSON.parse(e.detail.data.data);
if(resultMessage.orderNumber===res.data.data.orderNumber){
if (resultMessage.success === "Y"){
this.dialogVisible=false;
alert("支付成功")
_this.dialogVisible=false;
alert("充值成功")
// 支付成功后修改订单状态
let paras = { ordernumber: resultMessage.orderNumber,reamke3: "1"};
ediOrder(paras).then((res) => {
}).catch((error) => {
alert(error);
});
}else {
this.dialogVisible=false;
alert("支付失败")
_this.dialogVisible=false;
alert("充值失败")
let paras = { ordernumber: resultMessage.orderNumber,reamke3: "0"};
ediOrder(paras).then((res) => {
}).catch((error) => {
alert(error);
});
}
}
}
... ...