Skip to content

Z
zhichan
Commit 5acecf38 by 刘泽奇
Options

123

parent 12e9fe2d
Showing with 133 additions and 53 deletions
igirl-channel-web/app/base/db/metadata/apps/platform.js
......@@ -70,9 +70,9 @@ module.exports = {
"isctl": "no"
},
{
"code": "jdicbc",
"code": "jdindustry",
"icon": "fa fa-power-off",
"path": ":channel/jdicbc",
"path": ":channel/jdindustry",
"isMenu": false,
"label": "工商核名",
"isctl": "no"
......@@ -289,7 +289,7 @@ module.exports = {
"bycnoticeindex": { "title": "登录", "config": null, "path": "/:channel/bycnoticeindex", "comname": "bycnoticeindex" },
"jdbycnoticetm": { "title": "登录", "config": null, "path": "/:channel/jdbycnoticetm", "comname": "jdbycnoticetm" },
"jdbycquerytm": { "title": "登录", "config": null, "path": "/:channel/jdbycquerytm", "comname": "jdbycquerytm" },
"jdicbc": { "title": "登录", "config": null, "path": "/:channel/jdicbc", "comname": "jdicbc" },
"jdindustry": { "title": "登录", "config": null, "path": "/:channel/jdindustry", "comname": "jdindustry" },
"jdtrademark": { "title": "登录", "config": null, "path": "/:channel/jdtrademark", "comname": "jdtrademark" },
"register": { "title": "注册", "config": null, "path": "/:channel/register", "comname": "register" },
"home": { "title": "前台首页", "config": null, "path": "/:channel/", "comname": "home" },
......
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/companydetail/companydetail.css
......@@ -3,7 +3,7 @@
}
.companydetail-warpper {
width: 1320px;
width: 1200px;
margin: 0 auto;
}
......
igirl-channel-web/app/front/vues/pages/jdindentlist/jdindentlist.html
......@@ -429,8 +429,13 @@
</div>
<div><span>订单状态：</span>
<el-input v-model="icbcOrderStatus" placeholder="请输入内容"></el-input>
<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>
<el-input v-model="icbcChannelServiceNo" placeholder="请输入内容"></el-input>
</div>
......@@ -522,11 +527,12 @@
</el-tooltip>
</template>
</el-table-column>
<el-table-column prop="orderStatus" label="付款状态">
<el-table-column prop="orderStatusName" label="订单状态">
<template slot-scope="scope">
<el-tooltip placement="top" :content="scope.row.orderStatus"
:disabled="scope.row.orderStatus ? false : true">
<p solt="content">{{scope.row.orderStatus ? scope.row.orderStatus : \'---\'}}
<el-tooltip placement="top" :content="scope.row.orderStatusName"
:disabled="scope.row.orderStatusName ? false : true">
<p solt="content">
{{scope.row.orderStatusName ? scope.row.orderStatusName : \'---\'}}
</p>
</el-tooltip>
</template>
......@@ -563,8 +569,8 @@
<p>很抱歉，没有查询到您要搜索的内容！您也可以减少筛选范围再尝试~</p>
</div>
<div class="jdindentlist-list-page">
<el-pagination @current-change="getIcbcList()" :current-page.sync="icbcCurrentPage"
:page-size="20" layout="prev, pager, next,jumper" :total="countPage">
<el-pagination @current-change="getIcbcList()" :current-page.sync="currentPage2" :page-size="20"
layout="prev, pager, next,jumper" :total="IndustryCountPage">
</el-pagination>
</div>
</div>
......
igirl-channel-web/app/front/vues/pages/jdindentlist/jdindentlist.js
......@@ -150,8 +150,9 @@
CreateDate: null,
tableData: [],
currentPage: 1,
icbcCurrentPage: 1,
currentPage2: 1,
countPage: 0,
IndustryCountPage: 0,
pageSize: null,
/* 上传资料弹框 */
......@@ -417,7 +418,6 @@
"channelItemName": "",
"channelServiceNo": "",
"orderStatus": "",
"pageIndex": 1,
"pageSize": 30
},
......@@ -464,8 +464,26 @@
channelFrom: "",
icbcChannelItemName: '',
icbcChannelServiceNo: '',
icbcOrderStatus: '',
icbcData:[],
icbcOrderStatusName: '',
icbcData: [],
icbcOrderStatusNameList: [
{
value: '1',
label: '待付款'
},
{
value: '2',
label: '已付款'
},
{
value: '3',
label: '待服务'
},
{
value: '4',
label: '已完成'
},
]
}
},
......@@ -497,7 +515,7 @@
});
if (this.$root.channelUserId != "") {
this.handleSizeChange();
this.getIcbcList();
}
this.getChannelFrom();
},
......@@ -577,6 +595,9 @@
},
navClick(tab, e){
console.log(tab, e, this.navActive);
if (this.navActive == 'second') {
this.getIcbcList();
}
},
tableRowClassName({ row, rowIndex }) {
if (rowIndex === 1) {
......@@ -696,13 +717,20 @@
},
getIcbcList(){
if (this.$route.query.channelUserId != "") {
this.indentInfo.pageIndex = this.currentPage;
console.log(this.currentPage2);
this.icbcIndentInfo.pageIndex = this.currentPage2;
var obj = this.$root.copyParams(this.icbcIndentInfo, "getOrderInfo", "/action/tmOrder/springBoard", "yes", "yes");
this.$root.loading = true;
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.data.IndustryCountPage;
*/
})
} else {
this.$message('当前未登录');
}
},
handleSizeChange(){
......@@ -777,13 +805,13 @@
icbcReset(){
this.icbcChannelItemName = null;
this.icbcChannelServiceNo = null;
this.icbcOrderStatus = null;
this.icbcOrderStatusName = null;
},
icbcFind(){
this.icbcIndentInfo.channelItemName = this.icbcChannelItemName;
this.icbcIndentInfo.channelServiceNo = this.icbcChannelServiceNo;
this.icbcIndentInfo.orderStatus = this.icbcOrderStatus;
this.icbcIndentInfo.orderStatus = this.icbcOrderStatusName;
this.getIcbcList();
},
dateChecked(v){
......
igirl-channel-web/app/front/vues/pages/jdicbc/jdicbc.css → igirl-channel-web/app/front/vues/pages/jdindustry/jdindustry.css
......@@ -365,11 +365,11 @@ p {
/* 移入 */
.jdicbc .brandreg-swiper .swiper-slide-enter-btm {
height: 380px;
.jdicbc .jdicbc-productlist .addheight {
padding: 0;
}
.jdicbc .brandreg-swiper .brandreg-swiper-hearder-enter-btm {
.jdicbc .jdicbc-productlist-item .brandreg-swiper-hearder-enter {
height: 80px;
background: #32b6e7;
color: #fff;
......@@ -377,11 +377,44 @@ p {
line-height: 80px;
}
.jdicbc .brandreg-swiper .brandreg-swiper-content-button-enter-btm {
.jdicbc .jdicbc-productlist-item .brandreg-swiper-content-button-enter {
background: #32b6e7;
border: 1px solid #32b6e7;
color: #fff;
cursor: pointer;
}
/* 结束 */
\ No newline at end of file
/* 结束 */
.jdicbc-productlist {
display: flex;
width: 100%;
height: auto;
flex-wrap: wrap;
box-sizing: border-box;
}
.jdicbc-productlist-item {
width: 400px;
box-sizing: border-box;
height: 370px;
padding-top: 10px;
text-align: center;
margin-right: 0;
transition: all .1s;
border-radius: 1px;
margin-bottom: 80px;
}
.jdicbc-productlist-item-header {
font-size: 16px;
height: 70px;
line-height: 70px;
background: #2F3353;
color: #fff;
}
.jdicbc-productlist-item .brandreg-swiper-content ul li>div:nth-of-type(2) {
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
\ No newline at end of file
igirl-channel-web/app/front/vues/pages/jdicbc/jdicbc.html → igirl-channel-web/app/front/vues/pages/jdindustry/jdindustry.html
......@@ -75,7 +75,7 @@
</div> -->
</div>
<!-- 轮播部分 -->
<div class="brandreg-swiper">
<!-- <div class="brandreg-swiper">
<div class="swiper-container">
<div class="swiper-wrapper">
<div class="swiper-slide" v-for="(item, index) in dataList.slice(0,3)"
......@@ -116,21 +116,12 @@
</div>
</div>
<!-- Add Pagination -->
<!-- <div class="swiper-pagination"></div> -->
</div>
<!-- 控制箭头隐藏显示 -->
<div v-if="showArrows" @mouseleave="showArrows = false">
<div class="swiper-button-prev"></div>
<!--左箭头。如果放置在swiper-container外面，需要自定义样式。-->
<div class="swiper-button-next"></div>
<!--右箭头。如果放置在swiper-container外面，需要自定义样式。-->
</div>
</div>
</div> -->
<!-- 下面 -->
<div class="brandreg-swiper" style="margin-top:50px;">
<!-- <div class="brandreg-swiper" style="margin-top:50px;">
<div class="swiper-container">
<div class="swiper-wrapper">
<div class="swiper-slide" v-for="(item, index) in dataList.slice(3,6)"
......@@ -171,19 +162,40 @@
</div>
</div>
<!-- Add Pagination -->
<!-- <div class="swiper-pagination"></div> -->
</div>
<!-- 控制箭头隐藏显示 -->
<div v-if="showArrows" @mouseleave="showArrows = false">
<div class="swiper-button-prev"></div>
<!--左箭头。如果放置在swiper-container外面，需要自定义样式。-->
<div class="swiper-button-next"></div>
<!--右箭头。如果放置在swiper-container外面，需要自定义样式。-->
</div>
</div> -->
</div>
<div class="jdicbc-productlist">
<div class="jdicbc-productlist-item" :class="{ \'addheight\':index==current}"
@mouseenter="adHeight(index,$event)" v-for="(item, index) in dataList" :key="index">
<div style="box-shadow: inset 1px -1px 4px 0 rgba(0, 0, 0, .1);padding-bottom: 10px;">
<div class="jdicbc-productlist-item-header"
:class="{\'brandreg-swiper-hearder-enter\':index==current}">
{{item.channel_item_name}}
</div>
<div class="brandreg-swiper-content">
<ul>
<li v-for="(item, index) in item.product_desc" :key="index">
<div><img src=" imgs/jdcloud/jdicbc/dbx.png" alt="">
</div>
<div>{{item}}</div>
</li>
</ul>
<div>
<div><sup>￥</sup><span>{{item.price}}</span>/件</div>
<div class="brandreg-swiper-content-button"
:class="{\'brandreg-swiper-content-button-enter\':index==current}"
@click="toBuy(item)">立即购买
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
......
igirl-channel-web/app/front/vues/pages/jdicbc/jdicbc.js → igirl-channel-web/app/front/vues/pages/jdindustry/jdindustry.js
......@@ -7,7 +7,6 @@
],
/*切换class */
current: 1,
current2: 1,
materials: [
{
img: "imgs/jdcloud/jdicbc/q1.png",
......@@ -34,7 +33,6 @@
text: "如自有地址需提供经营场所产权证明及租赁协议及房租发票"
},
],
showArrows: false,
/*搜索选择相关 */
......@@ -249,6 +247,11 @@
this.$root.postReq("/web/trademark/tmqueryCtl/doPost", obj).then((d) => {
if (d.status == 0) {
this.dataList = d.data;
this.dataList.map((item,index)=>{
let desc = JSON.parse(item.product_desc);
console.log(desc);
item.product_desc = desc;
});
console.log("返回信息", { ...d.data })
} else {
console.log(d.msg);
......@@ -316,9 +319,7 @@
adHeight(index, event){
this.current = index;
},
adHeight2(index, event){
this.current2 = index;
},
goVerification(){
let obj = {
cityname: this.cityName,
......@@ -334,5 +335,5 @@
}
},
vname: "gsb-jdicbc"
vname: "gsb-jdindustry"
}
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