zhuce
/
lilishop-ui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

master
ran 2022-04-28 16:13:36 +08:00
parent 24f4a36082
commit 1691f8244f
4 changed files with 54 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
manager/src/views/main.scss
View File

@ -149,7 +149,7 @@
right: 0; right: 0;
top: 0; top: 0;
height: 100%; height: 100%;
width: 260px;
.options { .options {
.ivu-select-dropdown { .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 { .message-con {
display: inline-block; display: inline-block;
@ -204,15 +190,17 @@
.user-dropdown { .user-dropdown {
&-menu-con { &-menu-con {
position: absolute;
right: 0;
top: 0;
height: 100%;
.main-user-name { .main-user-name {
font-size: 14px; font-size: 14px;
display: inline-block; display: inline-block;
cursor: pointer; cursor: pointer;
margin-right: 5px; margin-right: 5px;
width: 200px;
overflow: hidden;
word-wrap: normal;
white-space: nowrap;
text-overflow: ellipsis;
vertical-align: middle; vertical-align: middle;
overflow: hidden; overflow: hidden;
@ -328,4 +316,4 @@
right: 4px; right: 4px;
z-index: 100; z-index: 100;
top: 1px; top: 1px;
} }

24
manager/src/views/order/order/orderDetail.vue
View File

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

4
manager/src/views/personal-center/personal-center.vue
View File

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

54
seller/src/views/main.scss
View File

@ -1,3 +1,13 @@
.lock-screen-back {
border-radius: 50%;
z-index: -1;
box-shadow: 0 0 0 0 #667aa6 inset;
position: fixed;
left: 50%;
top: 50%;
transform: translate(-50%, -50%);
transition: all 3s;
}
.main { .main {
position: absolute; position: absolute;
@ -133,11 +143,13 @@
} }
.header-avator-con { .header-avator-con {
display: flex;
align-items: center;
position: absolute; position: absolute;
right: 0; right: 0;
top: 0; top: 0;
height: 100%; height: 100%;
width: 300px;
.options { .options {
.ivu-select-dropdown { .ivu-select-dropdown {
@ -149,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 { .message-con {
display: inline-block; display: inline-block;
@ -192,15 +190,17 @@
.user-dropdown { .user-dropdown {
&-menu-con { &-menu-con {
position: absolute;
right: 0;
top: 0;
height: 100%;
.main-user-name { .main-user-name {
font-size: 14px; font-size: 14px;
display: inline-block; display: inline-block;
cursor: pointer; cursor: pointer;
margin-right: 5px; margin-right: 5px;
width: 200px;
overflow: hidden;
word-wrap: normal;
white-space: nowrap;
text-overflow: ellipsis;
vertical-align: middle; vertical-align: middle;
overflow: hidden; overflow: hidden;
@ -243,13 +243,14 @@
.single-page-con { .single-page-con {
min-width: 740px; min-width: 740px;
left: 180px;
position: relative; position: relative;
left: 180px;
top: 100px; top: 100px;
right: 0; right: 0;
bottom: 0; bottom: 0;
height: calc(100% - 110px); height: calc(100% - 110px);
width: calc(100% - 180px); width: calc(100% - 180px);
overflow: auto;
background-color: #f0f0f0; background-color: #f0f0f0;
z-index: 1; z-index: 1;
transition: left 0.3s; transition: left 0.3s;
@ -267,6 +268,9 @@
} }
} }
.taglist-moving-animation-move {
transition: transform 0.3s;
}
.logo-con { .logo-con {
width: 100%; width: 100%;
@ -286,8 +290,6 @@
} }
.menu-bar::-webkit-scrollbar { .menu-bar::-webkit-scrollbar {
// width: 6px;
// height: 6px;
display: none; display: none;
} }
@ -300,6 +302,14 @@
background: #fff; background: #fff;
} }
.nav-item {
font-size: 14px;
}
.main-nav-menu {
bottom: 10px;
position: relative;
}
.loading-position { .loading-position {
position: absolute; position: absolute;