Skip to content

Z
zhichan
Commit 1ed7d44a by 刘泽奇
Options

123

parent 2dc42964
Showing with 148 additions and 139 deletions
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
...@@ -255,7 +255,11 @@ axios.get("/web/common/metaCtl/getRouteConfig").then(d => { ...@@ -255,7 +255,11 @@ axios.get("/web/common/metaCtl/getRouteConfig").then(d => {
var title = document.getElementById('idtitle'); var title = document.getElementById('idtitle');
switch (this.channelName) { switch (this.channelName) {
case 'jd': case 'jd':
title.innerText = "京东云商标注册服务"; if (location.hostname == "gs.plus.jdcloud.com") {
title.innerText = "京东云工商注册服务";
} else if (location.hostname == "tm.plus.jdcloud.com") {
title.innerText = "京东云商标注册服务";
}
break; break;
case 'bw': case 'bw':
title.innerText = "小望商标注册服务"; title.innerText = "小望商标注册服务";
......
igirl-channel-web/app/front/vues/pages/companydetail/companydetail.html
...@@ -171,7 +171,7 @@ ...@@ -171,7 +171,7 @@
style="width: 100%;height: 100px;line-height: 100px;text-align: center;border: 1px solid #EBEEF5;color: #909399"> style="width: 100%;height: 100px;line-height: 100px;text-align: center;border: 1px solid #EBEEF5;color: #909399">
暂无材料 暂无材料
</div> </div>
<!-- <div class="company-title"> <!-- <div class="company-title">d
官方回执 官方回执
</div> </div>
<div class="companydetail-reply"> <div class="companydetail-reply">
......
igirl-channel-web/app/front/vues/pages/icorder/icorder.css
...@@ -25,6 +25,14 @@ ...@@ -25,6 +25,14 @@
font-weight: 100; font-weight: 100;
} }
.icorder-breadcrumb .el-breadcrumb__item .el-breadcrumb__inner:hover {
color: #0989c5;
}
.icorder-breadcrumb .el-breadcrumb__item .is-link:hover {
color: #0989c5;
}
.icorder-header { .icorder-header {
width: 100%; width: 100%;
height: 240px; height: 240px;
...@@ -250,6 +258,7 @@ ...@@ -250,6 +258,7 @@
margin: 0 auto; margin: 0 auto;
} }
.icorder-main-con-left>.text2 { .el-breadcrumb__item:last-child .el-breadcrumb__inner,
.el-breadcrumb__item:last-child .el-breadcrumb__inner a,
} .el-breadcrumb__item:last-child .el-breadcrumb__inner a:hover,
\ No newline at end of file .el-breadcrumb__item:last-child .el-breadcrumb__inner:hover {}
\ No newline at end of file
igirl-channel-web/app/front/vues/pages/jdindentlist/jdindentlist.css
...@@ -103,21 +103,19 @@ ...@@ -103,21 +103,19 @@
.jdindentlist-inquire { .jdindentlist-inquire {
width: 100%; width: 100%;
height: 150px; height: 150px;
display: flex;
background: rgba(255, 255, 255, 1); background: rgba(255, 255, 255, 1);
box-shadow: 0px 2px 2px 0px rgba(0, 0, 0, 0.1); box-shadow: 0px 2px 2px 0px rgba(0, 0, 0, 0.1);
box-sizing: border-box; box-sizing: border-box;
padding-top: 30px; padding-top: 30px;
padding-left: 40px; padding-left: 40px;
} }
.jdindentlist-inquire>div:nth-child(2) { .jdindentlist-inquire-btnbox {
flex: 1;
padding-top: 66px; padding-top: 66px;
min-width: 3%;
} }
.jdindentlist-inquire>div:nth-child(2)>button { .jdindentlist button {
background: rgba(255, 255, 255, 1); background: rgba(255, 255, 255, 1);
color: #333333; color: #333333;
border: 1px solid #3071fe; border: 1px solid #3071fe;
...@@ -128,7 +126,7 @@ ...@@ -128,7 +126,7 @@
font-size: 12px; font-size: 12px;
} }
.jdindentlist-inquire>div:nth-child(2)>button:nth-child(2) { .jdindentlist button:nth-child(2) {
background: #3171ff !important; background: #3171ff !important;
color: #fff !important; color: #fff !important;
border: 1px solid #dee0eb !important; border: 1px solid #dee0eb !important;
...@@ -138,27 +136,18 @@ ...@@ -138,27 +136,18 @@
padding: 0; padding: 0;
font-size: 12px; font-size: 12px;
} }
.jdindentlist-inquire-form>div>div{
.jdindentlist-inquire-form { margin-right: 20px;
display: flex;
flex-wrap: wrap;
width: 85%;
min-width: 1000px;
}
.jdindentlist-inquire-form-industry {
flex-wrap: nowrap;
} }
.jdindentlist-inquire-form>div>div>div {
.jdindentlist-inquire-form>div {
display: flex; display: flex;
margin-right: 2.78%; margin-right: 2.78%;
line-height: 36px; line-height: 36px;
height: 36px; height: 36px;
margin-bottom: 20px;
} }
.jdindentlist-inquire-form>div>span { .jdindentlist-inquire-form>div>div>div>span {
display: block; display: block;
min-width: 70px; min-width: 70px;
height: 12px; height: 12px;
...@@ -174,7 +163,8 @@ ...@@ -174,7 +163,8 @@
background: rgba(255, 255, 255, 1); background: rgba(255, 255, 255, 1);
border-radius: 0px; border-radius: 0px;
border: 1px solid rgba(225, 225, 225, 1); border: 1px solid rgba(225, 225, 225, 1);
} }
.jdindentlist-icbc-warpper .jdindentlist-inquire { .jdindentlist-icbc-warpper .jdindentlist-inquire {
......
igirl-channel-web/app/front/vues/pages/jdindentlist/jdindentlist.html
...@@ -31,56 +31,80 @@ ...@@ -31,56 +31,80 @@
<div class="jdindentlist"> <div class="jdindentlist">
<div class="jdindentlist-inquire"> <div class="jdindentlist-inquire">
<div class="jdindentlist-inquire-form"> <el-row>
<!-- <div><span>订单编号：</span> <el-col :span="20">
<el-input v-model="channelServiceNo" placeholder="请输入内容"></el-input> <div class="jdindentlist-inquire-form">
</div> --> <el-row>
<div><span>交付单号：</span> <el-col :span="5">
<el-input v-model="deliveryOrderNo" placeholder="请输入内容"></el-input> <div><span>交付单号：</span>
</div> <el-input v-model="deliveryOrderNo" placeholder="请输入内容"></el-input>
<div><span>业务类型：</span> </div>
<el-select v-model="itemName" placeholder="请选择"> </el-col>
<el-option v-for="item in businessType" :key="item.value" :label="item.label" <el-col :span="5">
:value="item.value"> <div><span>业务类型：</span>
</el-option> <el-select v-model="itemName" placeholder="请选择">
</el-select> <el-option v-for="item in businessType" :key="item.value"
</div> :label="item.label" :value="item.value">
<div><span>交付状态：</span> </el-option>
<el-select v-model="checkedStatus" placeholder="请选择"> </el-select>
<el-option v-for="item in DeliveryStatus" :key="item.value" :label="item.label" </div>
:value="item.value"> </el-col>
</el-option> <el-col :span="5">
</el-select> <div><span>交付状态：</span>
</div> <el-select v-model="checkedStatus" placeholder="请选择">
<div><span>下单时间：</span> <el-option v-for="item in DeliveryStatus" :key="item.value"
<div class="block"> :label="item.label" :value="item.value">
<span class="demonstration"></span> </el-option>
<el-date-picker v-model="CreateDate" style="width:225px;" @change="dateChecked(CreateDate)" type="daterange" </el-select>
align="right" start-placeholder="起始" end-placeholder="结束" </div>
:picker-options="pickerOptions"> </el-col>
</el-date-picker> <el-col :span="5">
<div><span>下单时间：</span>
<div class="block">
<span class="demonstration"></span>
<el-date-picker v-model="CreateDate" style="width:225px;"
@change="dateChecked(CreateDate)" type="daterange" align="right"
start-placeholder="起始" end-placeholder="结束"
:picker-options="pickerOptions">
</el-date-picker>
</div>
</div>
</el-col>
</el-row>
<el-row>
<el-col :span="5">
<div><span>商标名称：</span>
<el-input v-model="tmName" placeholder="请输入内容"></el-input>
</div>
</el-col>
<el-col :span="5">
<div><span>申请人：</span>
<el-input v-model="name" placeholder="请输入内容"></el-input>
</div>
</el-col>
<el-col :span="5">
<div v-if="channelFrom == \'bw\'"><span>付款状态：</span>
<el-select v-model="paymentStatus" placeholder="请选择">
<el-option v-for="item in paymentStatusList" :key="item.value"
:label="item.label" :value="item.value">
</el-option>
</el-select>
</div>
</el-col>
</el-row>
</div> </div>
</div> </el-col>
<div><span>商标名称：</span> <el-col :span="4">
<el-input v-model="tmName" placeholder="请输入内容"></el-input> <div class="jdindentlist-inquire-btnbox">
</div> <el-button @click="reset">重置</el-button>
<div><span>申请人：</span> <el-button @click="find" style="border: #3071fe;background: #3171ff; color: #fff;">查询
<el-input v-model="name" placeholder="请输入内容"></el-input> </el-button>
</div> </div>
</el-col>
</el-row>
<div v-if="channelFrom == \'bw\'"><span>付款状态：</span>
<el-select v-model="paymentStatus" placeholder="请选择">
<el-option v-for="item in paymentStatusList" :key="item.value" :label="item.label"
:value="item.value">
</el-option>
</el-select>
</div>
</div>
<div>
<el-button @click="reset">重置</el-button>
<el-button @click="find" style="border: #3071fe;background: #3171ff; color: #fff;">查询
</el-button>
</div>
</div> </div>
<div class="jdindentlist-list"> <div class="jdindentlist-list">
...@@ -95,7 +119,6 @@ ...@@ -95,7 +119,6 @@
</template> </template>
</el-table-column> --> </el-table-column> -->
<el-table-column prop="deliveryOrderNo" label="交付单号" width="180"> <el-table-column prop="deliveryOrderNo" label="交付单号" width="180">
<template slot-scope="scope"> <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"> :disabled="scope.row.itemName ? false : true">
...@@ -418,70 +441,53 @@ ...@@ -418,70 +441,53 @@
<div class="jdindentlist"> <div class="jdindentlist">
<div class="jdindentlist-icbc-warpper"> <div class="jdindentlist-icbc-warpper">
<div class="jdindentlist-inquire"> <div class="jdindentlist-inquire">
<div class="jdindentlist-inquire-form jdindentlist-inquire-form-industry"> <el-row>
<div><span>订单编号：</span> <el-col :span="20">
<el-input v-model="icbcChannelServiceNo" placeholder="请输入内容"></el-input> <div class="jdindentlist-inquire-form jdindentlist-inquire-form-industry">
</div> <el-row>
<div><span>产品名称：</span> <el-col :span="5">
<el-input v-model="icbcChannelItemName" placeholder="请输入内容"></el-input> <div><span>订单编号：</span>
</div> <el-input v-model="icbcChannelServiceNo" placeholder="请输入内容"></el-input>
</div>
<div><span>订单状态：</span> </el-col>
<el-select v-model="icbcOrderStatusName" placeholder="请选择"> <el-col :span="5">
<el-option v-for="item in icbcOrderStatusNameList" :key="item.value" <div><span>产品名称：</span>
:label="item.label" :value="item.value"> <el-input v-model="icbcChannelItemName" placeholder="请输入内容"></el-input>
</el-option> </div>
</el-select> </el-col>
</div> <el-col :span="5">
<div><span>下单时间：</span> <div><span>订单状态：</span>
<div class="block"> <el-select v-model="icbcOrderStatusName" placeholder="请选择">
<el-date-picker v-model="icbcCreateDate" @change="icbcDateChecked(icbcCreateDate)" <el-option v-for="item in icbcOrderStatusNameList" :key="item.value"
type="daterange" align="right" start-placeholder="起始" end-placeholder="结束" :label="item.label" :value="item.value">
:picker-options="pickerOptions"> </el-option>
</el-date-picker> </el-select>
</div>
</el-col>
<el-col :span="5">
<div><span>下单时间：</span>
<div class="block">
<el-date-picker v-model="icbcCreateDate"
@change="icbcDateChecked(icbcCreateDate)" type="daterange"
align="right" start-placeholder="起始" end-placeholder="结束"
:picker-options="pickerOptions">
</el-date-picker>
</div>
</div>
</el-col>
</el-row>
</div> </div>
</div> </el-col>
<!-- <div><span>订单编号：</span> <el-col :span="4">
<el-input v-model="icbcChannelServiceNo" placeholder="请输入内容"></el-input> <div class="jdicbc-find">
</div> <el-button @click="icbcReset()">重置</el-button>
<div><span>业务单号：</span> <el-button @click="icbcFind()">查询</el-button>
<el-input v-model="icbcDeliveryOrderNo" placeholder="请输入内容"></el-input> </div>
</div> </el-col>
<div><span>支付状态：</span>
<el-select v-model="icbcItemName" placeholder="请选择"> </el-row>
<el-option v-for="item in businessType" :key="item.value" :label="item.label"
:value="item.value">
</el-option>
</el-select>
</div>
<div><span>注册地区：</span>
<el-cascader v-model="regionValue" :options="region" @change="checkedCity">
</el-cascader>
</div>
<div><span>公司类型：</span>
<el-input v-model="icbcName" placeholder="请输入内容"></el-input>
</div>
<div><span>流程状态：</span>
<el-select v-model="icbcCheckedStatus" placeholder="请选择">
<el-option v-for="item in icbcDeliveryStatus" :key="item.value" :label="item.label"
:value="item.value">
</el-option>
</el-select>
</div> -->
<!-- <div><span>付款状态：</span>
<el-select v-model="paymentStatus" placeholder="请选择">
<el-option v-for="item in options" :key="item.value" :label="item.label"
:value="item.value">
</el-option>
</el-select>
</div> -->
</div>
<div class="jdicbc-find">
<el-button @click="icbcReset()">重置</el-button>
<el-button @click="icbcFind()">查询</el-button>
</div>
</div> </div>
</div> </div>
......
igirl-channel-web/app/front/vues/pages/jdindustry/jdindustry.js
...@@ -257,7 +257,7 @@ ...@@ -257,7 +257,7 @@
goIndentList(){ goIndentList(){
switch (this.$root.channelName) { switch (this.$root.channelName) {
case "jd": case "jd":
location.href = "https://oauth2.jdcloud.com/authorize?response_type=token&redirect_uri=https://tm.plus.jdcloud.com/jdtm/getUser&state=jdindentlist&client_id=9491577327154697"; location.href = "https://oauth2.jdcloud.com/authorize?response_type=token&redirect_uri=https://gs.plus.jdcloud.com/jdtm/getUser&state=jdindentlist&client_id=9491577327154697";
break; break;
case "bw": case "bw":
console.log($.cookie("channelUserId"), `llllllllllllllllllllllll`); console.log($.cookie("channelUserId"), `llllllllllllllllllllllll`);
......
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