Skip to content

Z
zhichan
Commit 92e52c36 by 宋毅
Options

Merge branch 'igirl-channel-web' of gitlab.gongsibao.com:jiangyong/zhichan into igirl-channel-web

parents d8ca5d89 e1537ab5
Showing with 72 additions and 44 deletions
igirl-channel-web/app/front/entry/index.ejs
......@@ -46,12 +46,16 @@
.activeColor {
color: deepskyblue;
}
body>.el-loading-mask {
z-index: 5555 !important;
}
</style>
</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 id="app" v-loading.fullscreen.lock="loading" customClass="global-loading"
element-loading-background="rgba(0, 0, 0, 0.8)" class="app-main" style="visibility:hidden">
<div class="jc_hd"></div>
<transition name="slide-fade">
<router-view></router-view>
......
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
......@@ -102,7 +102,7 @@ axios.get("/web/common/metaCtl/getRouteConfig").then(d => {
"actionType": "",
"requrl": '',
},
loading: true,
loading: false,
logins: [],
editableTabs2: [
{
......@@ -126,7 +126,6 @@ axios.get("/web/common/metaCtl/getRouteConfig").then(d => {
catas: [
],
loading: false,
items: [
],
logins: [
......@@ -174,7 +173,7 @@ axios.get("/web/common/metaCtl/getRouteConfig").then(d => {
$("#app").css("min-height", $(window).height());
});
$("#app").css("visibility", 'visible');
this.loading = false;
this.loading = false;
this.channelName = location.hash.split('/')[1];
},
updated() {
......
igirl-channel-web/app/front/vues/pages/jdindentdetail/jdindentdetail.css
......@@ -269,7 +269,7 @@
.jdindentdetail-info>div:nth-child(3) {
float: left;
margin-top: 24px;
margin-top: 26px;
height: 100px;
box-sizing: border-box;
}
......@@ -532,7 +532,9 @@
.jdindentdetail-diag .el-drawer__open .el-drawer.rtl {
width: 66%;
}
.jdindentdetail-drawer{
overflow-y: auto;
}
.jdindentdetail-drawer .selftmreg_main .el-form-item {
margin-bottom: 20px !important;
}
......
igirl-channel-web/app/front/vues/pages/jdindentdetail/jdindentdetail.html
......@@ -2,19 +2,21 @@
<div class="jdindentdetail-warpper">
<div class="jdindentlist-header" v-if="channelFrom == \'jd\'">
<div>京东云PLUS工商、商标注册平台</div>
<div v-if="user_Name">
<span v-if="user_Name"><i class="el-icon-user"></i></span>
<span>{{user_Name}}</span>
<span @click="loginOut" v-if="user_Name">退出</span>
</div>
<div v-else>
<a href="https://login.jdcloud.com/?returnUrl=https%3A%2F%2Ftm.plus.jdcloud.com%2F%23%2Fjd%2Fjdindentlist" class="jdindentlist-header-login" >登录</a>
<a href="https://user.jdcloud.com/register?source=jdcloud&ReturnUrl=https%3A%2F%2Fwww.jdcloud.com" style="display:inline-block;color: #fff;padding: 0 15px;background:linear-gradient(80deg,#3171ff 0,#a14faf 100%);border-radius:13px;height: 26px;
<div class="jdindentlist-header" v-if="channelFrom == \'jd\'">
<div>京东云PLUS工商、商标注册平台</div>
<div v-if="user_Name">
<span v-if="user_Name"><i class="el-icon-user"></i></span>
<span>{{user_Name}}</span>
<span @click="loginOut" v-if="user_Name">退出</span>
</div>
<div v-else>
<a href="https://login.jdcloud.com/?returnUrl=http%3A%2F%2Ftm.plus.jdcloud.com%2F%23%2Fjd%2Fjdindentlist"
class="jdindentlist-header-login">登录</a>
<a href="https://user.jdcloud.com/register?source=jdcloud&ReturnUrl=https%3A%2F%2Fwww.jdcloud.com"
style="display:inline-block;color: #fff;padding: 0 15px;background:linear-gradient(80deg,#3171ff 0,#a14faf 100%);border-radius:13px;height: 26px;
line-height: 26px;">免费注册</a>
</div>
</div>
</div>
</div>
<div class="jdindentdetail">
......@@ -73,7 +75,7 @@
</div>
<div>
<p>
<img :src="deliveryInfo.colorizedPicUrl" alt="">
<img :src="deliveryInfo.colorizedPicUrl || deliveryInfo.picUrl" alt="">
</p>
<p>商标图样</p>
</div>
......@@ -134,6 +136,16 @@
</div>
<p>营业执照</p>
</div>
<div v-if=" applyInfo.customerType==\'person\'">
<div class="license-uploader">
<img v-if="imageUrl" :src="imageUrl" class="license">
<div class="license-uploader-icon" v-else>
<img :src="applyInfo.identityCardPic?applyInfo.identityCardPic:\'/imgs/indent/materialNull.png\'"
alt="" @click="openPdf(applyInfo.identityCardPic)">
</div>
</div>
<p>身份证</p>
</div>
<div>
<div class="license-uploader">
<img v-if="imageUrl" :src="imageUrl" class="license">
......@@ -155,16 +167,7 @@
</div>
<p>优先权证明</p>
</div>
<div v-if=" applyInfo.customerType==\'person\'">
<div class="license-uploader">
<img v-if="imageUrl" :src="imageUrl" class="license">
<div class="license-uploader-icon" v-else>
<img :src="applyInfo.identityCardPic?applyInfo.identityCardPic:\'/imgs/indent/materialNull.png\'"
alt="" @click="openPdf(applyInfo.identityCardPic)">
</div>
</div>
<p>身份证</p>
</div>
</div>
</div>
<div class="jdindentdetail-main-infohr"></div>
......@@ -174,7 +177,7 @@
<span v-show="itemCode" @click="showDialog(4)"><i class="el-icon-edit"></i>
修改</span>
</div>
<ul>
<ul v-if="applyInfo.customerType != \'person\'">
<li><span>公司名称：</span><span>{{applyInfo.name?applyInfo.name:\"-\"}}</span>
</li>
<li><span>统一社会信用代码：</span><span>{{applyInfo.code?applyInfo.code:\'-\'}}</span>
......@@ -184,6 +187,18 @@
<li><span>邮编地址：</span><span>{{applyInfo.zipCode?applyInfo.zipCode:\'-\'}}</span>
</li>
</ul>
<ul v-else>
<li><span>姓名：</span><span>{{applyInfo.name?applyInfo.name:\"-\"}}</span>
</li>
<li><span>身份证号码：</span><span>{{applyInfo.identityCardNo?applyInfo.identityCardNo:\'-\'}}</span>
</li>
<li><span>统一社会信用代码：</span><span>{{applyInfo.code?applyInfo.code:\'-\'}}</span>
</li>
<li><span>注册地址：</span><span>{{applyInfo.applyAddr?applyInfo.applyAddr:\"-\"}}</span>
</li>
<li><span>邮政编码：</span><span>{{applyInfo.zipCode?applyInfo.zipCode:\'-\'}}</span>
</li>
</ul>
</div>
<div class="jdindentdetail-main-infohr"></div>
<div class="jdindentdetail-main-contact">
......@@ -417,7 +432,7 @@
style="overflow: auto;height: 100%;padding: 60px 20px 0px;box-sizing: border-box;">
<div v-for="(nclone,index) in nclOne"
style="text-align: left;padding-left:5px;padding-bottom:5px;">
<span style="font-size:16px"><b>{{nclone.code}}
<span style="font-size:16px"><b>第{{nclone.code}}类
{{nclone.name}}</b></span>
<span style="font-size:16px;float:right"><b>已选择<span
style="color:#0F8EE9;">{{nclone.nclThree.length}}</span>项</b>
......@@ -714,9 +729,9 @@
</el-input>
</el-form-item>
<div style="clear:both;"></div>
<el-form-item v-if="editApply.customerType==\'person\'" label-width="140px"
label="身份证住址" style="width:493px;float:left;padding-right:50px;" prop="applyAddr">
<el-input placeHolder="请输入身份证住址" v-model="editApply.applyAddr">
<el-form-item v-if="editApply.customerType==\'person\'" label-width="140px" label="注册地址"
style="width:493px;float:left;padding-right:50px;" prop="applyAddr">
<el-input placeHolder="请输入注册地址" v-model="editApply.applyAddr">
</el-input>
</el-form-item>
<div style="clear:both;"></div>
......
igirl-channel-web/app/front/vues/pages/jdindentlist/jdindentlist.html
......@@ -7,7 +7,8 @@
<span @click="loginOut" v-if="user_Name">退出</span>
</div>
<div v-else>
<a href="https://login.jdcloud.com/?returnUrl=https%3A%2F%2Ftm.plus.jdcloud.com%2F%23%2Fjd%2Fjdindentlist" class="jdindentlist-header-login" >登录</a>
<a href="https://login.jdcloud.com/?returnUrl=https%3A%2F%2Ftm.plus.jdcloud.com%2F%23%2Fjd%2Fjdindentlist"
class="jdindentlist-header-login">登录</a>
<a href="https://user.jdcloud.com/register?source=jdcloud&ReturnUrl=https%3A%2F%2Fwww.jdcloud.com" style="display:inline-block;color: #fff;padding: 0 15px;background:linear-gradient(80deg,#3171ff 0,#a14faf 100%);border-radius:13px;height: 26px;
line-height: 26px;">免费注册</a>
</div>
......@@ -188,7 +189,8 @@
<template slot-scope="scope">
<el-tooltip placement="top" :content="scope.row.submitTime"
:disabled="scope.row.submitTime ? false : true">
<p solt="content">{{scope.row.submitTime ? scope.row.submitTime : \'---\'}}
<p solt="content">
{{scope.row.submitTime ? scope.row.submitTime : \'---\'}}
</p>
</el-tooltip>
</template>
......
igirl-channel-web/app/front/vues/pages/jdindentlist/jdindentlist.js
......@@ -663,12 +663,12 @@
if (item.submitTime) {
item.submitTime = new Date(item.submitTime).toLocaleString('chinese', { hour12: false });
} else {
item.submitTime = '--';
item.submitTime = '';
}
if (item.CreateDate) {
item.CreateDate = new Date(item.CreateDate).toLocaleDateString('chinese', { hour12: false });
} else {
item.CreateDate = '--';
item.CreateDate = '';
}
});
} else {
......
igirl-channel-web/app/front/vues/pages/jdregscheme/jdregscheme.html
......@@ -50,7 +50,7 @@
<div class="jdindentdetail-main-type-box" v-for="(item, index) in nclInfo" :key="index">
<div class="jdindentdetail-main-type">
<div class="jdindentdetail-main-type-services">
<p>{{item.nclOneCodes}}</p>
<p>{{\'第\' + item.nclOneCodes + \'类\'}}</p>
<ul>
<li v-for="(item, index) in item.nclSmallCodes" :key="index">
{{item.pcode}}{{item.name}}
......
igirl-channel-web/app/front/vues/pages/jdtrademark/jdtrademark.css
......@@ -13,15 +13,19 @@ li {
min-height: 480px;
background: url(/imgs/jdcloud/jdtrademark/banner.png) center center no-repeat;
background-size: cover;
}
.jdtrademark-banner>div{
width: 1200px;
margin: 0 auto;
position: relative;
min-height: 480px;
}
.jdtrademark-banner>div {
.jdtrademark-banner>div>div {
padding: 10px 40px;
border: 1px solid rgba(207, 235, 252);
color: rgba(207, 235, 252);
position: absolute;
left: 10.8%;
left: 0;
top: 66%;
cursor: pointer;
font-size: 16px;
......
igirl-channel-web/app/front/vues/pages/jdtrademark/jdtrademark.html
<div class="jdtrademark">
<div class="jdtrademark-banner">
<div @click="goIndentList">我的订单</div>
<div>
<div @click="goIndentList">我的订单</div>
</div>
</div>
<div class="jdtrademark-warpper">
<div class="jdtrademark-search">
......
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