From c94d9517fc88ec19f54c8d5b1f60c41e87413b70 Mon Sep 17 00:00:00 2001
From: fox <1466778434@qq.com>
Date: Fri, 21 Mar 2025 14:05:25 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E8=AE=A2=E5=8D=95=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2;?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/index/order.vue                 | 159 +++++++++++++++++++++-------------
 pages_order/order/createOrder.vue     |   4 -
 pages_order/product/productDetail.vue |   9 --
 3 files changed, 98 insertions(+), 74 deletions(-)

diff --git a/pages/index/order.vue b/pages/index/order.vue
index 161dcdc..cb2cb26 100644
--- a/pages/index/order.vue
+++ b/pages/index/order.vue
@@ -1,85 +1,110 @@
 <template>
 	<view class="page">
 		<!-- 导航栏 -->
-		<navbar title="订单中心" leftClick @leftClick="$utils.navigateBack" bgColor="#E3441A" color="#fff" />
-
+		<navbar title="订单" leftClick @leftClick="$utils.navigateBack" color="#fff" />
+		
 		<!-- 订单筛选 -->
 		<view class="tabs">
 			<uv-tabs :list="tabs" 
-			:activeStyle="{color : '#fff', fontWeight : 600}" 
-			lineColor="#fff"
-			:inactiveStyle="{color: 'rgba(255,255,255,.8)'}" 
+			:customStyle="{
+				backgroundColor: '#FFFFFF',
+			}"
+			:activeStyle="{
+				color: '#84A73F',
+				fontSize: '28rpx',
+				whiteSpace: 'nowrap',
+				paddingTop: '29rpx',
+				paddingBottom: '21rpx',
+			}"
+			:inactiveStyle="{
+				color: '#000000',
+				fontSize: '28rpx',
+				whiteSpace: 'nowrap',
+				paddingTop: '29rpx',
+				paddingBottom: '21rpx',
+			}"
 			lineHeight="8rpx" 
-			lineWidth="50rpx" 
+			lineWidth="92rpx" 
+			lineColor="linear-gradient(to right, #84A73F, #D8FF8F)"
+			:scrollable="false"
 			:current="current"
 			@click="clickTabs"></uv-tabs>
 		</view>
 
 		<view class="list">
-			<view class="item" v-for="(item, index) in list" @click="toOrderDetail(item.id)" :key="index">
-				<view class="content" :key="index" v-for="(good, index) in item.commonOrderSkuList">
-					<view class="top">
-						<view class="service">
-							{{ good.title }}
-						</view>
-						<view class="status">
-							<text> {{ tabs[Number(item.state) + 1].name }}</text>
-						</view>
-					</view>
+			<orderCard v-for="item in list" :data="item" :key="item.id"></orderCard>
+			<!-- todo: delete -->
+			<orderCard></orderCard>
+		</view>
 
-					<view class="main">
-						<view class="left">
-							<image mode="aspectFill" :src="good.image && good.image.split(',')[0]"></image>
-						</view>
+		<template v-if="false">
 
-						<view class="right">
-							<view class="text-hidden-1">
-								客户姓名：{{item.name}}
+			<view class="list">
+				<view class="item" v-for="(item, index) in list" @click="toOrderDetail(item.id)" :key="index">
+					<view class="content" :key="index" v-for="(good, index) in item.commonOrderSkuList">
+						<view class="top">
+							<view class="service">
+								{{ good.title }}
 							</view>
-							<view class="text-hidden-1">
-								下单时间：{{item.createTime}}
+							<view class="status">
+								<text> {{ tabs[Number(item.state) + 1].name }}</text>
 							</view>
-							<view class="text-hidden-1">
-								联系电话：{{item.phone}}
+						</view>
+
+						<view class="main">
+							<view class="left">
+								<image mode="aspectFill" :src="good.image && good.image.split(',')[0]"></image>
 							</view>
 
+							<view class="right">
+								<view class="text-hidden-1">
+									客户姓名：{{item.name}}
+								</view>
+								<view class="text-hidden-1">
+									下单时间：{{item.createTime}}
+								</view>
+								<view class="text-hidden-1">
+									联系电话：{{item.phone}}
+								</view>
+
+							</view>
 						</view>
+
 					</view>
 
-				</view>
+					<view class="bottom">
+						<view class="price">
+							<text class="total-title">总价格：</text>
+							<text class="unit">￥</text>
+							<text class="num">{{item.price}}</text>
+							<text class="c-unit">元</text>
+						</view>
 
