Skip to content

Z
zhichan
Commit 04963f7d by 刘泽奇
Options

123

parent a54de537
Showing with 72 additions and 33 deletions
igirl-channel-web/app/front/entry/index.ejs
......@@ -50,7 +50,6 @@
</head>
<body>
<div id="app" v-loading.fullscreen.lock="loading" element-loading-background="rgba(0, 0, 0, 0.8)" class="app-main"
style="visibility:hidden">
<div class="jc_hd"></div>
......@@ -59,7 +58,6 @@
</transition>
<div class="jdc-footer"></div>
</div>
<script src="/js/cropper/index.js"></script>
<script src="/js/vue/base64.js"></script>
<script src="/js/common.js"></script>
......
igirl-channel-web/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-web/app/front/entry/public/js/index.js
......@@ -180,16 +180,19 @@ axios.get("/web/common/metaCtl/getRouteConfig").then(d => {
var selftmreg = location.hash.includes('/selftmreg');
var OAjdlist = location.hash.includes('/OAjdlist');
var jdindentlist = location.hash.includes('/jdindentlist');
console.log(find, "lllllllllllllllllllllllllllllll")
console.log(find, "lllllllllllllllllllllllllllllll");
if (OAjdlist || selftmreg || jdindentlist) {
$('.jdc-footer').hide();
}
if (OAjdlist || jdindentlist) {
$('.jc_hd').hide();
}
} else {
$('.jc_hd').hide();
$('.jdc-footer').hide();
console.log("zzzzzzzzzzzzzzz", location.hash.split('/')[1], this.headerHidden);
}
}, 500);
}, 0);
var self = this;
if (!this.currentUser) {
this.logins.push({ "icon": "el-icon-location-outline", "title": "登录", "type": "text", key: "login", "isOnGrid": true });
......
igirl-channel-web/app/front/vues/pages/OAjdlist/OAjdlist.js
......@@ -123,7 +123,7 @@
CreateDate: null,
tableData: [],
currentPage: 1,
countPage: "",
countPage: 0,
pageSize: null,
/* 上传资料弹框 */
......@@ -142,6 +142,7 @@
sfs: [
{ field: 'totalSum', label: '订单金额' },
],
deliveryStatus:'',
form: {
tmFormType: 3,
name: "",
......@@ -605,8 +606,10 @@
this.tableData = d.data;
/* 没有分页参数 需要重新改*/
this.countPage = d.dataCount;
/*
this.countPage.length > 10 ? this.hidePage = false : this.hidePage = true;
console.log(this.hidePage, `xxxxxxxxxxxxxxxxxxxxxxxxxxxx`);
*/
d.data.map((item, index) => {
if (item.submitTime) {
item.submitTime = new Date(item.submitTime).toLocaleString('chinese', { hour12: false });
......@@ -645,7 +648,7 @@
this.indentInfo.itemName = this.itemName;
this.indentInfo.tmName = this.tmName;
this.indentInfo.CreateDate = this.CreateDate;
this.indentInfo.deliveryStatus = this.deliveryStatus;
this.indentInfo.deliveryStatus = this.checkedStatus;
this.indentInfo.startTime = this.startTime || "";
this.indentInfo.entTime = this.entTime || "";
this.handleSizeChange();
......@@ -667,7 +670,7 @@
this.icbcIndentInfo.itemName = this.itemName;
this.icbcIndentInfo.tmName = this.tmName;
this.icbcIndentInfo.CreateDate = this.CreateDate;
this.icbcIndentInfo.deliveryStatus = this.deliveryStatus;
this.icbcIndentInfo.deliveryStatus = this.checkedStatus;
this.icbcIndentInfo.startTime = this.startTime || "";
this.icbcIndentInfo.entTime = this.entTime || "";
this.handleSizeChange();
......
igirl-channel-web/app/front/vues/pages/jdindentdetail/jdindentdetail.html
......@@ -10,10 +10,11 @@
</div>
</div> -->
<div class="jdindentlist-header">
<div>京东云商标</div>
<div>京东云PLUS工商、商标注册平台</div>
<div>
<span><i class="el-icon-user"></i></span>
<span>1366*565445</span>
<span>{{user_Name}}</span>
<span>退出</span>
</div>
</div>
<div>
......
igirl-channel-web/app/front/vues/pages/jdindentdetail/jdindentdetail.js
......@@ -331,7 +331,7 @@
popupValue: "",
/**订单付款信息 */
receiptVoucher: {},
user_Name:""
}
},
mounted: function() {
......@@ -388,6 +388,11 @@
this.$root.channelUserId = this.$route.query.channelUserId;
console.log(this.$route.query.channelUserId, "11111111111");
}
document.cookie.split('; ').map((item, index) => {
if(item.includes('pin=')){
this.user_Name = item.substring(4);
}
});
},
computed: {
......
igirl-channel-web/app/front/vues/pages/jdindentlist/jdindentlist.css
.jdindentlist-header {
width: 100%;
height: 0px;
height: 70px;
display: flex;
justify-content: space-between;
align-items: center;
......@@ -12,10 +12,11 @@
.jdindentlist-header>div:nth-child(1) {
font-size: 22px;
font-family: PingFangSC-Semibold, PingFang SC;
font-weight: 600;
font-family: JDLANGZHENGTI--GB1-0;
font-size: 20px;
color: #ffffff;
text-align: left;
line-height: 24px;
}
......@@ -33,6 +34,8 @@
font-weight: 400;
color: #ffffff;
line-height: 22px;
margin-right: 20px;
}
.jdindentlist-header>div:nth-child(2)>span:nth-child(3) {
......@@ -41,6 +44,7 @@
font-weight: 400;
color: #ffffff;
line-height: 22px;
cursor: pointer;
}
.jdindentlist-warpper .el-tabs__item {
......@@ -158,9 +162,11 @@
margin-bottom: 30px;
/* padding: 32px 25px 25px; */
}
.jdindentlist-warpper .el-tabs__content{
.jdindentlist-warpper .el-tabs__content {
background: #fff;
}
.jdindentlist-warpper .el-table .cell {
text-align: center;
display: -webkit-box;
......
igirl-channel-web/app/front/vues/pages/jdindentlist/jdindentlist.html
<div class="jdindentlist-warpper">
<div class="jdindentlist-header">
<div>京东云商标</div>
<div>京东云PLUS工商、商标注册平台</div>
<div>
<span><i class="el-icon-user"></i></span>
<span>1366*565445</span>
<span>{{user_Name}}</span>
<span @click="loginOut">退出</span>
</div>
</div>
......@@ -94,7 +95,10 @@
<el-table-column prop="deliveryOrderNo" label="交付单号" width="180">
<template slot-scope="scope">
<el-tooltip placement="top" :content="scope.row.deliveryOrderNo">
<el-tooltip placement="top" :content="scope.row.deliveryOrderNo"
:disabled="scope.row.itemName ? false : true">
<el-tooltip placement="top" :content="scope.row.deliveryOrderNo"
:disabled="scope.row.itemName ? false : true">
<p solt="content">
{{scope.row.deliveryOrderNo ? scope.row.deliveryOrderNo : \'---\'}}
</p>
......@@ -103,7 +107,8 @@
</el-table-column>
<el-table-column prop="itemName" label="业务类型" width="180">
<template slot-scope="scope">
<el-tooltip placement="top" :content="scope.row.itemName">
<el-tooltip placement="top" :content="scope.row.itemName"
:disabled="scope.row.itemName ? false : true">
<p solt="content">{{scope.row.itemName ? scope.row.itemName : \'---\'}}
</p>
</el-tooltip>
......@@ -111,7 +116,8 @@
</el-table-column>
<el-table-column prop="tmName" label="商标名称" width="180">
<template slot-scope="scope">
<el-tooltip placement="top" :content="scope.row.tmName">
<el-tooltip placement="top" :content="scope.row.tmName"
:disabled="scope.row.tmName ? false : true">
<p solt="content">{{scope.row.tmName ? scope.row.tmName : \'---\'}}
</p>
</el-tooltip>
......@@ -119,7 +125,8 @@
</el-table-column>
<el-table-column prop="nclOneCodes" label="类别">
<template slot-scope="scope">
<el-tooltip placement="top" :content="scope.row.nclOneCodes">
<el-tooltip placement="top" :content="scope.row.nclOneCodes"
:disabled="scope.row.nclOneCodes ? false : true">
<p solt="content">
{{scope.row.nclOneCodes ?\'第\'+scope.row.nclOneCodes+\'类\': "---"}}
</p>
......@@ -128,7 +135,8 @@
</el-table-column>
<el-table-column prop="nclOneCount" label="件数" width="" class-name="jdindentlist-brand-count">
<template slot-scope="scope">
<el-tooltip placement="top" :content="scope.row.nclOneCount">
<el-tooltip placement="top" :content="scope.row.nclOneCount"
:disabled="scope.row.nclOneCount ? false : true">
<p solt="content">{{scope.row.nclOneCount?scope.row.nclOneCount: \'---\'}}
</p>
</el-tooltip>
......@@ -136,7 +144,8 @@
</el-table-column>
<el-table-column prop="name" label="申请人">
<template slot-scope="scope">
<el-tooltip placement="top" :content="scope.row.name">
<el-tooltip placement="top" :content="scope.row.name"
:disabled="scope.row.name ? false : true">
<p solt="content">{{scope.row.name ? scope.row.name :\'---\'}}
</p>
</el-tooltip>
......@@ -144,7 +153,8 @@
</el-table-column>
<el-table-column prop="totalSum" label="订单金额">
<template slot-scope="scope">
<el-tooltip placement="top" :content="scope.row.totalSum">
<el-tooltip placement="top" :content="scope.row.totalSum"
:disabled="scope.row.totalSum ? false : true">
<p solt="content">{{scope.row.totalSum ? scope.row.totalSum : \'---\'}}
</p>
</el-tooltip>
......@@ -152,7 +162,8 @@
</el-table-column>
<el-table-column prop="deliveryStatusName" label="交付状态" class-name="dsqcl">
<template slot-scope="scope">
<el-tooltip placement="top" :content="scope.row.deliveryStatusName">
<el-tooltip placement="top" :content="scope.row.deliveryStatusName"
:disabled="scope.row.deliveryStatusName ? false : true">
<p solt="content">
{{scope.row.deliveryStatusName ? scope.row.deliveryStatusName : \'---\'}}
</p>
......@@ -161,7 +172,8 @@
</el-table-column>
<el-table-column prop="CreateDate" label="下单时间">
<template slot-scope="scope">
<el-tooltip placement="top" :content="scope.row.CreateDate">
<el-tooltip placement="top" :content="scope.row.CreateDate"
:disabled="scope.row.CreateDate ? false : true">
<p solt="content">{{scope.row.CreateDate ? scope.row.CreateDate: \'---\'}}
</p>
</el-tooltip>
......@@ -169,7 +181,8 @@
</el-table-column>
<el-table-column prop="submitTime" label="递交时间" class-name="subtime">
<template slot-scope="scope">
<el-tooltip placement="top" :content="scope.row.submitTime">
<el-tooltip placement="top" :content="scope.row.submitTime"
:disabled="scope.row.submitTime ? false : true">
<p solt="content">{{scope.row.submitTime ? scope.row.submitTime : \'---\'}}
</p>
</el-tooltip>
......@@ -294,7 +307,7 @@
<el-form-item class="gsb_items">
<div class="title special">上传材料：代理委托书
<a href="http://gsb-zc.oss-cn-beijing.aliyuncs.com/igirl_channel_tmwtsdemo001.doc"
style="color:#0F8EE9;font-size:13px;cursor:pointer;position: absolute;top: 70%;left: 51%;line-height: 0px;border-bottom: 1px solid #0F8EE9;height: 5px;">生成委托书</a>
style="color:#0F8EE9;font-size:13px;cursor:pointer;position: absolute;top: 70%;left: 51%;line-height: 0px;border-bottom: 1px solid #0F8EE9;height: 5px;">生成委托书</span>
</div>
<div class="upload-box" v-loading="loading2" @mouseover="mouseOverDemo(2,\'b\')"
@mouseleave="mouseLeaveDemo(2,\'b\')">
......
igirl-channel-web/app/front/vues/pages/jdindentlist/jdindentlist.js
......@@ -15,7 +15,7 @@
};
return {
input: "",
search:"",
search: "",
businessType: [
{
value: 'zzzc',
......@@ -126,7 +126,7 @@
CreateDate: null,
tableData: [],
currentPage: 1,
countPage: "",
countPage: 0,
pageSize: null,
/* 上传资料弹框 */
......@@ -165,6 +165,7 @@
taxNum: "",
email: "",
},
deliveryStatus: '',
form2: {
title: "",
taxNum: "",
......@@ -439,6 +440,7 @@
},
],
hidePage: true,
user_Name: "",
}
},
......@@ -448,6 +450,11 @@
console.log(this.$route.query.channelUserId, "11111111111");
console.log(this.$route.fullPath.split("/")[this.$route.fullPath.split("/").length - 1]);
}
document.cookie.split('; ').map((item, index) => {
if(item.includes('pin=')){
this.user_Name = item.substring(4);
}
});
},
mounted: function() {
var that = this;
......@@ -487,6 +494,9 @@
this.pullDownForm = this.baseForm.slice(1);
}
},
loginOut(){
location.href="http://login.jdcloud.com/logout?callback=http://tm.plus.jdcloud.com/#/jd/jdtrademark";
},
toViewImg(src) {
this.toViewImgSrc = src;
this.toViewImgType = true
......@@ -652,7 +662,7 @@
this.indentInfo.itemName = this.itemName;
this.indentInfo.tmName = this.tmName;
this.indentInfo.CreateDate = this.CreateDate;
this.indentInfo.deliveryStatus = this.deliveryStatus;
this.indentInfo.deliveryStatus = this.checkedStatus;
this.indentInfo.startTime = this.startTime || "";
this.indentInfo.entTime = this.entTime || "";
this.handleSizeChange();
......@@ -674,7 +684,7 @@
this.icbcIndentInfo.itemName = this.itemName;
this.icbcIndentInfo.tmName = this.tmName;
this.icbcIndentInfo.CreateDate = this.CreateDate;
this.icbcIndentInfo.deliveryStatus = this.deliveryStatus;
this.icbcIndentInfo.deliveryStatus = this.checkedStatus;
this.icbcIndentInfo.startTime = this.startTime || "";
this.icbcIndentInfo.entTime = this.entTime || "";
this.handleSizeChange();
......
igirl-channel-web/app/front/vues/pages/selftmreg/selftmreg.html
......@@ -656,7 +656,7 @@
</div>
<div v-if="apply.identityCardPic"
style="display:inline-block;padding-left:10px;cursor: pointer;text-align: center;color: rgb(99, 101, 105);">
<img @click="window.open(apply.identityCardPic)" v-if="apply.identityCardPic" src="/imgs/sbzc/wtsD.png"
<img @click="window.open(apply.identityCardPic)" v-if="apply.identityCardPic" :src="apply.identityCardPic"
style="height:118px;width:98px;border: 2px dashed rgb(233, 233, 233);">
<div>身份证明</div>
</div>
......
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