Skip to content

P
pica.cloud.web-education-admin
提交 e1e8f6ee 编写于 作者: shuang.zhou's avatar shuang.zhou
浏览文件
操作

Merge branch 'feature/shuang' into 'develop-3.18.0' 

联调问题修复

See merge request com.pica.cloud.education.frontend/pica.cloud.web-education-admin!319
上级 3fc46a3a ace35cc2
显示空白字符变更
内嵌 并排
正在显示 包含 41 行增加 和 34 行删除
src/views/goods/order-detail.vue
浏览文件 @ e1e8f6ee
......@@ -52,7 +52,7 @@
:filter-method="filterStatusHandler"
>
<template slot-scope="scope">
<span>{{orderDetailData.showStatusStr}}</span>
<span>{{scope.row.goodsShowStatusStr}}</span>
</template>
</el-table-column>
<el-table-column prop="expressCompany" label="物流公司" min-width="100" align="center">
......@@ -107,20 +107,20 @@
<p>{{ orderDetailData.receiverAddr }}</p>
<p>{{orderDetailData.receiver}} {{ orderDetailData.receiverMobile }}</p>
</div>
<div v-if="showStatus == 1 || showStatus == 2">
<div v-if="showStatus == 1 || showStatus == 2 || showStatus == 6">
<div>
<!-- 多包裹 -->
<div class="multi-package">
<el-tabs v-model="packageName" @tab-click="handlePackageClick">
<el-tab-pane v-for="(item, index) in expressList" :key="index" :label="item.packageName" :name="item.packageName">
<div class="package-img">
<div class="img-box" v-for="(val, i) in item.goodsInfoList" :key="i">
<img :src="val.goodsImageUrl" alt="">
<span class="img-tips">{{val.goodsQuantity}}</span>
<div class="img-box" v-for="(val, valindex) in item.goodsInfoList[0].goodsImageUrl" :key="valindex">
<img :src="val" alt="">
<span class="img-tips">{{item.goodsInfoList[0].goodsQuantity}}件</span>
</div>
</div>
<!-- 云鹊配送 小药房 && 线下配送-->
<div class="yq-logistics" v-if="(storeType == 2 && expressType == 2)">
<div class="yq-logistics" v-if="(storeType == 2 && item.expressType == 2)">
<div class="title">
{{item.expressStatus !== 4 ? '云鹊配送中' : '云鹊配送完成'}}
</div>
......@@ -130,7 +130,7 @@
</div>
<!-- 物流信息 供货商 || 小药房 && 物流信息-->
<div
v-if="storeType == 1 || (storeType == 2 && expressType == 1)"
v-if="storeType == 1 || (storeType == 2 && item.expressType == 1)"
class="package-detail"
>
<div>物流公司：{{ item.expressCompany }}</div>
......@@ -141,7 +141,7 @@
<div>备注：{{ item.remark }}</div>
</div>
<!-- 线上物流时间线 -- 订单展示状态,1已完成,2已发货,3待发货,4待支付,5交易关闭 -->
<div class="steps-logistics" v-if="expressType == 1 && (showStatus === 1 || showStatus === 2 || showStatus === 6)">
<div class="steps-logistics" v-if="item.expressType == 1 && (showStatus === 1 || showStatus === 2 || showStatus === 6)">
<el-steps direction="vertical" :active="0">
<el-step
v-for="item in expressData"
......@@ -336,7 +336,6 @@
showOrderNoFlag: false,
expressType: 1,
isShowRefundDetail: false, // 是否展示退款说明弹窗
statusImgUrl: '',
showStatusStr: '', // 订单状态文案
packageName: '包裹1', // 多包裹name
expressIndex: 0, // 修改物流单号下标
......@@ -350,6 +349,28 @@
this.jumPathThird = `/order-manage?storeId=${this.storeId}`;
this.init();
},
computed:{
statusImgUrl() {
// "订单展示状态：1已完成,2已发货,3待发货,4待支付,5已关闭,6部分发货,7已取消"
let imgUrl = '';
console.log(imgUrl);
switch (this.showStatus) {
case 1:
return (imgUrl = require(`../../assets/image/order/order_status1.png`));
case 2:
case 6:
return (imgUrl = require(`../../assets/image/order/order_status2.png`));
case 3:
case 4:
return (imgUrl = require(`../../assets/image/order/order_status3.png`));
case 5:
case 7:
return (imgUrl = require(`../../assets/image/order/order_status5.png`));
default:
return (imgUrl = '');
}
}
},
methods: {
// 多包裹切换获取包裹物流信息
handlePackageClick(tab) {
......@@ -368,10 +389,14 @@
getRefundDesc(parmas).then(res => {
if (res.code == "000000") {
this.isShowRefundDetail = true;
this.$alert(`<p>退款方式：${res.refundWay}</p>
<p>退款金额：${res.refundAmount}元</p>
<p>退款对象：${res.refundObject}</p>
<p>退款理由：${res.refundReason}</p>`,
let refundWayStr = '';
let refundObjectStr = '';
refundWayStr = res.data.refundWay == 0 ? '仅退款，无需退货' : '退款退货';
refundObjectStr = res.data.refundObject == 1 ? '开单医生' : '支付用户';
this.$alert(`<p>退款方式：${refundWayStr}</p>
<p>退款金额：${res.data.refundAmount}元</p>
<p>退款对象：${refundObjectStr}</p>
<p>退款理由：${res.data.refundReason}</p>`,
'退款说明', {
dangerouslyUseHTMLString: true
});
......@@ -385,7 +410,6 @@
this.orderDetailData = {...res.data};
this.showStatus = res.data.showStatus;
this.showStatusStr = res.data.showStatusStr;
this.statusImgUrl = require(`../../assets/image/order/order_status${res.data.showStatus}.png`);
this.expressType = res.data.expressType; // 小店 1.普通快递，2云鹊快递
this.tableData = goodsInfoDtoList;
let expressNo = goodsInfoDtoList[0].expressNo;
......@@ -479,23 +503,6 @@
}
this.$message.success('复制成功');
},
//查看物流
// viewLogistics() {
// if (this.orderDetailData.expressNo && this.orderDetailData.receiverMobile)
// expressInfo({
// expressNo: this.orderDetailData.expressNo,
// receiverMobile: this.orderDetailData.receiverMobile,
// }).then((res) => {
// if (res.code == "000000") {
// if (res.data.data && res.data.data.length) {
// this.expressData = res.data.data;
// } else {
// this.expressData[0].time = res.data.updateTime || '';
// this.expressData = this.expressData;
// }
// }
// });
// },
//查看物流
viewLogistics(expressNo, receiverMobile) {
if (expressNo && receiverMobile)
......
src/views/goods/order-manage.vue
浏览文件 @ e1e8f6ee
......@@ -402,9 +402,9 @@
size="small"
>配送完成</el-button
> -->
<el-button @click="goDetail(scope.row)" type="text" size="small"
>查看详情</el-button
>
<el-button type="text" size="small" @click="goDetail(scope.row)" v-if="[3,6].includes(scope.row.showStatus)">发货</el-button>
<el-button type="text" size="small" @click="goDetail(scope.row)">查看详情</el-button>
<el-button type="text" size="small" @click="goDetail(scope.row)" v-if="[3,6].includes(scope.row.showStatus)">退款退货</el-button>
<!-- <el-button
v-if="
(scope.row.storeType == 1 || scope.row.storeType == 2) &&
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或