Skip to content

I
integral-mall
Commit 976c3a51 by damodmg
Options

add：订单页面

parent 349ebe43
Showing with 376 additions and 56 deletions
dist/index.html
<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><link rel=stylesheet type=text/css href=./static/css/iconfont.css><link rel=stylesheet type=text/css href=./static/css/common.css><link rel="shortcut icon" type=image/x-icon href=./static/img/favicon.ico><title>微商城</title><link href=./static/css/app.c56e4817bf8f37869a9904b78c5e1e1c.css rel=stylesheet></head><body><div id=app></div><script src=//web-1251519181.file.myqcloud.com/lib/vue/2.5.2/vue.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/vue-router/3.0.2/vue-router.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/vuex/3.1.0/vuex.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/elementUI/index.2.5.4.js></script><script src=//web-1251519181.file.myqcloud.com/components/header.2.0.18.js></script><script src=//web-1251519181.file.myqcloud.com/components/aside-menu.2.0.02.js></script><script src=//web-1251519181.file.myqcloud.com/components/footer.2.0.02.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-linkage.2.0.00.js></script><script src=//web-1251519181.file.myqcloud.com/components/card.2.0.01.js></script><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.2a66e15144de1c0f565b.js></script><script type=text/javascript src=./static/js/app.906cb0f4bd6b9976c769.js></script></body></html> <!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><link rel=stylesheet type=text/css href=./static/css/iconfont.css><link rel=stylesheet type=text/css href=./static/css/common.css><link rel="shortcut icon" type=image/x-icon href=./static/img/favicon.ico><title>微商城</title><link href=./static/css/app.650a9746aa8a2ff40ac133a3edd04641.css rel=stylesheet></head><body><div id=app></div><script src=//web-1251519181.file.myqcloud.com/lib/vue/2.5.2/vue.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/vue-router/3.0.2/vue-router.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/vuex/3.1.0/vuex.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/elementUI/index.2.5.4.js></script><script src=//web-1251519181.file.myqcloud.com/components/header.2.0.18.js></script><script src=//web-1251519181.file.myqcloud.com/components/aside-menu.2.0.02.js></script><script src=//web-1251519181.file.myqcloud.com/components/footer.2.0.02.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-linkage.2.0.00.js></script><script src=//web-1251519181.file.myqcloud.com/components/card.2.0.01.js></script><script src=//web-1251519181.file.myqcloud.com/components/export-excel.2.0.02.js></script><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.2a66e15144de1c0f565b.js></script><script type=text/javascript src=./static/js/app.0ec41083027d41bdd5c7.js></script></body></html>
\ No newline at end of file \ No newline at end of file
dist/static/css/app.650a9746aa8a2ff40ac133a3edd04641.css 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/css/app.c56e4817bf8f37869a9904b78c5e1e1c.css deleted 100644 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
index.html
...@@ -21,6 +21,7 @@ ...@@ -21,6 +21,7 @@
<script src="//web-1251519181.file.myqcloud.com/components/footer.2.0.02.js"></script> <script src="//web-1251519181.file.myqcloud.com/components/footer.2.0.02.js"></script>
<script src='//web-1251519181.file.myqcloud.com/components/store-linkage.2.0.00.js'></script> <script src='//web-1251519181.file.myqcloud.com/components/store-linkage.2.0.00.js'></script>
<script src="//web-1251519181.file.myqcloud.com/components/card.2.0.01.js"></script> <script src="//web-1251519181.file.myqcloud.com/components/card.2.0.01.js"></script>
<script src="//web-1251519181.file.myqcloud.com/components/export-excel.2.0.02.js"></script>
<!-- <script src="//web-1251519181.cos.ap-shanghai.myqcloud.com/components/space.2.0.00.js"></script> --> <!-- <script src="//web-1251519181.cos.ap-shanghai.myqcloud.com/components/space.2.0.00.js"></script> -->
<!-- built files will be auto injected --> <!-- built files will be auto injected -->
</body> </body>
......
src/views/order/couponExchange.vue
...@@ -11,13 +11,16 @@ ...@@ -11,13 +11,16 @@
<span>礼品兑换</span> <span>礼品兑换</span>
</h3> </h3>
</div> </div>
<el-tabs v-model="activeName" class="bread-content"> <el-tabs v-model="orderStatus" class="bread-content" @tab-click="handleClick">
<div style="height:24px;background:#f0f2f5;"></div> <div style="height:24px;background:#f0f2f5;"></div>
<div> <div>
<div class="operate-top"> <div class="operate-top">
<div class="fl"> <div class="fl">
<div class="search-item"> <div class="search-item">
<el-select v-model="changeType" placeholder="配送方式" clearable> <el-date-picker class="date-picker" @change="changeTime" v-model="dateValue" type="datetimerange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
</div>
<div class="search-item">
<el-select v-model="changeType" placeholder="配送方式" clearable @change="getList">
<el-option label="物流发货" :value="2"></el-option> <el-option label="物流发货" :value="2"></el-option>
<el-option label="在线发货（虚拟商品）" :value="3"></el-option> <el-option label="在线发货（虚拟商品）" :value="3"></el-option>
</el-select> </el-select>
...@@ -27,19 +30,16 @@ ...@@ -27,19 +30,16 @@
</div> </div>
</div> </div>
<div class="fr"> <div class="fr">
<el-button type="primary">批量发货</el-button>
<el-button plain><i class="iconfont icon-icon_yunxiazai" style="margin-right:5px"></i>导出订单</el-button> <el-button plain><i class="iconfont icon-icon_yunxiazai" style="margin-right:5px"></i>导出订单</el-button>
</div> </div>
</div> </div>
</div> </div>
<el-tab-pane label="全部" name="first" class="goods-table-content"> </el-tab-pane> <el-tab-pane label="全部" name="-1" class="goods-table-content"> </el-tab-pane>
<el-tab-pane label="待付款" name="second" class="goods-table-content"> </el-tab-pane> <el-tab-pane label="待付款" name="11" class="goods-table-content"> </el-tab-pane>
<el-tab-pane :label="'待发货' + '(' + deliverNum + ')'" name="third" class="goods-table-content"> </el-tab-pane> <el-tab-pane label="已付款" name="3" class="goods-table-content"> </el-tab-pane>
<el-tab-pane label="已发货" name="fouth" class="goods-table-content"> </el-tab-pane>
<el-tab-pane label="交易成功" name="fifth" class="goods-table-content"> </el-tab-pane>
<el-tab-pane label="交易关闭" name="sixth" class="goods-table-content"> </el-tab-pane>
<div class="goods-list-content"> <div class="goods-list-content">
<el-table :data="tableData" ref="multipleTable" style="width: 100%"> <el-table :data="tableData" ref="multipleTable" style="width: 100%" @sort-change="sortChange" v-loading="loading">
<el-table-column type="selection" width="40"> </el-table-column> <el-table-column type="selection" width="40"> </el-table-column>
<el-table-column label="礼品信息" min-width="320px"> <el-table-column label="礼品信息" min-width="320px">
<template slot-scope="scope"> <template slot-scope="scope">
...@@ -101,8 +101,8 @@ ...@@ -101,8 +101,8 @@
</template> </template>
<script> <script>
// import qs from 'qs'; import qs from 'qs';
// import request from '../../../service/request.js'; import request from '../../service/request.js';
import getInputVal from '../../utils/common.js'; import getInputVal from '../../utils/common.js';
export default { export default {
...@@ -110,43 +110,97 @@ export default { ...@@ -110,43 +110,97 @@ export default {
return { return {
getTime: getInputVal.getTime, getTime: getInputVal.getTime,
getSeconds: getInputVal.getSeconds, getSeconds: getInputVal.getSeconds,
activeName: 'first', getTimeAll: getInputVal.formatDate,
activeName: '-1',
currentPage: 1, currentPage: 1,
pageSizes: [20, 30, 50], pageSizes: [20, 30, 50],
pageSize: 20, pageSize: 20,
total: 0, total: 0,
tableData: [ tableData: [],
{
giftMainPic: 'https://pic01-10001430.image.myqcloud.com/3e2968e6-e033-4003-9f32-8486d109b014',
giftName: '天天',
createTime: 1546484379000,
definedCode: '2019010300000003',
memberName: 'test',
cardNum: 'dm20****1517',
proDisplayType: 1
}
],
deliverNum: 0, deliverNum: 0,
searchValue: '', searchValue: '',
changeType: '', //配送方式 changeType: '', //配送方式
windowUrl: window.location.origin windowUrl: window.location.origin,
orderStatus: '-1',
dateValue: [new Date() - 90 * 24 * 60 * 60 * 1000, new Date().valueOf()]
}; };
}, },
created() {
this.getList();
},
methods: { methods: {
// tab切换 // tab切换
// handleClick(tab) { handleClick(tab) {
this.orderStatus = tab.name;
// }, this.getList();
},
// 搜索
handleInputSearch() {
this.currentPage = 1;
this.getList();
},
// 分页 // 分页
handleSizeChange(size) { handleSizeChange(size) {
//设置每页条数 //设置每页条数
this.pageSize = size; this.pageSize = size;
// this.getList(); this.getList();
}, },
handleCurrentChange(page) { handleCurrentChange(page) {
//设置跳到第几页 //设置跳到第几页
this.currentPage = page; this.currentPage = page;
// this.getList(); this.getList();
},
// 排序
sortChange(value) {
this.sortColumn = value.prop;
if (value.order == 'ascending') {
this.sortType = 'asc';
} else if (value.order == 'descending') {
this.sortType = 'desc';
}
this.getList();
},
// 时间改变
changeTime() {
if (this.dateValue) {
this.beginTime = this.getTimeAll(this.dateValue[0]);
this.endTime = this.getTimeAll(this.dateValue[1]);
} else {
this.beginTime = '';
this.endTime = '';
}
this.getList();
},
//获取列表
getList() {
this.beginTime = this.dateValue ? this.getTimeAll(this.dateValue[0]) : '';
this.endTime = this.dateValue ? this.getTimeAll(this.dateValue[1]) : '';
let params = {
currentPage: this.currentPage,
pageSize: this.pageSize,
changeType: this.changeType === '' ? '-1' : this.changeType,
orderStatus: this.orderStatus,
searchParams: this.searchValue,
pageType: 1,
beginTime: this.beginTime,
endTime: this.endTime,
sortType: this.sortType
};
this.loading = true;
request.post('/api-integral-mall/page-undeliver', qs.stringify(params)).then(res => {
if (res.data.errorCode === 0) {
if (res.data.result.rows) {
this.tableData = res.data.result.rows;
this.total = res.data.result.total;
} else {
this.tableData = [];
this.total = 0;
}
this.loading = false;
} else {
this.$message.error(res.data.message);
}
});
} }
}, },
components: {} components: {}
......
src/views/order/giftExchange.vue
...@@ -11,13 +11,16 @@ ...@@ -11,13 +11,16 @@
<span>礼品兑换</span> <span>礼品兑换</span>
</h3> </h3>
</div> </div>
<el-tabs v-model="activeName" class="bread-content"> <el-tabs v-model="orderStatus" class="bread-content" @tab-click="handleClick">
<div style="height:24px;background:#f0f2f5;"></div> <div style="height:24px;background:#f0f2f5;"></div>
<div> <div>
<div class="operate-top"> <div class="operate-top">
<div class="fl"> <div class="fl">
<div class="search-item"> <div class="search-item">
<el-select v-model="changeType" placeholder="配送方式" clearable> <el-date-picker class="date-picker" @change="changeTime" v-model="dateValue" type="datetimerange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
</div>
<div class="search-item">
<el-select v-model="changeType" placeholder="配送方式" clearable @change="getList">
<el-option label="物流发货" :value="2"></el-option> <el-option label="物流发货" :value="2"></el-option>
<el-option label="在线发货（虚拟商品）" :value="3"></el-option> <el-option label="在线发货（虚拟商品）" :value="3"></el-option>
</el-select> </el-select>
...@@ -27,26 +30,26 @@ ...@@ -27,26 +30,26 @@
</div> </div>
</div> </div>
<div class="fr"> <div class="fr">
<el-button type="primary">批量发货</el-button> <el-button type="primary" @click="betachDeliver">批量发货</el-button>
<el-button plain><i class="iconfont icon-icon_yunxiazai" style="margin-right:5px"></i>导出订单</el-button> <el-button plain @click="exportExcel"><i class="iconfont icon-icon_yunxiazai" style="margin-right:5px"></i>导出订单</el-button>
</div> </div>
</div> </div>
</div> </div>
<el-tab-pane label="全部" name="first" class="goods-table-content"> </el-tab-pane> <el-tab-pane label="全部" name="-1" class="goods-table-content"> </el-tab-pane>
<el-tab-pane label="待付款" name="second" class="goods-table-content"> </el-tab-pane> <el-tab-pane label="待付款" name="11" class="goods-table-content"> </el-tab-pane>
<el-tab-pane :label="'待发货' + '(' + deliverNum + ')'" name="third" class="goods-table-content"> </el-tab-pane> <el-tab-pane :label="'待发货' + '(' + deliverNum + ')'" name="1" class="goods-table-content"> </el-tab-pane>
<el-tab-pane label="已发货" name="fouth" class="goods-table-content"> </el-tab-pane> <el-tab-pane label="已发货" name="3" class="goods-table-content"> </el-tab-pane>
<el-tab-pane label="交易成功" name="fifth" class="goods-table-content"> </el-tab-pane> <el-tab-pane label="交易成功" name="0" class="goods-table-content"> </el-tab-pane>
<el-tab-pane label="交易关闭" name="sixth" class="goods-table-content"> </el-tab-pane> <el-tab-pane label="交易关闭" name="4" class="goods-table-content"> </el-tab-pane>
<div class="goods-list-content"> <div class="goods-list-content">
<el-table :data="tableData" ref="multipleTable" style="width: 100%"> <el-table :data="tableData" ref="multipleTable" style="width: 100%" @sort-change="sortChange" v-loading="loading">
<el-table-column type="selection" width="40"> </el-table-column> <el-table-column type="selection" width="40"> </el-table-column>
<el-table-column label="礼品信息" min-width="320px"> <el-table-column label="礼品信息" min-width="320px">
<template slot-scope="scope"> <template slot-scope="scope">
<div class="gift-info"> <div class="gift-info">
<img :src="scope.row.giftMainPic" /> <img :src="scope.row.giftMainPic" />
<div class="info-name"> <div class="info-name">
<p class="pro-ellipsis">{{ scope.row.giftName }}<i class="el-icon-edit"></i></p> <p class="pro-ellipsis">{{ scope.row.giftName }}</p>
<p class="category-ellipsis">颜色：黑色 尺码：L</p> <p class="category-ellipsis">颜色：黑色 尺码：L</p>
<p class="category-ellipsis">规格编码:{{ scope.row.proCode }}</p> <p class="category-ellipsis">规格编码:{{ scope.row.proCode }}</p>
</div> </div>
...@@ -78,7 +81,12 @@ ...@@ -78,7 +81,12 @@
<p style="line-height:18px" v-if="scope.row.complete === 1"><span class="dm-status--success">已完善</span></p> --> <p style="line-height:18px" v-if="scope.row.complete === 1"><span class="dm-status--success">已完善</span></p> -->
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="saleNum" label="实付金额"> </el-table-column> <el-table-column prop="saleNum" label="实付金额">
<template slot-scope="scope">
<p style="line-height:18px">积分：{{ scope.row.applyIntergral }}</p>
<p style="line-height:18px">现金：￥{{ scope.row.applyPrice }}</p>
</template>
</el-table-column>
<template slot="empty"> <template slot="empty">
<div class="no-data-wrap"> <div class="no-data-wrap">
...@@ -97,20 +105,26 @@ ...@@ -97,20 +105,26 @@
</div> </div>
</el-tabs> </el-tabs>
</div> </div>
<!-- 批量发货 -->
<importdispatch :deliverModal="deliverModal"></importdispatch>
<!-- 导出订单 -->
<vue-gic-export-excel :dataArr="tableData" :dialogVisible.sync="dialogVisible" :type="2" :excelUrl="excelUrl" :params="params" :projectName="projectName"></vue-gic-export-excel>
</div> </div>
</template> </template>
<script> <script>
// import qs from 'qs'; import qs from 'qs';
// import request from '../../../service/request.js'; import request from '../../service/request.js';
import getInputVal from '../../utils/common.js'; import getInputVal from '../../utils/common.js';
import importdispatch from './importInfo';
export default { export default {
data() { data() {
return { return {
getTime: getInputVal.getTime, getTime: getInputVal.getTime,
getTimeAll: getInputVal.formatDate,
getSeconds: getInputVal.getSeconds, getSeconds: getInputVal.getSeconds,
activeName: 'first', activeName: '-1',
currentPage: 1, currentPage: 1,
pageSizes: [20, 30, 50], pageSizes: [20, 30, 50],
pageSize: 20, pageSize: 20,
...@@ -127,29 +141,133 @@ export default { ...@@ -127,29 +141,133 @@ export default {
} }
], ],
deliverNum: 0, deliverNum: 0,
dateValue: [new Date() - 90 * 24 * 60 * 60 * 1000, new Date().valueOf()],
searchValue: '', searchValue: '',
beginTime: '',
endTime: '',
changeType: '', //配送方式 changeType: '', //配送方式
windowUrl: window.location.origin windowUrl: window.location.origin,
orderStatus: '-1',
deliverModal: {
//批量发货
dialogVisible: false
},
// 导出数据控件
projectName: 'integral-mall', // 当前项目名
dialogVisible: false,
excelUrl: '/api-integral-mall/download-integral-online-excel', // 下载数据的地址
params: {} // 传递的参数
}; };
}, },
created() {
this.getList();
},
methods: { methods: {
// tab切换 // tab切换
// handleClick(tab) { handleClick(tab) {
this.orderStatus = tab.name;
// }, this.getList();
},
// 搜索
handleInputSearch() {
this.currentPage = 1;
this.getList();
},
// 分页 // 分页
handleSizeChange(size) { handleSizeChange(size) {
//设置每页条数 //设置每页条数
this.pageSize = size; this.pageSize = size;
// this.getList(); this.getList();
}, },
handleCurrentChange(page) { handleCurrentChange(page) {
//设置跳到第几页 //设置跳到第几页
this.currentPage = page; this.currentPage = page;
// this.getList(); this.getList();
},
// 排序
sortChange(value) {
this.sortColumn = value.prop;
if (value.order == 'ascending') {
this.sortType = 'asc';
} else if (value.order == 'descending') {
this.sortType = 'desc';
}
this.getList();
},
// 时间改变
changeTime() {
if (this.dateValue) {
this.beginTime = this.getTimeAll(this.dateValue[0]);
this.endTime = this.getTimeAll(this.dateValue[1]);
} else {
this.beginTime = '';
this.endTime = '';
}
this.getList();
},
//获取列表
getList() {
this.beginTime = this.dateValue ? this.getTimeAll(this.dateValue[0]) : '';
this.endTime = this.dateValue ? this.getTimeAll(this.dateValue[1]) : '';
let params = {
currentPage: this.currentPage,
pageSize: this.pageSize,
changeType: this.changeType === '' ? '-1' : this.changeType,
orderStatus: this.orderStatus, //-1:全部 1、待发货 11、待付款 3、已发货 0 、已取消 4、交易成功
searchParams: this.searchValue,
pageType: 2, //1、代表优惠券订单列表 2、礼品订单
beginTime: this.beginTime,
endTime: this.endTime,
sortType: this.sortType
};
// this.loading = true;
request.post('/api-integral-mall/page-undeliver', qs.stringify(params)).then(res => {
if (res.data.errorCode === 0) {
// this.loading = false;
if (res.data.result.rows) {
this.tableData = res.data.result.rows;
this.total = res.data.result.total;
} else {
this.tableData = [];
this.total = 0;
}
} else {
this.$message.error(res.data.message);
}
});
},
//批量发货
betachDeliver() {
this.deliverModal.dialogVisible = true;
},
// 导出发货单
exportExcel() {
if (this.dateValue) {
this.beginTime = this.getTimeAll(this.dateValue[0]);
this.endTime = this.getTimeAll(this.dateValue[1]);
} else {
this.beginTime = this.listParams.senendTimedEndTime = '';
}
if (!this.beginTime || !this.beginTime) {
this.$message.error('时间不能为空');
return;
}
this.params = {
orderStatus: this.orderStatus,
changeType: this.changeType,
searchParams: this.searchValue,
beginTime: this.beginTime,
endTime: this.endTime,
pageType: 2, //1、代表优惠券订单列表 2、礼品订单
requestProject: 'integral-mall'
};
this.dialogVisible = true;
// window.location = `${exportOnlineListExcel}?orderStatus=${this.listParams.orderStatus}&changeType=${this.listParams.changeType}&searchParams=${this.listParams.searchParams}&beginTime=${this.listParams.beginTime}&endTime=${this.listParams.endTime}&requestProject=marketing`;
} }
}, },
components: {} components: {
importdispatch
}
}; };
</script> </script>
<style scoped> <style scoped>
......
src/views/order/importInfo.vue 0 → 100644
<template>
<el-dialog title="批量发货" :visible.sync="deliverModal.dialogVisible" width="620px">
<el-form :model="dialogForm" label-position="right" label-width="80px" v-loading="loading">
<el-form-item label="选择文件" required>
<div>
<div class="upload-btn">
<el-upload class="upload-ele" :action="action" :before-upload="uploadFileBefore" :on-success="uploadFile" with-credentials :show-file-list="showList" :data="uploadData">
<el-button size="small"><i class="el-icon-upload2" style="margin-right:5px"></i>点击上传</el-button>
</el-upload>
</div>
<el-button type="info" plain @click="downloadFile">下载EXCEL模板</el-button>
</div>
<!-- <p class="import-info" v-show="importMess">
本次共导入&nbsp;<span style="font-weight:600">{{ successNum + falseNum }}</span
>&nbsp;个商品，其中成功&nbsp;<span style="font-weight:600">{{ successNum }}</span
>&nbsp;个，失败&nbsp;<span style="color:#f5222d">{{ falseNum }}</span
>&nbsp;个<a href="javaScript:void(0)" v-show="falseNum > 0" style="margin-left:10px" @click="showInfo">查看失败原因</a>
</p> -->
</el-form-item>
<el-form-item label="导入规则">
<div class="line"></div>
<div class="upload-rules">
<p>1. 每个sheet表最多300个订单，文件大小不超过2M</p>
<p>2. 只需要填写订单编号，物流公司，物流单号（其中物流公司的填写请参考模板中的物流公司字典）</p>
<p>3. 仅支持.xlsx .csv文件的导入（建议直接下载模板，在模板的基础上进行数据的填充）</p>
</div>
</el-form-item>
</el-form>
</el-dialog>
</template>
<script>
export default {
props: {
deliverModal: {
type: Object
}
},
data() {
return {
action: window.location.origin + '/api-mall/upload-goods-selected-goods?requestProject=mall',
// action:'http://gicdev.demogic.com/api-mall/upload-goods-selected-goods?requestProject=mall',
dialogForm: {},
errorList: []
};
},
methods: {
//下载模板
downloadFile() {
let url = 'static/批量发货模板.xlsx';
window.open(url);
},
//上传之前
uploadFileBefore(file) {
const isXlsx = 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet';
if (file.type !== isXlsx) {
this.$message.error('文件格式错误，请导入.xlsx格式的文件');
return false;
}
if (file.size > 2 * 1024 * 1024) {
this.$message.error('请上传小于2MB的文件');
return false;
}
this.loading = true;
this.fileName = file.name;
},
//上传文件
uploadFile(file, fileList) {
if (file.errorCode === 0) {
if (file.result !== '') {
this.errorList = file.result.split(',');
this.dialogFormVisible = true;
this.loading = false;
} else {
this.errorList = [];
}
} else {
this.loading = false;
this.$message.error(file.message);
}
}
}
};
</script>
<style scoped>
.dialog-body {
display: flex;
justify-content: center;
margin-bottom: 25px;
/* justify-content: space-around; */
}
/*上传文件*/
.upload-btn {
height: 30px;
text-align: center;
border: 1px dashed rgba(192, 196, 204, 1);
display: inline-block;
font-size: 14px;
color: #c0c4cc;
cursor: pointer;
margin-right: 10px;
text-align: center;
border-radius: 4px;
}
.import-info {
color: #606266;
margin-top: 10px;
}
.upload-ele .el-button {
border: none;
color: #c0c4cc;
}
.upload-ele .el-button--small {
padding: 7px 15px;
}
.upload-btn .el-icon-upload2 {
font-size: 16px;
color: #c0c4cc;
}
/*.upload-btn:hover .el-button,.upload-btn .el-button:focus{
color: #1890ff;
}
.upload-btn .upload-ele:hove .el-button{
color: #1890ff;
}
.upload-btn:hover .el-icon-upload2{
color: #1890ff;
}*/
.upload-btn:hover {
border-color: #1890ff;
}
.line {
border-top: 1px solid #e4e7ed;
position: absolute;
left: 0px;
top: 15px;
width: 100%;
}
.upload-rules {
color: #909399;
font-size: 13px;
line-height: 18px;
margin-top: 30px;
}
</style>
src/views/order/refundList.vue
...@@ -43,7 +43,7 @@ ...@@ -43,7 +43,7 @@
<div class="gift-info"> <div class="gift-info">
<img :src="scope.row.giftMainPic" /> <img :src="scope.row.giftMainPic" />
<div class="info-name"> <div class="info-name">
<p class="pro-ellipsis">{{ scope.row.giftName }}<i class="el-icon-edit"></i></p> <p class="pro-ellipsis">{{ scope.row.giftName }}</p>
<p class="category-ellipsis"> <p class="category-ellipsis">
<span v-for="(i, v) in scope.row.giftProSkuAttr" :key="v">{{ i.propName }}:{{ v.propName }}</span> <span v-for="(i, v) in scope.row.giftProSkuAttr" :key="v">{{ i.propName }}:{{ v.propName }}</span>
</p> </p>
......
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