Skip to content

S
shop-new
提交 428411d9 authored 作者: huaxinzhu's avatar huaxinzhu
浏览文件
操作

样式；路由调整

上级 ea451cb6
隐藏空白字符变更
内嵌 并排
正在显示 包含 57 行增加 和 35 行删除
src/views/system/goods/add/components/goodsaftersale.vue
浏览文件 @ 428411d9
......@@ -2,7 +2,7 @@
<div class="goods-after-sale">
<el-card class="box-card" ref="paramsvalue">
<div slot="header" class="clearfix">
<span>商品参数</span> <span style="font-size:13px;padding-left:20px;">参数名称/参数值</span>
<span>商品参数</span> <span style="font-size:13px;padding-left:20px;font-weight: 400;">参数名称/参数值</span>
</div>
<draggable :list="goodsAfterSaleForm.params" group="article" class="dragArea">
<div v-for="(element,index) in goodsAfterSaleForm.params" :key="index" class="list-complete-item">
......@@ -14,6 +14,7 @@
v-model="element.title"
maxlength="15"
show-word-limit
size="small"
></el-input>
</el-col>
<el-col :span="12" style="height:50px;">
......@@ -23,6 +24,7 @@
v-model="element.value"
maxlength="60"
show-word-limit
size="small"
></el-input>
</el-col>
<el-col :span="4" style="height:50px;">
......@@ -37,7 +39,7 @@
</div>
</draggable>
<el-button style="margin-left:50px;margin-bottom:30px;" type="primary" @click="addparameter">添加参数</el-button>
<el-button style="margin-left:50px;margin-bottom:30px;" type="primary" size="small" @click="addparameter">添加参数</el-button>
</el-card>
<el-form ref="goodsAfterSaleForm" :model="goodsAfterSaleForm" :rules="goodsAfterSaleRules" label-width="150px" size="small">
<el-card class="box-card" ref="salesvalue">
......@@ -282,9 +284,13 @@
}
.box-card{
margin-bottom: 20px;
//padding: 10px;
}
.box-card /deep/ .el-card__header{
background: #F1F1F6;
::v-deep .box-card .el-card__header{
border-bottom: none;
font-size: 18px;
font-weight: 500;
padding-left: 20px;
}
.curspor{
font-size: 16px;
......
src/views/system/goods/add/components/goodsimg2.vue
浏览文件 @ 428411d9
......@@ -116,11 +116,12 @@ export default {
<style scoped>
.goods-img {
padding: 20px;
background-color: #fff;
}
/deep/ .w-e-text-container {
::v-deep .w-e-text-container {
z-index: 1000 !important;
}
/deep/ .w-e-toolbar {
::v-deep .w-e-toolbar {
z-index: 1001 !important;
}
</style>
src/views/system/goods/add/components/goodsinfomation.vue
浏览文件 @ 428411d9
......@@ -23,7 +23,7 @@
</el-select>
<el-link class="edit-type-span el-icon-plus" type="primary" :underline="false" @click="toPage('brand')">新增品牌</el-link>
</el-form-item>
<el-form-item label="计量单位：" prop="metering_unit">
<el-form-item label="计量单位：">
<el-select v-model.trim="goodsInfoForm.metering_unit" placeholder="请选择商品计量单位" style="width: 420px;">
<el-option v-for="item in unitList" :key="item.id" :label="item.title" :value="item.id"></el-option>
</el-select>
......@@ -316,7 +316,7 @@
// goods_des: [{required: true, validator: goodsDecCheck, trigger: 'blur'}],
producing_area_id:[{required: true, message: '请选择商品产地', trigger: 'change'}],
deliver_area_id: [{ required: true, message: '请选择商品发货地', trigger: 'change' }],
metering_unit: [{ required: true, message: '商品单位不能为空', trigger: 'blur' }],
// metering_unit: [{ required: true, message: '商品单位不能为空', trigger: 'change' }],
goods_brand: [{ required: true, message: '请选择商品品牌', trigger: 'change' }],
imgs: [{ required: true, message: '请上传商品图片', validator: categoryIdCheck }]
},
......@@ -868,15 +868,15 @@
break;
}
case 'group' : {
this.$router.push({ path: '/system/setup/commodityGroup' });
this.$router.push({ path: '/system/settings/commodityGroup' });
break;
}
case 'supplier' : {
this.$router.push({ path: '/system/supplier' });
this.$router.push({ path: '/system/supplier/supplier' });
break;
}
case 'warehouse' : {
this.$router.push({ path: '/system/warehouse' });
this.$router.push({ path: '/system/warehouse/wareHouse' });
break;
}
}
......@@ -928,7 +928,8 @@
}
.goods-info {
padding: 20px;
padding: 20px 0;
background-color: #fff;
/*margin-top: 18px;*/
}
......
src/views/system/goods/add/components/goodsparameter.vue
浏览文件 @ 428411d9
......@@ -860,6 +860,7 @@ p {
}
.goods-parameter {
padding: 20px;
background-color: #fff;
}
.goods-parameter-spe {
......
src/views/system/goods/add/components/goodsspecifications.vue
浏览文件 @ 428411d9
......@@ -331,7 +331,7 @@ export default {
/** 规格参数 变化时，对数据进行处理后，再进行笛卡尔积算法，最终计算出商品售价的数据 */
specCalcResult() {
debugger
// debugger
// 商品规格原始数据
let specs_group = []
let orgSpeData = this.deepClone(this.speData);
......@@ -508,6 +508,7 @@ export default {
<style scoped>
.goods-specifications {
padding: 20px;
background-color: #fff;
/*margin-top: 18px;*/
}
.spe-con {
......
src/views/system/goods/add/index.vue
浏览文件 @ 428411d9
......@@ -18,7 +18,7 @@
</el-card>
<!-- 选择商品类目 end -->
<!-- 添加商品 start -->
<el-card class="box-card good-details-body" v-if="isShowGoodsDetails" v-loading="goodsLoading">
<div class="box-card good-details-body" v-if="isShowGoodsDetails" v-loading="goodsLoading">
<div class="floor-nav" id="floorNavList">
<ul class="nav-list">
<li class="nav-list-item" :class="{'floor-item-active': isFIActive === index}" v-for="(item, index) in floorNav" :key="item.id" @click="setFloorNavMountClick(index)">{{ item.name }}</li>
......@@ -75,7 +75,7 @@
<div class="submit-cont">
<el-button type="primary" style="padding: 10px 30px;" @click="save" v-preventReClick>提 交</el-button>
</div>
</el-card>
</div>
<!-- 添加商品 end -->
<!-- 查看各类价格说明 -->
<el-dialog
......@@ -257,6 +257,8 @@
});
}
// console.log(260,this.goodsinfodata.producing_area_id,this.goodsinfodata.deliver_area_id)
// 商品规格, 售价由规格决定
if(res.data.specs && res.data.specs.length > 0) {
this.specificationsdata = res.data.specs;
......@@ -991,7 +993,6 @@
</script>
<style scoped lang="scss" type="text/css">
.goods-all {
height: 100%;
padding: 20px;
......@@ -1002,7 +1003,7 @@
overflow: auto;
}
/deep/.goods-all .el-card .el-card__body{
::v-deep .goods-all .el-card .el-card__body{
height:100%;
overflow: auto;
}
......@@ -1011,15 +1012,15 @@
margin: 0;
padding: 0;
}
/* el-card title hxz 样式统一 */
/* el-card title 样式统一 */
.card-header-title {
display: flex;
flex-direction: row;
justify-content: start;
align-items: center;
font-size: 16px;
font-size: 18px;
color: #333;
font-weight: 400;
font-weight: 500;
height: 24px;
}
.blue-block-goods {
......@@ -1044,24 +1045,24 @@
margin: 25px 0;
}
/*------------ 联级面板样式重置 start ------------*/
/deep/.el-cascader-panel.is-bordered {
::v-deep .el-cascader-panel.is-bordered {
border: none;
}
/deep/.el-cascader-menu {
::v-deep .el-cascader-menu {
min-width: 280px;
border: none;
box-shadow: 0px 4px 9px 1px rgba(51, 51, 51, 0.09);
border-radius: 2px;
overflow: hidden;
}
/deep/.el-cascader-menu__wrap {
::v-deep .el-cascader-menu__wrap {
width: 280px;
height: 500px;
overflow: auto;
margin: 5px 0!important;
}
/* 很重要,不要问我为什么 */
/deep/.el-scrollbar:hover>.el-scrollbar__bar, /deep/.el-scrollbar:active>.el-scrollbar__bar, /deep/.el-scrollbar:focus>.el-scrollbar__bar {
::v-deep .el-scrollbar:hover>.el-scrollbar__bar, ::v-deep .el-scrollbar:active>.el-scrollbar__bar, ::v-deep .el-scrollbar:focus>.el-scrollbar__bar {
opacity: 0;
}
/*------------ 联级面板样式重置 end ---------------*/
......@@ -1074,6 +1075,7 @@
/* 电梯效果 样式 */
.floor-nav {
width: 100%;
background-color: #fff;
}
.floor-nav .nav-list {
padding: 0;
......@@ -1087,7 +1089,8 @@
font-size: 16px;
font-weight: 400;
color: #333333;
padding: 0 25px 15px;
padding: 15px 25px 15px;
//margin: 0 5px;
list-style: none;
vertical-align: middle;
align-self: center;
......@@ -1102,7 +1105,7 @@
}
.floor-item-box-title {
background: #F1F1F6;
background-color: #fff;
height: 45px;
}
.blue-block-goods-title {
......@@ -1111,9 +1114,9 @@
.good-details-body {
height: 100%;
}
/deep/.good-details-body .el-card__body {
::v-deep .good-details-body .el-card__body {
height: 100%;
padding: 15px 20px 0px 20px;
padding: 15px 0;
overflow: hidden;
}
......@@ -1124,24 +1127,33 @@
.floor-item {
padding: 0;
margin: 20px;
margin: 20px 15px 0 0;
color: #333;
box-shadow: 0 2px 12px 0 rgba(0, 0, 0 ,0.1);
}
.submit-type-con {
width: 236px;
margin: 0 auto 20px;
padding: 0 0 20px;
height: 60px;
width: calc(100% - 15px);
background-color: #fff;
display: flex;
justify-content: center;
align-items: center;
flex-direction: row;
margin-bottom: 20px;
border-radius: 4px;
}
.submit-cont {
width: calc(100% + 40px);
//width: calc(100% + 40px);
width: calc(100% - 27px);
background-color: #fff;
padding: 12px 0 8px;
margin-left: -20px;
display: flex;
flex-direction: row;
justify-content: center;
align-items: center;
/*align-content: center;*/
margin-left: 0;
border-radius: 4px;
box-shadow: 0 -8px 9px 1px rgba(51, 51, 51, 0.06);
}
.edit-type-span {
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论