Skip to content

Z
zhichan
Commit 7ae0f1f4 by 刘泽奇
Options

123

parent ab1f941c
Showing with 146 additions and 26 deletions
igirl-channel-web/app/front/entry/index.ejs
......@@ -58,6 +58,7 @@
<body>
<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">
<!-- 根据渠道显示不同公共头start -->
<div class="jd_header_box" v-show="jdSelfHeaderShow">
<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 @@
.jdindentlist-inquire>div:nth-child(2)>button:nth-child(2) {
background: rgba(255, 255, 255, 1);
color: #333333;
border: 1px solid #3071fe;
background: rgba(255, 255, 255, 1) !important;
color: #333333 !important;
border: 1px solid #3071fe !important;
border-radius: 100px;
width: 58px;
height: 28px;
......@@ -277,4 +277,17 @@
.jdindentlist-warpper .el-button:hover {
background: 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.js
......@@ -464,8 +464,10 @@
channelFrom: "",
icbcChannelItemName: '',
icbcChannelServiceNo: '',
icbcOrderStatusName: '',
icbcOrderStatusName: null,
icbcData: [],
icbcOrderStatusNameList: [
{
value: '1',
......@@ -483,7 +485,9 @@
value: '4',
label: '已完成'
},
]
],
icbcStartTime: "",
icbcEntTime: ''
}
},
......@@ -630,7 +634,7 @@
query: {
orderNo: row.orderNo,
channelUserId: this.$route.query.channelUserId,
payTime:row.payTime
payTime: row.payTime
}
});
},
......@@ -723,9 +727,14 @@
this.$root.postReq("/web/trademark/tmqueryCtl/doPost", obj).then(d => {
this.$root.loading = false;
console.log({ ...d.data });
this.icbcData = d.data;
this.IndustryCountPage = d.dataCount;
if (d.status == 0) {
this.icbcData = d.data;
this.IndustryCountPage = d.dataCount;
} else {
this.$message("请重试");
}
})
} else {
this.$message('当前未登录');
......@@ -804,14 +813,23 @@
this.icbcChannelItemName = null;
this.icbcChannelServiceNo = null;
this.icbcOrderStatusName = null;
this.icbcStartTime = null;
this.icbcEntTime = null;
},
icbcFind(){
this.icbcIndentInfo.channelItemName = this.icbcChannelItemName;
this.icbcIndentInfo.channelServiceNo = this.icbcChannelServiceNo;
this.icbcIndentInfo.orderStatus = this.icbcOrderStatusName;
this.icbcIndentInfo.startTime = this.icbcStartTime;
this.icbcIndentInfo.entTime = this.icbcEntTime;
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){
this.startTime = new Date(v[0]).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 {
margin: 0;
}
.jdicbc-banner {
min-height: 480px;
background: url(/imgs/jdcloud/jdicbc/banner.png) center center no-repeat;
background-size: cover;
background-size: cover !important;
}
.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 {
......@@ -46,7 +76,7 @@ p {
box-sizing: border-box;
position: relative;
height: 54px;
width: 838px;
width: 880px;
background: #fff;
margin-top: 28px;
align-items: center
......@@ -316,7 +346,7 @@ p {
}
.jdicbc-industry>ul {
right: 116px;
right: 127px;
top: 54px;
position: absolute;
width: 113px;
......@@ -324,7 +354,7 @@ p {
z-index: 5;
border: 1px solid #fff;
overflow-y: auto;
max-height: 170px;
height: 170px;
}
.jdicbc-industry>ul li {
......@@ -341,7 +371,7 @@ p {
.jdicbc-companyType>ul {
position: absolute;
width: 113px;
width: 123px;
background: #fff;
z-index: 5;
border: 1px solid #fff;
......@@ -417,4 +447,13 @@ p {
overflow: hidden;
text-overflow: ellipsis;
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="jdtrademark">
<div class="jdicbc-banner">
<div class="jdicbc-banner" :style="channelBanner">
<div>
<div @click="goIndentList">我的订单</div>
</div>
</div>
<div class="jdtrademark-warpper">
<div class="jdicbc-search">
<div>
......@@ -13,29 +16,34 @@
</div>
<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-tab-pane :label="item.title" :name="item.title" v-for="(item, index) in city"
:key="index">
<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>
</el-tab-pane>
</el-tabs>
</p>
<input type="text" v-model="companyName" placeholder="请输入公司名">
<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>
<li @click="industrySelected(item)" v-for="(item, index) in industryList" :key="index">
{{item}}
</li>
<el-scrollbar class="page-component__scroll" style="marginTop:0; height: 100%;">
<li @click="industrySelected(item)" v-for="(item, index) in industryList" :key="index">
{{item}}
</li>
</el-scrollbar>
</ul>
</div>
<div @click="companyTypeShow = !companyTypeShow">{{companyType}}<i class="el-icon-arrow-down"></i>
</div>
<div class="jdicbc-companyType" v-show="companyTypeShow">
<ul>
<div class="jdicbc-companyType" v-show="companyTypeShow" @mouseleave="companyTypeShow = false">
<ul class="jdicbc-companyType">
<li @click="companyTypeSelected(item)" v-for="(item, index) in companyTypeList"
:key="index">
{{item}}</li>
......
igirl-channel-web/app/front/vues/pages/jdindustry/jdindustry.js
......@@ -218,9 +218,11 @@
baseForm: ["有限公司（除金融投资、教育培训、食品加工等限制行业）", "有限公司", "个人独资企业（除金融投资、教育培训、食品加工等限制行业）"],
pullDownForm: [],
formValue: "",
channelBanner: "",
}
},
mounted: function() {
this.getChannerBanner();
this.getProductList();
var swiper = new Swiper('.swiper-container', {
slidesPerView: 3,
......@@ -234,12 +236,49 @@
prevEl: '.swiper-button-prev',
},
centeredSlides: false,
});
},
created: function() {
},
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(){
let obj = this.$root.copyParams({
"pathCode": "gsfu"
......@@ -247,7 +286,7 @@
this.$root.postReq("/web/trademark/tmqueryCtl/doPost", obj).then((d) => {
if (d.status == 0) {
this.dataList = d.data;
this.dataList.map((item,index)=>{
this.dataList.map((item, index) => {
let desc = JSON.parse(item.product_desc);
console.log(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