From cad79143aeae484fcd500b39ac07fde1a67f0ee6 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期三, 11 二月 2026 18:31:44 +0800
Subject: [PATCH] 合并
---
mini-program/pagesA/pages/order/order.vue | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/mini-program/pagesA/pages/order/order.vue b/mini-program/pagesA/pages/order/order.vue
index 2149f3b..773c5d1 100644
--- a/mini-program/pagesA/pages/order/order.vue
+++ b/mini-program/pagesA/pages/order/order.vue
@@ -1,13 +1,13 @@
<template>
<view class="box">
<view class="cate">
- <view @click="changeRow(index)" :class="active === index ? 'cate-item active' : 'cate-item'" v-for="(item, index) in cate" :key="'cate_'+index">
+ <view @click="changeRow(index)" :class="active === index ? 'cate-item active' : 'cate-item'" v-for="(item, index) in cate" :key="index">
{{item.name}}
<view class="cate-item-xiab" v-if="active === index"></view>
</view>
</view>
<view class="list">
- <view class="list-item" v-for="(item, index) in dataList" :key="index">
+ <view class="list-item" v-for="(item, index) in dataList" :key="index" @click="jumpOrderDetail(item.id)">
<view class="a">
<view class="a-left">
<view class="a-left-tips">{{item.receiveType==1?'鑷彁':'蹇�掗厤閫�'}}</view>
@@ -77,8 +77,8 @@
<view class="phone-item" >
<view>
<image src="/static/icon/ic_call@2x.png" mode="widthFix" @click="contactPhoneDo()" ></image>
- <text>{{linkItem.linkname}} </text>
- <text style="margin-left: 10px;"> {{linkItem.linkphone}}</text>
+ <text>{{linkItem.linkname||''}} </text>
+ <text style="margin-left: 10px;"> {{linkItem.linkphone||''}}</text>
</view>
</view>
<view style="width: 100%; height: 30rpx;"></view>
@@ -186,6 +186,11 @@
}
this.loading=false
},
+ jumpOrderDetail(id){
+ uni.navigateTo({
+ url: '/pagesA/pages/order-details/order-details?userType=1&id='+id
+ })
+ },
checkShopLogin(){
var that =this
if( this.shopInfo ==null || this.shopInfo.id==null || this.shopToken==null || this.shopToken==''){
@@ -232,6 +237,7 @@
padding: 0 6rpx;
height: 40rpx;
line-height: 40rpx;
+ // background: #00B775;
background: #00B775;
border-radius: 8rpx;
font-weight: 400;
--
Gitblit v1.9.3