修改账户昵称过长问题以及viper 在pr上提的Bug

This commit is contained in:
ran
2022-04-28 16:13:36 +08:00
parent 24f4a36082
commit 1691f8244f
4 changed files with 54 additions and 56 deletions

View File

@@ -149,7 +149,7 @@
right: 0;
top: 0;
height: 100%;
width: 260px;
.options {
.ivu-select-dropdown {
@@ -161,20 +161,6 @@
}
}
.language {
display: inline-block;
width: 30px;
padding: 18px 0;
text-align: center;
cursor: pointer;
vertical-align: middle;
}
.switch-theme-con {
display: inline-block;
width: 40px;
height: 100%;
}
.message-con {
display: inline-block;
@@ -204,15 +190,17 @@
.user-dropdown {
&-menu-con {
position: absolute;
right: 0;
top: 0;
height: 100%;
.main-user-name {
font-size: 14px;
display: inline-block;
cursor: pointer;
margin-right: 5px;
width: 200px;
overflow: hidden;
word-wrap: normal;
white-space: nowrap;
text-overflow: ellipsis;
vertical-align: middle;
overflow: hidden;
@@ -328,4 +316,4 @@
right: 4px;
z-index: 100;
top: 1px;
}
}

View File

@@ -60,18 +60,18 @@
<div class="div-item-left">发票抬头</div>
<div class="div-item-right">
{{
orderInfo.receipt.receiptTitle ? orderInfo.receipt.receiptTitle : "暂无"
orderInfo.receipt && orderInfo.receipt.receiptTitle ? orderInfo.receipt.receiptTitle : "暂无"
}}
</div>
</div>
<div
class="div-item"
v-if="orderInfo.order.needReceipt == true && orderInfo.receipt.taxpayerId"
v-if="orderInfo.order.needReceipt == true && orderInfo.receipt && orderInfo.receipt.taxpayerId"
>
<div class="div-item-left">发票税号</div>
<div class="div-item-right">
{{ orderInfo.receipt.taxpayerId ? orderInfo.receipt.taxpayerId : "暂无" }}
{{ orderInfo.receipt && orderInfo.receipt.taxpayerId ? orderInfo.receipt.taxpayerId : "暂无" }}
</div>
</div>
@@ -79,7 +79,7 @@
<div class="div-item-left">发票内容</div>
<div class="div-item-right">
{{
orderInfo.receipt.receiptContent
orderInfo.receipt && orderInfo.receipt.receiptContent
? orderInfo.receipt.receiptContent
: "暂无"
}}
@@ -90,7 +90,7 @@
<div class="div-item-left">发票金额</div>
<div class="div-item-right">
{{
orderInfo.receipt.receiptPrice
orderInfo.receipt && orderInfo.receipt.receiptPrice
? orderInfo.receipt.receiptPrice
: "暂无" | unitPrice("¥")
}}
@@ -100,7 +100,7 @@
<div class="div-item" v-if="orderInfo.order.needReceipt == true">
<div class="div-item-left">是否开票</div>
<div class="div-item-right">
{{ orderInfo.receipt.receiptStatus == 0 ? "未开" : "已开" }}
{{ orderInfo.receipt?(orderInfo.receipt.receiptStatus == 0 ? "未开" : "已开"):"空" }}
</div>
</div>
</div>
@@ -135,18 +135,18 @@
<div class="div-item-left">发票抬头</div>
<div class="div-item-right">
{{
orderInfo.receipt.receiptTitle ? orderInfo.receipt.receiptTitle : "暂无"
orderInfo.receipt && orderInfo.receipt.receiptTitle ? orderInfo.receipt.receiptTitle : "暂无"
}}
</div>
</div>
<div
class="div-item"
v-if="orderInfo.order.needReceipt == true && orderInfo.receipt.taxpayerId"
v-if="orderInfo.order.needReceipt == true && orderInfo.receipt && orderInfo.receipt.taxpayerId"
>
<div class="div-item-left">发票税号</div>
<div class="div-item-right">
{{ orderInfo.receipt.taxpayerId ? orderInfo.receipt.taxpayerId : "暂无" }}
{{ orderInfo.receipt && orderInfo.receipt.taxpayerId ? orderInfo.receipt.taxpayerId : "暂无" }}
</div>
</div>
@@ -154,7 +154,7 @@
<div class="div-item-left">发票内容</div>
<div class="div-item-right">
{{
orderInfo.receipt.receiptContent
orderInfo.receipt && orderInfo.receipt.receiptContent
? orderInfo.receipt.receiptContent
: "暂无"
}}
@@ -165,7 +165,7 @@
<div class="div-item-left">发票金额</div>
<div class="div-item-right">
{{
orderInfo.receipt.receiptPrice
orderInfo.receipt && orderInfo.receipt.receiptPrice
? orderInfo.receipt.receiptPrice
: "暂无" | unitPrice("¥")
}}
@@ -175,7 +175,7 @@
<div class="div-item" v-if="orderInfo.order.needReceipt == true">
<div class="div-item-left">是否开票</div>
<div class="div-item-right">
{{ orderInfo.receipt.receiptStatus == 0 ? "未开" : "已开" }}
{{ orderInfo.receipt?(orderInfo.receipt.receiptStatus == 0 ? "未开" : "已开"):"空" }}
</div>
</div>

View File

@@ -24,7 +24,7 @@
{{ userForm.username }}
</FormItem>
<FormItem label="昵称:" prop="nickName">
<Input v-model="userForm.nickName" style="width: 250px"/>
<Input maxlength="20" v-model="userForm.nickName" style="width: 250px"/>
</FormItem>
<FormItem>
<Button
@@ -195,4 +195,4 @@ export default {
}
}
</style>
</style>