Skip to content

Z
zhichan
Commit 0b5dad77 by 刘泽奇
Options

123

parent edec4ab1
Showing with 128 additions and 69 deletions
igirl-channel-jdweb/app/front/entry/public/css/pagecom.css
This source diff could not be displayed because it is too large. You can view the blob instead.
igirl-channel-jdweb/app/front/vues/pages/jdindentdetail/jdindentdetail.css
......@@ -528,4 +528,3 @@
.jdindentdetail-drawer .selftmreg_main .el-form-item{
margin-bottom: 10px !important;
}
.jdindentdetail-drawer .selftmreg_main
\ No newline at end of file
igirl-channel-jdweb/app/front/vues/pages/jdindentdetail/jdindentdetail.js
......@@ -399,7 +399,7 @@
this.$refs.tree.setChecked(newVal[1].nclThree[0], false);
newVal.pop();
this.message.show = !this.message.show;
this.message.info = "只能修改一个类别";
this.message.info = "只能修改当前类别";
var timer = setTimeout(() => {
this.message.show = false;
clearTimeout(timer);
......@@ -518,7 +518,6 @@
case 1:
this.headerInfo = "商标信息";
this.popupValue = "form";
break;
case 2:
this.headerInfo = "商标类别";
......
igirl-channel-jdweb/app/front/vues/pages/jdindentlist/jdindentlist.css
.jdindentlist-header {
width: 100%;
height: 80px;
height: 50px;
display: flex;
justify-content: space-between;
align-items: center;
padding: 0 30px 0 36px;
box-sizing: border-box;
background: rgba(255, 255, 255, 1);
background: #212122;
box-shadow: 0px 2px 2px 0px rgba(0, 0, 0, 0.2);
}
......@@ -15,7 +15,7 @@
font-size: 22px;
font-family: PingFangSC-Semibold, PingFang SC;
font-weight: 600;
color: rgba(38, 146, 255, 1);
color: #ffffff;
line-height: 24px;
}
......@@ -23,7 +23,7 @@
font-size: 16px;
font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400;
color: rgba(47, 47, 47, 1);
color: #ffffff;
line-height: 22px;
}
......@@ -31,7 +31,7 @@
font-size: 16px;
font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400;
color: rgba(47, 47, 47, 1);
color: #ffffff;
line-height: 22px;
}
......@@ -39,10 +39,30 @@
font-size: 16px;
font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400;
color: rgba(38, 146, 255, 1);
color: #ffffff;
line-height: 22px;
}
.jdindentlist-warpper .el-tabs__item {
background: #eef2fb;
width: 130px;
text-align: center;
color:#777777;
height: 40px;
}
.jdindentlist-warpper .el-tabs__header{
box-sizing: border-box;
padding-left: 20px;
}
.jdindentlist-warpper .el-tabs__item.is-active {
border-top: 2px solid #3071fe;
background: #ffffff;
color:#777777 !important;
}
/* 上面是公共部分 */
.jdindentlist {
padding: 2.78% 20px 30px;
background: #F9F9F9;
......@@ -128,40 +148,39 @@
font-weight: 400;
color: rgba(47, 47, 47, 1);
}
.jdindentlist-list .el-table tr>th:nth-of-type(12n)>.cell{
.jdindentlist-list .el-table tr>th:nth-of-type(12n)>.cell {
text-align: center;
}
.jdindentlist-list-page{
.jdindentlist-list-page {
margin-top: 25px;
width: 100%;
text-align: center;
}
.jdindentlist-list .subtime{
.jdindentlist-list .subtime {
padding-right: 25px;
}
.jdindentlist-list .dsqcl{
.jdindentlist-list .dsqcl {
color: red;
}
.jdindentlist-null{
.jdindentlist-null {
width: 34.57%;
height: 333px;
margin: 10.37% auto 0;
}
.jdindentlist-null>div:nth-child(1) img{
.jdindentlist-null>div:nth-child(1) img {
width: 100%;
height: 100%;
}
.jdindentlist-warpper .demo-ruleForm{
.jdindentlist-warpper .demo-ruleForm {
display: flex;
justify-content: space-around;
}
\ No newline at end of file
igirl-channel-jdweb/app/front/vues/pages/jdindentlist/jdindentlist.html
<div class="jdindentlist-warpper">
<!-- <div class="jdindentlist-header">
<div>个人中心</div>
<div class="jdindentlist-header">
<div>京东云商标</div>
<div>
<span>欢迎</span>
<span><i class="el-icon-user"></i></span>
<span>1366*565445</span>
<span>退出</span>
</div>
</div> -->
</div>
<div>
<div style="display:flex;height: 60px;align-items: center;">
<div style="background:#ffffff;
border:3px solid #3071fe;
width:6px;
height:6px;
border-radius:100%;margin: 0 10px 0 20px;">
</div>
<div style="font-size: 16px;">
订单列表
</div>
</div>
</div>
<el-tabs v-model="navActive" @tab-click="navClick">
<el-tab-pane label="商标订单" name="first">
<div class="jdindentlist-nav">
</div>
<div class="jdindentlist">
<div class="jdindentlist-inquire">
<div class="jdindentlist-inquire-form">
......@@ -80,14 +99,13 @@
</el-table-column>
<el-table-column prop="totalSum" label="订单金额">
</el-table-column>
<el-table-column prop="deliveryStatusName" label="交付状态"
class-name="dsqcl">
<el-table-column prop="deliveryStatusName" label="交付状态" class-name="dsqcl">
</el-table-column>
<el-table-column prop="CreateDate" label="下单时间">
</el-table-column>
<el-table-column prop="submitTime" label="递交时间" class-name="subtime">
</el-table-column>
<el-table-column prop="address" label="操作" >
<el-table-column prop="address" label="操作">
<template slot-scope="scope">
<el-button v-show="showDetails(scope.$index, scope.row)"
style="border:0;width:100%;color: #0F8EE9;" size="mini"
......@@ -194,4 +212,8 @@
</div>
</div>
</div>
</el-tab-pane>
<el-tab-pane label="工商订单" name="second">配置管理</el-tab-pane>
</el-tabs>
</div>
\ No newline at end of file
igirl-channel-jdweb/app/front/vues/pages/jdindentlist/jdindentlist.js
......@@ -220,6 +220,7 @@
showUploadStuff: false,
currentOrderNo: "",
currentOrderType: "",
navActive:'first',
}
},
created: function() {
......@@ -248,6 +249,9 @@
},
methods: {
navClick(tab,e){
console.log(tab,e,this.navActive);
},
tableRowClassName({ row, rowIndex }) {
if (rowIndex === 1) {
return 'warning-row';
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment