提交 db11856f authored 作者: huaxinzhu's avatar huaxinzhu

添加商品样式调整,其他优化及bug修复

上级 704550a9
...@@ -280,13 +280,13 @@ ...@@ -280,13 +280,13 @@
toRegister() { toRegister() {
store.dispatch('LogOut').then(() => { store.dispatch('LogOut').then(() => {
var ssa = window.location.host; var ssa = window.location.host;
// window.location.href = 'http://sso.jxhh.com/logout?redirect=http://' + ssa
window.location.href = 'http://sso.jxhh.com/logout?redirect=http://' + window.location.host + '/platformlogin' window.location.href = 'http://sso.jxhh.com/logout?redirect=http://' + window.location.host + '/platformlogin'
}) })
}, },
// 去登录 // 去登录
toLogin() { toLogin() {
//window.location.href = 'http://sso.jxhh.com/logout?redirect=http://' + window.location.host + '/platformlogin' window.location.href = 'http://sso.jxhh.com/logout?redirect=http://' + window.location.host + '/platformlogin'
//http://sso.jxhh.com/logout?redirect=http://' + ssa + '/login
} }
} // methods end } // methods end
......
...@@ -275,7 +275,7 @@ ...@@ -275,7 +275,7 @@
} }
if( isabled < 0 ) { if( isabled < 0 ) {
this.$message({type: 'error',message: '【当前余额】不足以支付本次提现的手续费用,请您重新输入提现金额'}); this.$message({type: 'error',message: '本次操作提现后,【当前余额】不足以支付本次提现的手续费用,请您重新输入提现金额'});
return; return;
} }
......
...@@ -135,7 +135,7 @@ ...@@ -135,7 +135,7 @@
<style lang="scss" type="text/stylus" scoped> <style lang="scss" type="text/stylus" scoped>
.goods-after-sale { .goods-after-sale {
padding: 15px 0px; padding: 20px;
margin-top: 18px; margin-bottom:20px;
} }
</style> </style>
...@@ -169,8 +169,7 @@ ...@@ -169,8 +169,7 @@
</script> </script>
<style lang="scss" type="text/stylus" scoped> <style lang="scss" type="text/stylus" scoped>
.goods-img { .goods-img {
padding: 15px 0px; padding: 20px;
margin-top: 18px;
} }
.avatar-uploader2 { .avatar-uploader2 {
display : none; display : none;
......
...@@ -470,8 +470,8 @@ ...@@ -470,8 +470,8 @@
padding: 0; padding: 0;
} }
.goods-info { .goods-info {
padding: 15px 0px; padding: 20px;
margin-top: 18px; /*margin-top: 18px;*/
} }
.type-text-span { .type-text-span {
display: inline-block; display: inline-block;
......
...@@ -213,7 +213,7 @@ export default { ...@@ -213,7 +213,7 @@ export default {
}, },
watch:{ watch:{
'parameterdata': function(val) { 'parameterdata': function(val) {
debugger //debugger
this.orgGoodsPam = val; this.orgGoodsPam = val;
//console.log("监听",this.orgGoodsPam); //console.log("监听",this.orgGoodsPam);
}, },
...@@ -436,8 +436,8 @@ p { ...@@ -436,8 +436,8 @@ p {
margin: 0 0 20px 0; margin: 0 0 20px 0;
} }
.goods-parameter { .goods-parameter {
padding: 15px 0; padding: 20px;
margin-top: 18px;
} }
.edit-type-span { .edit-type-span {
......
...@@ -392,8 +392,8 @@ export default { ...@@ -392,8 +392,8 @@ export default {
</script> </script>
<style scoped> <style scoped>
.goods-specifications { .goods-specifications {
padding: 15px 0; padding: 20px;
margin-top: 18px; /*margin-top: 18px;*/
} }
.spe-con { .spe-con {
display: flex; display: flex;
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<!-- 选择商品类目 start --> <!-- 选择商品类目 start -->
<el-card class="good-all-type" v-if="!isShowGoodsDetails"> <el-card class="good-all-type" v-if="!isShowGoodsDetails">
<div slot="header" class="clearfix"> <div slot="header" class="clearfix">
<p class="card-header-title"><span class="blue-block-goods"></span>确认商品所在目录</p> <p class="card-header-title"><span class="blue-block-goods"></span>选择商品所属类目</p>
</div> </div>
<div> <div>
<div> <div>
...@@ -640,8 +640,9 @@ ...@@ -640,8 +640,9 @@
padding: 20px; padding: 20px;
} }
/deep/.goods-all .good-all-type { .goods-all .good-all-type {
height: 100%; height: 100%;
overflow: auto;
} }
/deep/.goods-all .el-card .el-card__body{ /deep/.goods-all .el-card .el-card__body{
...@@ -765,7 +766,7 @@ ...@@ -765,7 +766,7 @@
} }
.floor-item { .floor-item {
padding: 20px; padding: 0;
margin: 20px; margin: 20px;
color: #333; color: #333;
box-shadow: 0 2px 12px 0 rgba(0, 0, 0 ,0.1); box-shadow: 0 2px 12px 0 rgba(0, 0, 0 ,0.1);
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<div class="app-container"> <div class="app-container">
<el-card class="box-card"> <el-card class="box-card">
<div slot="header" class="clearfix">商品导入</div> <div slot="header" class="clearfix">商品导入</div>
<h3 class="cton_h3">已使用次数:{{collect_num}} / 1000次</h3> <h3 class="cton_h3">剩余次数:{{collect_num}} / 1000次</h3>
<div class="cton_text"> <div class="cton_text">
<p>功能介绍:</p> <p>功能介绍:</p>
<p> <p>
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论