Web/daimp-front
8
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev' into dev

Browse Source
This commit is contained in:
姚俊旭 2025-06-12 13:13:26 +08:00
commit e858c83717
4 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sub-operation-service/src/utils/axios.js
View File

@ -86,7 +86,7 @@ const formatResult = async (res) => {
case 500: case 500:
case 1: case 1:
// code === 1 或 500 代表存在错误 // code === 1 或 500 代表存在错误
ElNotification.error(res.data.message); ElNotification.error(res.data.msg);
break; break;
case 401: case 401:
// code === 401 代表登录过期 // code === 401 代表登录过期
@ -94,7 +94,7 @@ const formatResult = async (res) => {
router.push('/login'); router.push('/login');
break; break;
default: default:
ElNotification.error(res.data.message); ElNotification.error(res.data.msg);
break; break;
} }
}; };

2
sub-operation-service/src/views/userCenter/mySource.vue
View File

@ -158,7 +158,7 @@ const columns = ref([
{ prop: 'status', label: '申请状态', slotName: 'status' }, { prop: 'status', label: '申请状态', slotName: 'status' },
{ prop: 'report', label: '检测报告', slotName: 'report' }, { prop: 'report', label: '检测报告', slotName: 'report' },
{ prop: 'sourceCode', label: '溯源码', slotName: 'sourceCode' }, { prop: 'sourceCode', label: '溯源码', slotName: 'sourceCode' },
{ prop: 'action', label: '操作', slotName: 'action', width: '180' }, // { prop: 'action', label: '操作', slotName: 'action', width: '180' },
]); ]);
// 生成模拟数据 // 生成模拟数据
const generateMockData = () => { const generateMockData = () => {

8
sub-operation-service/src/views/userCenter/orderDetails.vue
View File

@ -156,14 +156,10 @@
<div v-if="detailsData.orderStatus == '4' || detailsData.orderStatus == '5'" class="button-bottom" @click="confirmReceipt()"> <div v-if="detailsData.orderStatus == '4' || detailsData.orderStatus == '5'" class="button-bottom" @click="confirmReceipt()">
确认收货 确认收货
</div> </div>
<div v-if="detailsData.orderStatus == '2' || detailsData.orderStatus == '3'" class="button-bottoms" @click="reAddress()">修改地址</div> <div v-if="detailsData.orderStatus == '2' || detailsData.orderStatus == '3'" class="button-bottom" @click="reAddress()">修改地址</div>
<div <div
v-if=" v-if="
detailsData.orderStatus == '2' || detailsData.orderStatus == '2' || detailsData.orderStatus == '3' || detailsData.orderStatus == '4' || detailsData.orderStatus == '5'
detailsData.orderStatus == '3' ||
detailsData.orderStatus == '4' ||
detailsData.orderStatus == '5' ||
detailsData.orderStatus == '6'
" "
class="button-bottoms" class="button-bottoms"
@click="refund()" @click="refund()"

9
sub-operation-service/src/views/userCenter/userOrders.vue
View File

@ -77,7 +77,6 @@
<div v-if="o.orderStatus == '1'" class="right-item do-btn"> <div v-if="o.orderStatus == '1'" class="right-item do-btn">
<el-button @click="doCancel(o.id)">取消订单</el-button> <el-button @click="doCancel(o.id)">取消订单</el-button>
</div> </div>
<div <div
v-if="o.orderStatus == '2' || o.orderStatus == '3' || o.orderStatus == '4' || o.orderStatus == '5'" v-if="o.orderStatus == '2' || o.orderStatus == '3' || o.orderStatus == '4' || o.orderStatus == '5'"
class="right-item do-btn" class="right-item do-btn"
@ -88,6 +87,9 @@
<!-- <div v-if="o.orderStatus == '5'" class="right-item">已发货</div> --> <!-- <div v-if="o.orderStatus == '5'" class="right-item">已发货</div> -->
<!-- <div v-if="o.orderStatus == '5'" class="right-item text-link">快递单号</div> --> <!-- <div v-if="o.orderStatus == '5'" class="right-item text-link">快递单号</div> -->
<el-button type="primary" class="right-item do-btn" @click="goInfo(o.id)">订单详情</el-button> <el-button type="primary" class="right-item do-btn" @click="goInfo(o.id)">订单详情</el-button>
<div v-if="o.orderStatus == '3'" class="right-item do-btn">
<el-button @click="doPay(o.id)">修改地址</el-button>
</div>
<div class="right-item text-link"> <div class="right-item text-link">
{{ {{
o.orderStatus == '7' o.orderStatus == '7'
@ -99,7 +101,7 @@
: o.orderStatus == '5' : o.orderStatus == '5'
? '待收货' ? '待收货'
: o.orderStatus == '6' : o.orderStatus == '6'
? '已收货' ? '已完成'
: o.orderStatus == '10' : o.orderStatus == '10'
? '退款中' ? '退款中'
: o.orderStatus == '11' : o.orderStatus == '11'
@ -184,7 +186,8 @@ let bottomList = reactive([
{ title: '待发货', name: '3' }, { title: '待发货', name: '3' },
// { title: '已发货', name: '6' }, // { title: '已发货', name: '6' },
{ title: '待收货', name: '4' }, { title: '待收货', name: '4' },
{ title: '已收货', name: '6' }, { title: '已完成', name: '6' },
{ title: '已取消', name: '7' },
{ title: '退款中', name: '10' }, { title: '退款中', name: '10' },
{ title: '已退款', name: '11' }, { title: '已退款', name: '11' },
]); ]);