Skip to content

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

1、订单、店铺、运费，bug修复，优化

上级 7ad35de0
隐藏空白字符变更
内嵌 并排
正在显示 包含 123 行增加 和 167 行删除
src/views/system/order/index.vue
浏览文件 @ 0a5a1e67
...@@ -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 slot="header" class="clearfix">
<el-form :model="queryParams" ref="queryForm" :inline="true" label-width="85px"> <el-form :model="queryParams" ref="queryForm" :inline="true" label-width="85px" class="queryFormInline">
<el-form-item label="付款状态" prop="payStatus"> <el-form-item label="付款状态" prop="payStatus">
<el-select v-model="queryParams.payStatus" placeholder="付款状态" size="small"> <el-select v-model="queryParams.payStatus" placeholder="付款状态" size="small">
<el-option v-for="item in payOptions" :key="item.value" :label="item.label" <el-option v-for="item in payOptions" :key="item.value" :label="item.label"
...@@ -165,8 +165,8 @@ ...@@ -165,8 +165,8 @@
:limit.sync="queryParams.pageSize" :limit.sync="queryParams.pageSize"
@pagination="getList" @pagination="getList"
/> />
<!-- 添加或修改折扣金额对话框 --> <!-- 详情 -->
<el-dialog :title="title" :visible.sync="open" width="80%" append-to-body> <el-dialog :title="title" :visible.sync="open" width="70%" append-to-body class="order-details">
<el-col :span="24" class="card-box" v-loading="loading"> <el-col :span="24" class="card-box" v-loading="loading">
<el-card> <el-card>
<div slot="header"> <div slot="header">
...@@ -396,32 +396,45 @@ ...@@ -396,32 +396,45 @@
</div> </div>
</el-dialog> </el-dialog>
<!-- 去发货 --> <!-- 去发货 -->
<el-dialog :title="title2" :visible.sync="open2" width="60%" append-to-body v-loading="loading"> <el-dialog :title="title2" :visible.sync="open2" width="60%" append-to-body v-loading="loading" style="height: 40%">
<el-form :model="sendGoods" ref="sendGoods" :inline="true"> <el-form :model="sendGoods" ref="sendGoods" label-width="100px;">
<el-form-item label="快递公司"> <el-row>
<el-select v-model="sendGoods.deliverName" filterable clearable placeholder="请选择快递公司" @change="selectValue"> <el-col :span="16" :offset="3">
<el-option v-for="item in expressList" :key="item.value" :label="item.label" <el-form-item label="快递公司" >
:value="item.value"></el-option> <el-select v-model="sendGoods.deliverName" filterable clearable placeholder="请选择快递公司" @change="selectValue" style="width:70%">
</el-select> <el-option v-for="item in expressList" :key="item.value" :label="item.label" size="small"
</el-form-item> :value="item.value"></el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-form-item label="快递单号" prop="Tel"> <el-row>
<el-input <el-col :span="16" :offset="3">
v-model="sendGoods.deliverNo" <el-form-item label="快递单号" prop="Tel">
placeholder="请输快递单号" <el-input
clearable v-model="sendGoods.deliverNo"
size="small" placeholder="请输快递单号"
/> clearable
</el-form-item> size="small"
style="width:70%"
/>
</el-form-item>
</el-col>
</el-row>
<el-form-item> <el-row :span="24">
<el-button type="primary" icon="el-icon-search" size="mini" @click="submitForm()">提交</el-button> <el-col :span="2" :offset="21">
</el-form-item> <el-form-item>
<el-button type="primary" @click="submitForm()">提 交</el-button>
</el-form-item>
</el-col>
</el-row>
</el-form> </el-form>
</el-dialog> </el-dialog>
<!-- 物流信息 --> <!-- 物流信息 -->
<el-dialog :title="title3" :visible.sync="open3" width="80%" append-to-body v-loading="loading"> <el-dialog :title="title3" :visible.sync="open3" width="60%" append-to-body v-loading="loading">
<el-timeline :reverse="reverse"> <el-timeline :reverse="reverse" style="padding: 10px 60px;">
<el-timeline-item <el-timeline-item
v-loading="loading" v-loading="loading"
v-for="(activity, index) in expressInfo" v-for="(activity, index) in expressInfo"
...@@ -470,8 +483,8 @@ ...@@ -470,8 +483,8 @@
}] }]
}, },
//------------------- //-------------------
fullHeight: '', fullHeight: 0,
tableHeight: 500, tableHeight: 0,
fullscreenLoading: false, fullscreenLoading: false,
// 时间线正序 // 时间线正序
reverse: false, reverse: false,
...@@ -568,7 +581,7 @@ ...@@ -568,7 +581,7 @@
}) })
}, },
watch: { watch: {
fullHeight(val, oldval) { fullHeight(val) {
let formHeight = document.getElementsByClassName('clearfix')[0].clientHeight let formHeight = document.getElementsByClassName('clearfix')[0].clientHeight
this.tableHeight = val - formHeight - 110 this.tableHeight = val - formHeight - 110
}, },
...@@ -719,21 +732,23 @@ ...@@ -719,21 +732,23 @@
} //methods结束 } //methods结束
}; };
</script> </script>
<style scoped> <style scoped lang="scss" type="text/stylus">
.app-container {
height: 100%;
}
.box-card {
height: 100%;
}
.box-card /deep/ .el-card__body { .order-details{
height: 100%; /deep/.el-dialog {
overflow: hidden; height: 80%;
overflow: hidden;
}
/deep/.el-dialog__body {
height: calc(100% - 120px);
overflow-x: hidden;
overflow-y: scroll;
}
} }
.el-table { /deep/.queryFormInline {
height: calc(100% - 120px); .el-form-item {
margin-bottom: 5px ;
}
} }
</style> </style>
src/views/system/retreat/address.vue
浏览文件 @ 0a5a1e67
...@@ -2,13 +2,21 @@ ...@@ -2,13 +2,21 @@
<div class="app-container"> <div class="app-container">
<el-card class="box-card"> <el-card class="box-card">
<div slot="header" class="clearfix"> <div slot="header" class="clearfix">
<el-form :model="queryParams" ref="queryForm" :inline="true" label-width="68px"> <el-form :model="queryParams" ref="queryForm" :inline="true" label-width="68px" class="queryFormInline">
<el-form-item> <el-row :span="24" type="flex" align="middle" justify="space-between">
<el-button type="primary" size="mini" icon="el-icon-plus" @click="handleAdd">新 增</el-button> <el-col :span="20">
</el-form-item> <span style="font-size: 18px; float:left;">售后地址列表</span>
</el-col>
<el-col :span="4">
<el-form-item style="float: right">
<el-button type="primary" size="mini" icon="el-icon-plus" @click="handleAdd">新 增</el-button>
</el-form-item>
</el-col>
</el-row>
</el-form> </el-form>
</div> </div>
<el-table v-loading="loading" :data="addressList"> <el-table v-loading="loading" :data="addressList" :height="tableHeight">
<el-table-column label="序号" prop="id" align="center"></el-table-column> <el-table-column label="序号" prop="id" align="center"></el-table-column>
<el-table-column label="售后地址" prop="address" align="center"> <el-table-column label="售后地址" prop="address" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
...@@ -35,7 +43,7 @@ ...@@ -35,7 +43,7 @@
/> />
</el-card> </el-card>
<!-- 新增、修改 --> <!-- 新增、修改 -->
<el-dialog :title="addTitle" :visible.sync="isOpen" width="50%"> <el-dialog :title="addTitle" :visible.sync="isOpen" width="50%" class="add-edit">
<el-form v-if="isOpen" :model="addressForm" :rules="addressRules" ref="addressForm" label-width="100px"> <el-form v-if="isOpen" :model="addressForm" :rules="addressRules" ref="addressForm" label-width="100px">
<el-row> <el-row>
<el-col :span="16" :offset="3"> <el-col :span="16" :offset="3">
...@@ -102,8 +110,8 @@ ...@@ -102,8 +110,8 @@
} }
}; };
return { return {
fullHeight: '', fullHeight: 0,
tableHeight: 500, tableHeight: 0,
areaList: [], // 省市区 areaList: [], // 省市区
props: { props: {
expandTrigger: 'click', expandTrigger: 'click',
...@@ -154,7 +162,7 @@ ...@@ -154,7 +162,7 @@
watch: { watch: {
fullHeight(val) { fullHeight(val) {
let formHeight = document.getElementsByClassName('clearfix')[0].clientHeight let formHeight = document.getElementsByClassName('clearfix')[0].clientHeight
this.tableHeight = val - formHeight - 110 this.tableHeight = val - formHeight - 120
} }
}, },
methods: { methods: {
...@@ -228,8 +236,6 @@ ...@@ -228,8 +236,6 @@
this.addTitle = "新增地址"; this.addTitle = "新增地址";
this.areaList = []; this.areaList = [];
this.resetForm('addressForm'); this.resetForm('addressForm');
console.log(230,this.addressForm);
}, },
handleDelete(row) { handleDelete(row) {
...@@ -322,20 +328,5 @@ ...@@ -322,20 +328,5 @@
</script> </script>
<style lang="scss" type="text/stylus" scoped> <style lang="scss" type="text/stylus" scoped>
.app-container {
height: 100%;
}
.box-card {
height: 100%;
}
.box-card /deep/ .el-card__body {
height: 100%;
overflow: hidden;
}
.el-table {
height: calc(100% - 137px);
overflow: scroll;
}
</style> </style>
src/views/system/retreat/retreat/index.vue
浏览文件 @ 0a5a1e67
...@@ -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 slot="header" class="clearfix">
<el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px"> <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px" class="queryFormInline">
<el-form-item label="申请时间" prop="applyTime"> <el-form-item label="申请时间" prop="applyTime">
<el-date-picker <el-date-picker
size="small" size="small"
...@@ -34,7 +34,6 @@ ...@@ -34,7 +34,6 @@
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button> <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button> <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
...@@ -70,7 +69,7 @@ ...@@ -70,7 +69,7 @@
@pagination="getList" @pagination="getList"
/> />
<!-- 售后申请信息对话框 --> <!-- 售后申请信息对话框 -->
<el-dialog :title="title" :visible.sync="open" width="80%" append-to-body> <el-dialog :title="title" :visible.sync="open" width="80%" append-to-body class="after-sales-details">
<el-col :span="24" class="card-box" v-loading="loading"> <el-col :span="24" class="card-box" v-loading="loading">
<el-card> <el-card>
<div slot="header"> <div slot="header">
...@@ -319,8 +318,8 @@ ...@@ -319,8 +318,8 @@
data() { data() {
return { return {
fullHeight: '', fullHeight: 0,
tableHeight: 500, tableHeight: 0,
//退货地址 //退货地址
address: [], address: [],
//提交信息 //提交信息
...@@ -424,13 +423,11 @@ ...@@ -424,13 +423,11 @@
this.$nextTick(() => { this.$nextTick(() => {
this.fullHeight = document.getElementsByClassName('box-card')[0].clientHeight this.fullHeight = document.getElementsByClassName('box-card')[0].clientHeight
}) })
}, },
watch: { watch: {
fullHeight(val, oldval) { fullHeight(val) {
// console.log(val)
let formHeight = document.getElementsByClassName('clearfix')[0].clientHeight let formHeight = document.getElementsByClassName('clearfix')[0].clientHeight
this.tableHeight = val - formHeight - 110 this.tableHeight = val - formHeight - 120
}, },
'queryParams.applyTime'() { 'queryParams.applyTime'() {
// select组件，clear的时候，将addTimeInterval的值，初始化为null，判断当其值为null时，赋值为数组 // select组件，clear的时候，将addTimeInterval的值，初始化为null，判断当其值为null时，赋值为数组
...@@ -678,21 +675,6 @@ ...@@ -678,21 +675,6 @@
} //methods结束 } //methods结束
}; };
</script> </script>
<style scoped> <style scoped lang="scss" type="text/stylus">
.app-container {
height: 100%;
}
.box-card {
height: 100%;
}
.box-card /deep/ .el-card__body {
height: 100%;
overflow: hidden;
}
.el-table {
height: calc(100% - 120px);
}
</style> </style>
src/views/system/shop/brand.vue
浏览文件 @ 0a5a1e67
...@@ -2,9 +2,9 @@ ...@@ -2,9 +2,9 @@
<div class="app-container"> <div class="app-container">
<el-card class="box-card"> <el-card class="box-card">
<div slot="header" class="clearfix"> <div slot="header" class="clearfix">
<el-form :model="queryParams" ref="queryForm" :inline="true"> <el-form class="queryFormInline" :model="queryParams" ref="queryForm" :inline="true">
<el-row> <el-row :span="24" type="flex" justify="space-between" align="middle">
<el-col :span="24"> <el-col :span="22">
<el-form-item label="品牌名称"> <el-form-item label="品牌名称">
<el-input <el-input
v-model="queryParams.brand_cn" v-model="queryParams.brand_cn"
...@@ -34,21 +34,19 @@ ...@@ -34,21 +34,19 @@
:value="item.value" :value="item.value"
></el-option> ></el-option>
</el-select> </el-select>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">查 询</el-button>
</el-form-item> </el-form-item>
</el-col>
<el-form-item> <el-col :span="2">
<el-form-item style="float: right">
<el-button type="primary" size="mini" icon="el-icon-plus" @click="handleAdd">新 增</el-button> <el-button type="primary" size="mini" icon="el-icon-plus" @click="handleAdd">新 增</el-button>
</el-form-item> </el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">查询</el-button>
</el-form-item>
</el-col> </el-col>
</el-row> </el-row>
</el-form> </el-form>
</div> </div>
<el-table v-loading="loading" :data="brandList"> <el-table v-loading="loading" :data="brandList" :height="tableHeight">
<el-table-column type="selection" width="45" align="center"/> <!-- <el-table-column type="selection" width="45" align="center"/>-->
<el-table-column label="序号" prop="id" align="center"></el-table-column> <el-table-column label="序号" prop="id" align="center"></el-table-column>
<el-table-column label="品牌名称" prop="brand_cn" align="center"></el-table-column> <el-table-column label="品牌名称" prop="brand_cn" align="center"></el-table-column>
<el-table-column label="品牌经营类型" prop="brand_type" align="center"> <el-table-column label="品牌经营类型" prop="brand_type" align="center">
...@@ -82,7 +80,7 @@ ...@@ -82,7 +80,7 @@
></pagination> ></pagination>
</el-card> </el-card>
<!-- 新增/修改/详情 --> <!-- 新增/修改/详情 -->
<el-dialog :title="brandTitle" :visible.sync="isOpen" width="60%" > <el-dialog :title="brandTitle" :visible.sync="isOpen" width="60%" class="brandInf-add">
<el-form :model="brandForm" :rules="brandRules" ref="brandForm" label-width="140px"> <el-form :model="brandForm" :rules="brandRules" ref="brandForm" label-width="140px">
<el-row> <el-row>
<el-col :span="16" :offset="3"> <el-col :span="16" :offset="3">
...@@ -358,8 +356,8 @@ ...@@ -358,8 +356,8 @@
} }
}; };
return { return {
fullHeight: '', fullHeight: 0,
tableHeight: 500, tableHeight: 0,
loading: false, loading: false,
isOpen: false, isOpen: false,
brandTitle: '', brandTitle: '',
...@@ -422,7 +420,6 @@ ...@@ -422,7 +420,6 @@
downTemplatehttp: '', downTemplatehttp: '',
shopTemplatehttp : 'http://img3.jxhh.com/shop/brand.doc', shopTemplatehttp : 'http://img3.jxhh.com/shop/brand.doc',
factoryTemplatehttp : 'http://img3.jxhh.com/shop/factory.doc', factoryTemplatehttp : 'http://img3.jxhh.com/shop/factory.doc',
} }
}, },
created() { created() {
...@@ -434,13 +431,8 @@ ...@@ -434,13 +431,8 @@
watch: { watch: {
fullHeight(val) { fullHeight(val) {
let formHeight = document.getElementsByClassName('clearfix')[0].clientHeight let formHeight = document.getElementsByClassName('clearfix')[0].clientHeight
this.tableHeight = val - formHeight - 110; this.tableHeight = val - formHeight - 100;
}, }
// 'brandForm.brand_auth'() {
// if(this.brandForm.brand_auth === '') {
// this.factoryImgFileList = [];
// }
// }
}, },
methods: { methods: {
...@@ -488,7 +480,6 @@ ...@@ -488,7 +480,6 @@
if(this.brandForm.brand_auth === '') { if(this.brandForm.brand_auth === '') {
this.factoryImgFileList = []; this.factoryImgFileList = [];
} }
//console.log("切换时候：",this.brandForm);
}, },
chooseBrandRange() { chooseBrandRange() {
this.$refs.brandForm.clearValidate('brand_range'); this.$refs.brandForm.clearValidate('brand_range');
...@@ -681,7 +672,6 @@ ...@@ -681,7 +672,6 @@
const ids = row.id; const ids = row.id;
getDetails(ids).then(res => { getDetails(ids).then(res => {
if(res.code && res.code === 1 && res.data) { if(res.code && res.code === 1 && res.data) {
//console.log("详情：",res.data);
this.brandForm = res.data; this.brandForm = res.data;
// 模板下载地址赋值 // 模板下载地址赋值
this.downTemplatehttp = (this.brandForm.brand_type === 1 ? this.shopTemplatehttp : this.factoryTemplatehttp); this.downTemplatehttp = (this.brandForm.brand_type === 1 ? this.shopTemplatehttp : this.factoryTemplatehttp);
...@@ -851,7 +841,6 @@ ...@@ -851,7 +841,6 @@
}).then(() => { }).then(() => {
this.edit(toArrBrandForm); this.edit(toArrBrandForm);
}).catch(() => { }).catch(() => {
//this.reset('brandForm');
this.isOpen = false; this.isOpen = false;
}); });
} }
...@@ -954,32 +943,16 @@ ...@@ -954,32 +943,16 @@
</script> </script>
<style lang="scss" type="text/stylus" scoped> <style lang="scss" type="text/stylus" scoped>
.app-container { .brandInf-add {
height: 100%; /deep/.el-dialog {
} height: 80%;
overflow : hidden;
.box-card { }
height: 100%; /deep/.el-dialog__body{
} height: calc(100% - 60px);
overflow-x: hidden;
.box-card /deep/ .el-card__body { overflow-y: scroll;
height: 100%; }
overflow: hidden;
}
.el-table {
height: calc(100% - 137px);
overflow: scroll;
}
/deep/ .el-dialog {
height: 80%;
overflow: hidden;
}
/deep/ .el-dialog__body {
height: 80%;
overflow-x: hidden;
overflow-y: scroll;
} }
.btnCen { .btnCen {
/deep/.el-form-item__content { /deep/.el-form-item__content {
......
src/views/system/shop/index.vue
浏览文件 @ 0a5a1e67
...@@ -7,8 +7,8 @@ ...@@ -7,8 +7,8 @@
当前审核状态：<span class="speDom">{{ reviewResult }}</span><span 当前审核状态：<span class="speDom">{{ reviewResult }}</span><span
style="display: block;width:20px;height:100%"></span> style="display: block;width:20px;height:100%"></span>
<span class="speTip">仅可修改店铺相关信息，企业主体信息不允许修改！</span></p> <span class="speTip">仅可修改店铺相关信息，企业主体信息不允许修改！</span></p>
<p style=""> <p>
<el-button type="primary" @click="handleEdit">编辑信息</el-button> <el-button size="small" icon="el-icon-edit" type="primary" @click="handleEdit">编辑信息</el-button>
</p> </p>
</div> </div>
</div> </div>
...@@ -223,7 +223,7 @@ ...@@ -223,7 +223,7 @@
</el-card> </el-card>
<!--编辑--> <!--编辑-->
<el-dialog :title="title" :visible.sync="isOpen" width="60%"> <el-dialog :title="title" :visible.sync="isOpen" width="60%" class="shopinf-edit">
<el-form ref="editForm" :model="editForm" :rules="eidtRules" label-width="180px"> <el-form ref="editForm" :model="editForm" :rules="eidtRules" label-width="180px">
<el-form-item label="电商平台经验：" prop="is_business_experience"> <el-form-item label="电商平台经验：" prop="is_business_experience">
...@@ -366,7 +366,7 @@ ...@@ -366,7 +366,7 @@
return { return {
loading: false, loading: false,
isOpen: false, isOpen: false,
reviewResult: '', reviewResult: '加载中。。',
title: '', title: '',
isMainItem: true,// 主体/企业信息 单项 是否可以修改，目前暂时不能 isMainItem: true,// 主体/企业信息 单项 是否可以修改，目前暂时不能
// 执照类型 // 执照类型
...@@ -862,23 +862,29 @@ ...@@ -862,23 +862,29 @@
</script> </script>
<style lang="scss" type="text/stylus" scoped> <style lang="scss" type="text/stylus" scoped>
.app-container {
height: 100%;
}
.box-card {
height: 100%;
/deep/ .el-card__body { .shopinf-edit{
height: calc(100% - 100px); /deep/.el-dialog {
height: 80%;
overflow : hidden;
}
/deep/.el-dialog__body{
height: calc(100% - 60px);
overflow-x: hidden; overflow-x: hidden;
overflow-y: scroll; overflow-y: scroll;
} }
}
/deep/ .el-card__body {
height: calc(100% - 80px);
margin: 10px 0;
overflow-x: hidden;
overflow-y: scroll;
} }
/deep/ .speDom { /deep/ .speDom {
color: red; color: red;
font-size: 22px; font-size: 20px;
margin: 0 0 4px 10px; margin: 0 0 4px 10px;
} }
...@@ -944,22 +950,11 @@ ...@@ -944,22 +950,11 @@
} }
// 提示语样式 end // 提示语样式 end
// 对话框出现滚动条
/deep/ .el-dialog {
height: 80%;
overflow: hidden;
}
/deep/ .el-dialog__body {
height: 80%;
overflow-x: hidden;
overflow-y: scroll;
}
.btnCen { .btnCen {
/deep/.el-form-item__content { /deep/.el-form-item__content {
margin-left: 0!important; margin-left: 0!important;
text-align : center; text-align : center;
margin-top: 30px; //margin-top: 30px;
} }
} }
</style> </style>
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论