Skip to content

I
integral-mall
Commit 458997ee by damodmg
Options

调整优惠券

parent fb2246f2
Showing with 48 additions and 60 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.59a014684b7212fbacddfd7f5385383b.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.a60203b2d29826e98be4.js></script></body></html>
\ No newline at end of file
<!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.24fd30f03ec9c1dabd0d8b6fcc16e2a7.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.46d69548d73c5efaef7a.js></script></body></html>
\ No newline at end of file
dist/static/js/app.46d69548d73c5efaef7a.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/app.a60203b2d29826e98be4.js deleted 100644 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
src/components/editCouponInfo.vue
......@@ -51,7 +51,12 @@ export default {
this.$message.error('现金费用不能大于礼品成本');
return false;
}
url = '/api-integral-mall/update-integral-cost';
if (this.intergralModal.num === 1) {
url = '/api-integral-mall/update-integral-cost';
} else if (this.intergralModal.num === 2) {
//现金
url = '/api-integral-mall/update-cash-cost';
}
} else if (this.editInfoModal.type === '库存') {
params.stock = this.editInfoModal.num;
url = '/api-integral-mall/update-stock';
......
src/views/goods/gift/gift.vue
......@@ -57,12 +57,12 @@
</el-table-column>
<el-table-column prop="integralCost" label="积分费用" sortable="custom" min-width="110px">
<template slot-scope="scope">
<p class="intergral-edit">{{ scope.row.integralCost }}积分<i class="el-icon-edit" @click="handleTable(scope.row, 'cash')"></i></p>
<p class="intergral-edit">{{ scope.row.integralCost }}积分<i class="el-icon-edit" @click="handleTable(scope.row, 'cash', 1)"></i></p>
</template>
</el-table-column>
<el-table-column prop="cashCost" label="现金费用" sortable="custom" min-width="110px">
<template slot-scope="scope">
<p class="intergral-edit">{{ scope.row.cashCost }}元<i class="el-icon-edit" @click="handleTable(scope.row, 'cash')"></i></p>
<p class="intergral-edit">{{ scope.row.cashCost }}元<i class="el-icon-edit" @click="handleTable(scope.row, 'cash', 2)"></i></p>
</template>
</el-table-column>
<el-table-column prop="sortCost" label="库存" sortable="custom">
......@@ -453,7 +453,7 @@ export default {
this.refash = !this.refash;
},
// 调整库存弹框
handleTable(item, type) {
handleTable(item, type, num) {
let params = {
integralMallProId: item.integralMallProId
};
......@@ -560,6 +560,7 @@ export default {
this.intergralModal.integralCost = item.integralCost; //积分
this.intergralModal.cashCost = item.cashCost; //现金
this.intergralModal.proCode = item.proCode; //编码
this.intergralModal.num = item.num; //1是积分2是现金
this.intergralModal.dialogVisible = true;
} else {
this.$message.error(res.data.message);
......
src/views/order/closeOrder.vue
......@@ -54,7 +54,7 @@ export default {
let params = {
integralMallProRefundId: this.refunOrderdModal.mallProId,
cancelReason: this.refundForm.closeReason,
opType: this.refunOrderdModal.orderStatus === 11 ? 3 : 2
opType: this.refunOrderdModal.orderStatus === 11 ? 4 : 2
};
request.get('/api-integral-mall/order-opt', params).then(res => {
if (res.data.errorCode === 0) {
......
src/views/order/deliverInfo.vue
......@@ -42,17 +42,17 @@
</div>
<div class="logistics-item">
<span>运单号码：</span>
<el-input type="text" v-model="deliverInfodModal.logisticsCompanyCode" style="width:160px" placeholder="请输入快递单号" @input="value => limitCode(value)"> </el-input>
<el-input type="text" v-model="deliverInfodModal.courierNumber" style="width:160px" placeholder="请输入快递单号" @input="value => limitCode(value)"> </el-input>
</div>
</div>
<div style="float:right;margin-top:-20px;">
<el-button type="text" v-show="!editStatus" @click="editLogisticsInfo">修改运单编号</el-button>
<el-button type="text" v-show="editStatus">确认</el-button>
<el-button type="text" v-show="editStatus" @click="updateLogisticsInfo">确认</el-button>
<el-button type="text" v-show="editStatus" @click="cancelLogisticsInfo">取消</el-button>
</div>
</div>
<div class="logisticsList">
<div class="logisticsList" v-show="deliverInfodModal.traces">
<ul class="el-timeline is-reverse">
<li class="el-timeline-item" v-for="(i, v) in deliverInfodModal.traces" :key="v">
<div class="el-timeline-item__tail"></div>
......@@ -100,6 +100,8 @@ export default {
},
created() {
this.getLogistiesList();
this.logisticsCompanyCode = this.deliverInfodModal.logisticsCompanyCode;
this.logisticsCompanyName = this.deliverInfodModal.logisticsCompanyName;
},
methods: {
getLogistiesList() {
......@@ -138,7 +140,7 @@ export default {
},
limitCode(value) {
this.$nextTick(() => {
this.deliverInfodModal.logisticsCompanyCode = getInputVal.getInputVal(value, 32);
this.deliverInfodModal.courierNumber = getInputVal.getInputVal(value, 32);
});
},
limitOtherName(value) {
......@@ -149,6 +151,25 @@ export default {
editLogisticsInfo() {
this.editStatus = true;
},
updateLogisticsInfo() {
let params = {
optType: 3,
integralMallProExchangeId: this.deliverInfodModal.integralMallProExchangeId,
logisticsCompanyId: this.deliverInfodModal.logisticsCompanyId,
logisticsCompanyCode: this.logisticsCompanyCode,
courierNumber: this.deliverInfodModal.courierNumber,
logisticsCompanyName: this.otherLogistics ? this.deliverInfodModal.otherLogisticsCompanyName : this.logisticsCompanyName //物流公司名称
};
request.get('/api-integral-mall/order-opt', { params }).then(res => {
if (res.data.errorCode === 0) {
this.$message.success('发货成功');
this.deliverInfodModal.dialogVisible = false;
this.$emit('getList');
} else {
this.$message.error(res.data.message);
}
});
},
cancelLogisticsInfo() {
this.editStatus = false;
},
......
src/views/order/giftExchange.vue
......@@ -138,7 +138,7 @@
<!-- 发货 -->
<deliverModal :deliverdModal="deliverdModal" @getList="getList"></deliverModal>
<!-- 物流详情 -->
<deliverInfoModal :deliverInfodModal="deliverInfodModal"></deliverInfoModal>
<deliverInfoModal :deliverInfodModal="deliverInfodModal" v-show="deliverInfodModal.dialogVisible"></deliverInfoModal>
<!-- 关闭订单 -->
<closeOrder :refunOrderdModal="refunOrderdModal"></closeOrder>
<!-- 取消订单 -->
......@@ -405,52 +405,13 @@ export default {
this.deliverInfodModal.receivingAddress = res.data.result.changeLog.receivingAddress; //收货地址
this.deliverInfodModal.logisticsCompanyName = res.data.result.changeLog.logisticsCompanyName; //快递公司
this.deliverInfodModal.logisticsCompanyId = res.data.result.changeLog.logisticsCompanyId; //快递公司
this.deliverInfodModal.logisticsCompanyCode = res.data.result.changeLog.logisticsCompanyCode; //快递单号
this.deliverInfodModal.logisticsCompanyCode = res.data.result.changeLog.logisticsCompanyCode; //快递code
this.deliverInfodModal.courierNumber = res.data.result.changeLog.courierNumber; //快递单号
this.deliverInfodModal.otherLogisticsCompanyName = '';
this.deliverInfodModal.otherLogisticsCompanyName = ''; //快递单号
let traces = [
{
acceptStation: '客户签收人:本人签收 已签收 感谢使用圆通速递，期待再次为您服务222',
acceptTime: '2018-02-04 18:32:35',
remark: null
},
{
acceptStation: '客户 签收人 :本人签收 已签收 感谢使用圆通速递，期待再次为您服务3333',
acceptTime: '2018-02-04 18:32:35',
remark: null
},
{
acceptStation: '客户 签收人 :本人签收 已签收 感谢使用圆通速递，期待再次为您服务4444',
acceptTime: '2018-02-04 18:32:35',
remark: null
},
{
acceptStation: '客户 签收人 :本人签收 已签收 感谢使用圆通速递，期待再次为您服务4444',
acceptTime: '2018-02-04 18:32:35',
remark: null
},
{
acceptStation: '客户签收人:本人签收 已签收 感谢使用圆通速递，期待再次为您服务222',
acceptTime: '2018-02-04 18:32:35',
remark: null
},
{
acceptStation: '客户 签收人 :本人签收 已签收 感谢使用圆通速递，期待再次为您服务3333',
acceptTime: '2018-02-04 18:32:35',
remark: null
},
{
acceptStation: '客户 签收人 :本人签收 已签收 感谢使用圆通速递，期待再次为您服务4444',
acceptTime: '2018-02-04 18:32:35',
remark: null
},
{
acceptStation: '客户 签收人 :本人签收 已签收 感谢使用圆通速递，期待再次为您服务4444',
acceptTime: '2018-02-04 18:32:35',
remark: null
}
];
// this.deliverInfodModal.traces = res.data.result.changeLog.traces; //物流信息
this.deliverInfodModal.traces = traces; //物流信息
this.deliverInfodModal.traces = res.data.result.changeLog.traces; //物流信息
this.deliverInfodModal.deliveryTime = res.data.result.changeLog.deliveryTime; //发货时间
this.deliverInfodModal.clerkName = res.data.result.changeLog.clerkName; //操作人员
this.deliverInfodModal.deliveryContent = res.data.result.changeLog.deliveryContent; //发货内容
......
src/views/order/refundList.vue
......@@ -31,7 +31,7 @@
</div>
</div>
</div>
<el-tab-pane label="全部" name="" 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="0" 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="2" class="goods-table-content"> </el-tab-pane>
......@@ -151,7 +151,7 @@ export default {
getTime: getInputVal.getTime,
getSeconds: getInputVal.getSeconds,
getTimeAll: getInputVal.formatDate,
status: '',
status: '-1',
currentPage: 1,
pageSizes: [20, 30, 50],
pageSize: 20,
......@@ -251,7 +251,7 @@ export default {
sort: this.sortType,
startTime: this.startTime,
endTime: this.endTime,
status: this.status
status: this.status === '-1' ? '' : this.status
};
this.loading = true;
request.post('/api-integral-mall/page-refunds', qs.stringify(params)).then(res => {
......
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