Skip to content

Z
zhichan
Commit 7ae0f1f4 by 刘泽奇
Options

123

parent ab1f941c
Showing with 216 additions and 93 deletions
igirl-channel-web/app/front/entry/index.ejs
...@@ -58,6 +58,7 @@ ...@@ -58,6 +58,7 @@
<body> <body>
<div id="app" v-loading.fullscreen.lock="loading" customClass="global-loading" <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"> element-loading-background="rgba(0, 0, 0, 0.8)" class="app-main" style="visibility:hidden">
<!-- 根据渠道显示不同公共头start --> <!-- 根据渠道显示不同公共头start -->
<div class="jd_header_box" v-show="jdSelfHeaderShow"> <div class="jd_header_box" v-show="jdSelfHeaderShow">
<div class="jc_hd"></div> <div class="jc_hd"></div>
......
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/vues/pages/jdindentlist/jdindentlist.css
...@@ -129,9 +129,9 @@ ...@@ -129,9 +129,9 @@
.jdindentlist-inquire>div:nth-child(2)>button:nth-child(2) { .jdindentlist-inquire>div:nth-child(2)>button:nth-child(2) {
background: rgba(255, 255, 255, 1); background: rgba(255, 255, 255, 1) !important;
color: #333333; color: #333333 !important;
border: 1px solid #3071fe; border: 1px solid #3071fe !important;
border-radius: 100px; border-radius: 100px;
width: 58px; width: 58px;
height: 28px; height: 28px;
...@@ -277,4 +277,17 @@ ...@@ -277,4 +277,17 @@
.jdindentlist-warpper .el-button:hover { .jdindentlist-warpper .el-button:hover {
background: none; background: none;
color: none; color: none;
}
.jdindentlist-list .el-table::before {
height: 0;
}
.jdindentlist-icbc-warpper .jdindentlist-inquire .jdicbc-find {
padding-top: 4px ;
} }
\ No newline at end of file
igirl-channel-web/app/front/vues/pages/jdindentlist/jdindentlist.html
...@@ -77,9 +77,9 @@ ...@@ -77,9 +77,9 @@
</div> </div>
</div> </div>
<div> <div>
<el-button @click="reset">重置</el-button>
<el-button @click="find" style="border: #3071fe;background: #3171ff; color: #fff;">查询 <el-button @click="find" style="border: #3071fe;background: #3171ff; color: #fff;">查询
</el-button> </el-button>
<el-button @click="reset">重置</el-button>
</div> </div>
</div> </div>
...@@ -225,7 +225,7 @@ ...@@ -225,7 +225,7 @@
<div> <div>
<img src="/imgs/listnull.png" alt=""> <img src="/imgs/listnull.png" alt="">
</div> </div>
<p>很抱歉，没有查询到您要搜索的内容！您也可以减少筛选范围再尝试~</p> <p>您暂无订单</p>
</div> </div>
<div class="jdindentlist-list-page"> <div class="jdindentlist-list-page">
<el-pagination @current-change="handleSizeChange()" :current-page.sync="currentPage" <el-pagination @current-change="handleSizeChange()" :current-page.sync="currentPage"
...@@ -412,83 +412,86 @@ ...@@ -412,83 +412,86 @@
<div style="clear:both"></div> <div style="clear:both"></div>
</div> </div>
</el-drawer> </el-drawer>
</el-tab-pane> </el-tab-pane>
<!-- channelFrom != \'gsbhome\' --> <!-- channelFrom != \'gsbhome\' -->
<el-tab-pane label="工商订单" name="second" v-if="channelFrom == \'jd\'"> <el-tab-pane label="工商订单" name="second" v-if="channelFrom == \'jd\'">
<div class="jdindentlist"> <div class="jdindentlist">
<div class="jdindentlist-inquire"> <div class="jdindentlist-icbc-warpper">
<div class="jdindentlist-inquire-form"> <div class="jdindentlist-inquire">
<div><span>订单编号：</span> <div class="jdindentlist-inquire-form">
<el-input v-model="icbcChannelServiceNo" placeholder="请输入内容"></el-input> <div><span>订单编号：</span>
</div> <el-input v-model="icbcChannelServiceNo" placeholder="请输入内容"></el-input>
<div><span>产品名称：</span> </div>
<el-input v-model="icbcChannelItemName" placeholder="请输入内容"></el-input> <div><span>产品名称：</span>
</div> <el-input v-model="icbcChannelItemName" placeholder="请输入内容"></el-input>
</div>
<div><span>订单状态：</span>
<el-select v-model="icbcOrderStatusName" placeholder="请选择">
<el-option v-for="item in icbcOrderStatusNameList" :key="item.value" :label="item.label"
:value="item.value">
</el-option>
</el-select>
</div>
<!-- <div><span>订单编号：</span> <div><span>订单状态：</span>
<el-input v-model="icbcChannelServiceNo" placeholder="请输入内容"></el-input> <el-select v-model="icbcOrderStatusName" placeholder="请选择">
</div> <el-option v-for="item in icbcOrderStatusNameList" :key="item.value"
<div><span>业务单号：</span> :label="item.label" :value="item.value">
<el-input v-model="icbcDeliveryOrderNo" placeholder="请输入内容"></el-input> </el-option>
</div> </el-select>
<div><span>支付状态：</span>
<el-select v-model="icbcItemName" placeholder="请选择">
<el-option v-for="item in businessType" :key="item.value" :label="item.label"
:value="item.value">
</el-option>
</el-select>
</div>
<div><span>下单时间：</span>
<div class="block">
<span class="Demonstration"></span>
<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>
<div><span>下单时间：</span>
<div class="block">
<span class="Demonstration"></span>
<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>
<!-- <div><span>订单编号：</span>
<el-input v-model="icbcChannelServiceNo" placeholder="请输入内容"></el-input>
</div>
<div><span>业务单号：</span>
<el-input v-model="icbcDeliveryOrderNo" placeholder="请输入内容"></el-input>
</div>
<div><span>支付状态：</span>
<el-select v-model="icbcItemName" placeholder="请选择">
<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>
<div><span>注册地区：</span> <div class="jdicbc-find">
<el-cascader v-model="regionValue" :options="region" @change="checkedCity"> <el-button @click="icbcReset()">重置</el-button>
</el-cascader> <el-button @click="icbcFind()">查询</el-button>
</div>
<div><span>公司类型：</span>
<el-input v-model="icbcName" placeholder="请输入内容"></el-input>
</div> </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>
<el-button @click="icbcFind()">查询</el-button>
<el-button @click="icbcReset()">重置</el-button>
</div> </div>
</div> </div>
<div class="jdindentlist-list"> <div class="jdindentlist-list">
<el-table header-row-class-name="companydetail-name-header" :data="icbcData" style="width: 100%"> <el-table header-row-class-name="companydetail-name-header" :data="icbcData" style="width: 100%">
<div slot="empty">
</div>
<el-table-column prop="channelServiceNo" label="订单编号"> <el-table-column prop="channelServiceNo" label="订单编号">
<template slot-scope="scope"> <template slot-scope="scope">
<el-tooltip placement="top" :content="scope.row.channelServiceNo" <el-tooltip placement="top" :content="scope.row.channelServiceNo"
...@@ -566,7 +569,7 @@ ...@@ -566,7 +569,7 @@
<div> <div>
<img src="/imgs/listnull.png" alt=""> <img src="/imgs/listnull.png" alt="">
</div> </div>
<p>很抱歉，没有查询到您要搜索的内容！您也可以减少筛选范围再尝试~</p> <p>您暂无订单</p>
</div> </div>
<div class="jdindentlist-list-page"> <div class="jdindentlist-list-page">
<el-pagination @current-change="getIcbcList()" :current-page.sync="currentPage2" :page-size="20" <el-pagination @current-change="getIcbcList()" :current-page.sync="currentPage2" :page-size="20"
......
igirl-channel-web/app/front/vues/pages/jdindentlist/jdindentlist.js
...@@ -464,8 +464,10 @@ ...@@ -464,8 +464,10 @@
channelFrom: "", channelFrom: "",
icbcChannelItemName: '', icbcChannelItemName: '',
icbcChannelServiceNo: '', icbcChannelServiceNo: '',
icbcOrderStatusName: '', icbcOrderStatusName: null,
icbcData: [], icbcData: [],
icbcOrderStatusNameList: [ icbcOrderStatusNameList: [
{ {
value: '1', value: '1',
...@@ -483,7 +485,9 @@ ...@@ -483,7 +485,9 @@
value: '4', value: '4',
label: '已完成' label: '已完成'
}, },
] ],
icbcStartTime: "",
icbcEntTime: ''
} }
}, },
...@@ -630,7 +634,7 @@ ...@@ -630,7 +634,7 @@
query: { query: {
orderNo: row.orderNo, orderNo: row.orderNo,
channelUserId: this.$route.query.channelUserId, channelUserId: this.$route.query.channelUserId,
payTime:row.payTime payTime: row.payTime
} }
}); });
}, },
...@@ -723,9 +727,14 @@ ...@@ -723,9 +727,14 @@
this.$root.postReq("/web/trademark/tmqueryCtl/doPost", obj).then(d => { this.$root.postReq("/web/trademark/tmqueryCtl/doPost", obj).then(d => {
this.$root.loading = false; this.$root.loading = false;
console.log({ ...d.data }); console.log({ ...d.data });
this.icbcData = d.data; if (d.status == 0) {
this.IndustryCountPage = d.dataCount; this.icbcData = d.data;
this.IndustryCountPage = d.dataCount;
} else {
this.$message("请重试");
}
}) })
} else { } else {
this.$message('当前未登录'); this.$message('当前未登录');
...@@ -804,14 +813,23 @@ ...@@ -804,14 +813,23 @@
this.icbcChannelItemName = null; this.icbcChannelItemName = null;
this.icbcChannelServiceNo = null; this.icbcChannelServiceNo = null;
this.icbcOrderStatusName = null; this.icbcOrderStatusName = null;
this.icbcStartTime = null;
this.icbcEntTime = null;
}, },
icbcFind(){ icbcFind(){
this.icbcIndentInfo.channelItemName = this.icbcChannelItemName; this.icbcIndentInfo.channelItemName = this.icbcChannelItemName;
this.icbcIndentInfo.channelServiceNo = this.icbcChannelServiceNo; this.icbcIndentInfo.channelServiceNo = this.icbcChannelServiceNo;
this.icbcIndentInfo.orderStatus = this.icbcOrderStatusName; this.icbcIndentInfo.orderStatus = this.icbcOrderStatusName;
this.icbcIndentInfo.startTime = this.icbcStartTime;
this.icbcIndentInfo.entTime = this.icbcEntTime;
this.getIcbcList(); this.getIcbcList();
}, },
icbcDateChecked(v){
this.icbcStartTime = new Date(v[0]).toLocaleDateString('chinese', { hour12: false }).replace(/\//g, '-');
this.icbcEntTime = new Date(v[1]).toLocaleDateString('chinese', { hour12: false }).replace(/\//g, '-');
console.log(this.icbcStartTime, this.icbcEntTime, "llllllllllll");
},
dateChecked(v){ dateChecked(v){
this.startTime = new Date(v[0]).toLocaleDateString('chinese', { hour12: false }).replace(/\//g, '-'); this.startTime = new Date(v[0]).toLocaleDateString('chinese', { hour12: false }).replace(/\//g, '-');
this.entTime = new Date(v[1]).toLocaleDateString('chinese', { hour12: false }).replace(/\//g, '-'); this.entTime = new Date(v[1]).toLocaleDateString('chinese', { hour12: false }).replace(/\//g, '-');
......
igirl-channel-web/app/front/vues/pages/jdindustry/jdindustry.css
...@@ -3,10 +3,40 @@ p { ...@@ -3,10 +3,40 @@ p {
margin: 0; margin: 0;
} }
.jdicbc-banner { .jdicbc-banner {
min-height: 480px; min-height: 480px;
background: url(/imgs/jdcloud/jdicbc/banner.png) center center no-repeat; background-size: cover !important;
background-size: cover; }
.jdicbc-banner>div:nth-child(1) {
width: 1200px;
margin: 0 auto;
position: relative;
min-height: 480px;
}
.jdicbc-banner>div>div:nth-child(1) {
padding: 10px 40px;
border: 1px solid rgba(207, 235, 252);
color: rgba(207, 235, 252);
position: absolute;
left: 0;
top: 66%;
cursor: pointer;
font-size: 16px;
}
.jdicbc-banner>div>div:nth-child(2) {
position: absolute;
left: 0%;
text-align: right;
top: 37.2%;
font-size: 40px;
font-weight: 300;
width: 216px;
color: #fff;
background: rgb(3, 0, 75)
} }
.jdicbc-search { .jdicbc-search {
...@@ -46,7 +76,7 @@ p { ...@@ -46,7 +76,7 @@ p {
box-sizing: border-box; box-sizing: border-box;
position: relative; position: relative;
height: 54px; height: 54px;
width: 838px; width: 880px;
background: #fff; background: #fff;
margin-top: 28px; margin-top: 28px;
align-items: center align-items: center
...@@ -316,7 +346,7 @@ p { ...@@ -316,7 +346,7 @@ p {
} }
.jdicbc-industry>ul { .jdicbc-industry>ul {
right: 116px; right: 127px;
top: 54px; top: 54px;
position: absolute; position: absolute;
width: 113px; width: 113px;
...@@ -324,7 +354,7 @@ p { ...@@ -324,7 +354,7 @@ p {
z-index: 5; z-index: 5;
border: 1px solid #fff; border: 1px solid #fff;
overflow-y: auto; overflow-y: auto;
max-height: 170px; height: 170px;
} }
.jdicbc-industry>ul li { .jdicbc-industry>ul li {
...@@ -341,7 +371,7 @@ p { ...@@ -341,7 +371,7 @@ p {
.jdicbc-companyType>ul { .jdicbc-companyType>ul {
position: absolute; position: absolute;
width: 113px; width: 123px;
background: #fff; background: #fff;
z-index: 5; z-index: 5;
border: 1px solid #fff; border: 1px solid #fff;
...@@ -417,4 +447,13 @@ p { ...@@ -417,4 +447,13 @@ p {
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
white-space: nowrap; white-space: nowrap;
}
.page-component__scroll {
height: calc(100% - 40px);
margin-top: 40px;
}
.page-component__scroll .el-scrollbar__wrap {
overflow-x: hidden;
} }
\ No newline at end of file
igirl-channel-web/app/front/vues/pages/jdindustry/jdindustry.html
<div class="jdicbc"> <div class="jdicbc">
<div class="jdtrademark"> <div class="jdtrademark">
<div class="jdicbc-banner" :style="channelBanner">
<div class="jdicbc-banner"> <div>
<div @click="goIndentList">我的订单</div>
</div>
</div> </div>
<div class="jdtrademark-warpper"> <div class="jdtrademark-warpper">
<div class="jdicbc-search"> <div class="jdicbc-search">
<div> <div>
...@@ -13,29 +16,34 @@ ...@@ -13,29 +16,34 @@
</div> </div>
<div> <div>
<div @click="cityShow = !cityShow">{{cityName}} <i class="el-icon-arrow-down"></i></div> <div @click="cityShow = !cityShow">{{cityName}} <i class="el-icon-arrow-down"></i></div>
<p v-show="cityShow"> <p v-show="cityShow" @mouseleave="cityShow = false">
<el-tabs v-model="activeName"> <el-tabs v-model="activeName">
<el-tab-pane :label="item.title" :name="item.title" v-for="(item, index) in city" <el-tab-pane :label="item.title" :name="item.title" v-for="(item, index) in city"
:key="index"> :key="index">
<ul> <ul>
<li @click="citySelected(el)" v-for="(el, i) in item.cityList" :key="i">{{el}}</li> <li @click="citySelected(el)" v-for="(el, i) in item.cityList" :key="i">{{el}}
</li>
</ul> </ul>
</el-tab-pane> </el-tab-pane>
</el-tabs> </el-tabs>
</p> </p>
<input type="text" v-model="companyName" placeholder="请输入公司名"> <input type="text" v-model="companyName" placeholder="请输入公司名">
<div @click="industryShow = !industryShow">{{industry}} <i class="el-icon-arrow-down"></i></div> <div @click="industryShow = !industryShow">{{industry}} <i class="el-icon-arrow-down"></i></div>
<div class="jdicbc-industry" v-show="industryShow"> <div class="jdicbc-industry" v-show="industryShow" @mouseleave="industryShow = false">
<ul> <ul>
<li @click="industrySelected(item)" v-for="(item, index) in industryList" :key="index"> <el-scrollbar class="page-component__scroll" style="marginTop:0; height: 100%;">
{{item}} <li @click="industrySelected(item)" v-for="(item, index) in industryList" :key="index">
</li> {{item}}
</li>
</el-scrollbar>
</ul> </ul>
</div> </div>
<div @click="companyTypeShow = !companyTypeShow">{{companyType}}<i class="el-icon-arrow-down"></i> <div @click="companyTypeShow = !companyTypeShow">{{companyType}}<i class="el-icon-arrow-down"></i>
</div> </div>
<div class="jdicbc-companyType" v-show="companyTypeShow"> <div class="jdicbc-companyType" v-show="companyTypeShow" @mouseleave="companyTypeShow = false">
<ul> <ul class="jdicbc-companyType">
<li @click="companyTypeSelected(item)" v-for="(item, index) in companyTypeList" <li @click="companyTypeSelected(item)" v-for="(item, index) in companyTypeList"
:key="index"> :key="index">
{{item}}</li> {{item}}</li>
......
igirl-channel-web/app/front/vues/pages/jdindustry/jdindustry.js
...@@ -218,9 +218,11 @@ ...@@ -218,9 +218,11 @@
baseForm: ["有限公司（除金融投资、教育培训、食品加工等限制行业）", "有限公司", "个人独资企业（除金融投资、教育培训、食品加工等限制行业）"], baseForm: ["有限公司（除金融投资、教育培训、食品加工等限制行业）", "有限公司", "个人独资企业（除金融投资、教育培训、食品加工等限制行业）"],
pullDownForm: [], pullDownForm: [],
formValue: "", formValue: "",
channelBanner: "",
} }
}, },
mounted: function() { mounted: function() {
this.getChannerBanner();
this.getProductList(); this.getProductList();
var swiper = new Swiper('.swiper-container', { var swiper = new Swiper('.swiper-container', {
slidesPerView: 3, slidesPerView: 3,
...@@ -234,12 +236,49 @@ ...@@ -234,12 +236,49 @@
prevEl: '.swiper-button-prev', prevEl: '.swiper-button-prev',
}, },
centeredSlides: false, centeredSlides: false,
}); });
}, },
created: function() { created: function() {
}, },
methods: { methods: {
getChannerBanner(){
console.log(this.$root.channelName, "ddddddddddddddddddddddddddd");
switch (this.$root.channelName) {
case 'jd':
this.channelBanner = "background: url(/imgs/jdcloud/jdicbc/banner.png) center center no-repeat";
break;
default:
this.channelBanner = "background: url(/imgs/jdcloud/jdicbc/banner.png) center center no-repeat";
break;
}
},
goIndentList(){
switch (this.$root.channelName) {
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";
break;
case "bw":
console.log($.cookie("channelUserId"), `llllllllllllllllllllllll`);
if ($.cookie("userpin")) {
this.$router.push({
path: `/${this.$root.channelName}/jdindentlist`,
query: { channelUserId: $.cookie("channelUserId") }
});
} else {
this.$message.warning("请登录");
this.$router.push({
path: `/${this.$root.channelName}/login`,
});
}
break;
default:
break;
}
},
getProductList(){ getProductList(){
let obj = this.$root.copyParams({ let obj = this.$root.copyParams({
"pathCode": "gsfu" "pathCode": "gsfu"
...@@ -247,7 +286,7 @@ ...@@ -247,7 +286,7 @@
this.$root.postReq("/web/trademark/tmqueryCtl/doPost", obj).then((d) => { this.$root.postReq("/web/trademark/tmqueryCtl/doPost", obj).then((d) => {
if (d.status == 0) { if (d.status == 0) {
this.dataList = d.data; this.dataList = d.data;
this.dataList.map((item,index)=>{ this.dataList.map((item, index) => {
let desc = JSON.parse(item.product_desc); let desc = JSON.parse(item.product_desc);
console.log(desc); console.log(desc);
item.product_desc = desc; item.product_desc = desc;
......
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