-				<view class="bottom">
-					<view class="price">
-						<text class="total-title">总价格：</text>
-						<text class="unit">￥</text>
-						<text class="num">{{item.price}}</text>
-						<text class="c-unit">元</text>
-					</view>
+						<view @click.stop="toPayOrder(item)" class="btn" v-if="item.state == 0">
+							立即付款
+						</view>
 
-					<view @click.stop="toPayOrder(item)" class="btn" v-if="item.state == 0">
-						立即付款
-					</view>
+						<view @click.stop="cancelOrder(item)" class="btn" v-if="item.state == 0">
+							取消订单
+						</view>
 
-					<view @click.stop="cancelOrder(item)" class="btn" v-if="item.state == 0">
-						取消订单
-					</view>
+						<view class="btn" @click.stop="confirmOrder(item)" v-if="item.state == 2">
+							确认收货
+						</view>
 
-					<view class="btn" @click.stop="confirmOrder(item)" v-if="item.state == 2">
-						确认收货
+						<view @click.stop="$refs.customerServicePopup.open()" class="btn" v-if="item.state > 0">
+							联系客服
+						</view>
 					</view>
 
-					<view @click.stop="$refs.customerServicePopup.open()" class="btn" v-if="item.state > 0">
-						联系客服
-					</view>
 				</view>
-
-			</view>
-			<view style="
-			margin-top: 20rpx;
-			min-width: 700rpx;">
-				<uv-empty mode="list" v-if="list.length == 0"></uv-empty>
+				<view style="
+				margin-top: 20rpx;
+				min-width: 700rpx;">
+					<uv-empty mode="list" v-if="list.length == 0"></uv-empty>
+				</view>
 			</view>
-		</view>
+		</template>
 		
 		<customerServicePopup ref="customerServicePopup" />
 
@@ -88,6 +113,8 @@
 </template>
 
 <script>
+	import orderCard from '@/components/order/orderCard.vue'
+
 	import {
 		mapGetters
 	} from 'vuex'
@@ -99,6 +126,7 @@
 	export default {
 		mixins: [mixinsList, mixinsOrder],
 		components: {
+			orderCard,
 			tabber,
 			customerServicePopup,
 		},
@@ -106,23 +134,20 @@
 		data() {
 			return {
 				tabs: [{
-						name: '全部'
+						name: '全部订单'
 					},
 					{
 						name: '待付款'
 					},
 					{
-						name: '待发货'
-					},
-					{
-						name: '待收货'
+						name: '待核销'
 					},
 					{
 						name: '已完成'
 					},
 					{
 						name: '已取消'
-					}
+					},
 				],
 				current: 0,
 				mixinsListApi: 'getOrderPageList',
@@ -157,10 +182,22 @@
 </script>
 
 <style scoped lang="scss">
-	.page {}
+	.page {
+		background-color: #F5F5F5;
+				
+		/deep/ .nav-bar__view {
+			background-image: linear-gradient(#84A73F, #D8FF8F);
+		}
+	}
 
 	.tabs {
-		background: $uni-color;
+		/deep/ .uv-tabs__wrapper__nav__line {
+			bottom: 0;
+		}
+	}
+
+	.list {
+		padding: 16rpx 17rpx;
 	}
 
 	.list {
diff --git a/pages_order/order/createOrder.vue b/pages_order/order/createOrder.vue
index 80a127b..44283e0 100644
--- a/pages_order/order/createOrder.vue
+++ b/pages_order/order/createOrder.vue
@@ -67,8 +67,6 @@
 
 <script>
 	import productCard from '@/components/product/productCard.vue'
-
-	import addressList from '../components/address/addressList.vue'
 	import couponList from '@/components/couponList/couponList.vue'
 
 	import {
@@ -78,8 +76,6 @@
 	export default {
 		components: {
 			productCard,
-
-			addressList,
 			couponList
 		},
 		data() {
diff --git a/pages_order/product/productDetail.vue b/pages_order/product/productDetail.vue
index e62cfc6..ba9a856 100644
--- a/pages_order/product/productDetail.vue
+++ b/pages_order/product/productDetail.vue
@@ -70,16 +70,7 @@
 </template>
 
 <script>
-	import submit from '../components/product/submit.vue'
-	import submitUnitSelect from '../components/product/submitUnitSelect.vue'
-	import customerServicePopup from '@/components/config/customerServicePopup.vue'
-
 	export default {
-		components: {
-			submit,
-			submitUnitSelect,
-			customerServicePopup
-		},
 		data() {
 			return {
 				productDetail: {