no message
This commit is contained in:
@@ -59,26 +59,26 @@
|
||||
<view class="content_right_quantity">x{{ pItem.buyNum }}</view>
|
||||
</view>
|
||||
</view>
|
||||
<view class="content_item_yd" v-if="pItem.expressNo">
|
||||
<view>
|
||||
运单号:
|
||||
<text v-if="pItem.expressName">({{ pItem.expressName }})</text>
|
||||
{{ pItem.expressNo }}
|
||||
<view class="content_item_yd" v-if="pItem.expressNo && pItem.expressData">
|
||||
<view class="express-view text-overflow1">
|
||||
<u-icon name="email" color="#333" size="20"></u-icon>
|
||||
<text class="text-24 text-zu1 text-space" style="margin-left:10rpx;">{{pItem.expressData.logisticsStatusDesc}}</text>
|
||||
<text class="text-24 text-fu text-space text-overflow1" style="margin-left:10rpx;">{{pItem.expressData.logisticsTraceDetailList[0].desc}}</text>
|
||||
</view>
|
||||
<view style="margin-left: 10rpx">
|
||||
<!-- <view style="margin-left: 10rpx">
|
||||
<up-image src="/static/common/copy.png" width="14" height="14" bgColor="#f1f6ff00"
|
||||
@click="copyData(pItem.expressNo)"></up-image>
|
||||
</view>
|
||||
</view> -->
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
<!-- 汇总 -->
|
||||
<view class="order_item_collect">
|
||||
<view class="collect_msg collect_msg_s" v-if="this.form.type === MINE_ORDER_TYPE.NOT_RECEIVE">
|
||||
<view class="content_item_yd_msg">(快递动态跟进请复制单号至[快递100官网] 查询)</view>
|
||||
<!-- <view class="collect_msg collect_msg_s" v-if="this.form.type === MINE_ORDER_TYPE.NOT_RECEIVE">
|
||||
<view class="content_item_yd_msg">(快递动态跟进请复制单号至[快递100官网] 查询)</view>
|
||||
<view>共{{ item.buyNum }}件,合计¥{{ item.sumAmount }}</view>
|
||||
</view>
|
||||
<view class="collect_msg" v-else>共{{ item.buyNum }}件,合计¥{{ item.sumAmount }}</view>
|
||||
</view> -->
|
||||
<view class="collect_msg">共{{ item.buyNum }}件,合计¥{{ item.sumAmount }}</view>
|
||||
<view class="collect_operate">
|
||||
<!-- <view class="operate_comm operate_but_1" v-if="item.status === ORDER_TYPE.UNSHIPPED" @click="checkCancel(true)">取消订单</view> -->
|
||||
<view class="operate_comm operate_but_2" v-if="
|
||||
@@ -89,6 +89,12 @@
|
||||
|
||||
<view class="operate_comm operate_but_2" v-if="item.status === ORDER_TYPE.NOT_RECEIVE"
|
||||
@click="confirmReceiptOk(item)">确认收货</view>
|
||||
|
||||
<view class="operate_comm operate_but_1" style="borderColor: #7732FF;" v-if="form.type == 3"
|
||||
@click="onExpress(item.id,item.items.expressNo)">
|
||||
<text class="text-zi">查看物流</text>
|
||||
</view>
|
||||
|
||||
<view class="operate_comm operate_but_2" v-if="
|
||||
!isCheckSigne &&
|
||||
index == 0 &&
|
||||
@@ -261,7 +267,8 @@ import {
|
||||
isSignContract,
|
||||
getMiniProgramSignUrl,
|
||||
afterSaleDetail,
|
||||
cancelOrder
|
||||
cancelOrder,
|
||||
orderLogistics
|
||||
} from "@/api/order.js";
|
||||
import dayjs from "dayjs";
|
||||
import { formatDate1, copyData } from "@/utils/index.js";
|
||||
@@ -353,7 +360,9 @@ export default {
|
||||
const type = options.type;
|
||||
this.form.type =
|
||||
type ? parseInt(type, 10) : MINE_ORDER_TYPE.UNPAID;
|
||||
this.loadData();
|
||||
this.$nextTick(()=>{
|
||||
this.loadData();
|
||||
})
|
||||
// 待收货判断是否签署
|
||||
if (
|
||||
this.form.type === MINE_ORDER_TYPE.NOT_RECEIVE ||
|
||||
@@ -368,7 +377,13 @@ export default {
|
||||
getValue,
|
||||
formatDate1,
|
||||
copyData,
|
||||
|
||||
onExpress(itemId){
|
||||
console.log('onExpress',itemId)
|
||||
// let expressId =
|
||||
uni.navigateTo({
|
||||
url:`/pages/rwa_package/setting/express?id=${itemId}`
|
||||
})
|
||||
},
|
||||
onNextRefund() {
|
||||
this.salesServer = 2;
|
||||
|
||||
@@ -542,18 +557,21 @@ export default {
|
||||
}
|
||||
try {
|
||||
// 模拟异步获取数据,实际应用中应该替换为你的数据获取逻辑,例如API调用
|
||||
const newData = await this.fetchData(
|
||||
this.form.page,
|
||||
this.form.pageSize
|
||||
);
|
||||
if (newData.entitys && newData.entitys.length !== 0) {
|
||||
this.orderList = [...this.orderList, ...newData.entitys]; // 将新数据添加到列表中
|
||||
this.form.page++; // 页码加1
|
||||
console.log("this.orderList", this.orderList);
|
||||
}
|
||||
const newData = await this.fetchData(
|
||||
this.form.page,
|
||||
this.form.pageSize
|
||||
);
|
||||
if (newData.entitys && newData.entitys.length !== 0) {
|
||||
this.orderList = [...this.orderList, ...newData.entitys]; // 将新数据添加到列表中
|
||||
this.form.page++; // 页码加1
|
||||
console.log("this.orderList", this.orderList);
|
||||
}
|
||||
|
||||
} catch (error) {
|
||||
console.error("加载数据失败:", error);
|
||||
} finally {
|
||||
console.log("this.orderList1111",JSON.parse(JSON.stringify(this.orderList)));
|
||||
this.$forceUpdate();
|
||||
this.loading = false; // 设置加载状态为false
|
||||
}
|
||||
},
|
||||
@@ -569,11 +587,41 @@ export default {
|
||||
}
|
||||
const data = await getOrderList(params);
|
||||
if (data && data.bizcode === 100) {
|
||||
for(let i=0;i<data.data.entitys.length;i++){
|
||||
for(let j=0;j<data.data.entitys[i].items.length;j++){
|
||||
if(data.data.entitys[i].items[j].expressNo){
|
||||
data.data.entitys[i].items[j].expressData = await this.getOrderLogistics(data.data.entitys[i].items[j].expressNo);
|
||||
}
|
||||
}
|
||||
}
|
||||
// data.data.entitys.forEach(item=>{
|
||||
// if(item.items.length){
|
||||
// item.items.forEach(async (Iitem)=>{
|
||||
// if(Iitem.expressNo){
|
||||
// Iitem.expressData = await this.getOrderLogistics(Iitem.expressNo);
|
||||
// }
|
||||
// })
|
||||
// }
|
||||
// })
|
||||
|
||||
return data.data;
|
||||
} else {
|
||||
return [];
|
||||
return '';
|
||||
}
|
||||
},
|
||||
async getOrderLogistics(id){
|
||||
const params = {
|
||||
mailNo:id
|
||||
};
|
||||
|
||||
const data = await orderLogistics(params);
|
||||
if(data.bizcode == 100){
|
||||
return data.data;
|
||||
}else{
|
||||
return [];
|
||||
}
|
||||
|
||||
},
|
||||
// 当滚动到底部时触发的方法
|
||||
loadMore() {
|
||||
this.loadData(); // 加载更多数据
|
||||
@@ -726,6 +774,16 @@ export default {
|
||||
</script>
|
||||
|
||||
<style lang="scss" scoped>
|
||||
.express-view{
|
||||
width:100%;
|
||||
height:52rpx;
|
||||
background-color: #f5f5f5;
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
align-items: center;
|
||||
border-radius: 4rpx;
|
||||
line-height: 1.6;
|
||||
}
|
||||
.after-sales-popup {
|
||||
height: 400px !important;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user