autumn/jsowell-charger-web
1
0
Fork 0
mirror of https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git synced 2026-04-20 02:55:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' into HEAD

Browse Source
This commit is contained in:
Lemon
2023-03-23 10:13:25 +08:00
parent 14dc324a56 80da9cae9b
commit 5b12128a1e
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
jsowell-netty/src/main/java/com/jsowell/netty/server/yunkuaichong/NettyServerChannelInitializer.java
View File

@@ -20,7 +20,7 @@ public class NettyServerChannelInitializer extends ChannelInitializer<SocketChan
@Override
protected void initChannel(SocketChannel channel) throws Exception {
ChannelPipeline pipeline = channel.pipeline();
// pipeline.addLast("decoder",new CustomDecoder());
// pipeline.addLast("frameDecoder",new CustomDecoder());
pipeline.addLast("frameDecoder", new StartAndLengthFieldFrameDecoder(0x68));
pipeline.addLast("decoder", new ByteArrayDecoder());
pipeline.addLast("encoder", new ByteArrayDecoder());

2
jsowell-ui/src/views/order/order/orderDetail.vue
View File

@@ -1,6 +1,6 @@
<template>
<div class="app-container">
<el-card class="cardStyle" v-if="orderInfo[0].orderStatus === '4'">
<el-card class="cardStyle" v-if="orderInfo[0].orderStatus === '4' || orderInfo[0].orderStatus === '2'">
<div style="margin: 10px">
<span style="color: #bf1c1c">该笔订单为异常状态，请检查充电桩状态！</span>
<el-button type="primary" icon="el-icon-search" size="mini" @click="dialogVisible = true">手动结算</el-button>