maguodong/uniapp-ZHSQ
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: maguodong:df2d5538f7f1e1f64c807f86e36e13939de0280d
Branches Tags
maguodong:master
maguodong:feature/yi
maguodong:feature-yjs
maguodong:qjl
maguodong:myb
...
compare: maguodong:0a8c876ba871bc4c4a9d2786c7ec53e6f9c67a3b
Branches Tags
maguodong:master
maguodong:feature/yi
maguodong:feature-yjs
maguodong:qjl
maguodong:myb

3 Commits
df2d5538f7 ... 0a8c876ba8

Author SHA1 Message Date
赵毅
0a8c876ba8 优化订单详情页的布局 2025-12-26 15:30:03 +08:00
赵毅
0e2284bb94 修改我的订单页数据显示错误的问题 2025-12-26 15:29:44 +08:00
赵毅
f3f5aafe61 修改易购立即购买支付后不调用查单接口的问题 2025-12-26 11:24:26 +08:00
4 changed files with 14 additions and 13 deletions
Show Stats Expand all files Collapse all files

8
packages/myOrders/groupOrders/index.vue
View File

@ -8,13 +8,13 @@
</view>
<view class="content">
<view v-if="selectedTab === 6">
<view v-if="selectedCategory === '待评价'">
<awaitRated :orderData="orderData" />
</view>
<view v-else-if="selectedTab === 7">
<view v-else-if="selectedCategory === '已评价'">
<rated :orderData="orderData" />
</view>
<view v-else-if="selectedTab === 8">
<view v-else-if="selectedCategory === '售后'">
<afterSale :afterSaleList="afterSaleList" @revokeApply="revokeApply" :order_cate="2" />
</view>
<view v-else>
@ -152,6 +152,7 @@ export default {
{ category_name: "售后", status: "" },
],
selectedTab: 0,
selectedCategory: '',
// orderData: orderMockData,
orderData: [],
@ -169,6 +170,7 @@ export default {
methods: {
selectTab(index, item) {
this.selectedTab = index;
this.selectedCategory = item.category_name;
this.selectStatus = item.status || '';
this.evaluateStatus = item.evaluateStatus || '';
this.getOrderList();

9
packages/myOrders/index/index.vue
View File

@ -5,17 +5,16 @@
:class="['tabItem', selectedTab === index ? 'active2' : '']" @click="selectTab(index, item)">
{{ item.category_name }}
</view>
</view>
<view class="content">
<view v-if="selectedTab === 6">
<view v-if="selectedCategory === '待评价'">
<awaitRated :orderData="orderData" />
</view>
<view v-else-if="selectedTab === 7">
<view v-else-if="selectedCategory === '已评价'">
<rated :orderData="orderData" />
</view>
<view v-else-if="selectedTab === 8">
<view v-else-if="selectedCategory === '售后'">
<afterSale :afterSaleList="afterSaleList" @revokeApply="revokeApply" />
</view>
<view v-else>
@ -153,6 +152,7 @@ export default {
{ category_name: "售后", status: "" },
],
selectedTab: 0,
selectedCategory: '',
// orderData: orderMockData,
orderData: [],
@ -171,6 +171,7 @@ export default {
selectTab(index, item) {
console.log("🚀 ~ item:", item)
this.selectedTab = index;
this.selectedCategory = item.category_name;
this.selectStatus = item.status || '';
this.evaluateStatus = item.evaluateStatus || '';
this.getOrderList();

7
packages/myOrders/orderDetails/index.vue
View File

@ -30,11 +30,10 @@
<view class="countdown">订单已取消</view>
<!-- <view class="tips">您的订单已取消，再来一单吧</view> -->
</view>
<!-- <view class="status-bar" v-if="status === '退款中'">
<view class="status">已完成</view>
<view class="countdown">预计到货时间: 2025-09-09 9:59:59</view>
<view class="status-bar" v-if="status === '7'">
<view class="status">退款中</view>
<view class="tips">感谢对我们的信任，期待下次光临</view>
</view> -->
</view>
<view class="content">
<!-- 订单金额 -->

3
packages/shop/goods/index.vue
View File

@ -893,8 +893,7 @@ export default {
success: (payRes) => {
const params = {
order_id: orderId,
from: this.carList.some(item => item.isAdver === true) ? 3 : (isGroupBuyValid ? 2 : 1),
adver_id: this.carList.some(item => item.isAdver === true) ? this.carList.find(item => item.isAdver === true).adver_id : ''
from: 1,
}
request(apiArr.queryOrder, "POST", params).then(res => {
this.verifyCode = res.verification_code