Skip to content

I
integral-mall
Commit 54eaee41 by damodmg
Options

提交功能

parent 815092ba
Showing with 179 additions and 44 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.e7d9fd8020a10db18bdc4fc44569f721.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.4726622b2ba70102a5e3.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.45126357135cf1c49e1676d7e9b0d6e1.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.f7c7441afe6f990acc11.js></script></body></html>
\ No newline at end of file \ No newline at end of file
dist/static/css/app.45126357135cf1c49e1676d7e9b0d6e1.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.e7d9fd8020a10db18bdc4fc44569f721.css deleted 100644 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/app.4726622b2ba70102a5e3.js deleted 100644 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/app.f7c7441afe6f990acc11.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
src/views/goods/coupon/coupon.vue
...@@ -41,12 +41,9 @@ ...@@ -41,12 +41,9 @@
<el-table-column label="礼品信息" min-width="310px"> <el-table-column label="礼品信息" min-width="310px">
<template slot-scope="scope"> <template slot-scope="scope">
<div class="gift-info"> <div class="gift-info">
<img v-if="scope.row.cardType === 2" src="../../../../static/img/兑换券.png" alt="" /> <img v-if="scope.row.cardType === 2" src="../../../../static/img/dui.png" alt="" />
<img v-if="scope.row.cardType === 0" src="../../../../static/img/抵金券.png" alt="" /> <img v-if="scope.row.cardType === 0" src="../../../../static/img/di.png" alt="" />
<img v-if="scope.row.cardType === 1" src="../../../../static/img/折扣券.png" alt="" /> <img v-if="scope.row.cardType === 1" src="../../../../static/img/zhe.png" alt="" />
<!-- <svg class="icon" aria-hidden="true">
<use xlink:href="#icon-zhekouquan"></use>
</svg> -->
<div class="info-name"> <div class="info-name">
<p class="pro-ellipsis">{{ scope.row.proTitle }}</p> <p class="pro-ellipsis">{{ scope.row.proTitle }}</p>
<p class="category-ellipsis">编码：{{ scope.row.giftCategoryName }}</p> <p class="category-ellipsis">编码：{{ scope.row.giftCategoryName }}</p>
......
src/views/goods/gift/addSku.vue
...@@ -161,9 +161,9 @@ export default { ...@@ -161,9 +161,9 @@ export default {
this.skuJson.push({ this.skuJson.push({
standardId: '', standardId: '',
standardName: '', standardName: '',
checked: false,
valueList: [{ valueName: '', valueId: '' }] valueList: [{ valueName: '', valueId: '' }]
}); });
// console.log(this.isStdImg);
}, },
//删除规格值 //删除规格值
deleteSku(index) { deleteSku(index) {
......
src/views/goods/gift/info.vue
...@@ -806,6 +806,7 @@ export default { ...@@ -806,6 +806,7 @@ export default {
} }
}, },
IsAgreeUpload(val) { IsAgreeUpload(val) {
this.isStdImg = val;
this.IsAgreeUploadStatus = val; this.IsAgreeUploadStatus = val;
}, },
//处理sku //处理sku
......
src/views/order/couponExchange.vue
...@@ -19,12 +19,12 @@ ...@@ -19,12 +19,12 @@
<div class="search-item"> <div class="search-item">
<el-date-picker class="date-picker" @change="changeTime" v-model="dateValue" type="datetimerange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker> <el-date-picker class="date-picker" @change="changeTime" v-model="dateValue" type="datetimerange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
</div> </div>
<div class="search-item"> <!-- <div class="search-item">
<el-select v-model="changeType" placeholder="配送方式" clearable @change="getList"> <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>
</div> </div> -->
<div class="search-item"> <div class="search-item">
<el-input v-model="searchValue" placeholder="请输入商品名称或货号" prefix-icon="el-icon-search" clearable @keyup.enter.native="handleInputSearch(searchValue)" @clear="handleInputSearch(searchValue)"> </el-input> <el-input v-model="searchValue" placeholder="请输入商品名称或货号" prefix-icon="el-icon-search" clearable @keyup.enter.native="handleInputSearch(searchValue)" @clear="handleInputSearch(searchValue)"> </el-input>
</div> </div>
...@@ -44,7 +44,9 @@ ...@@ -44,7 +44,9 @@
<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" v-if="scope.row.cardType === 2" />
<img v-if="scope.row.cardType === 0" src="../../../static/img/di.png" alt="" />
<img v-if="scope.row.cardType === 1" src="../../../static/img/zhe.png" alt="" />
<div class="info-name"> <div class="info-name">
<p class="pro-ellipsis">{{ scope.row.giftName }}</p> <p class="pro-ellipsis">{{ scope.row.giftName }}</p>
<p class="category-ellipsis"> <p class="category-ellipsis">
...@@ -57,13 +59,25 @@ ...@@ -57,13 +59,25 @@
</el-table-column> </el-table-column>
<el-table-column prop="createTime" label="下单时间" sortable="custom" min-width="120px"> <el-table-column prop="createTime" label="下单时间" sortable="custom" min-width="120px">
<template slot-scope="scope"> <template slot-scope="scope">
<p style="line-height:18px">{{ getTime(scope.row.createTime) }}</p> <p style="line-height:18px">{{ scope.row.createTime ? getTime(scope.row.createTime) : '--' }}</p>
<p style="line-height:18px" class="gray-color">{{ getSeconds(scope.row.createTime) }}</p> <p style="line-height:18px" class="gray-color">{{ scope.row.createTime ? getSeconds(scope.row.createTime) : '--' }}</p>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="definedCode" label="订单编号" min-width="120px"> <el-table-column prop="definedCode" label="订单编号" min-width="120px">
<template slot-scope="scope"> <template slot-scope="scope">
<p>{{ scope.row.definedCode }}</p> <el-dropdown @visible-change="i => getOrderInfo(i, scope.row.integralMallProExchangeId)" trigger="click">
<span class="el-dropdown-link"> {{ scope.row.definedCode }}<i class="el-icon-arrow-down el-icon--right"></i> </span>
<el-dropdown-menu slot="dropdown">
<el-dropdown-item command="orderInfo.definedCode">订单编号：{{ orderInfo.orderNumber }}</el-dropdown-item>
<el-dropdown-item command="orderInfo.definedCode">商户支付号：{{ orderInfo.payNumber }}</el-dropdown-item>
<el-dropdown-item command="orderInfo.definedCode">支付流水号：{{ orderInfo.payNumber }}</el-dropdown-item>
<el-dropdown-item command="orderInfo.definedCode">下单时间：{{ orderInfo.orderTime }}</el-dropdown-item>
<el-dropdown-item command="orderInfo.definedCode">付款时间：{{ orderInfo.payTime }}</el-dropdown-item>
<el-dropdown-item command="orderInfo.definedCode">发货时间：{{ orderInfo.deliveryTime }}</el-dropdown-item>
<el-dropdown-item command="orderInfo.definedCode">交易完成时间：{{ orderInfo.finishTime }}</el-dropdown-item>
<el-dropdown-item command="orderInfo.definedCode">收货信息：{{ orderInfo.definedCode }} {{ orderInfo.consignee }} {{ orderInfo.consigneePhone }} {{ orderInfo.receivingAddress }}</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="会员"> <el-table-column label="会员">
...@@ -76,11 +90,23 @@ ...@@ -76,11 +90,23 @@
</el-table-column> </el-table-column>
<el-table-column prop="complete" label="交易状态"> <el-table-column prop="complete" label="交易状态">
<template slot-scope="scope"> <template slot-scope="scope">
<!-- <p style="line-height:18px" v-if="scope.row.complete === 0"><span class="dm-status--error">未完善</span></p> <p style="line-height:18px">
<p style="line-height:18px" v-if="scope.row.complete === 1"><span class="dm-status--success">已完善</span></p> --> <span v-if="scope.row.status <= 0">交易关闭</span>
<span v-if="scope.row.status === 2 || scope.row.status === 1">买家已付款</span>
<span v-if="scope.row.status === 11">待付款</span>
</p>
<p style="line-height:18px">
<el-button type="text" v-if="scope.row.status === 2 || scope.row.status === 1">发货</el-button>
<el-button type="text" v-if="scope.row.status === 11">关闭订单</el-button>
</p>
</template>
</el-table-column>
<el-table-column prop="saleNum" label="实付金额">
<template slot-scope="scope">
<p style="line-height:18px">积分：{{ scope.row.unitCostIntegral }}</p>
<p style="line-height:18px">现金：￥{{ scope.row.payCost }}</p>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="saleNum" label="实付金额"> </el-table-column>
<template slot="empty"> <template slot="empty">
<div class="no-data-wrap"> <div class="no-data-wrap">
...@@ -124,7 +150,8 @@ export default { ...@@ -124,7 +150,8 @@ export default {
changeType: '', //配送方式 changeType: '', //配送方式
windowUrl: window.location.origin, windowUrl: window.location.origin,
orderStatus: '-1', orderStatus: '-1',
dateValue: [new Date() - 90 * 24 * 60 * 60 * 1000, new Date().valueOf()] dateValue: [new Date() - 90 * 24 * 60 * 60 * 1000, new Date().valueOf()],
orderInfo: {}
}; };
}, },
created() { created() {
...@@ -152,6 +179,23 @@ export default { ...@@ -152,6 +179,23 @@ export default {
this.currentPage = page; this.currentPage = page;
this.getList(); this.getList();
}, },
getOrderInfo(i, integralMallProExchangeId) {
let params = {
integralMallProExchangeId: integralMallProExchangeId
};
request.get('/api-integral-mall/get-order-information', params).then(res => {
if (res.data.errorCode === 0) {
// this.loading = false;
if (res.data.result) {
this.orderInfo = res.data.result;
} else {
this.orderInfo = {};
}
} else {
this.$message.error(res.data.message);
}
});
},
// 排序 // 排序
sortChange(value) { sortChange(value) {
this.sortColumn = value.prop; this.sortColumn = value.prop;
...@@ -180,7 +224,7 @@ export default { ...@@ -180,7 +224,7 @@ export default {
let params = { let params = {
currentPage: this.currentPage, currentPage: this.currentPage,
pageSize: this.pageSize, pageSize: this.pageSize,
changeType: this.changeType === '' ? '-1' : this.changeType, changeType: '-1',
orderStatus: this.orderStatus, orderStatus: this.orderStatus,
searchParams: this.searchValue, searchParams: this.searchValue,
pageType: 1, pageType: 1,
......
src/views/order/delive.vue
...@@ -139,7 +139,7 @@ export default { ...@@ -139,7 +139,7 @@ export default {
params.logisticsCompanyName = ''; params.logisticsCompanyName = '';
params.courierNumber = ''; params.courierNumber = '';
} }
request.get('/api-integral-mall/order-opt', params).then(res => { request.get('/api-integral-mall/order-opt', { params }).then(res => {
if (res.data.errorCode === 0) { if (res.data.errorCode === 0) {
this.$message.success('发货成功'); this.$message.success('发货成功');
this.deliverdModal.dialogVisible = false; this.deliverdModal.dialogVisible = false;
......
src/views/order/giftExchange.vue
...@@ -60,13 +60,25 @@ ...@@ -60,13 +60,25 @@
</el-table-column> </el-table-column>
<el-table-column prop="createTime" label="下单时间" sortable="custom" min-width="120px"> <el-table-column prop="createTime" label="下单时间" sortable="custom" min-width="120px">
<template slot-scope="scope"> <template slot-scope="scope">
<p style="line-height:18px">{{ getTime(scope.row.createTime) }}</p> <p style="line-height:18px">{{ scope.row.createTime ? getTime(scope.row.createTime) : '--' }}</p>
<p style="line-height:18px" class="gray-color">{{ getSeconds(scope.row.createTime) }}</p> <p style="line-height:18px" class="gray-color">{{ scope.row.createTime ? getSeconds(scope.row.createTime) : '--' }}</p>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="definedCode" label="订单编号" min-width="120px"> <el-table-column prop="definedCode" label="订单编号" min-width="140px">
<template slot-scope="scope"> <template slot-scope="scope">
<p>{{ scope.row.definedCode }}</p> <el-dropdown @visible-change="i => getOrderInfo(i, scope.row.integralMallProExchangeId)" trigger="click">
<span class="el-dropdown-link"> {{ scope.row.definedCode }}<i class="el-icon-arrow-down el-icon--right"></i> </span>
<el-dropdown-menu slot="dropdown">
<el-dropdown-item command="orderInfo.definedCode">订单编号：{{ orderInfo.orderNumber }}</el-dropdown-item>
<el-dropdown-item command="orderInfo.definedCode">商户支付号：{{ orderInfo.payNumber }}</el-dropdown-item>
<el-dropdown-item command="orderInfo.definedCode">支付流水号：{{ orderInfo.payNumber }}</el-dropdown-item>
<el-dropdown-item command="orderInfo.definedCode">下单时间：{{ orderInfo.orderTime }}</el-dropdown-item>
<el-dropdown-item command="orderInfo.definedCode">付款时间：{{ orderInfo.payTime }}</el-dropdown-item>
<el-dropdown-item command="orderInfo.definedCode">发货时间：{{ orderInfo.deliveryTime }}</el-dropdown-item>
<el-dropdown-item command="orderInfo.definedCode">交易完成时间：{{ orderInfo.finishTime }}</el-dropdown-item>
<el-dropdown-item command="orderInfo.definedCode">收货信息：{{ orderInfo.definedCode }} {{ orderInfo.consignee }} {{ orderInfo.consigneePhone }} {{ orderInfo.receivingAddress }}</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="会员"> <el-table-column label="会员">
...@@ -77,16 +89,27 @@ ...@@ -77,16 +89,27 @@
</p> </p>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="complete" label="交易状态"> <el-table-column prop="complete" label="交易状态" min-width="120px">
<template slot-scope="scope"> <template slot-scope="scope">
<!-- <p style="line-height:18px" v-if="scope.row.complete === 0"><span class="dm-status--error">未完善</span></p> <p style="line-height:18px">
<p style="line-height:18px" v-if="scope.row.complete === 1"><span class="dm-status--success">已完善</span></p> --> <span v-if="scope.row.status === 11">待付款</span>
<span v-if="scope.row.status === 1">待发货</span>
<span v-if="scope.row.status === 3">已发货</span>
<span v-if="scope.row.status === 4">交易完成</span>
<span v-if="scope.row.status <= 0">交易关闭</span>
</p>
<p style="line-height:18px">
<el-button type="text" v-if="scope.row.status === 1 && scope.row.changeType === 2" @click="handleDeliver(scope.row)">物流发货</el-button>
<el-button type="text" v-if="scope.row.status === 1 && scope.row.changeType === 3" @click="handleDeliver(scope.row)">在线发货</el-button>
<el-button type="text" v-if="scope.row.status === 3">查看物流</el-button>
<el-button type="text" v-if="scope.row.status === 11 || scope.row.status === 1">关闭订单</el-button>
</p>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="saleNum" label="实付金额"> <el-table-column prop="saleNum" label="实付金额">
<template slot-scope="scope"> <template slot-scope="scope">
<p style="line-height:18px">积分：{{ scope.row.applyIntergral }}</p> <p style="line-height:18px">积分：{{ scope.row.unitCostIntegral }}</p>
<p style="line-height:18px">现金：￥{{ scope.row.applyPrice }}</p> <p style="line-height:18px">现金：￥{{ scope.row.payCost }}</p>
</template> </template>
</el-table-column> </el-table-column>
...@@ -111,6 +134,8 @@ ...@@ -111,6 +134,8 @@
<importdispatch :deliverModal="deliverModal"></importdispatch> <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> <vue-gic-export-excel :dataArr="tableData" :dialogVisible.sync="dialogVisible" :type="2" :excelUrl="excelUrl" :params="params" :projectName="projectName"></vue-gic-export-excel>
<!-- 发货 -->
<deliverModal :deliverdModal="deliverdModal" @getList="getList"></deliverModal>
</div> </div>
</template> </template>
...@@ -119,6 +144,7 @@ import qs from 'qs'; ...@@ -119,6 +144,7 @@ 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'; import importdispatch from './importInfo';
import deliverModal from './delive';
export default { export default {
data() { data() {
...@@ -148,11 +174,25 @@ export default { ...@@ -148,11 +174,25 @@ export default {
projectName: 'integral-mall', // 当前项目名 projectName: 'integral-mall', // 当前项目名
dialogVisible: false, dialogVisible: false,
excelUrl: '/api-integral-mall/download-integral-online-excel', // 下载数据的地址 excelUrl: '/api-integral-mall/download-integral-online-excel', // 下载数据的地址
params: {} // 传递的参数 params: {}, // 传递的参数
orderInfo: {}, //订单信息
deliverdModal: {
//发货
dialogVisible: false,
changeType: '',
integralMallProExchangeId: '',
consignee: '', //收件人
consigneePhone: '', //联系方式
receivingAddress: '', //收货地址
logisticsCompanyId: '',
logisticsCode: '',
otherLogisticsCompanyName: ''
}
}; };
}, },
created() { created() {
this.getList(); this.getList();
this.getNumber();
}, },
methods: { methods: {
// tab切换 // tab切换
...@@ -176,6 +216,24 @@ export default { ...@@ -176,6 +216,24 @@ export default {
this.currentPage = page; this.currentPage = page;
this.getList(); this.getList();
}, },
getOrderInfo(i, integralMallProExchangeId) {
if (i) {
let params = {
integralMallProExchangeId: integralMallProExchangeId
};
request.get('/api-integral-mall/get-order-information', { params }).then(res => {
if (res.data.errorCode === 0) {
if (res.data.result) {
this.orderInfo = res.data.result;
} else {
this.orderInfo = {};
}
} else {
this.$message.error(res.data.message);
}
});
}
},
// 排序 // 排序
sortChange(value) { sortChange(value) {
this.sortColumn = value.prop; this.sortColumn = value.prop;
...@@ -212,10 +270,10 @@ export default { ...@@ -212,10 +270,10 @@ export default {
endTime: this.endTime, endTime: this.endTime,
sortType: this.sortType sortType: this.sortType
}; };
// this.loading = true; this.loading = true;
request.post('/api-integral-mall/page-undeliver', qs.stringify(params)).then(res => { request.post('/api-integral-mall/page-undeliver', qs.stringify(params)).then(res => {
if (res.data.errorCode === 0) { if (res.data.errorCode === 0) {
// this.loading = false; this.loading = false;
if (res.data.result.rows) { if (res.data.result.rows) {
this.tableData = res.data.result.rows; this.tableData = res.data.result.rows;
this.total = res.data.result.total; this.total = res.data.result.total;
...@@ -233,6 +291,15 @@ export default { ...@@ -233,6 +291,15 @@ export default {
} }
}); });
}, },
getNumber() {
request.get('/api-integral-mall/get-not-send-count').then(res => {
if (res.data.errorCode === 0) {
this.deliverNum = res.data.result;
} else {
this.$message.error(res.data.message);
}
});
},
//批量发货 //批量发货
betachDeliver() { betachDeliver() {
this.deliverModal.dialogVisible = true; this.deliverModal.dialogVisible = true;
...@@ -260,10 +327,30 @@ export default { ...@@ -260,10 +327,30 @@ export default {
}; };
this.dialogVisible = true; 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`; // 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`;
},
// 发货
handleDeliver(item) {
// 获取快递发货的信息
let params = {
integralMallProExchangeId: item.integralMallProExchangeId
};
request.post('/api-integral-mall/list-logistics-traces', qs.stringify(params)).then(res => {
if (res.data.errorCode === 0) {
this.deliverdModal.integralMallProExchangeId = item.integralMallProExchangeId;
this.deliverdModal.changeType = item.changeType;
this.deliverdModal.consignee = res.data.result.changeLog.consignee; //收件人
this.deliverdModal.consigneePhone = res.data.result.changeLog.consigneePhone; //联系方式
this.deliverdModal.receivingAddress = res.data.result.changeLog.receivingAddress; //收货地址
this.deliverdModal.dialogVisible = true;
} else {
this.$message.error(res.data.message);
}
});
} }
}, },
components: { components: {
importdispatch importdispatch,
deliverModal
} }
}; };
</script> </script>
......
src/views/order/importInfo.vue
...@@ -39,7 +39,7 @@ export default { ...@@ -39,7 +39,7 @@ export default {
data() { data() {
return { return {
// action: window.location.origin + '/api-intergral-mall/upload-order-ship?requestProject=intergral-mall', // action: window.location.origin + '/api-intergral-mall/upload-order-ship?requestProject=intergral-mall',
action: 'http://gicdev.demogic.com//api-intergral-mall/upload-order-ship?requestProject=intergral-mall', action: 'http://gicdev.demogic.com/api-intergral-mall/upload-order-ship?requestProject=intergral-mall',
dialogForm: {}, dialogForm: {},
errorList: [] errorList: []
}; };
...@@ -147,5 +147,6 @@ export default { ...@@ -147,5 +147,6 @@ export default {
} }
.upload-ele .el-upload { .upload-ele .el-upload {
width: 120px !important; width: 120px !important;
display: inline-block !important;
} }
</style> </style>
src/views/order/refundList.vue
...@@ -62,15 +62,17 @@ ...@@ -62,15 +62,17 @@
<template slot-scope="scope"> <template slot-scope="scope">
<el-dropdown placement="bottom-end"> <el-dropdown placement="bottom-end">
<span class="el-dropdown-link"> {{ scope.row.refundNumber }}<i class="el-icon-arrow-down el-icon--right"></i> </span> <span class="el-dropdown-link"> {{ scope.row.refundNumber }}<i class="el-icon-arrow-down el-icon--right"></i> </span>
<el-dropdown-menu slot="dropdown"> <el-dropdown-menu slot="dropdown" style="width:400px;">
<el-dropdown-item>订单编号：</el-dropdown-item> <el-dropdown-item>订单编号：{{ scope.row.definedCode }}</el-dropdown-item>
<el-dropdown-item>商户支付号：</el-dropdown-item> <el-dropdown-item><span class="fw600">协商记录</span></el-dropdown-item>
<el-dropdown-item>支付流水号：</el-dropdown-item> <el-dropdown-item v-for="(i, v) in scope.row.consultList" :key="v">
<el-dropdown-item>下单时间：</el-dropdown-item> <p>
<el-dropdown-item>付款时间：</el-dropdown-item> <span v-if="i.role === 1" class="fw600" style="margin-right:10px">商家</span>
<el-dropdown-item>发货时间：</el-dropdown-item> <span v-if="i.role === 2" class="fw600" style="margin-right:10px">买家</span>
<el-dropdown-item>交易完成时间：</el-dropdown-item> <span>{{ i.createTime ? getTimeAll(i.createTime) : '--' }}</span>
<el-dropdown-item>收货信息：</el-dropdown-item> </p>
<p>{{ i.description }}</p>
</el-dropdown-item>
</el-dropdown-menu> </el-dropdown-menu>
</el-dropdown> </el-dropdown>
...@@ -358,4 +360,7 @@ export default { ...@@ -358,4 +360,7 @@ export default {
.w-140 { .w-140 {
width: 140px; width: 140px;
} }
.fw600 {
font-weight: 600;
}
</style> </style>
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