Skip to content

Z
zhichan
Commit 6ec987b4 by 宋毅
Options

Merge branch 'igirl-channel-jdweb' of gitlab.gongsibao.com:jiangyong/zhichan… 

Merge branch 'igirl-channel-jdweb' of gitlab.gongsibao.com:jiangyong/zhichan into igirl-channel-jdweb
parents 9e3df3b9 1f224422
Showing with 189 additions and 73 deletions
igirl-channel-jdweb/.vscode/launch.json 0 → 100644
{
// 使用 IntelliSense 了解相关属性。
// 悬停以查看现有属性的描述。
// 欲了解更多信息，请访问: https://go.microsoft.com/fwlink/?linkid=830387
"version": "0.2.0",
"configurations": [
{
"type": "node",
"request": "launch",
"name": "Launch Program",
"program": "${workspaceFolder}/main.js"
}
]
}
\ No newline at end of file
igirl-channel-jdweb/app/front/entry/index.ejs
...@@ -22,7 +22,6 @@ ...@@ -22,7 +22,6 @@
<script src="/js/vue/axios.min.js"></script> <script src="/js/vue/axios.min.js"></script>
<script src="/js/vue/jquery.min.js"></script> <script src="/js/vue/jquery.min.js"></script>
<!-- 京东公共头部和尾部js链接 --> <!-- 京东公共头部和尾部js链接 -->
<script src="http://www.jdcloud.com/public/js/portalBar.js"></script>
<script> <script>
var appinfo = JSON.parse(unescape('<%=appinfo?appinfo:null%>')); var appinfo = JSON.parse(unescape('<%=appinfo?appinfo:null%>'));
//缓存当前的基础组件列表 //缓存当前的基础组件列表
...@@ -67,4 +66,5 @@ ...@@ -67,4 +66,5 @@
<script type="module" src="/js/index.js"></script> <script type="module" src="/js/index.js"></script>
</body> </body>
</html> </html>
\ No newline at end of file <script src="http://www.jdcloud.com/public/js/portalBar.js"></script>
\ No newline at end of file
igirl-channel-jdweb/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-jdweb/app/front/vues/pages/OAjdlist/OAjdlist.js
...@@ -18,16 +18,23 @@ ...@@ -18,16 +18,23 @@
businessType: [ businessType: [
{ {
value: 'zzzc', value: 'zzzc',
label: '自助注册' label: '自助申请'
}, },
{ {
value: 'zzfzzc', value: 'zzfzzc',
label: '专家辅助注册' label: '专家辅助申请'
},
{
value: 'dbsbzc',
label: '担保申请'
}, },
], ],
DeliveryStatus: [ DeliveryStatus: [
{ {
value: 'dfwsfw',
label: '待服务商服务'
},
{
value: 'dsccl', value: 'dsccl',
label: '待上传材料' label: '待上传材料'
}, },
...@@ -428,7 +435,7 @@ ...@@ -428,7 +435,7 @@
label: '已完成' label: '已完成'
}, },
], ],
hidePage:true, hidePage: true,
} }
}, },
...@@ -543,7 +550,9 @@ ...@@ -543,7 +550,9 @@
} }
}, },
showDetails(idx, row){ showDetails(idx, row){
if (row.deliveryStatus != "dqrfa") { if (row.deliveryStatus == 'dfwsfw') {
return false;
} else if (row.deliveryStatus != 'dqrfa') {
if (this.showReg(idx, row)) { if (this.showReg(idx, row)) {
return false return false
} }
...@@ -551,7 +560,6 @@ ...@@ -551,7 +560,6 @@
} else { } else {
return false; return false;
} }
}, },
showReg(idx, row){ showReg(idx, row){
if (row.itemCode == 'zzsbzc') { if (row.itemCode == 'zzsbzc') {
...@@ -597,8 +605,8 @@ ...@@ -597,8 +605,8 @@
this.tableData = d.data; this.tableData = d.data;
/* 没有分页参数 需要重新改*/ /* 没有分页参数 需要重新改*/
this.countPage = d.dataCount; this.countPage = d.dataCount;
this.countPage.length > 10 ? this.hidePage = false: this.hidePage = true; this.countPage.length > 10 ? this.hidePage = false : this.hidePage = true;
console.log(this.hidePage,`xxxxxxxxxxxxxxxxxxxxxxxxxxxx`); console.log(this.hidePage, `xxxxxxxxxxxxxxxxxxxxxxxxxxxx`);
d.data.map((item, index) => { d.data.map((item, index) => {
if (item.submitTime) { if (item.submitTime) {
item.submitTime = new Date(item.submitTime).toLocaleString('chinese', { hour12: false }); item.submitTime = new Date(item.submitTime).toLocaleString('chinese', { hour12: false });
......
igirl-channel-jdweb/app/front/vues/pages/jdindentdetail/jdindentdetail.css
.wrapper-bg{ .wrapper-bg {
width: 100%; width: 100%;
background: rgb(236, 238, 243); background: rgb(236, 238, 243);
} }
.jdindentdetail-warpper { .jdindentdetail-warpper {
background: #fff; background: #fff;
max-width:1320px; max-width: 1320px;
margin: 0 auto; margin: 0 auto;
} }
...@@ -59,6 +60,12 @@ ...@@ -59,6 +60,12 @@
padding: 0 20px; padding: 0 20px;
} }
#selftmreg .el-tag {
margin: 5px 0px;
background: none;
border-radius: 0;
}
.jdindentdetail-nav { .jdindentdetail-nav {
box-sizing: border-box; box-sizing: border-box;
padding-top: 17px; padding-top: 17px;
...@@ -518,38 +525,41 @@ ...@@ -518,38 +525,41 @@
.jdindentdetail-diag .el-dialog__header { .jdindentdetail-diag .el-dialog__header {
border-bottom: 1px solid #E8E8E8; border-bottom: 1px solid #E8E8E8;
} }
.jdindentdetail-warpper .categoryFrom .el-form-item__error { .jdindentdetail-warpper .categoryFrom .el-form-item__error {
left: 0 !important; left: 0 !important;
} }
.jdindentdetail-diag .el-drawer__open .el-drawer.rtl{ .jdindentdetail-diag .el-drawer__open .el-drawer.rtl {
width: 66%; width: 66%;
} }
.jdindentdetail-drawer .selftmreg_main .el-form-item{
.jdindentdetail-drawer .selftmreg_main .el-form-item {
margin-bottom: 20px !important; margin-bottom: 20px !important;
} }
.popannouncementsText{ .popannouncementsText {
line-height: 26px; line-height: 26px;
margin: 0 auto; margin: 0 auto;
font-size: 14px; font-size: 14px;
font-family: PingFangSC-Regular; font-family: PingFangSC-Regular;
font-weight: 400; font-weight: 400;
color: rgba(74,74,74,1); color: rgba(74, 74, 74, 1);
width: 100%; width: 100%;
padding: 0 20px; padding: 0 20px;
} }
#steps{ #steps {
display: block; display: block;
} }
#steps>div{
#steps>div {
width: 170px; width: 170px;
} }
.btnBottom>span{ .btnBottom>span {
position: absolute; position: absolute;
bottom: 0px; bottom: 0px;
left: 0px; left: 0px;
...@@ -560,11 +570,18 @@ ...@@ -560,11 +570,18 @@
border-top: 1px solid #dee0ed; border-top: 1px solid #dee0ed;
z-index: 9999; z-index: 9999;
} }
.btnBottom>span>button{
.btnBottom>span>button {
border-radius: 100px !important; border-radius: 100px !important;
} }
.el-dialog__wrapper{ .el-dialog__wrapper {
cursor: pointer; cursor: pointer;
} }
.eltag-item {
margin: 5px 0px;
background: none;
border-radius: 0;
}
\ No newline at end of file
igirl-channel-jdweb/app/front/vues/pages/jdindentdetail/jdindentdetail.html
...@@ -443,7 +443,7 @@ ...@@ -443,7 +443,7 @@
<br /> <br />
<br /> <br />
<span v-for="(nclThree,index2) in nclone.nclThree"> <span v-for="(nclThree,index2) in nclone.nclThree">
<el-tag key="nclThree.code" closable="true" <el-tag class="eltag-item" key="nclThree.code" closable="true"
@close="closeTag(nclThree,index,index2)"> @close="closeTag(nclThree,index,index2)">
{{nclThree.code}} {{nclThree.code}}
{{nclThree.name}} {{nclThree.name}}
......
igirl-channel-jdweb/app/front/vues/pages/jdindentlist/jdindentlist.css
...@@ -56,9 +56,11 @@ ...@@ -56,9 +56,11 @@
/* padding: 0 20px; */ /* padding: 0 20px; */
background: #eef2fb; background: #eef2fb;
} }
.jdindentlist-warpper .el-tabs--top{
.jdindentlist-warpper .el-tabs--top {
padding: 0 20px; padding: 0 20px;
} }
.jdindentlist-warpper .el-tabs__nav-scroll { .jdindentlist-warpper .el-tabs__nav-scroll {
margin: 0; margin: 0;
} }
...@@ -108,7 +110,7 @@ ...@@ -108,7 +110,7 @@
background: rgba(255, 255, 255, 1); background: rgba(255, 255, 255, 1);
color: #333333; color: #333333;
border:1px solid #3071fe; border: 1px solid #3071fe;
border-radius: 100px; border-radius: 100px;
width: 58px; width: 58px;
height: 28px; height: 28px;
...@@ -152,15 +154,21 @@ ...@@ -152,15 +154,21 @@
background: #ffffff; background: #ffffff;
max-height: 30%; max-height: 30%;
box-sizing: border-box; box-sizing: border-box;
border: 1px solid #ebeef5;
margin-bottom: 30px;
/* padding: 32px 25px 25px; */ /* padding: 32px 25px 25px; */
} }
.el-table .cell{ .jdindentlist-warpper .el-tabs__content{
background: #fff;
}
.jdindentlist-warpper .el-table .cell {
text-align: center; text-align: center;
display: -webkit-box; display: -webkit-box;
-webkit-box-orient: vertical; -webkit-box-orient: vertical;
-webkit-line-clamp: 1; -webkit-line-clamp: 1;
overflow: hidden; overflow: hidden;
} }
.jdindentlist-list .el-table th>.cell { .jdindentlist-list .el-table th>.cell {
text-align: center; text-align: center;
font-size: 14px; font-size: 14px;
...@@ -174,9 +182,13 @@ ...@@ -174,9 +182,13 @@
} }
.jdindentlist-list-page { .jdindentlist-list-page {
margin-top: 25px; height: 47.4px;
width: 100%; width: 100%;
text-align: center; box-sizing: border-box;
display: flex;
align-items: center;
justify-content: center;
background: #EBEEF5;
} }
.jdindentlist-list .subtime { .jdindentlist-list .subtime {
...@@ -205,24 +217,37 @@ ...@@ -205,24 +217,37 @@
justify-content: space-around; justify-content: space-around;
} }
.dailogButton{ .dailogButton {
width: 100%; width: 100%;
text-align:left; text-align: left;
padding:10px 20px 20px; padding: 10px 20px 20px;
position: absolute; position: absolute;
bottom: 0; bottom: 0;
left: 0; left: 0;
box-sizing: border-box; box-sizing: border-box;
border-top: 1px solid #dee0eb; border-top: 1px solid #dee0eb;
} }
.dailogButton>button{
.dailogButton>button {
border-radius: 100px; border-radius: 100px;
padding: 6px 28px; padding: 6px 28px;
} }
.el-table_1_column_12>.cell{ .jdindentlist-tablecolumn-handle>.cell {
display: -webkit-box; display: -webkit-box;
-webkit-box-orient: vertical; -webkit-box-orient: vertical;
-webkit-line-clamp: 2; -webkit-line-clamp: 2 !important;
overflow: hidden; overflow: hidden;
} }
.jdindentlist-warpper .el-button {
background: none;
color: none;
}
.jdindentlist-warpper .el-button:hover {
background: none;
color: none;
}
\ No newline at end of file
igirl-channel-jdweb/app/front/vues/pages/jdindentlist/jdindentlist.js
...@@ -18,16 +18,24 @@ ...@@ -18,16 +18,24 @@
businessType: [ businessType: [
{ {
value: 'zzzc', value: 'zzzc',
label: '自助注册' label: '自助申请'
}, },
{ {
value: 'zzfzzc', value: 'zzfzzc',
label: '专家辅助注册' label: '专家辅助申请'
},
{
value: 'dbsbzc',
label: '担保申请'
}, },
], ],
DeliveryStatus: [ DeliveryStatus: [
{ {
value: 'dfwsfw',
label: '待服务商服务'
},
{
value: 'dsccl', value: 'dsccl',
label: '待上传材料' label: '待上传材料'
}, },
...@@ -57,6 +65,7 @@ ...@@ -57,6 +65,7 @@
label: '已完成' label: '已完成'
}, },
], ],
indentInfo: { indentInfo: {
"channelServiceNo": "", "channelServiceNo": "",
...@@ -428,7 +437,7 @@ ...@@ -428,7 +437,7 @@
label: '已完成' label: '已完成'
}, },
], ],
hidePage:true, hidePage: true,
} }
}, },
...@@ -543,7 +552,9 @@ ...@@ -543,7 +552,9 @@
} }
}, },
showDetails(idx, row){ showDetails(idx, row){
if (row.deliveryStatus != "dqrfa") { if (row.deliveryStatus == 'dfwsfw') {
return false;
} else if (row.deliveryStatus != 'dqrfa') {
if (this.showReg(idx, row)) { if (this.showReg(idx, row)) {
return false return false
} }
...@@ -551,7 +562,6 @@ ...@@ -551,7 +562,6 @@
} else { } else {
return false; return false;
} }
}, },
showReg(idx, row){ showReg(idx, row){
if (row.itemCode == 'zzsbzc') { if (row.itemCode == 'zzsbzc') {
...@@ -594,12 +604,16 @@ ...@@ -594,12 +604,16 @@
this.$root.loading = false; this.$root.loading = false;
console.log(d.data); console.log(d.data);
if (d.status == 0 && d.data) { if (d.status == 0 && d.data) {
console.log(d.data,"12313213"); console.log(d.data, "12313213");
this.tableData = d.data; this.tableData = d.data;
/* 没有分页参数 需要重新改*/ /* 没有分页参数 需要重新改*/
this.countPage = d.dataCount; this.countPage = d.dataCount;
this.countPage.length > 10 ? this.hidePage = false: this.hidePage = true; /**
* this.countPage.length > 10 ? this.hidePage = false: this.hidePage = true;
console.log(this.hidePage,`xxxxxxxxxxxxxxxxxxxxxxxxxxxx`); console.log(this.hidePage,`xxxxxxxxxxxxxxxxxxxxxxxxxxxx`);
*
*/
d.data.map((item, index) => { d.data.map((item, index) => {
if (item.submitTime) { if (item.submitTime) {
item.submitTime = new Date(item.submitTime).toLocaleString('chinese', { hour12: false }); item.submitTime = new Date(item.submitTime).toLocaleString('chinese', { hour12: false });
...@@ -613,7 +627,6 @@ ...@@ -613,7 +627,6 @@
} }
}); });
} else { } else {
this.hidePage = true;
console.log(d, "getTmOrderList..........."); console.log(d, "getTmOrderList...........");
} }
}); });
......
igirl-channel-jdweb/app/front/vues/pages/jdregscheme/jdregscheme.css
...@@ -66,3 +66,10 @@ ...@@ -66,3 +66,10 @@
margin-left: 11px; margin-left: 11px;
} }
.jdregscheme h4{
margin: 15px 0 ;
}
.jdregscheme .demo-ruleForm{
}
\ No newline at end of file
igirl-channel-jdweb/app/front/vues/pages/jdregscheme/jdregscheme.html
...@@ -2,17 +2,25 @@ ...@@ -2,17 +2,25 @@
<el-form ref="form" :rules="rules" :model="form" class="demo-ruleForm" <el-form ref="form" :rules="rules" :model="form" class="demo-ruleForm"
style="background:rgba(249,249,249,1);padding: 30px" label-width="120px"> style="background:rgba(249,249,249,1);padding: 30px" label-width="120px">
<div class="selftmreg_main" style="width: 96%;margin: 0 auto;padding:0 50px;background: #fff"> <div class="selftmreg_main" style="width: 1320px;margin: 0 auto;background: #fff">
<div class="jdregscheme-nav" style="padding-top: 20px"> <div class="jdregscheme-nav" style="padding-top: 20px">
<!-- <span style="float: left;line-height: 22px;color:rgba(130,130,130,1);">当前位置：</span> --> <!-- <span style="float: left;line-height: 22px;color:rgba(130,130,130,1);">当前位置：</span> -->
<!-- <el-breadcrumb separator-class="el-icon-arrow-right" style="float: left;line-height:22px"> <div class="jdindentdetail-nav">
<el-breadcrumb-item><a style="color:rgba(130,130,130,1);">我的订单</a></el-breadcrumb-item> <div style="background:#ffffff;
<el-breadcrumb-item :to="{ path: \'/1688/jdindentlist\' }"> border:3px solid #3071fe;
<a style="font-weight:800">确认注册方案</a> width:6px;
</el-breadcrumb-item> height:6px;
</el-breadcrumb> --> border-radius:100%;
<a style="font-weight:800">确认注册方案</a> margin: 0 10px 0 0;
<div style="clear:both"></div> display: inline-block;">
</div>
<span>当前位置：</span>
<el-breadcrumb separator-class="el-icon-arrow-right">
<el-breadcrumb-item :to="listPath">交付中心
</el-breadcrumb-item>
<el-breadcrumb-item>确认注册方案</el-breadcrumb-item>
</el-breadcrumb>
</div>
<div class="selftmreg_shu"></div> <div class="selftmreg_shu"></div>
</div> </div>
<div style="display:inline-block;margin-right:10px;"> <div style="display:inline-block;margin-right:10px;">
...@@ -113,13 +121,15 @@ ...@@ -113,13 +121,15 @@
</div> </div>
<div style="clear:both"></div> <div style="clear:both"></div>
</div> </div>
<h4><i class="selftmreg_shuxian"></i>材料信息</h4> <h4
v-show="applyInfo.businessLicensePic || applyInfo.identityCardPic||applyInfo.gzwtsUrl||applyInfo.smwjUrl">
<i class="selftmreg_shuxian"></i>材料信息</h4>
<div style="font-size:14px;font-family:PingFangSC-Regular; font-weight:400;"> <div style="font-size:14px;font-family:PingFangSC-Regular; font-weight:400;">
<div style="width: 100%;margin-bottom: 23px;padding-left: 40px;box-sizing: border-box;"> <div style="width: 100%;margin-bottom: 23px;padding-left: 40px;box-sizing: border-box;">
<div v-if="applyInfo.businessLicensePic" <div v-if="applyInfo.businessLicensePic"
style="display:inline-block;padding-left:10px;cursor: pointer;margin-right:50px"> style="display:inline-block;padding-left:10px;cursor: pointer;margin-right:50px">
<img @click="window.open(applyInfo.businessLicensePic)" v-if="applyInfo.businessLicensePic" <img @click="window.open(applyInfo.businessLicensePic)" v-if="applyInfo.businessLicensePic"
src="/imgs/sbzc/yyzzD.png" :src="applyInfo.businessLicensePic"
style="margin-bottom:10px;height:112px;width:81px;border: 2px dashed rgb(233, 233, 233);display: block"> style="margin-bottom:10px;height:112px;width:81px;border: 2px dashed rgb(233, 233, 233);display: block">
<span style="font-size:14px;font-family:PingFangSC-Regular,PingFang SC;font-weight:400; <span style="font-size:14px;font-family:PingFangSC-Regular,PingFang SC;font-weight:400;
color:#373737; color:#373737;
...@@ -128,7 +138,7 @@ ...@@ -128,7 +138,7 @@
<div v-if="deliveryInfo.gzwtsUrl" <div v-if="deliveryInfo.gzwtsUrl"
style="position: relative;display:inline-block;padding-left:10px;cursor: pointer;margin-right: 50px"> style="position: relative;display:inline-block;padding-left:10px;cursor: pointer;margin-right: 50px">
<img @click="window.open(deliveryInfo.gzwtsUrl)" v-if="deliveryInfo.gzwtsUrl" <img @click="window.open(deliveryInfo.gzwtsUrl)" v-if="deliveryInfo.gzwtsUrl"
src="/imgs/sbzc/wtsD.png" :src="deliveryInfo.gzwtsUrl"
style="margin-bottom:10px;height:112px;width:81px;border: 2px dashed rgb(233, 233, 233);display: block"> style="margin-bottom:10px;height:112px;width:81px;border: 2px dashed rgb(233, 233, 233);display: block">
<span style="font-size:14px;font-family:PingFangSC-Regular,PingFang SC;font-weight:400; <span style="font-size:14px;font-family:PingFangSC-Regular,PingFang SC;font-weight:400;
color:#373737; color:#373737;
......
igirl-channel-jdweb/app/front/vues/pages/jdregscheme/jdregscheme.js
...@@ -64,6 +64,13 @@ ...@@ -64,6 +64,13 @@
}; };
return { return {
ldms: [], ldms: [],
listPath: {
path: `/${this.$root.channelName}/jdindentlist`,
query: {
channelUserId: this.$route.query.channelUserId,
deliveryOrderNo: this.deliveryOrderNo,
}
},
form: { form: {
tmFormType: 3, tmFormType: 3,
name: "", name: "",
...@@ -136,7 +143,7 @@ ...@@ -136,7 +143,7 @@
methods: { methods: {
submitForm(){ submitForm(){
this.apply.centerDialogVisible = false; this.apply.centerDialogVisible = false;
console.log(this.values, `zzzzzzzzzzzzzzzzzzzzzzzz`); console.log(this.values,this.$route.query.channelUserId,`zzzzzzzzzzzzzzzzzzzzzzzz`);
var obj = {}; var obj = {};
obj.deliveryOrderNo = this.deliveryOrderNo; obj.deliveryOrderNo = this.deliveryOrderNo;
obj.channelUserId = this.$root.channelUserId; obj.channelUserId = this.$root.channelUserId;
...@@ -149,7 +156,7 @@ ...@@ -149,7 +156,7 @@
}); });
return; return;
} }
var obj = this.$root.copyParams(obj, "tmConfirm", "/action/tmOrder/springBoard"); var obj = this.$root.copyParams(obj, "tmConfirm", "/action/tmOrder/springBoard","yes","yes");
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.$router.push({ this.$router.push({
...@@ -172,7 +179,7 @@ ...@@ -172,7 +179,7 @@
obj.deliveryOrderNo = this.deliveryOrderNo; obj.deliveryOrderNo = this.deliveryOrderNo;
obj.channelUserId = this.$root.channelUserId; obj.channelUserId = this.$root.channelUserId;
obj.isConfirm = "1"; obj.isConfirm = "1";
var obj = this.$root.copyParams(obj, "tmConfirm", "/action/tmOrder/springBoard"); var obj = this.$root.copyParams(obj, "tmConfirm", "/action/tmOrder/springBoard","yes","yes");
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.$message({ this.$message({
......
igirl-channel-jdweb/app/front/vues/pages/jdtrademark/jdtrademark.css
...@@ -151,8 +151,9 @@ li { ...@@ -151,8 +151,9 @@ li {
} }
.brandreg-swiper .swiper-container { .brandreg-swiper .swiper-container {
width: 1200px; width: 1203px;
height: 380px; height: 380px;
padding-left: 3px ;
} }
.brandreg-swiper .swiper-wrapper { .brandreg-swiper .swiper-wrapper {
...@@ -166,7 +167,7 @@ li { ...@@ -166,7 +167,7 @@ li {
height: 370px; height: 370px;
text-align: center; text-align: center;
margin-right: 0 !important; margin-right: 0 !important;
transition: all .3s; transition: all .1s;
box-shadow: 0px 2px 4px 0px rgba(0, 0, 0, 0.1); box-shadow: 0px 2px 4px 0px rgba(0, 0, 0, 0.1);
border-radius: 1px; border-radius: 1px;
} }
...@@ -180,6 +181,8 @@ li { ...@@ -180,6 +181,8 @@ li {
height: 80px; height: 80px;
background: #32b6e7; background: #32b6e7;
color: #fff; color: #fff;
font-size: 18px;
line-height: 80px;
} }
.brandreg-swiper .brandreg-swiper-content-button-enter { .brandreg-swiper .brandreg-swiper-content-button-enter {
...@@ -204,22 +207,26 @@ li { ...@@ -204,22 +207,26 @@ li {
} }
.brandreg-swiper-hearder { .brandreg-swiper-hearder {
display: flex; font-size: 16px;
box-sizing: border-box;
padding-left: 100px;
align-items: center;
height: 70px; height: 70px;
background: #2F3353; background: #2F3353;
color: #fff; color: #fff;
} }
.brandreg-swiper-hearder>div{
.brandreg-swiper-hearder>div:nth-child(1) { width: 100%;
height: 100%;
line-height:70px ;
}
.brandreg-swiper-hearder>div>div{
display: inline-block;
}
.brandreg-swiper-hearder>div>div:nth-child(1) {
width: 39px; width: 39px;
height: 39px; height: 39px;
margin-right: 15px; margin-right: 15px;
} }
.brandreg-swiper-hearder>div:nth-child(1)>img { .brandreg-swiper-hearder>div>div:nth-child(1)>img {
width: 100%; width: 100%;
height: 100%; height: 100%;
} }
......
igirl-channel-jdweb/app/front/vues/pages/jdtrademark/jdtrademark.html
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
</div> </div>
</div> </div>
<div class="brandreg"> <div class="brandreg">
<div style="width: 1200px;margin: 30px auto 0;"> <div style="width:1200px;margin: 30px auto ;">
<div class="brand" style="width:100%;"> <div class="brand" style="width:100%;">
<div style="width:1200px;margin:0 auto"> <div style="width:1200px;margin:0 auto">
<div style="width:1200px"> <div style="width:1200px">
...@@ -48,7 +48,8 @@ ...@@ -48,7 +48,8 @@
</div> </div>
</div> </div>
<!-- 轮播部分 --> <!-- 轮播部分 -->
<div class="brandreg-swiper" @mouseenter="dataList.length>3 ? showArrows = true : showArrows=false"> <div class="brandreg-swiper swiper-no-swiping"
@mouseenter="dataList.length>3 ? showArrows = true : showArrows=false">
<div class="swiper-container"> <div class="swiper-container">
<div class="swiper-wrapper"> <div class="swiper-wrapper">
<div class="swiper-slide" v-for="(item, index) in dataList" <div class="swiper-slide" v-for="(item, index) in dataList"
...@@ -57,11 +58,14 @@ ...@@ -57,11 +58,14 @@
<div class="brandreg-swiper-hearder" <div class="brandreg-swiper-hearder"
:class="{\'brandreg-swiper-hearder-enter\':index==current}"> :class="{\'brandreg-swiper-hearder-enter\':index==current}">
<div> <div>
<img :src="item.productLogo" alt=""> <div>
</div> <img :src="item.productLogo" alt="">
<div> </div>
{{item.itemName}} <div>
{{item.itemName}}
</div>
</div> </div>
</div> </div>
<div class="brandreg-swiper-content"> <div class="brandreg-swiper-content">
<ul> <ul>
......
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