Skip to content

I
integral-mall
Commit 70bc2e6b by damodmg
Options

调整

parent 33c41d46
Showing with 312 additions and 89 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.fef57b68641c8264c767a8eab79fe60a.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/member-info.1.0.0.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.51d776c5d7cf136d1f21.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.26c1baf26cd128d7a1d036d118eb6596.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.fea3934c16cf40a01975.js></script></body></html>
\ No newline at end of file
dist/static/css/app.26c1baf26cd128d7a1d036d118eb6596.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.fef57b68641c8264c767a8eab79fe60a.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.51d776c5d7cf136d1f21.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.fea3934c16cf40a01975.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
index.html
......@@ -20,7 +20,7 @@
<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/member-info.1.0.0.js"></script>
<!-- <script src="//web-1251519181.file.myqcloud.com/components/member-info.1.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> -->
......
src/components/getSkuList.vue
......@@ -2,7 +2,7 @@
<!-- 调整库存弹框 stockModalData.modalShow -->
<el-dialog :title="title" :visible.sync="intergralModal.dialogVisible" :width="intergralModal.modalWidth + 40 + 'px'" @close="cancelStockModal">
<div class="dialog-body" :width="intergralModal.modalWidth + 40 + 'px'">
<table class="spu-table" :style="{ width: intergralModal.modalWidth + 'px' }">
<table class="spu-table" :style="{ width: intergralModal.modalWidth + 'px' }" v-show="intergralModal.tableSkuData.length">
<thead style=" display:table; width:100%;table-layout:fixed;">
<tr>
<!-- <span class="red-color" v-if="headerList.length - index1 < 2">*</span> -->
......@@ -23,7 +23,7 @@
</tr>
</tbody>
</table>
<div class="gift-spu" v-if="intergralModal.stdNum > 0 && intergralModal.type === 'cash'">
<div class="gift-spu" v-if="intergralModal.type === 'cash'">
<div class="table-title">
<p>商品编码</p>
<p><span class="red-color">*</span>积分</p>
......@@ -35,6 +35,9 @@
<p><el-input v-model="giftProSkuCash" placeholder="请输入内容" @blur="limitSkuCash"> </el-input></p>
</div>
</div>
<div class="gift-spu" v-if="intergralModal.type === 'stock' && intergralModal.tableSkuData.length === 0">
<p><el-input v-model="virtualStock" placeholder="请输入内容" @blur="limitVirtualStock"> </el-input></p>
</div>
</div>
<div slot="footer" class="dialog-footer">
<el-button @click="cancelStockModal">取 消</el-button>
......@@ -59,6 +62,7 @@ export default {
giftProSkuCode: '',
giftProSkuIntegral: '',
giftProSkuCash: '',
virtualStock: '',
headerList: []
};
},
......@@ -72,6 +76,7 @@ export default {
this.giftProSkuCash = this.intergralModal.cashCost; //现金
this.giftProSkuIntegral = this.intergralModal.integralCost; //积分
this.giftProSkuCode = this.intergralModal.proCode; //编码
this.virtualStock = this.intergralModal.virtualStock; //库存
},
methods: {
limitSkuCode() {
......@@ -119,6 +124,21 @@ export default {
this.giftProSkuCash = Number(this.giftProSkuCash).toFixed(2);
}
},
// spu库存
limitVirtualStock() {
if (Number(this.virtualStock < 0)) {
this.$message.error('请输入大于0的数字');
this.virtualStock = '';
} else if (!Number(this.virtualStock)) {
this.$message.error('请输入数字类型1');
this.virtualStock = '';
} else if (Number(this.virtualStock) > 1000000) {
this.$message.error('库存最大1000000');
this.virtualStock = '';
} else {
this.virtualStock = Number(this.virtualStock).toFixed(0);
}
},
// 列表输入限制
inputLimit(item2, index2, item1) {
if (this.intergralModal.type === 'stock') {
......@@ -178,22 +198,25 @@ export default {
let arrCash = []; //费用
let intergral = []; //积分
let stock = []; //库存
for (let j in this.intergralModal.tableSkuData) {
let index = this.intergralModal.tableSkuData[0].length - 1;
let index1 = this.intergralModal.tableSkuData[0].length - 2;
for (let i in this.intergralModal.tableSkuData[j]) {
if (Number(i) === index) {
if (this.intergralModal.type === 'cash') {
arrCash.push(this.intergralModal.tableSkuData[j][i].valueName);
} else if (this.intergralModal.type === 'stock') {
stock.push(this.intergralModal.tableSkuData[j][i].valueName);
if (this.intergralModal.tableSkuData.length) {
for (let j in this.intergralModal.tableSkuData) {
let index = this.intergralModal.tableSkuData[0].length - 1;
let index1 = this.intergralModal.tableSkuData[0].length - 2;
for (let i in this.intergralModal.tableSkuData[j]) {
if (Number(i) === index) {
if (this.intergralModal.type === 'cash') {
arrCash.push(this.intergralModal.tableSkuData[j][i].valueName);
} else if (this.intergralModal.type === 'stock') {
stock.push(this.intergralModal.tableSkuData[j][i].valueName);
}
}
if (Number(i) === index1) {
intergral.push(this.intergralModal.tableSkuData[j][i].valueName);
}
}
if (Number(i) === index1) {
intergral.push(this.intergralModal.tableSkuData[j][i].valueName);
}
}
}
if (this.intergralModal.list.length) {
//多规格
for (let m in this.intergralModal.list) {
......@@ -206,12 +229,13 @@ export default {
}
} else {
//单规格
skuJson.push({
giftProSkuId: '',
giftProSkuCash: this.intergralModal.type === 'cash' ? this.intergralModal.tableSkuData[0][1].valueName : '',
giftProSkuIntegral: this.intergralModal.type === 'cash' ? this.intergralModal.tableSkuData[0][0].valueName : '',
stock: this.intergralModal.type === 'stock' ? this.intergralModal.tableSkuData[0][0].valueName : ''
});
skuJson = '';
// skuJson.push({
// giftProSkuId: '',
// giftProSkuCash: this.intergralModal.type === 'cash' ? this.intergralModal.tableSkuData[0][1].valueName : '',
// giftProSkuIntegral: this.intergralModal.type === 'cash' ? this.intergralModal.tableSkuData[0][0].valueName : '',
// stock: this.intergralModal.type === 'stock' ? this.intergralModal.tableSkuData[0][0].valueName : ''
// });
}
if (this.intergralModal.list.length) {
if (this.intergralModal.type === 'cash') {
......@@ -223,36 +247,47 @@ export default {
}
}
}
for (let item of skuJson) {
if (this.intergralModal.type === 'cash') {
if (item.giftProSkuCash === '' || item.giftProSkuIntegral === '') {
this.$message.error('请填输入完整数据');
return false;
}
} else if (this.intergralModal.type === 'stock') {
if (item.stock === '') {
this.$message.error('请填输入完整数据');
return false;
if (this.intergralModal.type === 'stock') {
//库存
if (!this.virtualStock || Number(this.virtualStock) === 0) {
this.$message.errror('请输入库存');
return false;
}
}
if (skuJson) {
for (let item of skuJson) {
if (this.intergralModal.type === 'cash') {
if (item.giftProSkuCash === '' || item.giftProSkuIntegral === '') {
this.$message.error('请填输入完整数据');
return false;
}
} else if (this.intergralModal.type === 'stock') {
if (item.stock === '') {
this.$message.error('请填输入完整数据');
return false;
}
}
}
}
let params = {
integralMallProId: this.intergralModal.integralMallProId,
proCode: this.giftProSkuCode,
integralCost: this.giftProSkuIntegral,
cashCost: this.giftProSkuCash,
virtualStock: '',
virtualStock: this.intergralModal.type === 'stock' ? this.virtualStock : '',
skuJson: JSON.stringify(skuJson)
};
let num = 0;
if (this.intergralModal.type === 'stock') {
//修改库存计算总库存
for (let item of skuJson) {
num = num + Number(item.stock);
if (this.intergralModal.tableSkuData.length) {
//有规格
let num = 0;
if (this.intergralModal.type === 'stock') {
//修改库存计算总库存
for (let item of skuJson) {
num = num + Number(item.stock);
}
params.virtualStock = num;
}
params.virtualStock = num;
}
request.post('/api-integral-mall/update-gift-sku', qs.stringify(params)).then(res => {
......
src/components/memberInfo.vue 0 → 100644
<template>
<el-popover :placement="placement" width="440" height="180" trigger="hover" @show="getMemberInfo">
<div class="corsur-pointer">
<div class="singelinfo" @click="linkDetail">
<div class="singelinfo-img">
<img width="100" height="100" v-if="memberInfo.photoUrl" :src="memberInfo.photoUrl" alt="" />
<img width="100" height="100" v-else src="../../static/img/head_default.png" alt="" />
</div>
<div class="member-info-content">
<div class="info-top">
<span class="lheigt20 fl">{{ memberObj.memberName }}</span>
<div class="fr">
<img title="已取消关注公众号" v-if="memberInfo.status == 0" src="../../static/img/status@gzhcanclegray.png" style="margin-right:5px" />
<img title="已关注公众号" v-else-if="memberInfo.status == 1" src="../../static/img/status@gzh.png" style="margin-right:5px" />
<img title="未关注公众号" v-else src="../../static/img/status@gzhgray.png" style="margin-right:5px" />
<img title="使用过小程序" v-if="memberInfo.usedMiniProgram" src="../../static/img/status@xcx.png" style="margin-right:5px" />
<img title="未使用小程序" v-else src="../../static/img/status@xcxgray.png" style="margin-right:5px" />
<img title="已绑定手机号" v-if="memberInfo.bindPhone" src="../../static/img/phone_icon.png" style="margin-right:5px" />
<img title="未绑定手机号" v-else src="../../static/img/phone_icon_gray.png" style="margin-right:5px" />
<img title="已认证" v-if="memberInfo.authStatus" src="../../static/img/member_icon.png" style="margin-right:5px" />
<img title="未认证" v-else src="../../static/img/member_icon_gray.png" style="margin-right:5px" />
</div>
</div>
<p class="member-detal-info">
<span style="margin-right:5px;">{{ memberInfo.sex === 0 ? '未知性别' : memberInfo.sex === 1 ? '男' : '女' }}</span>
<span style="margin-right:5px;">{{ memberInfo.age }}</span>
<span>{{ memberInfo.cardNo }}</span>
</p>
<p class="member-detal-info">{{ memberInfo.mainStoreName }}</p>
<div class="singelinfo-cost">
<div class="singelinfo-costitem">
<p>{{ memberInfo.costFee || 0 }}</p>
<p>消费总额</p>
</div>
<div class="singelinfo-costitem">
<p>{{ memberInfo.costTimes || 0 }}</p>
<p>消费次数</p>
</div>
<div class="singelinfo-costitem">
<p class="no-wrap">{{ memberInfo.lastCostTime || '--' }}</p>
<p>最近消费</p>
</div>
</div>
</div>
</div>
<div class="singelinfo-jl">
<a class="singelinfo-jlitem">消费记录 ({{ memberInfo.numOfSale }})</a>
<a class="singelinfo-jlitem">营销记录 ({{ memberInfo.numOfmarket }})</a>
<a class="singelinfo-jlitem">卡券记录 ({{ memberInfo.numOfCard }})</a>
</div>
</div>
<div slot="reference" style="width:200px;">
<a :href="'/member/#/wechatmemberDetail?memberId=' + memberObj.memberId" target="_blank" class="link-content">
<!-- <img class="vertical-middle table__avatar" :src="filterAvatar(memberObj.memberImgUrl)" width="60" height="60" alt="" srcset="" /> -->
<div class="table-info">
<p class="table-name--ellipsis">{{ memberObj.memberName || '--' }}</p>
<a :href="'/member/#/wechatmemberDetail?memberId=' + memberObj.memberId" target="_blank">{{ memberObj.cardNum }}</a>
</div>
</a>
</div>
</el-popover>
</template>
<script>
import request from '../service/request.js';
export default {
name: 'vue-member-info',
props: {
memberObj: {
type: Object,
default() {
return {};
}
},
requestProject: {
type: String
},
placement: {
type: String
}
},
data() {
return {
memberInfo: {},
/*eslint-disable*/
defaultAvatar: require('../../static/img/head_default.png'),
};
},
methods: {
filterAvatar(img) {
return img ? img.replace(/^http(s)?/, 'https') : this.defaultAvatar;
},
//获取会员详情
getMemberInfo() {
let params = {
memberId: this.memberObj.memberId
};
request.post('/api-member/load-member-single-info', params).then(res => {
if (res.data.errorCode == 0) {
this.memberInfo = res.data.result.memberSingle;
} else {
this.memberInfo = {};
this.$message.error(res.data.message);
}
});
},
linkDetail() {
window.open(`/member/#/wechatmemberDetail?memberId=${this.memberObj.memberId}`);
}
}
};
</script>
<style scoped>
.link-content {
display: flex;
align-items: center;
}
.table-info {
width: 200px;
margin-left: 5px;
}
.table-name--ellipsis {
line-height: 18px;
color: #303133;
}
.table-card--ellipsis {
font-size: 13px;
line-height: 18px;
word-break: break-all;
}
.singelinfo {
display: flex;
}
.singelinfo-img {
display: inline-block;
vertical-align: top;
}
.lheigt20 {
line-height: 20px;
}
.member-info-content {
margin-left: 10px;
flex: 1;
}
.info-top {
height: 20px;
}
.fl {
float: left;
}
.fr {
float: right;
}
.member-detal-info {
margin: 5px 0;
line-height: 16px;
}
.singelinfo-cost {
display: flex;
align-content: center;
}
.singelinfo-costitem {
text-align: center;
flex: 1;
}
.singelinfo-jl {
display: flex;
margin: 15px 0;
}
.singelinfo-jlitem {
text-align: center;
flex: 1;
}
</style>
src/views/goods/coupon/info.vue
......@@ -172,6 +172,7 @@ export default {
limitStock: 0,
proReferId: '', //卡券关联id
couponForm: {
cardType: '', //卡券类型
integralCost: '', //积分费用
cashCost: '',
virtualStock: '',
......@@ -359,6 +360,7 @@ export default {
this.cardList.push(val);
this.limitStock = val.couponStock;
this.proReferId = val.coupCardId;
this.couponForm.cardType = val.cardType;
}
},
// 添加兑换时段
......@@ -389,6 +391,7 @@ export default {
integralMallProId: this.mallProId === '-1' ? '' : this.mallProId, //礼品id
proType: 1, //优惠券
proReferId: this.proReferId, //卡券id
cardType: this.couponForm.cardType,
integralCost: this.couponForm.integralCost, //积分费用
cashCost: this.couponForm.cashCost, //现金
virtualStock: this.couponForm.virtualStock, //库存
......
src/views/goods/gift/gift.vue
......@@ -425,6 +425,7 @@ export default {
this.intergralModal.type = type;
let list = copy(res.data.result);
if (list.length) {
//多规格
this.intergralModal.list = copy(res.data.result);
this.intergralModal.stdNum = list.length;
this.intergralModal.headerList = [];
......@@ -479,48 +480,51 @@ export default {
this.intergralModal.modalWidth = (this.intergralModal.tableSkuData[0].length + 1) * 120; //根据内容设置弹框的宽度
this.intergralModal.modalHeight = 200; //根据内容设置弹框的宽度
} else {
//单规格
this.intergralModal.list = [];
//无规格
this.intergralModal.stdNum = 0;
this.intergralModal.headerList = [];
this.intergralModal.tableSkuData = [];
let arrTem = [];
if (type === 'cash') {
this.intergralModal.headerList.push({
proName: '积分',
proId: ''
});
// let arrTem = [];
// if (type === 'cash') {
// this.intergralModal.headerList.push({
// proName: '积分',
// proId: ''
// });
this.intergralModal.headerList.push({
proName: '现金',
proId: ''
});
arrTem.push({
valueName: item.integralCost,
valueId: ''
});
arrTem.push({
valueName: item.cashCost,
valueId: ''
});
} else if (type === 'stock') {
this.intergralModal.headerList.push({
proName: '库存',
proId: ''
});
arrTem.push({
valueName: '',
valueId: ''
});
}
// this.intergralModal.headerList.push({
// proName: '现金',
// proId: ''
// });
// arrTem.push({
// valueName: item.integralCost,
// valueId: ''
// });
// arrTem.push({
// valueName: item.cashCost,
// valueId: ''
// });
// } else if (type === 'stock') {
// this.intergralModal.headerList.push({
// proName: '库存',
// proId: ''
// });
// arrTem.push({
// valueName: '',
// valueId: ''
// });
// }
this.intergralModal.tableSkuData.push(arrTem);
// this.intergralModal.tableSkuData.push(arrTem);
this.intergralModal.tableSkuData = [];
this.intergralModal.modalWidth = 450; //根据内容设置弹框的宽度
this.intergralModal.modalHeight = 80; //根据内容设置弹框的宽度
}
this.intergralModal.integralCost = item.integralCost; //积分
this.intergralModal.cashCost = item.cashCost; //现金
this.intergralModal.proCode = item.proCode; //编码
this.intergralModal.virtualStock = item.virtualStock; //库存
this.intergralModal.dialogVisible = true;
} else {
this.$message.error(res.data.message);
......
src/views/goods/gift/info.vue
......@@ -929,6 +929,7 @@ export default {
this.cardList.push(val);
// this.limitStock = val.couponStock;
this.giftForm.proReferId = val.coupCardId;
this.giftForm.cardType = val.cardType;
}
},
// 保存
......@@ -1007,6 +1008,7 @@ export default {
giftImageUrls: giftImageUrls.join(','), //礼品主图
giftImageFiledCodes: giftImageFiledCodes.join(','),
proReferId: this.giftForm.changeType === 1 ? this.giftForm.proReferId : '', //关联id
cardType: this.giftForm.changeType === 1 ? this.giftForm.cardType : '', //卡券类型
proCategoryId: this.giftForm.proCategoryId, //礼品分类
detailDescription: this.$refs.tinymceWrap.tinymceHtml, //图文详情
memberGrade: this.giftForm.memberGrade.join(','), //适用会员
......
src/views/order/couponExchange.vue
......@@ -87,7 +87,7 @@
</el-table-column>
<el-table-column label="会员">
<template slot-scope="scope">
<vue-member-info :memberObj="scope.row" :requestProject="requestProject" :placement="placement"></vue-member-info>
<memberInfo :memberObj="scope.row" :requestProject="requestProject" :placement="placement"></memberInfo>
</template>
</el-table-column>
<el-table-column prop="complete" label="交易状态">
......@@ -137,6 +137,7 @@
import qs from 'qs';
import request from '../../service/request.js';
import getInputVal from '../../utils/common.js';
import memberInfo from '../../components/memberInfo';
// import closeOrder from './closeOrder';
export default {
data() {
......@@ -323,6 +324,7 @@ export default {
},
components: {
// closeOrder
memberInfo
}
};
</script>
......
src/views/order/delive.vue
......@@ -18,8 +18,8 @@
<el-form-item v-if="deliverdModal.changeType === 2 && otherLogistics" label-width="80px" prop="otherLogisticsCompanyName">
<el-input type="text" v-model="deliverdModal.otherLogisticsCompanyName" class="w-450" placeholder="请输入快递公司" @input="value => logisticsNameLimit(value)"> </el-input>
</el-form-item>
<el-form-item v-if="deliverdModal.changeType === 2" label="运单编号" label-width="80px" prop="logisticsCode">
<el-input type="text" v-model="deliverdModal.logisticsCode" class="w-450" placeholder="请输入快递单号" @input="value => limitCode(value)"> </el-input>
<el-form-item v-if="deliverdModal.changeType === 2" label="运单编号" label-width="80px" prop="courierNumber">
<el-input type="text" v-model="deliverdModal.courierNumber" class="w-450" placeholder="请输入运单编号" @input="value => limitCode(value)"> </el-input>
</el-form-item>
<el-form-item v-if="deliverdModal.changeType === 3" label="发货内容" label-width="80px" prop="content">
<el-input type="textarea" :rows="4" v-model="deliverdModal.content" class="w-450" @input="value => contentLimit(value)"> </el-input>
......@@ -57,7 +57,7 @@ export default {
logisticsCompanyName: '',
modalRules: {
logisticsCompanyId: [{ required: true, message: '请选择快递公司', trigger: 'change' }],
logisticsCode: [{ required: true, message: '请输入运单编号', trigger: 'blur' }],
courierNumber: [{ required: true, message: '请输入运单编号', trigger: 'blur' }],
otherLogisticsCompanyName: [{ required: true, message: '请输入快递公司名称', trigger: 'blur' }],
content: [{ required: true, message: '请输入在线发货的内容', trigger: 'blur' }]
},
......@@ -111,7 +111,7 @@ export default {
},
limitCode(value) {
this.$nextTick(() => {
this.deliverdModal.logisticsCode = getInputVal.getInputVal(value, 32);
this.deliverdModal.courierNumber = getInputVal.getInputVal(value, 32);
});
},
contentLimit(value) {
......@@ -129,7 +129,7 @@ export default {
logisticsCompanyId: this.deliverdModal.logisticsCompanyId, //物流公司id
logisticsCompanyCode: this.logisticsCompanyCode, //物流公司code号
logisticsCompanyName: this.otherLogistics ? this.deliverdModal.otherLogisticsCompanyName : this.logisticsCompanyName, //物流公司名称
courierNumber: this.deliverdModal.logisticsCode, //物流单号
courierNumber: this.deliverdModal.courierNumber, //物流单号
cancelReason: '', //取消发货原因
deliveryContent: this.deliverdModal.changeType === 3 ? this.deliverdModal.content : '' //在线发货内容
};
......
src/views/order/deliverInfo.vue
<template>
<el-dialog title="发货" :visible.sync="deliverInfodModal.dialogVisible" width="880px" @close="cancelSubmit('deliverInfodModal')">
<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>
......@@ -21,13 +21,13 @@
</el-form-item>
<div class="line"></div>
<!-- {{ deliverInfodModal.traces }} -->
<div class="editInfo-content">
<div class="editInfo-content" v-show="deliverInfodModal.changeType !== 3">
<div v-if="!editStatus">
<div class="logistics-item">
<span>快递公司：</span><span>{{ deliverInfodModal.logisticsCompanyName }}</span>
</div>
<div class="logistics-item">
<span>运单号码：</span><span>{{ deliverInfodModal.logisticsCompanyCode }}</span>
<span>运单号码：</span><span>{{ deliverInfodModal.courierNumber }}</span>
</div>
</div>
<div v-else>
......@@ -51,8 +51,7 @@
<el-button type="text" v-show="editStatus" @click="cancelLogisticsInfo">取消</el-button>
</div>
</div>
<div class="logisticsList" v-show="deliverInfodModal.traces">
<div class="logisticsList" v-show="deliverInfodModal.traces.length">
<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>
......
src/views/order/giftExchange.vue
......@@ -83,7 +83,7 @@
</el-table-column>
<el-table-column label="会员">
<template slot-scope="scope">
<vue-member-info :memberObj="scope.row" :requestProject="requestProject" :placement="placement"></vue-member-info>
<memberInfo :memberObj="scope.row" :requestProject="requestProject" :placement="placement"></memberInfo>
<!-- <p>{{ scope.row.memberName }}</p>
<p>
<a :href="windowUrl + '/member/#/wechatmemberDetail?memberId=' + scope.row.memberId" target="_blank">{{ scope.row.cardNum }}</a>
......@@ -160,7 +160,7 @@ import deliverModal from './delive';
import deliverInfoModal from './deliverInfo';
import closeOrder from './closeOrder';
import cancelOrder from './getCloseDetail';
// import memberInfo from '../../components/dm-member-info/index';
import memberInfo from '../../components/memberInfo';
export default {
data() {
return {
......@@ -422,9 +422,12 @@ export default {
this.deliverInfodModal.courierNumber = res.data.result.changeLog.courierNumber; //快递单号
this.deliverInfodModal.otherLogisticsCompanyName = '';
this.deliverInfodModal.otherLogisticsCompanyName = ''; //快递单号
this.deliverInfodModal.traces = res.data.result.changeLog.traces; //物流信息
if (res.data.result.traces) {
this.deliverInfodModal.traces = res.data.result.traces; //物流信息
} else {
this.deliverInfodModal.traces = [];
}
this.deliverInfodModal.changeType = item.changeType;
this.deliverInfodModal.deliveryTime = res.data.result.changeLog.deliveryTime; //发货时间
this.deliverInfodModal.clerkName = res.data.result.changeLog.clerkName; //操作人员
this.deliverInfodModal.deliveryContent = res.data.result.changeLog.deliveryContent; //发货内容
......@@ -490,8 +493,8 @@ export default {
deliverModal,
deliverInfoModal,
closeOrder,
cancelOrder
// memberInfo
cancelOrder,
memberInfo
}
};
</script>
......
src/views/order/refundList.vue
......@@ -294,6 +294,7 @@ export default {
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.courierNumber = '';
this.deliverdModal.dialogVisible = true;
} else {
this.$message.error(res.data.message);
......
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