feat：订单页面提交

myPages/coupon/index.rpx.scss

@@ -16,9 +16,6 @@
         line-height: 26px;
     }
 
-    .service-order-tab-item.active {
-        // color: #ff0000;
-    }
 
     .underline {
         border-bottom: 2px solid #FFE05C;

myPages/coupon/index.vue

@@ -22,7 +22,7 @@
         <view class="service-order">
 
             <!-- 门店列表 -->
-            <view v-if="countsList.length > 0" v-for="(item, index) in countsList" :class="computedStyle(item.state)"
+            <view v-if="countsList.length > 0" v-for="(item, index) in countsList" 
                 class="store-wrap  bg-img">
                 <view class="row-list">
                     <view class="store-content">
@@ -98,6 +98,7 @@ export default {
                 this.reqParm.type = '2';
             }
 
+
         },
     }
 }

otherPages/order/index.rpx.scss

@@ -0,0 +1,392 @@
+.tabBarLineHeight {
+    height: 138rpx;
+}
+
+.tabBarView {
+    position: fixed;
+    bottom: 0;
+}
+
+.showDataLoading {
+    margin-top: 40rpx;
+}
+
+.h-content-wrap {
+    padding-top: 70rpx;
+    background: linear-gradient(to bottom, #fef1b9, #fff);
+    height: 180rpx;
+}
+
+.serial-number {
+    padding: 48rpx;
+    width: 600rpx;
+    text-align: center;
+    font-size: 28rpx;
+    font-family: PingFangSC-Semibold, PingFang SC;
+    line-height: 60rpx;
+    background: white;
+    border-radius: 15rpx;
+
+    .number {
+        line-height: 70rpx;
+        font-size: 35rpx;
+        color: #578D31;
+        font-weight: bold;
+    }
+
+    .text {
+        font-size: 26rpx;
+        color: #FFC000;
+        line-height: 80rpx;
+    }
+
+    .text1 {
+        line-height: 80rpx;
+        font-size: 26rpx;
+        color: red;
+    }
+
+}
+
+/* 菜单 */
+.tab-bar {
+    display: flex;
+    height: 80rpx;
+    margin-left: 24rpx;
+    background: #fff;
+    width: 340rpx;
+    border-radius: 40rpx;
+
+    .tab-item {
+        // flex: 1;
+        width: 50%;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        font-size: 28rpx;
+        color: #333;
+
+        border-radius: 50rpx;
+    }
+
+    .tab-item.active {
+        color: #333333;
+        // background: linear-gradient(to right, #ff6c7b, #ff9db8);
+        background: #FFE05C;
+        border-radius: 50rpx;
+    }
+}
+
+/* 服务订单的菜单 */
+.service-order-tab-bar {
+    display: flex;
+    justify-content: space-around;
+    height: 100rpx;
+    margin-top: 24rpx;
+
+    .service-order-tab-item {
+        flex: 1;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        font-size: 28rpx;
+        color: #333;
+        line-height: 52rpx;
+    }
+
+    .service-order-tab-item.active {
+        color: #ff0000;
+    }
+
+    .underline {
+        border-bottom: 4rpx solid #ff0000;
+    }
+}
+
+/* 服务订单内容*/
+.service-order {
+    /* 门店列表 */
+
+    .grayscale {
+        filter: grayscale(100%);
+    }
+
+    .store-wrap {
+        background: #fff;
+        border-radius: 24rpx;
+        // margin-top: 14rpx;
+        padding-left: 24rpx;
+        padding-right: 24rpx;
+        padding-bottom: 24rpx;
+
+        .order-state {
+            display: flex;
+            font-size: 24rpx;
+            align-items: center;
+
+            .order-num {
+
+                // width: 70%;
+                // display: flex;
+                // align-items: center;
+                // height: 40rpx;
+                .h-order-num {
+                    margin-right: 6rpx;
+                    font-size: 28rpx;
+                    font-family: PingFangSC-Regular, PingFang SC;
+                    color: #666666;
+
+                    image {
+                        width: 32rpx;
+                        height: 32rpx;
+                        transform: translateY(8rpx);
+                    }
+                }
+
+                .h-order-text {
+                    margin-right: 6rpx;
+                    font-size: 28rpx;
+                    font-size: large;
+                    font-family: PingFangSC-Regular, PingFang SC;
+                    color: #666666;
+                }
+            }
+
+            .order-state-name {
+                width: 30%;
+                text-align: right;
+                padding-right: 24rpx;
+
+                .h-text1 {
+                    color: #666666;
+                }
+
+                .h-text2 {
+                    color: #93D21A;
+                }
+
+                .h-text3 {
+                    color: #FFAF36;
+                }
+            }
+        }
+
+        .store-list {
+            margin-top: 24rpx;
+            margin-bottom: 12rpx;
+            display: flex;
+            justify-content: space-between;
+
+            .store-content {
+                display: flex;
+                justify-content: space-between;
+
+                .store-img {
+                    width: 152rpx;
+
+                    image {
+                        height: 152rpx;
+                        border-radius: 6rpx;
+                    }
+                }
+
+                .content {
+                    width: 100%;
+                    padding-left: 16rpx;
+                    padding-top: 4rpx;
+                    padding-right: 24rpx;
+
+                    .title {
+                        height: 44rpx;
+                        font-size: 28rpx;
+                        font-family: PingFangSC-Medium, PingFang SC;
+                        font-weight: bold;
+                        color: #111111;
+                        line-height: 44rpx;
+                        margin-left: 8rpx;
+
+                    }
+
+                    .price {
+                        height: 44rpx;
+                        font-size: 28rpx;
+                        font-family: PingFangSC-Medium, PingFang SC;
+                        font-weight: bold;
+                        color: #ED569F;
+                        line-height: 44rpx;
+                        margin-left: 8rpx;
+
+                    }
+
+                    .desc {
+                        display: flex;
+                        // padding: 6rpx;
+
+                        .time {
+                            font-size: 24rpx;
+                            font-family: PingFangSC-Regular, PingFang SC;
+                            font-weight: 400;
+                            color: #ED569F;
+                            background: rgba(237, 86, 159, 0.1);
+                            padding: 6rpx 16rpx;
+                            border-radius: 0rpx 0rpx 12rpx 12rpx;
+                        }
+
+                        .service-type {
+                            font-size: 24rpx;
+                            font-family: PingFangSC-Regular, PingFang SC;
+                            color: black;
+                            background: #FFE05C;
+                            padding: 6rpx 16rpx;
+                            margin-left: 16rpx;
+                            border-radius: 0rpx 0rpx 12rpx 12rpx;
+                        }
+
+                        .service-mode {
+                            font-size: 24rpx;
+                            font-family: PingFangSC-Regular, PingFang SC;
+                            color: #93D21A;
+                            background: rgba(147, 210, 26, 0.1);
+                            padding: 6rpx 16rpx;
+                            margin-left: 16rpx;
+                            border-radius: 0rpx 0rpx 12rpx 12rpx;
+                        }
+                    }
+                }
+            }
+        }
+
+        .detail {
+            font-size: 24rpx;
+            padding-top: 12rpx;
+            padding-bottom: 12rpx;
+            background-image: url('/static/order/ud4.png');
+            background-size: cover;
+
+            .d-item-row {
+                display: flex;
+                height: 44rpx;
+                align-items: center;
+
+                .item-icon {
+                    display: flex;
+                    align-items: center;
+                    padding-right: 8rpx;
+
+                    image {
+                        height: 36rpx;
+                        width: 36rpx;
+                    }
+                }
+
+                .item-text {
+                    color: #666666;
+
+                    .item-v {
+                        font-family: PingFangSC-Medium, PingFang SC;
+                        font-weight: 500;
+                        color: #333333;
+                    }
+                }
+            }
+        }
+
+        .detail11 {
+            font-size: 24rpx;
+            padding-top: 12rpx;
+            padding-bottom: 12rpx;
+
+            .d-item-row {
+                display: flex;
+                height: 44rpx;
+                align-items: center;
+
+                .item-icon {
+                    display: flex;
+                    align-items: center;
+                    padding-right: 8rpx;
+
+                    image {
+                        height: 36rpx;
+                        width: 36rpx;
+                    }
+                }
+
+                .item-text {
+                    color: #666666;
+
+                    .item-v {
+                        font-family: PingFangSC-Medium, PingFang SC;
+                        font-weight: 500;
+                        color: #333333;
+                    }
+                }
+            }
+        }
+
+        .flexLR {
+            border: 4rpx dotted #eeeeee;
+            width: 100%;
+            display: flex;
+            justify-content: space-between;
+            overflow: hidden;
+        }
+
+        .nav-bar {
+            display: flex;
+            text-align: right;
+            justify-content: flex-end;
+
+            .btn {
+                height: 60rpx;
+                line-height: 60rpx;
+                background: #FFE05C;
+                margin-top: 20rpx;
+                text-align: center;
+                color: #fff;
+                margin-right: 16rpx;
+                border-radius: 30rpx;
+                color: #333;
+                padding-right: 24rpx;
+                padding-left: 24rpx;
+                font-size: 26rpx;
+
+                .text1 {
+                    padding-left: 2rpx;
+                    font-size: 24rpx;
+                    color: #666;
+                }
+            }
+
+            .look-num-btn {
+                height: 60rpx;
+                line-height: 60rpx;
+                background: #999;
+                margin-top: 20rpx;
+                width: 160rpx;
+                text-align: center;
+                color: #fff;
+                margin-right: 16rpx;
+                border-radius: 8rpx;
+            }
+        }
+    }
+}
+
+/* 产品订单 */
+.product-order {
+    margin-top: 24rpx;
+
+    .developing {
+        text-align: center;
+        color: #666;
+    }
+}
+
+.planNumber {
+    font-size: 35rpx;
+    font-family: PingFangSC-Medium, PingFang SC;
+    font-weight: 500;
+    color: #93BC23;
+
+}

otherPages/order/index.vue

@@ -0,0 +1,260 @@
+<template>
+	<view class="content">
+		<view class="order-content-wrap">
+
+			<!-- 查看订单排号 -->
+			<view ref="hContentWrap" class="hContentWrap h-content-wrap">
+				<!-- 切换菜单-->
+				<view class="tab-bar">
+					<view class="tab-item" :class="{ active: currentTab === 'tab1' }" @click="changeTab('tab1')">
+						服务订单
+					</view>
+					<view class="tab-item" :class="{ active: currentTab === 'tab2' }" @click="changeTab('tab2')">
+						产品订单
+					</view>
+				</view>
+
+				<view v-show="currentTab === 'tab1'" class="store-wrap">
+					<!-- 导航-->
+					<view class="service-order-tab-bar">
+						<view class="service-order-tab-item" :class="{ active: currentServiceTab === 'orderTab1' }"
+							@click="changeServiceTab('orderTab1')">
+							<text :class="{ underline: currentServiceTab === 'orderTab1' }">全部</text>
+						</view>
+						<view class="service-order-tab-item" :class="{ active: currentServiceTab === 'orderTab2' }"
+							@click="changeServiceTab('orderTab2')">
+							<text :class="{ underline: currentServiceTab === 'orderTab2' }">当前订单</text>
+						</view>
+						<view class="service-order-tab-item" :class="{ active: currentServiceTab === 'orderTab3' }"
+							@click="changeServiceTab('orderTab3')">
+							<text :class="{ underline: currentServiceTab === 'orderTab3' }">待付款</text>
+						</view>
+						<view class="service-order-tab-item" :class="{ active: currentServiceTab === 'orderTab4' }"
+							@click="changeServiceTab('orderTab4')">
+							<text :class="{ underline: currentServiceTab === 'orderTab4' }">已完成</text>
+						</view>
+					</view>
+				</view>
+
+			</view>
+
+			<view class="service-order" v-show="currentTab === 'tab1'">
+				<!-- 当前订单-->
+				<view class="service-order" v-show="currentTab === 'tab1'">
+					<!-- 门店列表 -->
+					<view class="store-wrap">
+						<view :class="{ 'grayscale': item.forstStatus === '1' }">
+							<view @click="orderDetail(item)" class="">
+								<view class="store-list">
+									<view class="store-content">
+										<view class="content">
+											<view class="desc flex-row justify-start ">
+												<view class="time">
+													<!-- {{ this.dateFormat(item.createTime) }} -->
+													11111111111
+												</view>
+												<view class="service-type">
+													<!-- {{ item.serviceModeDesc }} -->
+													到店
+												</view>
+												<view class="service-mode">
+													<!-- <text>{{ item.serviceAttrDesc }}</text> -->
+													预约
+												</view>
+											</view>
+
+										</view>
+									</view>
+									<view class=" planNumber flex-col justify-center">
+										<text> {{ item.planNumber || '未排号' }}</text>
+									</view>
+								</view>
+								<view class="order-state">
+									<view class="order-num">
+										<view class="h-order-num">
+											<image src="../../static/index/u217.png" mode=""></image>订单编号：{{ item.orderNo }}
+										</view>
+										<view class="h-order-text">
+											服务项目
+										</view>
+									</view>
+									<view class="order-state-name">
+										<text class="h-text1">{{ item.forstStatus === '1' ? '已冻结' : item.orderStatusDesc
+										}}</text>
+									</view>
+
+								</view>
+								<view class="flex-col detail11 ">
+									<view class="d-item-row ">
+										<view class="item-icon">
+											<image src="../../static/order/ud1.png" mode=""></image>
+										</view>
+										<view class="item-text">
+											服务对象：<text class="item-v">{{ item.serviceObjectName }}</text>
+										</view>
+									</view>
+									<view class="d-item-row ">
+										<view class="item-icon">
+											<image src="../../static/order/ud2.png" mode=""></image>
+										</view>
+										<view class="item-text">
+											服务门店：<text class="item-v">{{ item.storeName }}</text>
+										</view>
+									</view>
+									<view class="d-item-row ">
+										<view class="item-icon">
+											<image src="../../static/order/ud3.png" mode=""></image>
+										</view>
+										<view class="item-text">
+											排号时段：<text class="item-v">{{ item.createTime }}</text>
+										</view>
+									</view>
+								</view>
+								<view class="detail flex-row justify-between">
+									<view class="flexLR">
+										<view>
+											<view class="d-item-row ">
+												<view class="item-icon">
+													<image src="../../static/order/ud3.png" mode=""></image>
+												</view>
+												<view class="item-text">
+													服务日期：<text v-if="item.servicePersonName" class="item-v">{{
+														item.servicePersonName }}</text>
+													<text v-else class="item-v">2023-8-16</text>
+												</view>
+											</view>
+											<view class="d-item-row ">
+												<view class="item-icon">
+													<image src="../../static/order/ud3.png" mode=""></image>
+												</view>
+												<view class="item-text">
+													服务时段：<text v-if="item.servicePersonName" class="item-v">{{
+														item.servicePersonName }}</text>
+													<text v-else class="item-v">15:30 -- 16:30</text>
+												</view>
+											</view>
+											<view class="d-item-row ">
+												<view class="item-icon">
+													<image src="../../static/order/ud3.png" mode=""></image>
+												</view>
+												<view class="item-text">
+													服务技师：<text v-if="item.servicePersonName" class="item-v">{{
+														item.servicePersonName }}</text>
+													<text v-else class="item-v">签到成功自动分配</text>
+												</view>
+											</view>
+										</view>
+										<view class=" planNumber flex-col justify-center">
+											<text> {{ item.planNumber || '未排号' }}</text>
+										</view>
+									</view>
+								</view>
+								<view class="price">
+									<text v-if="item.totalAmount"> 订单总金额：￥{{ item.totalAmount }}</text>
+									<text v-else>订单总金额：￥0</text>
+								</view>
+							</view>
+							<view class="nav-bar">
+								<view class="btn" @click="gotoPayOrder(item)" >
+									<text>扫码</text>
+								</view>
+								<view class="btn" @click="gotoPayOrder(item)" v-if="item.orderStatus == 1">
+									<text>去付款</text>
+								</view>
+								<view class="btn" v-else-if="item.orderStatus == 2">
+									<text>已取消</text>
+								</view>
+								<view @click="orderSign(item)" v-else-if="item.orderStatus == 4" class="btn">
+									立即排队
+									<!-- <text class="text1">点击开始排号</text> -->
+								</view>
+								<view @click="getOrderSign(item)" class="btn" v-else-if="item.orderStatus == 5">
+									<text>点击查看排号</text>
+								</view>
+								<view class="btn" v-else-if="item.orderStatus == 6">
+									<text>服务中</text>
+								</view>
+								<view class="btn" v-else-if="item.orderStatus == 7">
+									<text>排号过期</text>
+								</view>
+								<view @click="gotoEvaluate(item)" class="btn" v-else-if="item.orderStatus == 8">
+									<text>待评价</text>
+								</view>
+								<view @click="gotoPayOrder(item)" class="btn" v-else-if="item.orderStatus == 9">
+									<text>去支付预约费用</text>
+								</view>
+							</view>
+						</view>
+					</view>
+				</view>
+			</view>
+			<view class="product-order" v-show="currentTab === 'tab2'">
+				<!-- Tab 2 内容 -->
+				<view class="developing">
+					<text>敬请期待...</text>
+				</view>
+			</view>
+
+			<uni-popup ref="serialNumber">
+				<view class="serial-number">
+					<view class="text">
+						<text>您的排队号</text>
+					</view>
+					<view class="number">
+						<text>{{ orderNumberData.schedulingNo }}</text>
+					</view>
+
+					<view v-if="orderNumberData.isOverNo !== '否'" class="text1">
+						<text>已过号，请重新取号</text>
+					</view>
+
+					<view v-else class="text">
+						<text>前面还有{{ orderNumberData.waitNoNum }}人在等待</text>
+					</view>
+
+					<view class="text">
+						<text>随时关注小程序的排队进程，过号作废</text>
+					</view>
+
+					<view class="text">
+						<text>0851—85833828</text>
+					</view>
+				</view>
+			</uni-popup>
+
+		</view>
+
+		<view class="tabBarLineHeight"></view>
+		<view class="tabBarView">
+			<tab-bar :tabIndex="tabIndex"></tab-bar>
+		</view>
+	</view>
+</template>
+
+<script>
+import tabBar from "../../components/tabBar/tabBar";
+export default {
+	components: {
+		tabBar
+	},
+	data() {
+		return {
+			title: 'Hello',
+			tabIndex: 3,
+			currentTab: 'tab1',
+			currentServiceTab: 'orderTab1'
+		}
+	},
+	onLoad() {
+
+	},
+	methods: {
+
+	}
+}
+</script>
+
+<style scoped lang="scss">
+@import '/common/css/common.css';
+@import './index.rpx.scss';
+</style>

pages.json

@@ -42,25 +42,6 @@
 		}
 	],
 	"subPackages": [
-		{
-			"root": "orderPages",
-			"pages": [
-				{
-					"path": "orderDetail/index",
-					"style": {
-						"navigationBarTitleText": "订单详情",
-						"enablePullDownRefresh": false
-					}
-				},
-				{
-					"path": "goodsDetail/index",
-					"style": {
-						"navigationBarTitleText": "商品详情",
-						"enablePullDownRefresh": false
-					}
-				}
-			]
-		},
 		{
 			"root": "myPages",
 			"pages": [
@@ -91,6 +72,19 @@
 					}
 				}
 			]
+		},
+		{
+			"root": "otherPages",
+			"pages": [
+				{
+					"path": "order/index",
+					"style": {
+						"navigationBarTitleText": "订单",
+						"enablePullDownRefresh": false,
+						"navigationStyle": "custom"
+					}
+				}
+			]
 		}
 	],
 	"tabBar": {