订单列表样式修改

pages/order/module/index.rpx.css

@@ -217,14 +217,11 @@
 }
 
 .price {
-    height: 44rpx;
-    font-size: 28rpx;
-    font-family: PingFangSC-Medium, PingFang SC;
-    font-weight: bold;
-    color: #ED569F;
-    line-height: 44rpx;
-    margin-left: 8rpx;
-
+    font-size: 24rpx;
+    font-family: PingFangSC-Regular, PingFang SC;
+    font-weight: 400;
+    color: #666666;
+    line-height: 36rpx;
 }
 
 .desc {
@@ -373,7 +370,11 @@
 
 
 .fontColor {
-    color: red;
+    font-size: 28rpx;
+    font-family: PingFangSC-Medium, PingFang SC;
+    font-weight: bold;
+    color: #ED569F;
+    line-height: 44rpx;
 }
 
 
@@ -388,11 +389,20 @@
 
 
 .planNumber {
-    font-size: 35rpx;
-    font-family: PingFangSC-Medium, PingFang SC;
-    font-weight: 500;
-    color: #93BC23;
-
+    font-size: 40rpx;
+    font-family: PingFangSC-Semibold, PingFang SC;
+    font-weight: 600;
+    color: #333333;
+    line-height: 68rpx;
+    padding-right: 62rpx;
+}
+.planNumber1{
+    font-size: 20rpx;
+    font-family: PingFangSC-Regular, PingFang SC;
+    font-weight: 400;
+    color: #999999;
+    line-height: 28rpx;
+    padding-right: 62rpx;
 }
 
 .tabs{

pages/order/module/mescrollUni-item.vue

@@ -17,17 +17,10 @@
 								<view class="store-content">
 									<view class="content">
 										<view class="desc flex-row justify-start ">
-											<!-- <view class="time">
-                                                11111111111
-                                            </view> -->
-											<view  v-if="item.serviceAttrDesc === '及时' " class="service-type">
-												到店
-											</view>
-											<view v-else class="service-mode">
-												预约
+											<view  :class="item.serviceAttribute == 1? 'service-type':'service-mode'">
+												{{item.serviceAttrDesc}}
 											</view>
 										</view>
-
 									</view>
 								</view>
                 <view class="order-state-name">
@@ -46,33 +39,50 @@
 
 
 							</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 class="flex-row justify-between ">
+								<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>
-								<view class="d-item-row ">
-									<view class="item-icon">
-										<image src="/static/order/ud2.png" mode=""></image>
+									<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="item-text">
-										服务门店：<text class="item-v">{{ item.storeName }}</text>
+									<view class="d-item-row ">
+										<view class="item-icon">
+											<image src="/static/order/ud14.png" mode=""></image>
+										</view>
+										<view class="item-text">
+											下单时间：<text class="item-v">{{ item.createTime }}</text>
+										</view>
 									</view>
 								</view>
-								<view class="d-item-row ">
-									<view class="item-icon">
-										<image src="/static/order/ud14.png" mode=""></image>
+
+
+								<view class="flex-col justify-center" v-if="item.serviceAttribute == 1">
+									<view class="planNumber flex-row justify-center">
+										<text>{{ item.planNumber || '未排号' }}</text>
 									</view>
-									<view class="item-text">
-										下单时间：<text class="item-v">{{ item.createTime }}</text>
+
+									<view class="planNumber1 flex-row justify-center">
+										<text>排号</text>
 									</view>
+
 								</view>
+
+
+
 							</view>
-							<view class="detail flex-row justify-between" v-if="item.orderStatusDesc !== '未排号' " >
+							<view class="detail flex-row justify-between" v-if="item.serviceAttribute == '2' " >
 								<view class="flexLR">
 									<view>
 										<view class="d-item-row ">
@@ -100,22 +110,27 @@
 											</view>
 										</view>
 									</view>
-									<view class=" planNumber flex-col justify-center">
-										<text> {{ item.planNumber || '未排号' }}</text>
+									<view class=" flex-col justify-center">
+										<view class="planNumber flex-row justify-center">
+											<text>{{ item.planNumber || '未排号' }}</text>
+										</view>
+
+										<view class="planNumber1 flex-row justify-center">
+											<text>排号</text>
+										</view>
 									</view>
 								</view>
 							</view>
-							<view class="price" v-if="item.orderStatusDesc !== '未排号' " >
-								订单总金额：<text class="fontColor" v-if="item.totalAmount"> ￥{{ item.totalAmount }}</text>
-								<text class="fontColor" v-else>￥0</text>
+							<view class="price">
+								订单总金额：<text class="fontColor"> ￥{{ item.totalAmount || 0}}</text>
 							</view>
 						</view>
 						<view class="nav-bar">
-							<view class="btn" @click="scanCodeOrder(item)">
+							<view class="btn"  @click="scanCodeOrder(item)">
 								<u-icon name="scan" size="18" />
 								<text>扫码</text>
 							</view>
-							<view class="btn" @click="oneClickPay(item)">
+							<view class="btn" v-if="item.orderStatus == 6"  @click="oneClickPay(item)">
 								<text>一键付款</text>
 							</view>
 <!--							<view class="btn" v-else-if="item.orderStatus == 2">-->