Skip to content

I
integral-mall
Commit 11f2c2af by damodmg
Options

更新28号bug

parent f320e7ab
Showing with 49 additions and 42 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.4a3cfb4187c6f303e65820676470e7a0.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.05.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.01.js></script><script src=//web-1251519181.file.myqcloud.com/components/card.2.0.03.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.50c1d49b9411017df3a5.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.9db5b936ded9de8a0fa3e46b23f19971.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.05.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.01.js></script><script src=//web-1251519181.file.myqcloud.com/components/card.2.0.03.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.3b31b02923db7bdf43e3.js></script></body></html>
\ No newline at end of file
dist/static/css/app.4a3cfb4187c6f303e65820676470e7a0.css deleted 100644 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/css/app.9db5b936ded9de8a0fa3e46b23f19971.css 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/app.3b31b02923db7bdf43e3.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.50c1d49b9411017df3a5.js deleted 100644 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
src/views/goods/coupon/coupon.vue
......@@ -180,7 +180,7 @@ export default {
sortType: this.sortType,
sortColumn: this.sortColumn,
giftName: this.searchValue,
shelf: this.shelf === '' ? -1 : this.shelf //上架状态
shelf: this.shelf ? this.shelf : -1 //上架状态
};
this.loading = true;
request.post('/api-integral-mall/page-cards', qs.stringify(params)).then(res => {
......
src/views/goods/gift/gift.vue
......@@ -216,6 +216,7 @@ export default {
this.$router.push({ name: 'giftExchange', query: { integralMallProId: item.integralMallProId } });
}
},
// 获取列表
getList() {
let params = {
......@@ -224,8 +225,8 @@ export default {
sortType: this.sortType,
sortColumn: this.sortColumn,
giftName: this.searchValue,
giftType: this.giftType === '' ? -1 : this.giftType,
shelf: this.shelf === '' ? -1 : this.shelf, //上架状态
giftType: this.giftType ? this.giftType : -1,
shelf: this.shelf ? this.shelf : -1, //上架状态
goodsType: this.goodsType //商品类型
};
this.loading = true;
......
src/views/order/couponExchange.vue
......@@ -274,7 +274,6 @@ export default {
let params = {
currentPage: this.currentPage,
pageSize: this.pageSize,
changeType: '-1',
orderStatus: this.orderStatus,
searchParams: this.searchValue,
pageType: 1,
......
src/views/order/delive.vue
......@@ -111,7 +111,7 @@ export default {
},
limitCode(value) {
this.$nextTick(() => {
this.deliverdModal.courierNumber = getInputVal.getInputVal(value, 32);
this.deliverdModal.courierNumber = getInputVal.getInputVal(value, 16);
});
},
contentLimit(value) {
......
src/views/order/deliverInfo.vue
<template>
<el-dialog title="查看物流" :visible.sync="deliverInfodModal.dialogVisible" width="880px" @close="cancelSubmit('deliverInfodModal')">
<el-form :model="deliverInfodModal" ref="deliverInfodModal" :rules="modalRules">
<el-form-item v-if="deliverInfodModal.deliverStatus" label="收件人" label-width="80px">
<span>{{ deliverInfodModal.consignee }}</span>
<el-form :model="temDeliverInfodModal" ref="deliverInfodModal" :rules="modalRules">
<el-form-item v-if="temDeliverInfodModal.deliverStatus" label="收件人" label-width="80px">
<span>{{ temDeliverInfodModal.consignee }}</span>
</el-form-item>
<el-form-item v-if="deliverInfodModal.deliverStatus" label="联系方式" label-width="80px">
<span>{{ deliverInfodModal.consigneePhone }}</span>
<el-form-item v-if="temDeliverInfodModal.deliverStatus" label="联系方式" label-width="80px">
<span>{{ temDeliverInfodModal.consigneePhone }}</span>
</el-form-item>
<el-form-item v-if="deliverInfodModal.deliverStatus" label="收货地址" label-width="80px">
<span>{{ deliverInfodModal.receivingAddress }}</span>
<el-form-item v-if="temDeliverInfodModal.deliverStatus" label="收货地址" label-width="80px">
<span>{{ temDeliverInfodModal.receivingAddress }}</span>
</el-form-item>
<el-form-item v-if="!deliverInfodModal.deliverStatus" label="发货时间" label-width="80px">
<span>{{ getTimeAll(deliverInfodModal.deliveryTime) }}</span>
<el-form-item v-if="!temDeliverInfodModal.deliverStatus" label="发货时间" label-width="80px">
<span>{{ getTimeAll(temDeliverInfodModal.deliveryTime) }}</span>
</el-form-item>
<el-form-item v-if="!deliverInfodModal.deliverStatus" label="操作人员" label-width="80px">
<span>{{ deliverInfodModal.clerkName ? deliverInfodModal.clerkName : '---' }}</span>
<el-form-item v-if="!temDeliverInfodModal.deliverStatus" label="操作人员" label-width="80px">
<span>{{ temDeliverInfodModal.clerkName ? temDeliverInfodModal.clerkName : '---' }}</span>
</el-form-item>
<el-form-item v-if="!deliverInfodModal.deliverStatus" label="发货内容" label-width="80px">
<span style="word-break: break-all;">{{ deliverInfodModal.deliveryContent ? deliverInfodModal.deliveryContent : '--' }}</span>
<el-form-item v-if="!temDeliverInfodModal.deliverStatus" label="发货内容" label-width="80px">
<span style="word-break: break-all;">{{ temDeliverInfodModal.deliveryContent ? temDeliverInfodModal.deliveryContent : '--' }}</span>
</el-form-item>
<div class="line"></div>
<!-- {{ deliverInfodModal.traces }} -->
<div class="editInfo-content" v-show="deliverInfodModal.changeType !== 3">
<!-- {{ temDeliverInfodModal.traces }} -->
<div class="editInfo-content" v-show="temDeliverInfodModal.changeType !== 3">
<div v-if="!editStatus">
<div class="logistics-item">
<span>快递公司：</span><span>{{ deliverInfodModal.logisticsCompanyName }}</span>
<span>快递公司：</span><span>{{ temDeliverInfodModal.logisticsCompanyName }}</span>
</div>
<div class="logistics-item">
<span>运单号码：</span><span>{{ deliverInfodModal.courierNumber }}</span>
<span>运单号码：</span><span>{{ temDeliverInfodModal.courierNumber }}</span>
</div>
</div>
<div v-else>
<div class="logistics-item">
<span>快递公司：</span>
<el-select v-model="deliverInfodModal.logisticsCompanyId" placeholder="请选择快递" clearable @change="changeLogistics" style="width:160px;">
<el-select v-model="temDeliverInfodModal.logisticsCompanyId" placeholder="请选择快递" clearable @change="changeLogistics" style="width:160px;">
<el-option :label="item.logisticsCompanyName" :value="item.logisticsCompanyId" v-for="(item, index) in logistiesList" :key="index"></el-option>
</el-select>
<p style="margin:0px 10px 0 10px;display:inline-block" v-show="otherLogistics">
<el-input type="text" v-model="deliverInfodModal.otherLogisticsCompanyName" style="width:160px" placeholder="请输入快递公司" @input="value => limitOtherName(value)"> </el-input>
<el-input type="text" v-model="temDeliverInfodModal.otherLogisticsCompanyName" style="width:160px" placeholder="请输入快递公司" @input="value => limitOtherName(value)"> </el-input>
</p>
</div>
<div class="logistics-item">
<span>运单号码：</span>
<el-input type="text" v-model="deliverInfodModal.courierNumber" style="width:160px" placeholder="请输入快递单号" @input="value => limitCode(value)"> </el-input>
<el-input type="text" v-model="temDeliverInfodModal.courierNumber" style="width:160px" placeholder="请输入快递单号" @input="value => limitCode(value)"> </el-input>
</div>
</div>
<div style="float:right;margin-top:-20px;">
......@@ -51,9 +51,9 @@
<el-button type="text" v-show="editStatus" @click="cancelLogisticsInfo">取消</el-button>
</div>
</div>
<div class="logisticsList" v-show="deliverInfodModal.traces.length">
<div class="logisticsList" v-show="temDeliverInfodModal.traces.length">
<ul class="el-timeline is-reverse">
<li class="el-timeline-item" v-for="(i, v) in deliverInfodModal.traces" :key="v">
<li class="el-timeline-item" v-for="(i, v) in temDeliverInfodModal.traces" :key="v">
<div class="el-timeline-item__tail"></div>
<div class="el-timeline-item__node el-timeline-item__node--normal el-timeline-item__node--"></div>
<div class="el-timeline-item__wrapper">
......@@ -73,7 +73,7 @@
<script>
// import qs from 'qs';
import request from '../../service/request.js';
// import copy from '../../utils/clone.js';
import copy from '../../utils/clone.js';
import getInputVal from '../../utils/common.js';
export default {
props: {
......@@ -89,16 +89,22 @@ export default {
getTimeAll: getInputVal.formatDate,
reverse: true,
editStatus: false,
reasonLen: 0,
otherLogistics: false,
otherLogisticsCompanyName: '', //其他公司快递名称
logisticsCompanyCode: '', //物流公司code
logisticsCompanyName: '',
logistiesList: [] //快递公司
logistiesList: [], //快递公司
temDeliverInfodModal: ''
};
},
watch: {
deliverInfodModal() {
this.temDeliverInfodModal = copy(this.deliverInfodModal);
}
},
created() {
this.getLogistiesList();
this.temDeliverInfodModal = copy(this.deliverInfodModal);
this.logisticsCompanyCode = this.deliverInfodModal.logisticsCompanyCode;
this.logisticsCompanyName = this.deliverInfodModal.logisticsCompanyName;
},
......@@ -127,25 +133,25 @@ export default {
this.otherLogistics = true;
} else {
this.otherLogistics = false;
this.deliverInfodModal.otherLogisticsCompanyName = '';
this.temDeliverInfodModal.otherLogisticsCompanyName = '';
//获取下拉的快递名称
this.logisticsCompanyName = this.logistiesList.find(item => {
return item.logisticsCompanyId === this.deliverInfodModal.logisticsCompanyId;
return item.logisticsCompanyId === this.temDeliverInfodModal.logisticsCompanyId;
}).logisticsCompanyName;
}
} else {
this.otherLogistics = false;
this.deliverInfodModal.otherLogisticsCompanyName = '';
this.temDeliverInfodModal.otherLogisticsCompanyName = '';
}
},
limitCode(value) {
this.$nextTick(() => {
this.deliverInfodModal.courierNumber = getInputVal.getInputVal(value, 32);
this.temDeliverInfodModal.courierNumber = getInputVal.getInputVal(value, 16);
});
},
limitOtherName(value) {
this.$nextTick(() => {
this.deliverInfodModal.otherLogisticsCompanyName = getInputVal.getInputVal(value, 16);
this.temDeliverInfodModal.otherLogisticsCompanyName = getInputVal.getInputVal(value, 8);
});
},
editLogisticsInfo() {
......@@ -154,16 +160,16 @@ export default {
updateLogisticsInfo() {
let params = {
optType: 3,
integralMallProExchangeId: this.deliverInfodModal.integralMallProExchangeId,
logisticsCompanyId: this.deliverInfodModal.logisticsCompanyId,
integralMallProExchangeId: this.temDeliverInfodModal.integralMallProExchangeId,
logisticsCompanyId: this.temDeliverInfodModal.logisticsCompanyId,
logisticsCompanyCode: this.logisticsCompanyCode,
courierNumber: this.deliverInfodModal.courierNumber,
logisticsCompanyName: this.otherLogistics ? this.deliverInfodModal.otherLogisticsCompanyName : this.logisticsCompanyName //物流公司名称
courierNumber: this.temDeliverInfodModal.courierNumber,
logisticsCompanyName: this.otherLogistics ? this.temDeliverInfodModal.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.temDeliverInfodModal.dialogVisible = false;
this.$emit('getList');
} else {
this.$message.error(res.data.message);
......@@ -178,6 +184,7 @@ export default {
this.$refs[formName].resetFields();
this.otherLogistics = false;
this.deliverInfodModal.dialogVisible = false;
this.temDeliverInfodModal.dialogVisible = false;
}
}
};
......
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