朱兆平 / 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 @@ -6,7 +6,7 @@ export const getOrder = params => { return axios.get(`${base}/list`, { params: p
6 6
7 export const addOrder=params=>{return http.post(`${base}/add`, params);}; 7 export const addOrder=params=>{return http.post(`${base}/add`, params);};
8 8
9 -export const ediOrder=params=>{return http.put(`${base}/edi`, params);}; 9 +// export const ediOrder=params=>{return http.put(`${base}/edi`, params);};
10 10
11 export const remove = params => { return axios({ 11 export const remove = params => { return axios({
12 method: 'DELETE', 12 method: 'DELETE',
@@ -15,4 +15,13 @@ export const remove = params => { return axios({ @@ -15,4 +15,13 @@ export const remove = params => { return axios({
15 headers: { 15 headers: {
16 'Content-Type': 'application/json;charset=UTF-8' 16 'Content-Type': 'application/json;charset=UTF-8'
17 } 17 }
  18 +})};
  19 +
  20 +export const ediOrder = params => { return axios({
  21 + method: 'PUT',
  22 + url: `${base}/edi`,
  23 + data: params,
  24 + headers: {
  25 + 'Content-Type': 'application/json;charset=UTF-8'
  26 + }
18 })}; 27 })};
@@ -283,6 +283,7 @@ @@ -283,6 +283,7 @@
283 filterable 283 filterable
284 remote 284 remote
285 default-first-option 285 default-first-option
  286 + allow-create
286 placeholder="请输入关键词" 287 placeholder="请输入关键词"
287 :remote-method="waterMeterAlls" 288 :remote-method="waterMeterAlls"
288 :loading="listLoading" clearable> 289 :loading="listLoading" clearable>
@@ -584,7 +585,6 @@ @@ -584,7 +585,6 @@
584 }, 585 },
585 //删除 586 //删除
586 handleDel: function (row) { 587 handleDel: function (row) {
587 - console.log(row.id);  
588 this.$confirm('确认删除该记录吗?', '提示', { 588 this.$confirm('确认删除该记录吗?', '提示', {
589 type: 'warning' 589 type: 'warning'
590 }).then(() => { 590 }).then(() => {
@@ -652,7 +652,6 @@ @@ -652,7 +652,6 @@
652 //NProgress.start(); 652 //NProgress.start();
653 let para = Object.assign({}, this.addLocationForm); 653 let para = Object.assign({}, this.addLocationForm);
654 add(para).then((res) => { 654 add(para).then((res) => {
655 - console.log(res.data.code);  
656 this.addLoading = false; 655 this.addLoading = false;
657 if (res.data.code == 200) { 656 if (res.data.code == 200) {
658 this.$message({ 657 this.$message({
@@ -702,7 +701,6 @@ @@ -702,7 +701,6 @@
702 this.$confirm('确认提交吗？', '提示', {}).then(() => { 701 this.$confirm('确认提交吗？', '提示', {}).then(() => {
703 this.addLoading = true; 702 this.addLoading = true;
704 let para = Object.assign({}, this.editLocationForm); 703 let para = Object.assign({}, this.editLocationForm);
705 - this.addLoading = false;  
706 editLocation(para).then((res) => { 704 editLocation(para).then((res) => {
707 if(res.data.code == 200){ 705 if(res.data.code == 200){
708 //NProgress.done(); 706 //NProgress.done();
@@ -712,7 +710,9 @@ @@ -712,7 +710,9 @@
712 }); 710 });
713 this.$refs['editLocationForm'].resetFields(); 711 this.$refs['editLocationForm'].resetFields();
714 this.editFormLocationVisible = false; 712 this.editFormLocationVisible = false;
  713 + this.addLoading = false;
715 this.getList(); 714 this.getList();
  715 +
716 }else { 716 }else {
717 this.$message({ 717 this.$message({
718 message: '编辑失败', 718 message: '编辑失败',
@@ -56,13 +56,18 @@ @@ -56,13 +56,18 @@
56 <div v-else="scope.row.paytype === true" style="color: #42d885">电</div> 56 <div v-else="scope.row.paytype === true" style="color: #42d885">电</div>
57 </template> 57 </template>
58 </el-table-column> 58 </el-table-column>
59 -  
60 <el-table-column prop="paystatus" label="支付状态" width="100"> 59 <el-table-column prop="paystatus" label="支付状态" width="100">
61 <template slot-scope="scope"> 60 <template slot-scope="scope">
62 <div v-if="scope.row.paystatus === false" style="color:#ff4d51">未完成</div> 61 <div v-if="scope.row.paystatus === false" style="color:#ff4d51">未完成</div>
63 <div v-else="scope.row.paystatus === true" style="color: #42d885">已完成</div> 62 <div v-else="scope.row.paystatus === true" style="color: #42d885">已完成</div>
64 </template> 63 </template>
65 </el-table-column> 64 </el-table-column>
  65 + <el-table-column prop="reamke3" label="水表充值操作" width="150">
  66 + <template slot-scope="scope">
  67 + <div v-if="scope.row.reamke3 === '1'" style="color:#42d885">水表充值成功</div>
  68 + <div v-else="scope.row.reamke3 === '0'" style="color: #ff4d51">水表充值失败</div>
  69 + </template>
  70 + </el-table-column>
66 <el-table-column 71 <el-table-column
67 fixed="right" 72 fixed="right"
68 label="操作"> 73 label="操作">
@@ -64,7 +64,7 @@ @@ -64,7 +64,7 @@
64 64
65 <el-col :span="24"> 65 <el-col :span="24">
66 <el-form-item v-if="Edistatus=='create'" label="充值金额" prop="payFees"> 66 <el-form-item v-if="Edistatus=='create'" label="充值金额" prop="payFees">
67 - <el-input type="number" style="width:200px" oninput ="value=value.replace(/[^0-9.]/g,'')" v-model.number="waterForm.payFees"></el-input> 67 + <el-input type="number" style="width:200px" oninput ="value=value.replace(/[^0-9.(0-9)]/g,'')" v-model.number="waterForm.payFees"></el-input>
68 </el-form-item> 68 </el-form-item>
69 <el-form-item v-else label="充值金额" prop="payFees"> 69 <el-form-item v-else label="充值金额" prop="payFees">
70 <el-input type="number" style="width: 802px" oninput ="value=value.replace(/[^0-9.]/g,'')" v-model.number="waterForm.payFees"></el-input> 70 <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 @@ @@ -79,6 +79,8 @@
79 title="扫码支付 " 79 title="扫码支付 "
80 :visible.sync="dialogVisible" 80 :visible.sync="dialogVisible"
81 width="15%" 81 width="15%"
  82 + close-on-press-escape
  83 + close-on-click-modal
82 > 84 >
83 <template> 85 <template>
84 <span style="font-size: 20px"> 请在15分钟内进行支付</span> 86 <span style="font-size: 20px"> 请在15分钟内进行支付</span>
@@ -94,6 +96,7 @@ @@ -94,6 +96,7 @@
94 import loginUserInfo from '@/api/base'; 96 import loginUserInfo from '@/api/base';
95 import {getList, add, qrCode} from '../../api/empt/userPayOrder'; 97 import {getList, add, qrCode} from '../../api/empt/userPayOrder';
96 import ElCol from "element-ui/packages/col/src/col"; 98 import ElCol from "element-ui/packages/col/src/col";
  99 + import {ediOrder, remove} from '../../api/empt/PayOrder'
97 // import QRCode from 'qrcodejs2' 100 // import QRCode from 'qrcodejs2'
98 import Vue from 'vue'; 101 import Vue from 'vue';
99 import VueQriously from 'vue-qriously'; 102 import VueQriously from 'vue-qriously';
@@ -107,7 +110,7 @@ @@ -107,7 +110,7 @@
107 return{ 110 return{
108 loading:false, 111 loading:false,
109 filters:{ 112 filters:{
110 - roomNumber:'三号楼一层卫生间' 113 + roomNumber:''
111 }, 114 },
112 electricityForm:{ 115 electricityForm:{
113 overdraftthreshold:'', 116 overdraftthreshold:'',
@@ -146,18 +149,15 @@ @@ -146,18 +149,15 @@
146 methods:{ 149 methods:{
147 150
148 getdefaultData() { 151 getdefaultData() {
149 -  
150 let para = { 152 let para = {
151 roomNumber: this.filters.roomNumber 153 roomNumber: this.filters.roomNumber
152 }; 154 };
153 -  
154 this.loading=true; 155 this.loading=true;
155 getList(para).then((res) => { 156 getList(para).then((res) => {
156 let resData = res.data; 157 let resData = res.data;
157 if (resData.length > 0) { 158 if (resData.length > 0) {
158 for (var i = 0; i < resData.length; i++) { 159 for (var i = 0; i < resData.length; i++) {
159 if (resData[i].wmId === null) { 160 if (resData[i].wmId === null) {
160 -  
161 this.electricityForm = resData[i]; 161 this.electricityForm = resData[i];
162 this.electricityForm.payTime = new Date(); 162 this.electricityForm.payTime = new Date();
163 } else { 163 } else {
@@ -169,7 +169,7 @@ @@ -169,7 +169,7 @@
169 } 169 }
170 this.loading=false; 170 this.loading=false;
171 } else { 171 } else {
172 - this.$alert('请输入正确的房间号', '提示', { 172 + this.$alert('未查询到该房间的设备信息', '提示', {
173 confirmButtonText: '确定', 173 confirmButtonText: '确定',
174 callback: action => { 174 callback: action => {
175 } 175 }
@@ -184,7 +184,7 @@ @@ -184,7 +184,7 @@
184 if (null != error.response && error.response !== undefined) { 184 if (null != error.response && error.response !== undefined) {
185 let status = error.response.status; 185 let status = error.response.status;
186 let msg = error.response.statusText; 186 let msg = error.response.statusText;
187 - alert("请输入所查询的房号1"); 187 + alert("请输入所查询的房号");
188 } else { 188 } else {
189 this.$alert('请输入房间号', '提示', { 189 this.$alert('请输入房间号', '提示', {
190 confirmButtonText: '确定', 190 confirmButtonText: '确定',
@@ -198,7 +198,7 @@ @@ -198,7 +198,7 @@
198 198
199 //充值水费 199 //充值水费
200 topUpWater: function () { 200 topUpWater: function () {
201 - 201 + let _this = this;
202 this.$refs.waterForm.validate((valid) => { 202 this.$refs.waterForm.validate((valid) => {
203 if (valid) { 203 if (valid) {
204 this.$confirm('确认充值吗？', '提示', {}).then(() => { 204 this.$confirm('确认充值吗？', '提示', {}).then(() => {
@@ -209,25 +209,36 @@ @@ -209,25 +209,36 @@
209 this.addLoading = false; 209 this.addLoading = false;
210 if (res.data.code == 200) { 210 if (res.data.code == 200) {
211 this.dialogVisible=true; 211 this.dialogVisible=true;
212 - this.Qrcode = res.data.url; 212 + this.Qrcode = res.data.data.url;
213 this.loading=false; 213 this.loading=false;
214 // var socket_ = openSocket.openSocket(res.data.data.orderNum); 214 // var socket_ = openSocket.openSocket(res.data.data.orderNum);
215 createSocket(); 215 createSocket();
216 216
217 // 监听ws数据响应 217 // 监听ws数据响应
218 const getDataFunc = function(e) { 218 const getDataFunc = function(e) {
219 - console.log(e.detail.data.data)  
220 - console.log(res.data.data.orderNumber)  
221 - console.log(e.detail.data.data.orderNumber) 219 + console.log(e);
222 if (e.detail.data.data!==undefined){ 220 if (e.detail.data.data!==undefined){
223 let resultMessage = JSON.parse(e.detail.data.data); 221 let resultMessage = JSON.parse(e.detail.data.data);
224 if(resultMessage.orderNumber===res.data.data.orderNumber){ 222 if(resultMessage.orderNumber===res.data.data.orderNumber){
225 if (resultMessage.success === "Y"){ 223 if (resultMessage.success === "Y"){
226 - this.dialogVisible=false;  
227 - alert("支付成功") 224 + _this.dialogVisible=false;
  225 + alert("充值成功")
  226 + // 支付成功后修改订单状态
  227 + let paras = { ordernumber: resultMessage.orderNumber,reamke3: "1"};
  228 + ediOrder(paras).then((res) => {
  229 +
  230 + }).catch((error) => {
  231 + alert(error);
  232 + });
228 }else { 233 }else {
229 - this.dialogVisible=false;  
230 - alert("支付失败") 234 + _this.dialogVisible=false;
  235 + alert("充值失败")
  236 + let paras = { ordernumber: resultMessage.orderNumber,reamke3: "0"};
  237 + ediOrder(paras).then((res) => {
  238 +
  239 + }).catch((error) => {
  240 + alert(error);
  241 + });
231 } 242 }
232 } 243 }
233 } 244 }