Merge branch 'master' of http://154.8.193.216:3030/admin1/jiangchengfeiyi-xiaochengxu
This commit is contained in:
commit
9792a3fb8d
|
|
@ -2,49 +2,37 @@
|
|||
<view class="flex-col page">
|
||||
<view class="flex-col group">
|
||||
<view class="flex-row items-center group_2">
|
||||
<image
|
||||
class="image"
|
||||
src="https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FtiKFGDAi-avator.png"
|
||||
/>
|
||||
<image class="image"
|
||||
src="https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FtiKFGDAi-avator.png" />
|
||||
<view class="ml-20 flex-col items-start flex-1">
|
||||
<text class="text">微信用户</text>
|
||||
<text class="mt-18 font text_2">剩余积分：40</text>
|
||||
</view>
|
||||
</view>
|
||||
<view class="flex-row equal-division">
|
||||
<view class="flex-col items-center" @click="goto">
|
||||
<image
|
||||
class="shrink-0 image_2"
|
||||
src="https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FjqkEyOpY-totalorder.png"
|
||||
/>
|
||||
<view class="flex-col items-center" @click="goto('全部')">
|
||||
<image class="shrink-0 image_2"
|
||||
src="https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FjqkEyOpY-totalorder.png" />
|
||||
<text class="font text_3">总订单</text>
|
||||
</view>
|
||||
<view class="flex-col items-center ml-1">
|
||||
<image
|
||||
class="shrink-0 image_2"
|
||||
src="https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FEzgKLIBS-waitproduct.png"
|
||||
/>
|
||||
<text class="font text_5">待发货</text>
|
||||
<view class="flex-col items-center ml-1" @click="goto('待支付')">
|
||||
<image class="shrink-0 image_2"
|
||||
src="https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FEzgKLIBS-waitproduct.png" />
|
||||
<text class="font text_5">待支付</text>
|
||||
</view>
|
||||
<view class="flex-col items-center ml-1">
|
||||
<image
|
||||
class="shrink-0 image_2"
|
||||
src="https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FVWTrHegX-waitpay.png"
|
||||
/>
|
||||
<text class="font text_4">待付款</text>
|
||||
<view class="flex-col items-center ml-1" @click="goto('待发货')">
|
||||
<image class="shrink-0 image_2"
|
||||
src="https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FVWTrHegX-waitpay.png" />
|
||||
<text class="font text_4">待发货</text>
|
||||
</view>
|
||||
<view class="flex-col items-center ml-1">
|
||||
<image
|
||||
class="shrink-0 image_2"
|
||||
src="https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FWAdobYmD-waitshouhou.png"
|
||||
/>
|
||||
<text class="font text_6">待收货</text>
|
||||
<view class="flex-col items-center ml-1" @click="goto('已发货')">
|
||||
<image class="shrink-0 image_2"
|
||||
src="https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FWAdobYmD-waitshouhou.png" />
|
||||
<text class="font text_6">已发货</text>
|
||||
</view>
|
||||
<view class="flex-col items-center ml-1">
|
||||
<image
|
||||
class="shrink-0 image_2"
|
||||
src="https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FGEFKFVXw-shouhou.png"
|
||||
/>
|
||||
<view class="flex-col items-center ml-1" @click="goto('已退款')">
|
||||
<image class="shrink-0 image_2"
|
||||
src="https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FGEFKFVXw-shouhou.png" />
|
||||
<text class="font text_7">退款/售后</text>
|
||||
</view>
|
||||
</view>
|
||||
|
|
@ -52,74 +40,54 @@
|
|||
<view class="flex-col mt-37">
|
||||
<view class="flex-col group_3">
|
||||
<view class="flex-row justify-between relative">
|
||||
<image
|
||||
class="image_3"
|
||||
src="https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FSJZTOttL-address.png"
|
||||
/>
|
||||
<image
|
||||
class="self-start image_4 image_5"
|
||||
src="https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FwQgycnra-rush.png"
|
||||
/>
|
||||
<image class="image_3"
|
||||
src="https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FSJZTOttL-address.png" />
|
||||
<image class="self-start image_4 image_5"
|
||||
src="https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FwQgycnra-rush.png" />
|
||||
<text class="font_2 text_8 pos">地 址 列 表</text>
|
||||
<view class="divider pos_2"></view>
|
||||
</view>
|
||||
<view class="flex-row justify-between relative" @click="goToText">
|
||||
<image
|
||||
class="image_6"
|
||||
src="https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FejVXliLM-contact.png"
|
||||
/>
|
||||
<image
|
||||
class="self-start image_4 image_7"
|
||||
src="https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FwQgycnra-rush.png"
|
||||
/>
|
||||
<image class="image_6"
|
||||
src="https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FejVXliLM-contact.png" />
|
||||
<image class="self-start image_4 image_7"
|
||||
src="https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FwQgycnra-rush.png" />
|
||||
<text class="font_2 pos_3">联系人列表</text>
|
||||
<view class="divider pos_4"></view>
|
||||
</view>
|
||||
</view>
|
||||
<view class="flex-row justify-between group_4">
|
||||
<view class="flex-row items-center">
|
||||
<image
|
||||
class="shrink-0 image_8"
|
||||
src="https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FOfemexvK-booking.png"
|
||||
/>
|
||||
<image class="shrink-0 image_8"
|
||||
src="https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FOfemexvK-booking.png" />
|
||||
<text class="font_2 text_9">我 的 预 约</text>
|
||||
</view>
|
||||
<image
|
||||
class="self-start image_4 image_9"
|
||||
src="https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FwQgycnra-rush.png"
|
||||
/>
|
||||
<image class="self-start image_4 image_9"
|
||||
src="https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FwQgycnra-rush.png" />
|
||||
</view>
|
||||
<view class="flex-col group_5">
|
||||
<view class="divider view"></view>
|
||||
<view class="flex-row justify-between items-center group_6">
|
||||
<view class="flex-row items-center">
|
||||
<image
|
||||
class="shrink-0 image_10"
|
||||
src="https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FqihgypDY-coupon.png"
|
||||
/>
|
||||
<image class="shrink-0 image_10"
|
||||
src="https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FqihgypDY-coupon.png" />
|
||||
<text class="font_2">我的优惠券</text>
|
||||
</view>
|
||||
<image
|
||||
class="image_4 image_11"
|
||||
src="https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FwQgycnra-rush.png"
|
||||
/>
|
||||
<image class="image_4 image_11"
|
||||
src="https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FwQgycnra-rush.png" />
|
||||
</view>
|
||||
<view class="divider view_2"></view>
|
||||
<view class="flex-row justify-between group_7">
|
||||
<view class="flex-row self-center">
|
||||
<view class="flex-row shrink-0">
|
||||
<image
|
||||
class="shrink-0 image_12"
|
||||
src="https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FlGcdVAji-setting.png"
|
||||
/>
|
||||
<image class="shrink-0 image_12"
|
||||
src="https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FlGcdVAji-setting.png" />
|
||||
<text class="ml-10 self-start font_3 text_10">设</text>
|
||||
</view>
|
||||
<text class="ml-60 self-start font_3 text_11">置</text>
|
||||
</view>
|
||||
<image
|
||||
class="self-start image_4 image_13"
|
||||
src="https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FwQgycnra-rush.png"
|
||||
/>
|
||||
<image class="self-start image_4 image_13"
|
||||
src="https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FwQgycnra-rush.png" />
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
|
|
@ -127,16 +95,22 @@
|
|||
</template>
|
||||
|
||||
<script setup>
|
||||
import { onMounted, ref } from 'vue';
|
||||
import { onShow,onLoad } from "@dcloudio/uni-app";
|
||||
import {
|
||||
onMounted,
|
||||
ref
|
||||
} from 'vue';
|
||||
import {
|
||||
onShow,
|
||||
onLoad
|
||||
} from "@dcloudio/uni-app";
|
||||
onMounted(() => {
|
||||
getFonts() //启动使从服务器下载字体
|
||||
})
|
||||
const goto = () => { //跳转到订单
|
||||
uni.navigateTo({
|
||||
url: "/pages/mine/mineorders/mineorders"
|
||||
})
|
||||
}
|
||||
// const goto = () => { //跳转到订单
|
||||
// uni.navigateTo({
|
||||
// url: "/pages/mine/mineorders/mineorders"
|
||||
// })
|
||||
// }
|
||||
const goToText = () => { //跳转到联系人信息
|
||||
uni.navigateTo({
|
||||
url: '/pages/mine/Contact/Contact'
|
||||
|
|
@ -147,6 +121,11 @@ const goTo = ()=>{ //跳转到预约
|
|||
url: '/pages/mine/bookings/booking'
|
||||
})
|
||||
}
|
||||
const goto = (tab) => {
|
||||
uni.navigateTo({
|
||||
url: '/pages/mine/mineorders/mineorders?zt='+JSON.stringify(tab)
|
||||
})
|
||||
}
|
||||
const getFonts = () => { //导入字体
|
||||
uni.loadFontFace({
|
||||
family: 'FangZhengFonts',
|
||||
|
|
@ -165,9 +144,11 @@ const getFonts =()=>{ //导入字体
|
|||
.ml-1 {
|
||||
margin-left: 1.88rpx;
|
||||
}
|
||||
|
||||
.mt-37 {
|
||||
margin-top: 69.38rpx;
|
||||
}
|
||||
|
||||
.page {
|
||||
padding: 135rpx 0 211.88rpx;
|
||||
background-color: #ffffff00;
|
||||
|
|
@ -178,176 +159,219 @@ const getFonts =()=>{ //导入字体
|
|||
overflow-x: hidden;
|
||||
height: 100vh;
|
||||
}
|
||||
|
||||
.group {
|
||||
padding: 0 7.5rpx;
|
||||
}
|
||||
|
||||
.group_2 {
|
||||
margin: 0 30rpx;
|
||||
padding: 0 7.5rpx 37.5rpx;
|
||||
border-bottom: solid 0.94rpx #aeaeae;
|
||||
}
|
||||
|
||||
.image {
|
||||
border-radius: 50%;
|
||||
width: 150rpx;
|
||||
height: 151.88rpx;
|
||||
}
|
||||
|
||||
.text {
|
||||
color: #000000;
|
||||
font-size: 45rpx;
|
||||
font-family: FangZhengFonts;
|
||||
line-height: 40.61rpx;
|
||||
}
|
||||
|
||||
.font {
|
||||
font-size: 28.13rpx;
|
||||
font-family: FangZhengFonts;
|
||||
line-height: 27.02rpx;
|
||||
color: #000000;
|
||||
}
|
||||
|
||||
.text_2 {
|
||||
margin-left: 7.5rpx;
|
||||
font-size: 30rpx;
|
||||
line-height: 27.9rpx;
|
||||
}
|
||||
|
||||
.equal-division {
|
||||
margin-right: 5.63rpx;
|
||||
}
|
||||
|
||||
.image_2 {
|
||||
width: 144rpx;
|
||||
height: 144rpx;
|
||||
}
|
||||
|
||||
.text_3 {
|
||||
margin-top: -7.5rpx;
|
||||
}
|
||||
|
||||
.text_5 {
|
||||
margin-top: -7.5rpx;
|
||||
}
|
||||
|
||||
.text_4 {
|
||||
margin-top: -7.5rpx;
|
||||
}
|
||||
|
||||
.text_6 {
|
||||
margin-top: -7.5rpx;
|
||||
}
|
||||
|
||||
.text_7 {
|
||||
margin-top: -7.5rpx;
|
||||
}
|
||||
|
||||
.group_3 {
|
||||
padding: 0 35.63rpx;
|
||||
}
|
||||
|
||||
.image_3 {
|
||||
width: 120rpx;
|
||||
height: 123.75rpx;
|
||||
}
|
||||
|
||||
.image_4 {
|
||||
width: 39.38rpx;
|
||||
height: 41.25rpx;
|
||||
}
|
||||
|
||||
.image_5 {
|
||||
margin-right: 31.88rpx;
|
||||
margin-top: 52.5rpx;
|
||||
}
|
||||
|
||||
.font_2 {
|
||||
font-size: 37.5rpx;
|
||||
font-family: FangZhengFonts;
|
||||
line-height: 36.47rpx;
|
||||
color: #000000;
|
||||
}
|
||||
|
||||
.text_8 {
|
||||
line-height: 35.74rpx;
|
||||
}
|
||||
|
||||
.pos {
|
||||
position: absolute;
|
||||
left: 121.76rpx;
|
||||
top: 50%;
|
||||
transform: translateY(-50%);
|
||||
}
|
||||
|
||||
.divider {
|
||||
background-color: #aeaeae;
|
||||
height: 0.94rpx;
|
||||
}
|
||||
|
||||
.pos_2 {
|
||||
position: absolute;
|
||||
left: 3.75rpx;
|
||||
right: 37.5rpx;
|
||||
top: 117.19rpx;
|
||||
}
|
||||
|
||||
.image_6 {
|
||||
width: 120rpx;
|
||||
height: 125.63rpx;
|
||||
}
|
||||
|
||||
.image_7 {
|
||||
margin-right: 31.88rpx;
|
||||
margin-top: 52.5rpx;
|
||||
}
|
||||
|
||||
.pos_3 {
|
||||
position: absolute;
|
||||
left: 116.72rpx;
|
||||
top: 50%;
|
||||
transform: translateY(-50%);
|
||||
}
|
||||
|
||||
.pos_4 {
|
||||
position: absolute;
|
||||
left: 3.75rpx;
|
||||
right: 37.5rpx;
|
||||
top: 124.69rpx;
|
||||
}
|
||||
|
||||
.group_4 {
|
||||
margin-top: 4rpx;
|
||||
padding: 0 28.13rpx 11.25rpx;
|
||||
}
|
||||
|
||||
.image_8 {
|
||||
width: 133.13rpx;
|
||||
height: 114.38rpx;
|
||||
}
|
||||
|
||||
.text_9 {
|
||||
padding-top: 20rpx;
|
||||
margin-left: -7.5rpx;
|
||||
line-height: 33.99rpx;
|
||||
}
|
||||
|
||||
.image_9 {
|
||||
margin-right: 41.25rpx;
|
||||
margin-top: 45.5rpx;
|
||||
}
|
||||
|
||||
.group_5 {
|
||||
padding: 0 39.38rpx;
|
||||
}
|
||||
|
||||
.view {
|
||||
margin-right: 33.75rpx;
|
||||
}
|
||||
|
||||
.group_6 {
|
||||
padding: 22.5rpx 0 7.5rpx;
|
||||
}
|
||||
|
||||
.image_10 {
|
||||
width: 118.13rpx;
|
||||
height: 101.25rpx;
|
||||
}
|
||||
|
||||
.image_11 {
|
||||
margin-right: 28.13rpx;
|
||||
}
|
||||
|
||||
.view_2 {
|
||||
margin-right: 31.88rpx;
|
||||
}
|
||||
|
||||
.group_7 {
|
||||
padding: 28.13rpx 7.5rpx 0;
|
||||
}
|
||||
|
||||
.image_12 {
|
||||
width: 91.88rpx;
|
||||
height: 91.88rpx;
|
||||
}
|
||||
|
||||
.font_3 {
|
||||
font-size: 37.5rpx;
|
||||
font-family: FangZhengFonts;
|
||||
line-height: 30.47rpx;
|
||||
color: #000000;
|
||||
}
|
||||
|
||||
.text_10 {
|
||||
margin-top: 26.25rpx;
|
||||
}
|
||||
|
||||
.text_11 {
|
||||
margin-top: 22.5rpx;
|
||||
}
|
||||
|
||||
.image_13 {
|
||||
margin-right: 20.63rpx;
|
||||
margin-top: 16.88rpx;
|
||||
}
|
||||
|
||||
@import url(../../../common/css/global.css);
|
||||
</style>
|
||||
|
|
@ -71,13 +71,45 @@
|
|||
src="https://ide.code.fun/api/image?token=67610a10797f850011f30392&name=f10bd62afae3562e9d76103ff6fb0f84.png" />
|
||||
<text class="font_8 text_17">{{order.totalAmount}}</text>
|
||||
</view>
|
||||
<view class="flex-row justify-end group_7">
|
||||
<view class="flex-col justify-start items-center text-wrapper"><text
|
||||
<!-- <view class="flex-row justify-end group_7"> -->
|
||||
<!-- <view class="flex-col justify-start items-center text-wrapper"><text
|
||||
class="font text_18">删除记录</text></view>
|
||||
<view class="flex-col justify-start items-center text-wrapper_2 ml-14" v-if="order.orderStatus==='待支付'">
|
||||
<text class="font_3">去支付</text>
|
||||
</view>
|
||||
<view class="flex-col justify-start items-center text-wrapper_2 ml-14" v-if="order.orderStatus==='待发货'">
|
||||
<text class="font_3">取消订单</text>
|
||||
</view>
|
||||
<view class="flex-col justify-start items-center text-wrapper_2 ml-14" v-if="order.orderStatus==='已发货'">
|
||||
<text class="font_3">确认收货</text>
|
||||
</view>
|
||||
<view class="flex-col justify-start items-center text-wrapper_2 ml-14" v-if="order.orderStatus==='已退款'">
|
||||
<text class="font_3">已退款</text>
|
||||
</view> -->
|
||||
<!-- </view> -->
|
||||
<view class="flex-row justify-end group_7" v-if="order.orderStatus==='待支付'">
|
||||
<view class="flex-col justify-start items-center text-wrapper"><text
|
||||
class="font text_18">取消订单</text></view>
|
||||
<view class="flex-col justify-start items-center text-wrapper_2 ml-14">
|
||||
<text class="font_3">去支付</text>
|
||||
</view>
|
||||
</view>
|
||||
<view class="flex-row justify-end group_7" v-if="order.orderStatus==='待发货'">
|
||||
<view class="flex-col justify-start items-center text-wrapper_2 ml-14">
|
||||
<text class="font_3">联系客服</text>
|
||||
</view>
|
||||
</view>
|
||||
<view class="flex-row justify-end group_7" v-if="order.orderStatus==='已发货'">
|
||||
<view class="flex-col justify-start items-center text-wrapper"><text
|
||||
class="font text_18">取消订单</text></view>
|
||||
<view class="flex-col justify-start items-center text-wrapper_2 ml-14">
|
||||
<text class="font_3">查看物流</text>
|
||||
</view>
|
||||
</view>
|
||||
<view class="flex-row justify-end group_7" v-if="order.orderStatus==='已退款'">
|
||||
<view class="flex-col justify-start items-center text-wrapper"><text
|
||||
class="font text_18">删除订单</text></view>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
|
|
@ -95,18 +127,37 @@
|
|||
testUrl,
|
||||
suiUrl
|
||||
} from '@/api/request';
|
||||
import { onLoad } from "@dcloudio/uni-app";
|
||||
const Status = ref({
|
||||
orderStatus: '全部',
|
||||
orders: [],
|
||||
displayedOrders: [],
|
||||
});
|
||||
})
|
||||
const orderStatus = ''
|
||||
const currentColor = ref(0);
|
||||
const isSelected = (tab) => Status.value.orderStatus === tab;
|
||||
const isSelected = (tab) => Status.value.orderStatus === tab
|
||||
onMounted(async () => {
|
||||
await Getorder();
|
||||
await Getorder()
|
||||
if (Status.value.orderStatus === '全部') {
|
||||
Status.value.displayedOrders = Status.value.orders;
|
||||
});
|
||||
} else {
|
||||
Status.value.displayedOrders = Status.value.orders.filter((order) => {
|
||||
switch (Status.value.orderStatus) {
|
||||
case '待支付':
|
||||
return order.orderStatus === '待支付'
|
||||
case '待发货':
|
||||
return order.orderStatus === '待发货'
|
||||
case '已发货':
|
||||
return order.orderStatus === '已发货'
|
||||
case '已退款':
|
||||
return order.orderStatus === '已退款'
|
||||
default:
|
||||
return false;
|
||||
}
|
||||
})
|
||||
}
|
||||
})
|
||||
|
||||
const userInfo = wx.getStorageSync('userInfo')
|
||||
const Getorder = async () => {
|
||||
const res = await uni.request({
|
||||
|
|
@ -116,17 +167,23 @@
|
|||
cookie: wx.getStorageSync('cookie')
|
||||
},
|
||||
data: {
|
||||
// id:userInfo.value.userInfo.id,
|
||||
id: userInfo.id,
|
||||
},
|
||||
});
|
||||
})
|
||||
if (res.data.code === 1) {
|
||||
console.log('res.data.data--->', res.data.data);
|
||||
Status.value.orders = res.data.data;
|
||||
|
||||
Status.value.orders = res.data.data
|
||||
} else {
|
||||
console.log('没拿到用户数据');
|
||||
console.log('没拿到用户数据')
|
||||
}
|
||||
};
|
||||
}
|
||||
const zt = ref({
|
||||
tab:''
|
||||
})
|
||||
onLoad((options)=>{
|
||||
zt.value.tab = JSON.parse(options.zt)
|
||||
changeTab(zt.value.tab)
|
||||
})
|
||||
const changeTab = (tab) => {
|
||||
if (tab === '全部') {
|
||||
Status.value.displayedOrders = Status.value.orders;
|
||||
|
|
@ -145,14 +202,11 @@
|
|||
default:
|
||||
return false;
|
||||
}
|
||||
});
|
||||
Status.value.orderStatus = tab;
|
||||
})
|
||||
Status.value.orderStatus = tab
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
|
||||
const goToText = (index) => {
|
||||
console.log('下标-->', index);
|
||||
uni.navigateTo({
|
||||
url: '../../../pages/mine/OrderDetails/OrderDetails?info=' + JSON.stringify(Status.value
|
||||
.displayedOrders[index]),
|
||||
|
|
|
|||
|
|
@ -1,9 +1,10 @@
|
|||
<template>
|
||||
<view class="flex-row relative page">
|
||||
<view class="flex-row justify-center items-center section_2 pos">
|
||||
<image class="image"
|
||||
<!-- <image class="image"
|
||||
src="https://ide.code.fun/api/image?token=67610a10797f850011f30392&name=49977e5fbfb65cc3b62ce79b9d6705a2.png" />
|
||||
<text class="font text ml-4">搜索订单</text>
|
||||
<text class="font text ml-4">搜索订单</text> -->
|
||||
<input class="search-input" placeholder="请输入商品名称" v-model="searchKeyword" @input="handleSearch" />
|
||||
</view>
|
||||
<view class="flex-col section_44">
|
||||
<view class="flex-row justify-between self-stretch groupp">
|
||||
|
|
@ -95,19 +96,43 @@
|
|||
testUrl,
|
||||
suiUrl
|
||||
} from '@/api/request';
|
||||
import { onLoad } from "@dcloudio/uni-app";
|
||||
|
||||
const Status = ref({
|
||||
orderStatus: '全部',
|
||||
orders: [],
|
||||
displayedOrders: [],
|
||||
});
|
||||
const orderStatus = ''
|
||||
const orderStatus = '';
|
||||
const currentColor = ref(0);
|
||||
const isSelected = (tab) => Status.value.orderStatus === tab;
|
||||
const searchKeyword = ref(''); // 新增，用于存储搜索关键词
|
||||
|
||||
onMounted(async () => {
|
||||
await Getorder();
|
||||
// 根据当前的tab值来设置displayedOrders
|
||||
if (Status.value.orderStatus === '全部') {
|
||||
Status.value.displayedOrders = Status.value.orders;
|
||||
} else {
|
||||
Status.value.displayedOrders = Status.value.orders.filter((order) => {
|
||||
switch (Status.value.orderStatus) {
|
||||
case '待支付':
|
||||
return order.orderStatus === '待支付'
|
||||
case '待发货':
|
||||
return order.orderStatus === '待发货'
|
||||
case '已发货':
|
||||
return order.orderStatus === '已发货'
|
||||
case '已退款':
|
||||
return order.orderStatus === '已退款'
|
||||
default:
|
||||
return false;
|
||||
}
|
||||
});
|
||||
const userInfo = wx.getStorageSync('userInfo')
|
||||
}
|
||||
});
|
||||
|
||||
const userInfo = wx.getStorageSync('userInfo');
|
||||
|
||||
const Getorder = async () => {
|
||||
const res = await uni.request({
|
||||
url: baseUrl + '/order/list',
|
||||
|
|
@ -116,17 +141,27 @@
|
|||
cookie: wx.getStorageSync('cookie')
|
||||
},
|
||||
data: {
|
||||
// id:userInfo.value.userInfo.id,
|
||||
id: userInfo.id,
|
||||
},
|
||||
});
|
||||
if (res.data.code === 1) {
|
||||
console.log('res.data.data--->', res.data.data);
|
||||
Status.value.orders = res.data.data;
|
||||
} else {
|
||||
console.log('没拿到用户数据');
|
||||
}
|
||||
};
|
||||
|
||||
const zt = ref({
|
||||
tab: ''
|
||||
});
|
||||
|
||||
onLoad((options) => {
|
||||
if (options.tab) {
|
||||
zt.value.tab = JSON.parse(options.tab);
|
||||
changeTab(zt.value.tab);
|
||||
}
|
||||
});
|
||||
|
||||
const changeTab = (tab) => {
|
||||
if (tab === '全部') {
|
||||
Status.value.displayedOrders = Status.value.orders;
|
||||
|
|
@ -150,14 +185,44 @@
|
|||
}
|
||||
};
|
||||
|
||||
// 新增，处理搜索逻辑的函数
|
||||
const handleSearch = () => {
|
||||
if (searchKeyword.value.trim() === '') {
|
||||
// 如果关键词为空，恢复根据当前tab展示的数据（全部或筛选后的数据）
|
||||
if (Status.value.orderStatus === '全部') {
|
||||
Status.value.displayedOrders = Status.value.orders;
|
||||
} else {
|
||||
Status.value.displayedOrders = Status.value.orders.filter((order) => {
|
||||
switch (Status.value.orderStatus) {
|
||||
case '待支付':
|
||||
return order.orderStatus === '待支付'
|
||||
case '待发货':
|
||||
return order.orderStatus === '待发货'
|
||||
case '已发货':
|
||||
return order.orderStatus === '已发货'
|
||||
case '已退款':
|
||||
return order.orderStatus === '已退款'
|
||||
default:
|
||||
return false;
|
||||
}
|
||||
});
|
||||
}
|
||||
return;
|
||||
}
|
||||
const keyword = searchKeyword.value.toLowerCase(); // 转换为小写，方便不区分大小写搜索
|
||||
Status.value.displayedOrders = Status.value.orders.filter((order) => {
|
||||
return order.orderItemList.some((item) => {
|
||||
return item.goodSnapshot.name.toLowerCase().includes(keyword);
|
||||
});
|
||||
});
|
||||
};
|
||||
|
||||
const goToText = (index) => {
|
||||
console.log('下标-->', index);
|
||||
uni.navigateTo({
|
||||
url: '../../../pages/mine/OrderDetails/OrderDetails?info=' + JSON.stringify(Status.value
|
||||
.displayedOrders[index]),
|
||||
})
|
||||
}
|
||||
};
|
||||
</script>
|
||||
|
||||
<style lang="scss" scoped>
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user