refactor：订单详情

common/js/api.js

@@ -4,6 +4,38 @@ import request from '../js/request.js';
 export default {
 
 
+
+	//post请求  申诉
+	appeal(data){
+		return request({
+			url: '/business/wechat/order/appeal',
+			method: 'POST',
+			data:data
+		})
+	},
+
+
+
+	//post请求  申诉
+    appeal(data){
+		return request({
+			url: '/business/wechat/order/appeal',
+			method: 'POST',
+			data:data
+		})
+	},
+
+	//post请求 添加子订单
+	addChildProject(data) {
+		return request({
+			url: '/business/wechat/order/submit/child',
+			method: 'POST',
+			data:data
+		})
+	},
+
+
+
 	// get请求 根据id获取工位信息
 	getByPersonId(data) {
 		return request({

orderPages/bookService/index.vue

@@ -202,9 +202,10 @@ export default {
             periodTimeList:[],
             periodTimeIndex:0,
             //预约费用
-            price:'0.01',
+            price:'0',
             //订单编号
-            orderNo:''
+            orderNo:'',
+            subOrderNo:''
 
         }
     },
@@ -260,9 +261,9 @@ export default {
             let that = this;
             // 发起微信支付
             this.$api.wechatPay({
-                orderNo:this.orderNo
+                orderNo:this.subOrderNo
             }).then((res)=>{
-                var param = res;
+                var param = res.data.data;
                 uni.requestPayment({
                     appId: param.appid,
                     timeStamp: param.timestamp+"",
@@ -309,7 +310,7 @@ export default {
             this.$refs.passwordPopup.close()
             // 用户信息
             this.$api.balancePay({
-                orderNo: this.orderNo,
+                orderNo: this.subOrderNo,
                 password: this.password
             }).then((res)=>{
                 uni.switchTab({
@@ -348,6 +349,7 @@ export default {
               remark:this.remark
           }).then(res=>{
               this.orderNo=res.data.data.orderNo
+              this.subOrderNo=res.data.data.subOrderNo
               if (res.data.data.subOrderNo === null){
                     uni.switchTab({
                         url:'/pages/order/index'

orderPages/orderDetail/index.rpx.scss

@@ -1,807 +1,234 @@
-.page {
-    background-color: rgba(247,247,247,1.000000);
-    position: relative;
-    width: 750rpx;
-    height: 1650rpx;
-    overflow: hidden;
-    display: flex;
-    flex-direction: column;
-  }
-  .box_1 {
-    background-color: rgba(255,224,92,1.000000);
-    display: flex;
-    flex-direction: column;
-    padding: 30rpx 20rpx 14rpx 32rpx;
-  }
-  .box_2 {
-    width: 686rpx;
-    margin-right: 12rpx;
-    flex-direction: row;
-    display: flex;
-    justify-content: space-between;
-  }
-  .text-wrapper_1 {
-    width: 52rpx;
-    height: 40rpx;
-    overflow-wrap: break-word;
-    font-size: 0rpx;
-    letter-spacing: -1rpx;
-    font-family: PingFangSC-Medium;
-    font-weight: 500;
-    text-align: left;
-    white-space: nowrap;
-    line-height: 40rpx;
-  }
-  .text_1 {
-    overflow-wrap: break-word;
-    color: rgba(255,255,255,1.000000);
-    font-size: 28rpx;
-    font-family: PingFangSC-Medium;
-    font-weight: 500;
-    text-align: left;
-    white-space: nowrap;
-    line-height: 40rpx;
-  }
-  .text_2 {
-    overflow-wrap: break-word;
-    color: rgba(255,255,255,1.000000);
-    font-size: 28rpx;
-    font-family: PingFangSC-Medium;
-    font-weight: 500;
-    text-align: left;
-    white-space: nowrap;
-    line-height: 40rpx;
-  }
-  .image_1 {
-    width: 134rpx;
-    height: 22rpx;
-    margin: 4rpx 0 14rpx 0;
-  }
-  .box_3 {
-    width: 698rpx;
-    margin-top: 32rpx;
-    flex-direction: row;
-    display: flex;
-    justify-content: space-between;
-  }
-  .image-text_1 {
-    width: 192rpx;
-    flex-direction: row;
-    display: flex;
-    justify-content: space-between;
-    margin: 6rpx 0 6rpx 0;
-  }
-  .thumbnail_1 {
-    width: 40rpx;
-    height: 40rpx;
-    margin: 4rpx 0 4rpx 0;
-  }
-  .text-group_1 {
-    overflow-wrap: break-word;
-    color: rgba(51,51,51,1);
-    font-size: 32rpx;
-    font-family: PingFangSC-Medium;
-    font-weight: 500;
-    text-align: left;
-    white-space: nowrap;
-    line-height: 48rpx;
-  }
-  .image_2 {
-    width: 180rpx;
-    height: 60rpx;
-  }
-  .box_4 {
-    background-color: rgba(255,255,255,1.000000);
-    display: flex;
-    flex-direction: column;
-    padding: 24rpx 110rpx 24rpx 108rpx;
-  }
-  .group_1 {
-    width: 146rpx;
-    align-self: center;
-    flex-direction: row;
-    display: flex;
-    justify-content: space-between;
-  }
-  .thumbnail_2 {
-    width: 40rpx;
-    height: 40rpx;
-    margin: 2rpx 0 2rpx 0;
-  }
-  .text_3 {
-    overflow-wrap: break-word;
-    color: rgba(147,210,26,1);
-    font-size: 32rpx;
-    font-family: PingFangSC-Regular;
-    font-weight: normal;
-    text-align: left;
-    white-space: nowrap;
-    line-height: 44rpx;
-  }
-  .text_4 {
-    overflow-wrap: break-word;
-    color: rgba(51,51,51,1);
-    font-size: 28rpx;
-    font-family: PingFangSC-Regular;
-    font-weight: normal;
-    text-align: center;
-    white-space: nowrap;
-    line-height: 44rpx;
-    margin-top: 16rpx;
-  }
-  .box_5 {
-    background-color: rgba(255,255,255,1.000000);
-    margin-top: 24rpx;
-    display: flex;
-    flex-direction: column;
-    padding: 0 32rpx 0 32rpx;
-  }
-  .text-wrapper_2 {
-    background-color: rgba(255,224,92,0.200000);
-    border-radius: NaNrpx;
-    margin-right: 578rpx;
-    display: flex;
-    flex-direction: column;
-    padding: 10rpx 30rpx 10rpx 30rpx;
-  }
-  .text_5 {
-    overflow-wrap: break-word;
-    color: rgba(51,51,51,1);
-    font-size: 24rpx;
-    font-family: PingFangSC-Regular;
-    font-weight: normal;
-    text-align: left;
-    white-space: nowrap;
-    line-height: 36rpx;
-  }
-  .box_6 {
-    flex-direction: row;
-    display: flex;
-    margin: 24rpx 266rpx 0 0;
-  }
-  .thumbnail_3 {
-    width: 28rpx;
-    height: 28rpx;
-    margin: 8rpx 0 8rpx 0;
-  }
-  .text_6 {
-    overflow-wrap: break-word;
-    color: rgba(102,102,102,1);
-    font-size: 24rpx;
-    font-family: PingFangSC-Regular;
-    font-weight: normal;
-    text-align: left;
-    white-space: nowrap;
-    line-height: 44rpx;
-    margin-left: 8rpx;
-  }
-  .text_7 {
-    overflow-wrap: break-word;
-    color: rgba(51,51,51,1);
-    font-size: 24rpx;
-    font-family: PingFangSC-Regular;
-    font-weight: normal;
-    text-align: left;
-    white-space: nowrap;
-    line-height: 44rpx;
-  }
-  .text_8 {
-    overflow-wrap: break-word;
-    color: rgba(51,51,51,1);
-    font-size: 28rpx;
-    font-family: PingFangSC-Medium;
-    font-weight: 500;
-    text-align: center;
-    white-space: nowrap;
-    line-height: 40rpx;
-    margin: 24rpx 546rpx 0 0;
-  }
-  .box_7 {
-    flex-direction: row;
-    display: flex;
-    margin: 24rpx 62rpx 0 0;
-  }
-  .box_8 {
-    display: flex;
-    flex-direction: column;
-  }
-  .image-text_2 {
-    width: 156rpx;
-    flex-direction: row;
-    display: flex;
-    justify-content: space-between;
-  }
-  .thumbnail_4 {
-    width: 28rpx;
-    height: 28rpx;
-    margin: 4rpx 0 4rpx 0;
-  }
-  .text-group_2 {
-    overflow-wrap: break-word;
-    color: rgba(102,102,102,1);
-    font-size: 24rpx;
-    font-family: PingFangSC-Regular;
-    font-weight: normal;
-    text-align: left;
-    white-space: nowrap;
-    line-height: 36rpx;
-  }
-  .image-text_3 {
-    width: 156rpx;
-    margin-top: 16rpx;
-    flex-direction: row;
-    display: flex;
-    justify-content: space-between;
-  }
-  .thumbnail_5 {
-    width: 28rpx;
-    height: 28rpx;
-    margin: 4rpx 0 4rpx 0;
-  }
-  .text-group_3 {
-    overflow-wrap: break-word;
-    color: rgba(102,102,102,1);
-    font-size: 24rpx;
-    font-family: PingFangSC-Regular;
-    font-weight: normal;
-    text-align: left;
-    white-space: nowrap;
-    line-height: 36rpx;
-  }
-  .image-text_4 {
-    width: 156rpx;
-    margin-top: 16rpx;
-    flex-direction: row;
-    display: flex;
-    justify-content: space-between;
-  }
-  .thumbnail_6 {
-    width: 28rpx;
-    height: 28rpx;
-    margin: 4rpx 0 4rpx 0;
-  }
-  .text-group_4 {
-    overflow-wrap: break-word;
-    color: rgba(102,102,102,1);
-    font-size: 24rpx;
-    font-family: PingFangSC-Regular;
-    font-weight: normal;
-    text-align: left;
-    white-space: nowrap;
-    line-height: 36rpx;
-  }
-  .text-wrapper_3 {
-    display: flex;
-    flex-direction: column;
-  }
-  .text_9 {
-    overflow-wrap: break-word;
-    color: rgba(51,51,51,1);
-    font-size: 24rpx;
-    font-family: PingFangSC-Regular;
-    font-weight: normal;
-    text-align: left;
-    white-space: nowrap;
-    line-height: 36rpx;
-    margin-right: 180rpx;
-  }
-  .text_10 {
-    overflow-wrap: break-word;
-    color: rgba(51,51,51,1);
-    font-size: 24rpx;
-    font-family: PingFangSC-Regular;
-    font-weight: normal;
-    text-align: left;
-    white-space: nowrap;
-    line-height: 36rpx;
-    margin: 16rpx 36rpx 0 0;
-  }
-  .text_11 {
-    overflow-wrap: break-word;
-    color: rgba(51,51,51,1);
-    font-size: 24rpx;
-    font-family: PingFangSC-Regular;
-    font-weight: normal;
-    text-align: left;
-    white-space: nowrap;
-    line-height: 36rpx;
-    margin-top: 16rpx;
-  }
-  .text-group_5 {
-    display: flex;
-    flex-direction: column;
-    margin: 14rpx 0 30rpx 164rpx;
-  }
-  .text_12 {
-    overflow-wrap: break-word;
-    color: rgba(51,51,51,1);
-    font-size: 40rpx;
-    font-family: PingFangSC-Semibold;
-    font-weight: 600;
-    text-align: center;
-    white-space: nowrap;
-    line-height: 68rpx;
-  }
-  .text_13 {
-    overflow-wrap: break-word;
-    color: rgba(153,153,153,1);
-    font-size: 20rpx;
-    font-family: PingFangSC-Regular;
-    font-weight: normal;
-    text-align: center;
-    white-space: nowrap;
-    line-height: 28rpx;
-    align-self: center;
-  }
-  .box_9 {
-    background-color: rgba(255,224,92,1.000000);
-    border-radius: 32rpx;
-    display: flex;
-    flex-direction: row;
-    margin: 32rpx 232rpx 0 254rpx;
-    padding: 14rpx 58rpx 14rpx 58rpx;
-  }
-  .image-text_5 {
-    width: 84rpx;
-    flex-direction: row;
-    display: flex;
-    justify-content: space-between;
-  }
-  .thumbnail_7 {
-    width: 24rpx;
-    height: 24rpx;
-    margin: 6rpx 0 6rpx 0;
-  }
-  .text-group_6 {
-    overflow-wrap: break-word;
-    color: rgba(51,51,51,1);
-    font-size: 24rpx;
-    font-family: PingFangSC-Regular;
-    font-weight: normal;
-    text-align: center;
-    white-space: nowrap;
-    line-height: 36rpx;
-  }
-  .box_10 {
-    background-color: rgba(238,238,238,1.000000);
-    width: 686rpx;
-    height: 2rpx;
-    margin-top: 32rpx;
-    display: flex;
-    flex-direction: column;
-  }
-  .text-wrapper_4 {
-    width: 622rpx;
-    flex-direction: row;
-    display: flex;
-    justify-content: space-between;
-    margin: 32rpx 0 0 64rpx;
-  }
-  .text_14 {
-    overflow-wrap: break-word;
-    color: rgba(51,51,51,1);
-    font-size: 28rpx;
-    font-family: PingFangSC-Medium;
-    font-weight: 500;
-    text-align: left;
-    white-space: nowrap;
-    line-height: 44rpx;
-  }
-  .text_15 {
-    overflow-wrap: break-word;
-    color: rgba(147,210,26,1);
-    font-size: 24rpx;
-    font-family: PingFangSC-Regular;
-    font-weight: normal;
-    text-align: right;
-    white-space: nowrap;
-    line-height: 44rpx;
-  }
-  .box_11 {
-    flex-direction: row;
-    display: flex;
-    margin: 24rpx 238rpx 0 0;
-  }
-  .group_2 {
-    background-color: rgba(255,255,255,1.000000);
-    border-radius: 8rpx;
-    width: 32rpx;
-    height: 32rpx;
-    border: 1px solid rgba(221,221,221,1);
-    display: flex;
-    flex-direction: column;
-    margin: 28rpx 0 28rpx 0;
-  }
-  .group_3 {
-    margin-left: 32rpx;
-    display: flex;
-    flex-direction: column;
-  }
-  .image-text_6 {
-    width: 156rpx;
-    flex-direction: row;
-    display: flex;
-    justify-content: space-between;
-  }
-  .thumbnail_8 {
-    width: 28rpx;
-    height: 28rpx;
-    margin: 4rpx 0 4rpx 0;
-  }
-  .text-group_7 {
-    overflow-wrap: break-word;
-    color: rgba(102,102,102,1);
-    font-size: 24rpx;
-    font-family: PingFangSC-Regular;
-    font-weight: normal;
-    text-align: left;
-    white-space: nowrap;
-    line-height: 36rpx;
-  }
-  .box_12 {
-    width: 156rpx;
-    margin-top: 16rpx;
-    flex-direction: row;
-    display: flex;
-    justify-content: space-between;
-  }
-  .thumbnail_9 {
-    width: 28rpx;
-    height: 28rpx;
-    margin: 4rpx 0 4rpx 0;
-  }
-  .text_16 {
-    overflow-wrap: break-word;
-    color: rgba(102,102,102,1);
-    font-size: 24rpx;
-    font-family: PingFangSC-Regular;
-    font-weight: normal;
-    text-align: left;
-    white-space: nowrap;
-    line-height: 36rpx;
-  }
-  .text-wrapper_5 {
-    display: flex;
-    flex-direction: column;
-  }
-  .text_17 {
-    overflow-wrap: break-word;
-    color: rgba(51,51,51,1);
-    font-size: 24rpx;
-    font-family: PingFangSC-Regular;
-    font-weight: normal;
-    text-align: left;
-    white-space: nowrap;
-    line-height: 36rpx;
-    margin-right: 180rpx;
-  }
-  .text_18 {
-    overflow-wrap: break-word;
-    color: rgba(51,51,51,1);
-    font-size: 24rpx;
-    font-family: PingFangSC-Regular;
-    font-weight: normal;
-    text-align: left;
-    white-space: nowrap;
-    line-height: 36rpx;
-    margin-top: 16rpx;
-  }
-  .box_13 {
-    flex-direction: row;
-    display: flex;
-    margin: 24rpx 0 0 64rpx;
-  }
-  .text_19 {
-    overflow-wrap: break-word;
-    color: rgba(102,102,102,1);
-    font-size: 20rpx;
-    font-family: PingFangSC-Regular;
-    font-weight: normal;
-    text-align: left;
-    white-space: nowrap;
-    line-height: 36rpx;
-    margin-top: 4rpx;
-  }
-  .text_20 {
-    overflow-wrap: break-word;
-    color: rgba(237,86,159,1);
-    font-size: 28rpx;
-    font-family: PingFangSC-Medium;
-    font-weight: 500;
-    text-align: left;
-    white-space: nowrap;
-    line-height: 44rpx;
-  }
-  .image-text_7 {
-    width: 84rpx;
-    flex-direction: row;
-    display: flex;
-    justify-content: space-between;
-    margin: 8rpx 0 0 326rpx;
-  }
-  .thumbnail_10 {
-    width: 28rpx;
-    height: 28rpx;
-    margin: 4rpx 0 4rpx 0;
-  }
-  .text-group_8 {
-    overflow-wrap: break-word;
-    color: rgba(102,102,102,1);
-    font-size: 24rpx;
-    font-family: PingFangSC-Regular;
-    font-weight: normal;
-    text-align: left;
-    white-space: nowrap;
-    line-height: 36rpx;
-  }
-  .box_14 {
-    background-color: rgba(238,238,238,1.000000);
-    width: 686rpx;
-    height: 2rpx;
-    margin-top: 32rpx;
-    display: flex;
-    flex-direction: column;
-  }
-  .text-wrapper_6 {
-    width: 622rpx;
-    flex-direction: row;
-    display: flex;
-    justify-content: space-between;
-    margin: 32rpx 0 0 64rpx;
-  }
-  .text_21 {
-    overflow-wrap: break-word;
-    color: rgba(51,51,51,1);
-    font-size: 28rpx;
-    font-family: PingFangSC-Medium;
-    font-weight: 500;
-    text-align: left;
-    white-space: nowrap;
-    line-height: 44rpx;
-  }
-  .text_22 {
-    overflow-wrap: break-word;
-    color: rgba(147,210,26,1);
-    font-size: 24rpx;
-    font-family: PingFangSC-Regular;
-    font-weight: normal;
-    text-align: right;
-    white-space: nowrap;
-    line-height: 44rpx;
-  }
-  .box_15 {
-    flex-direction: row;
-    display: flex;
-    margin: 24rpx 238rpx 0 0;
-  }
-  .block_1 {
-    background-color: rgba(255,255,255,1.000000);
-    border-radius: 8rpx;
-    width: 32rpx;
-    height: 32rpx;
-    border: 1px solid rgba(221,221,221,1);
-    display: flex;
-    flex-direction: column;
-    margin: 28rpx 0 28rpx 0;
-  }
-  .block_2 {
-    margin-left: 32rpx;
-    display: flex;
-    flex-direction: column;
-  }
-  .image-text_8 {
-    width: 156rpx;
-    flex-direction: row;
-    display: flex;
-    justify-content: space-between;
-  }
-  .thumbnail_11 {
-    width: 28rpx;
-    height: 28rpx;
-    margin: 4rpx 0 4rpx 0;
-  }
-  .text-group_9 {
-    overflow-wrap: break-word;
-    color: rgba(102,102,102,1);
-    font-size: 24rpx;
-    font-family: PingFangSC-Regular;
-    font-weight: normal;
-    text-align: left;
-    white-space: nowrap;
-    line-height: 36rpx;
-  }
-  .box_16 {
-    width: 156rpx;
-    margin-top: 16rpx;
-    flex-direction: row;
-    display: flex;
-    justify-content: space-between;
-  }
-  .thumbnail_12 {
-    width: 28rpx;
-    height: 28rpx;
-    margin: 4rpx 0 4rpx 0;
-  }
-  .text_23 {
-    overflow-wrap: break-word;
-    color: rgba(102,102,102,1);
-    font-size: 24rpx;
-    font-family: PingFangSC-Regular;
-    font-weight: normal;
-    text-align: left;
-    white-space: nowrap;
-    line-height: 36rpx;
-  }
-  .text-wrapper_7 {
-    display: flex;
-    flex-direction: column;
-  }
-  .text_24 {
-    overflow-wrap: break-word;
-    color: rgba(51,51,51,1);
-    font-size: 24rpx;
-    font-family: PingFangSC-Regular;
-    font-weight: normal;
-    text-align: left;
-    white-space: nowrap;
-    line-height: 36rpx;
-    margin-right: 180rpx;
-  }
-  .text_25 {
-    overflow-wrap: break-word;
-    color: rgba(51,51,51,1);
-    font-size: 24rpx;
-    font-family: PingFangSC-Regular;
-    font-weight: normal;
-    text-align: left;
-    white-space: nowrap;
-    line-height: 36rpx;
-    margin-top: 16rpx;
-  }
-  .box_17 {
-    flex-direction: row;
-    display: flex;
-    margin: 24rpx 0 0 64rpx;
-  }
-  .text_26 {
-    overflow-wrap: break-word;
-    color: rgba(102,102,102,1);
-    font-size: 20rpx;
-    font-family: PingFangSC-Regular;
-    font-weight: normal;
-    text-align: left;
-    white-space: nowrap;
-    line-height: 36rpx;
-    margin-top: 4rpx;
-  }
-  .text_27 {
-    overflow-wrap: break-word;
-    color: rgba(237,86,159,1);
-    font-size: 28rpx;
-    font-family: PingFangSC-Medium;
-    font-weight: 500;
-    text-align: left;
-    white-space: nowrap;
-    line-height: 44rpx;
-  }
-  .image-text_9 {
-    width: 84rpx;
-    flex-direction: row;
-    display: flex;
-    justify-content: space-between;
-    margin: 8rpx 0 0 326rpx;
-  }
-  .thumbnail_13 {
-    width: 28rpx;
-    height: 28rpx;
-    margin: 4rpx 0 4rpx 0;
-  }
-  .text-group_10 {
-    overflow-wrap: break-word;
-    color: rgba(102,102,102,1);
-    font-size: 24rpx;
-    font-family: PingFangSC-Regular;
-    font-weight: normal;
-    text-align: left;
-    white-space: nowrap;
-    line-height: 36rpx;
-  }
-  .box_18 {
-    background-color: rgba(238,238,238,1.000000);
-    width: 686rpx;
-    height: 2rpx;
-    margin-top: 32rpx;
-    display: flex;
-    flex-direction: column;
-  }
-  .box_19 {
-    // box-shadow: 0px -2px 4px 0px rgba(0,0,0,0.030000);
-    background-color: rgba(255,255,255,1.000000);
-    margin-top: 24rpx;
-    display: flex;
-    flex-direction: column;
-    padding: 24rpx 32rpx 24rpx 32rpx;
-  }
-  .text_28 {
-    overflow-wrap: break-word;
-    color: rgba(51,51,51,1);
-    font-size: 24rpx;
-    font-family: PingFangSC-Regular;
-    font-weight: normal;
-    text-align: left;
-    white-space: nowrap;
-    line-height: 40rpx;
-    margin: 0 454rpx 0 32rpx;
-  }
-  .section_1 {
-    background-color: rgba(255,246,206,1.000000);
-    border-radius: 60rpx;
-    width: 686rpx;
-    margin-top: 16rpx;
-    padding-left: 32rpx;
-    flex-direction: row;
-    display: flex;
-    justify-content: flex-end;
-  }
-  .text_29 {
-    overflow-wrap: break-word;
-    color: rgba(51,51,51,1);
-    font-size: 24rpx;
-    font-family: PingFangSC-Regular;
-    font-weight: normal;
-    text-align: center;
-    white-space: nowrap;
-    line-height: 40rpx;
-    margin-top: 36rpx;
-  }
-  .text_30 {
-    overflow-wrap: break-word;
-    color: rgba(17,17,17,1);
-    font-size: 36rpx;
-    font-family: PingFangSC-Medium;
-    font-weight: 500;
-    text-align: left;
-    white-space: nowrap;
-    line-height: 52rpx;
-    margin: 28rpx 0 0 8rpx;
-  }
-  .text_31 {
-    overflow-wrap: break-word;
-    color: rgba(51,51,51,1);
-    font-size: 24rpx;
-    font-family: PingFangSC-Regular;
-    font-weight: normal;
-    text-align: center;
-    white-space: nowrap;
-    line-height: 40rpx;
-    margin: 36rpx 0 0 8rpx;
-  }
-  .text_32 {
-    overflow-wrap: break-word;
-    color: rgba(51,51,51,1);
-    font-size: 24rpx;
-    font-family: PingFangSC-Regular;
-    font-weight: normal;
-    text-align: center;
-    white-space: nowrap;
-    line-height: 40rpx;
-    margin: 34rpx 0 0 28rpx;
-  }
-  .text-wrapper_8 {
-    background-color: rgba(255,224,92,1.000000);
-    border-radius: NaNrpx;
-    margin-left: 24rpx;
-    display: flex;
-    flex-direction: column;
-    padding: 30rpx 78rpx 30rpx 78rpx;
-  }
-  .text_33 {
-    overflow-wrap: break-word;
-    color: rgba(17,17,17,1);
-    font-size: 32rpx;
-    font-family: PingFangSC-Medium;
-    font-weight: 500;
-    text-align: center;
-    white-space: nowrap;
-    line-height: 48rpx;
-  }
+.page{
+  background: #F7F7F7;
+}
+.state{
+  background: #FFFFFF;
+  padding: 24rpx 0;
+
+  font-size: 32rpx;
+  font-family: PingFangSC-Regular, PingFang SC;
+  font-weight: 400;
+  color: #93D21A;
+  line-height: 44rpx;
+}
+.box_4{
+  font-size: 28rpx;
+  font-family: PingFangSC-Regular, PingFang SC;
+  font-weight: 400;
+  color: #333333;
+  line-height: 44rpx;
+  margin-top: 18rpx;
+}
+.detail{
+  margin-top: 24rpx;
+  background: #FFFFFF;
+  padding: 0 32rpx;
+}
+.serviceAttrDesc{
+  width: 108rpx;
+  height: 56rpx;
+  background: #FFE05C;
+  border-radius: 0rpx 0rpx 12rpx 12rpx;
+  opacity: 0.2;
+
+  font-size: 24rpx;
+  font-family: PingFangSC-Regular, PingFang SC;
+  font-weight: 400;
+  color: #333333;
+  line-height: 56rpx;
+  text-align: center;
+}
+.serviceType{
+  font-size: 28rpx;
+  font-family: PingFangSC-Medium, PingFang SC;
+  font-weight: bold;
+  color: #333333;
+  line-height: 40rpx;
+}
+.key{
+  font-size: 24rpx;
+  font-family: PingFangSC-Regular, PingFang SC;
+  font-weight: 400;
+  color: #666666;
+  line-height: 44rpx;
+}
+.value{
+  height: 36rpx;
+  font-size: 24rpx;
+  font-family: PingFangSC-Regular, PingFang SC;
+  font-weight: 400;
+  color: #333333;
+  line-height: 44rpx;
+}
+.planNumber{
+  font-size: 40rpx;
+  font-family: PingFangSC-Semibold, PingFang SC;
+  font-weight: 600;
+  color: #333333;
+  line-height: 68rpx;
+  text-align: center;
+}
+.plan{
+  font-size: 20rpx;
+  font-family: PingFangSC-Regular, PingFang SC;
+  font-weight: 400;
+  color: #999999;
+  line-height: 28rpx;
+}
+.scan{
+  width: 200rpx;
+  height: 64rpx;
+  background: #FFE05C;
+  border-radius: 32rpx;
+  margin-top: 32rpx;
+
+  font-size: 24rpx;
+  font-family: PingFangSC-Regular, PingFang SC;
+  font-weight: 400;
+  color: #333333;
+  line-height: 64rpx;
+  text-align: center;
+}
+.line{
+  width: 686rpx;
+  height: 2rpx;
+  background: #EEEEEE;
+  margin-top: 32rpx;
+}
+.right{
+  width: 620rpx;
+}
+.projectState{
+  font-size: 24rpx;
+  font-family: PingFangSC-Regular, PingFang SC;
+  font-weight: 400;
+  color: #93D21A;
+  line-height: 44rpx;
+}
+
+.projectMoney{
+  font-size: 28rpx;
+  font-family: PingFangSC-Medium, PingFang SC;
+  font-weight: 500;
+  color: #ED569F;
+  line-height: 44rpx;
+}
+.bottom{
+  width: 750rpx;
+  height: 212rpx;
+  background: #FFFFFF;
+  position: fixed;
+  bottom: 0;
+}
+
+.bottomHeight{
+  height: 236rpx;
+  background: #F7F7F7;
+}
+
+.allMoney{
+  font-size: 24rpx;
+  font-family: PingFangSC-Regular, PingFang SC;
+  font-weight: 400;
+  color: #333333;
+  line-height: 40rpx;
+  margin-top: 24rpx;
+  margin-left: 64rpx;
+}
+.unpaid{
+  font-size: 24rpx;
+  font-family: PingFangSC-Regular, PingFang SC;
+  font-weight: 400;
+  color: #333333;
+  line-height: 108rpx;
+  margin-left: 32rpx;
+}
+.preferentialPrice{
+  font-size: 36rpx;
+  font-family: PingFangSC-Medium, PingFang SC;
+  font-weight: 500;
+  color: #111111;
+  line-height: 108rpx;
+  margin-left: 16rpx;
+}
+.originalPrice{
+  font-size: 24rpx;
+  font-family: PingFangSC-Regular, PingFang SC;
+  font-weight: 400;
+  color: #333333;
+  line-height: 108rpx;
+  margin-left: 16rpx;
+  text-decoration:line-through;
+}
+
+.priceDetail{
+  font-size: 24rpx;
+  font-family: PingFangSC-Regular, PingFang SC;
+  font-weight: 400;
+  color: #333333;
+  line-height: 108rpx;
+  margin-left: 32rpx;
+}
+.bottomBtn{
+  width: 686rpx;
+  height: 108rpx;
+  background: #FFF6CE;
+  border-radius: 60rpx;
+  margin-left: 32rpx;
+}
+.btn{
+  width: 220rpx;
+  height: 108rpx;
+  background: #FFE05C;
+  border-radius: 0rpx 60rpx 60rpx 0rpx;
+
+  font-size: 32rpx;
+  font-family: PingFangSC-Medium, PingFang SC;
+  font-weight: bold;
+  color: #111111;
+  line-height: 108rpx;
+  text-align: center;
+}
+.borderBottom{
+  margin-top: 32rpx;
+  border-bottom:  1px solid #F7F7F7;
+  padding-bottom: 32rpx;
+}
+.appealView{
+  width: 700rpx;
+  height: 500rpx;
+  border-radius: 15rpx;
+  background: #FFFFFF;
+}
+.popupTitle{
+  font-size: 28rpx;
+  font-family: PingFangSC-Medium, PingFang SC;
+  margin-top: 24rpx;
+  text-align: center;
+}
+.leftBtn{
+  width: 140rpx;
+  height: 70rpx;
+  background: #F7F7F7;
+  line-height: 70rpx;
+  text-align: center;
+}
+
+.rightBtn{
+  width: 140rpx;
+  height: 70rpx;
+  border-radius: 15rpx;
+  background: #F7F7F7;
+  line-height: 70rpx;
+  text-align: center;
+}
+.textareaView{
+  width: 650rpx;
+  height: 350rpx;
+}
+.textarea{
+  background: #f7f7f7;
+  font-size: 28rpx;
+  line-height: 40rpx;
+  padding: 24rpx;
+}

orderPages/orderDetail/index.vue

@@ -1,158 +1,224 @@
 <template>
-    <view class="content">
         <view class="page">
-            <view class="box_4">
-                <view class="group_1">
+            <view class="state ">
+                <view class="flex-row justify-center">
                     <u-icon name="cut" color="#93D21A" size="18"></u-icon>
-                    <text lines="1" class="text_3">服务中</text>
+                    <text>{{order.orderStatusDesc}}</text>
+                </view>
+                <view class="box_4 flex-row justify-center">
+                    <text>{{order.orderDesc}}</text>
                 </view>
-                <text lines="1" class="text_4">过程中您可以与发型师分享生活经历和趣事</text>
             </view>
-            <view class="box_5">
-                <view class="text-wrapper_2">
-                    <text lines="1" class="text_5">到店</text>
+
+            <view class="detail">
+                <view class="serviceAttrDesc">
+                    <text>{{order.serviceAttrDesc}}</text>
                 </view>
-                <view class="box_6">
-                    <image
-                        src="https://lanhu.oss-cn-beijing.aliyuncs.com/SketchPngbe12c633bc42bdfe4bec24b4a5cbba0cf2303827d9158295c117a6bd81b460f0"
-                        class="thumbnail_3"></image>
-                    <text lines="1" class="text_6">订单编号：</text>
-                    <text lines="1" class="text_7">0202304261651056047</text>
+                <view class="flex-row justify-start">
+                    <u-icon name="/static/index/u217.png" color="#93D21A" size="18"></u-icon>
+                    <text class="key">订单编号：</text>
+                    <text class="value">{{order.orderNo}}</text>
+                </view>
+                <view>
+                    <text  class="serviceType">{{order.serviceType}}</text>
                 </view>
-                <text lines="1" class="text_8">吉祥理胎发</text>
-                <view class="box_7">
-                    <view class="box_8">
-                        <view class="image-text_2">
-                            <image src="../../static/order/ud1.png" mode="" style="height: 36rpx;width: 36rpx;"></image>
-                            <text lines="1" class="text-group_2">服务对象：</text>
+
+                <view class="flex-row justify-between">
+                    <view class="flex-col">
+                        <view class=" flex-row">
+                            <u-icon name="/static/order/ud1.png" color="#93D21A" size="18"></u-icon>
+                            <text  class="key">服务对象：</text>
+                            <text  class="value">{{order.serviceObjectName}}</text>
                         </view>
-                        <view class="image-text_3">
-                            <image src="../../static/order/ud2.png" mode="" style="height: 36rpx;width: 36rpx;"></image>
-                            <text lines="1" class="text-group_3">服务门店：</text>
+                        <view class="flex-row">
+                            <u-icon name="/static/order/ud2.png" color="#93D21A" size="18"></u-icon>
+                            <text class="key">服务门店：</text>
+                            <text class="value">{{order.storeName}}</text>
                         </view>
-                        <view class="image-text_4">
+                        <view class="flex-row">
                             <u-icon name="clock" size="16"></u-icon>
-                            <text lines="1" class="text-group_4">下单时间：</text>
+                            <text class="key">下单时间：</text>
+                            <text class="value">{{order.createTime}}</text>
                         </view>
                     </view>
-                    <view class="text-wrapper_3">
-                        <text lines="1" class="text_9">娃娃</text>
-                        <text lines="1" class="text_10">红发廊富水南路店</text>
-                        <text lines="1" decode="true" class="text_11">2023-8-14&nbsp;12:33:55</text>
-                    </view>
-                    <view class="text-group_5">
-                        <text lines="1" class="text_12">A25</text>
-                        <text lines="1" class="text_13">排号</text>
-                    </view>
-                </view>
-                <view class="box_9">
-                    <view class="image-text_5">
-                        <u-icon name="scan" size="18"></u-icon>
-                        <text lines="1" class="text-group_6">扫码</text>
-                    </view>
-                </view>
-                <view class="box_10"></view>
-                <view class="text-wrapper_4">
-                    <text lines="1" class="text_14">扫码后的项目名称</text>
-                    <text lines="1" class="text_15">服务中</text>
-                </view>
-                <view class="box_11">
-                    <view class="group_2"></view>
-                    <view class="group_3">
-                        <view class="image-text_6">
-                            <u-icon name="server-man" size="16"></u-icon>
-                            <text lines="1" class="text-group_7">服务人员：</text>
+
+                    <view class="flex-col">
+                        <view class="planNumber flex-row justify-center">
+                            <text>{{order.planNumber}}</text>
                         </view>
-                        <view class="box_12">
-                            <u-icon name="clock" size="16"></u-icon>
-                            <text lines="1" class="text_16">服务时间：</text>
+                        <view class="plan flex-row justify-center">
+                            <text class="plan">排号</text>
                         </view>
                     </view>
-                    <view class="text-wrapper_5">
-                        <text lines="1" class="text_17">张三</text>
-                        <text lines="1" decode="true" class="text_18">2023-8-14&nbsp;12:33:55</text>
-                    </view>
                 </view>
-                <view class="box_13">
-                    <text lines="1" class="text_19">订单总金额：</text>
-                    <text lines="1" class="text_20">¥48.00</text>
-                    <view class="image-text_7">
-                        <image
-                            src="https://lanhu.oss-cn-beijing.aliyuncs.com/SketchPngff61e1197c09a2e2a6dbd82ec2e37efb6e678021c6c1e8ba4e8df5ff9259086d"
-                            class="thumbnail_10"></image>
-                        <text lines="1" class="text-group_8">申诉</text>
+
+
+                <view class="flex-row justify-center">
+                    <view class="scan flex-row justify-center">
+                        <u-icon name="scan" size="18"></u-icon>
+                        <text>扫码</text>
                     </view>
                 </view>
-                <view class="box_14"></view>
-                <view>
-                    <view class="text-wrapper_6">
-                        <text lines="1" class="text_21">扫码后的项目名称</text>
-                        <text lines="1" class="text_22">服务中</text>
+                <view class="line"></view>
+
+                <view class="flex-row justify-between borderBottom" v-for="(item,index) in order.child" :key="index">
+                    <view class="flex-col justify-center">
+                        <u-icon v-if="item.tick" name="checkmark-circle-fill" color="#38db38" size="20" @click="tick(item,index)"></u-icon>
+                        <u-icon v-else name="/static/order/ud9.png" color="green" size="20" @click="tick(item,index)"></u-icon>
                     </view>
-                    <view class="box_15">
-                        <view class="block_1"></view>
-                        <view class="block_2">
-                            <view class="image-text_8">
-                                <u-icon name="server-man" size="16"></u-icon>
-                                <text lines="1" class="text-group_9">服务人员：</text>
-                            </view>
-                            <view class="box_16">
-                                <u-icon name="clock" size="16"></u-icon>
-                                <text lines="1" class="text_23">服务时间：</text>
-                            </view>
+
+                    <view class="flex-col right">
+                        <view class="flex-row justify-between">
+                            <text class="serviceType">{{item.serviceName}}</text>
+                            <text class="projectState">{{item.statusDesc}}</text>
                         </view>
-                        <view class="text-wrapper_7">
-                            <text lines="1" class="text_24">张三</text>
-                            <text lines="1" decode="true" class="text_25">2023-8-14&nbsp;12:33:55</text>
+
+                        <view class="box_11">
+                            <view class="group_2"></view>
+                            <view class="group_3">
+                                <view class="flex-row">
+                                    <u-icon name="server-man" size="16"></u-icon>
+                                    <text class="key">服务人员：</text>
+                                    <text class="value">{{item.servicePerson || ''}}</text>
+                                </view>
+                                <view class="flex-row">
+                                    <u-icon name="clock" size="16"></u-icon>
+                                    <text class="key">服务时间：</text>
+                                    <text class="value">{{item.serviceTime || ''}}</text>
+                                </view>
+                            </view>
                         </view>
-                    </view>
-                    <view class="box_17">
-                        <text lines="1" class="text_26">订单总金额：</text>
-                        <text lines="1" class="text_27">¥48.00</text>
-                        <view class="image-text_9">
-                            <image
-                                src="https://lanhu.oss-cn-beijing.aliyuncs.com/SketchPngff61e1197c09a2e2a6dbd82ec2e37efb6e678021c6c1e8ba4e8df5ff9259086d"
-                                class="thumbnail_13"></image>
-                            <text lines="1" class="text-group_10">申诉</text>
+                        <view class="flex-row justify-between">
+                            <view>
+                                <text  class="key">金额：</text>
+                                <text  class="projectMoney">¥{{item.servicePrice}}</text>
+                            </view>
+
+                            <view class="flex-row" v-if="item.status === 1" @click="appeal(item.orderServiceId)">
+                                <u-icon name="/static/order/ud17.png" color="#93D21A" size="18"></u-icon>
+                                <text  class="key">申诉</text>
+                            </view>
                         </view>
                     </view>
-                    <view class="box_18"></view>
                 </view>
-                
+
+
+
+
             </view>
-            <view class="box_19">
-                <text lines="1" class="text_28">合计价格：¥96.00</text>
-                <view class="section_1">
-                    <text lines="1" class="text_29">待支付</text>
-                    <text lines="1" class="text_30">¥48.00</text>
-                    <text lines="1" class="text_31">¥68.00</text>
-                    <text lines="1" class="text_32">价格明细</text>
-                    <view class="text-wrapper_8">
+
+            <view class="bottomHeight"></view>
+
+            <view class="bottom flex-col">
+                <text class="allMoney">合计价格：¥{{allPrice}}</text>
+                <view class="bottomBtn　flex-row justify-between">
+                    <view class=" flex-row">
+                        <text  class="unpaid">待支付</text>
+                        <text  class="preferentialPrice">¥{{allPrice}}</text>
+                        <text  class="originalPrice">¥{{allPrice}}</text>
+                        <text  class="priceDetail">价格明细</text>
+                    </view>
+
+                    <view class="btn" @click="">
                         <text lines="1" class="text_33">提交</text>
                     </view>
                 </view>
             </view>
+
+            <uni-popup ref="appealPopup" :animation="false" :catchtouchmove="true">
+
+                <view class="appealView flex-col justify-around">
+                    <view class="popupTitle">
+                        <text>请输入申诉理由</text>
+                    </view>
+
+                    <view class="lex-row justify-center">
+                        <textarea class="textarea" v-model="appealReason"  placeholder="请输入申诉理由"></textarea>
+                    </view>
+
+
+                    <view class="flex-row justify-around">
+                        <view class="leftBtn" @click="appealPopupClose">
+                            <text>取消</text>
+                        </view>
+                        <view class="rightBtn" @click="commitAppeal">
+                            <text>确定</text>
+                        </view>
+                    </view>
+                </view>
+
+            </uni-popup>
+
+
         </view>
-    </view>
 </template>
 
 <script>
-import tabBar from "../../components/tabBar/tabBar";
+import UniPopup from "../../uni_modules/uni-popup/components/uni-popup/uni-popup";
 export default {
     components: {
-        tabBar
+        UniPopup
     },
     data() {
         return {
             title: 'Hello',
-            tabIndex: 3
+            tabIndex: 3,
+            order:{},
+            allPrice:0,
+            appealId:'',
+            appealReason:'',
+            orderId:''
         }
     },
-    onLoad() {
-
+    onLoad(e) {
+        this.orderId = e.id
+        this.getOrderDetailByOrderId(e.id)
     },
     methods: {
 
+        commitAppeal(){
+            this.$api.appeal({
+                childOrderId:this.appealId,
+                appealReason:this.appealReason
+            }).then(res=>{
+                this.appealReason=''
+                uni.$u.toast('申诉已提交')
+                this.$refs.appealPopup.close()
+                this.getOrderDetailByOrderId(this.orderId)
+            })
+        },
+        appealPopupClose(){
+            this.appealReason=''
+            this.$refs.appealPopup.close()
+        },
+
+        appeal(id){
+            this.appealId = id
+            this.$refs.appealPopup.open()
+        },
+
+        tick(item,index){
+
+          if (item.status === 1 || item.status === 4){
+              this.allPrice = 0
+              item.tick = !item.tick
+              this.$set(this.order.child,index,item)
+              this.order.child.forEach(i=>{
+                  if (i.tick){
+                      this.allPrice += i.servicePrice *1
+                  }
+              })
+              this.allPrice = this.allPrice.toFixed(2)
+          }
+        },
+
+        getOrderDetailByOrderId(id){
+            this.$api.getOrderDetailByOrderId({
+                id:id
+            }).then(res=>{
+                this.order= res.data.data
+            })
+        }
     }
 }
 </script>

orderPages/serviceItems/index.rpx.scss

@@ -52,9 +52,7 @@
 
 .block_2 {
   background-color: rgba(255, 255, 255, 1.000000);
-  display: flex;
-  flex-direction: column;
-  padding: 24rpx 32rpx 0 32rpx;
+  padding: 24rpx 32rpx;
 }
 
 .text_3 {
@@ -66,25 +64,16 @@
   text-align: left;
   white-space: nowrap;
   line-height: 44rpx;
-  margin: 0 398rpx 0 64rpx;
+  margin-left: 32rpx;
 }
 
 .box_3 {
   flex-direction: row;
   display: flex;
-  margin: 24rpx 238rpx 0 0;
+  margin-top: 24rpx;
 }
 
-.group_1 {
-  background-color: rgba(255, 255, 255, 1.000000);
-  border-radius: 16rpx;
-  width: 32rpx;
-  height: 32rpx;
-  border: 1px solid rgba(221, 221, 221, 1);
-  display: flex;
-  flex-direction: column;
-  margin: 28rpx 0 28rpx 0;
-}
+
 
 .group_2 {
   margin-left: 32rpx;
@@ -171,11 +160,8 @@
 }
 
 .text-wrapper_3 {
-  width: 212rpx;
-  flex-direction: row;
-  display: flex;
-  justify-content: space-between;
-  margin: 24rpx 410rpx 0 64rpx;
+  margin-top: 24rpx;
+  margin-left: 32rpx;
 }
 
 .text_7 {
@@ -281,10 +267,8 @@
   align-self: center;
   flex-direction: row;
   display: flex;
-  position: fixed;
-  bottom: 140rpx;
   justify-content: space-between;
-  padding: 20rpx 32rpx 20rpx 40rpx;
+  height: 84rpx;
 }
 
 .text_15 {
@@ -295,7 +279,7 @@
   font-weight: normal;
   text-align: left;
   white-space: nowrap;
-  line-height: 44rpx;
+  line-height: 84rpx;
 }
 
 .image-text_4 {
@@ -313,7 +297,7 @@
   font-weight: normal;
   text-align: right;
   white-space: nowrap;
-  line-height: 44rpx;
+  line-height: 84rpx;
 }
 
 .thumbnail_6 {
@@ -345,13 +329,9 @@
 }
 
 .tabBarLineHeight {
-  height: 170rpx;
+  height: 250rpx;
 }
 
-.tabBarView {
-  position: fixed;
-  bottom: 32rpx;
-  left: 32rpx;
 
   .submitButton {
     text-align: center;
@@ -360,5 +340,18 @@
     height: 84rpx;
     background: #FFE05C;
     border-radius: 54rpx;
-  }
-}
+    margin-top: 24rpx;
+}
+.text_9{
+  margin-left: 24rpx;
+}
+.bottomView{
+  position: fixed;
+  bottom: 0;
+  width: 750rpx;
+  height: 224rpx;
+  background: #FFFFFF;
+}
+.outView{
+  width: 600rpx;
+}

orderPages/serviceItems/index.vue

@@ -1,67 +1,120 @@
 <template>
     <view class="content">
         <view class="page">
-            <scroll-view :scroll-top="scrollTop" scroll-y="true" class="scroll-Y" @scrolltoupper="upper"
-                @scrolltolower="lower" @scroll="scroll">
-                <view class="block_2" v-for="  item in 10 ">
-                    <text lines="1" class="text_3">扫码后的项目名称</text>
-                    <view class="box_3">
-                        <view class="group_1"></view>
-                        <view class="group_2">
-                            <view class="image-text_2">
-                                <u-icon name="server-man" size="16"></u-icon>
-                                <text lines="1" class="text-group_2">服务人员：</text>
-                            </view>
-                            <view class="group_3">
-                                <u-icon name="clock" size="16"></u-icon>
-                                <text lines="1" class="text_4">服务时间：</text>
+                <view class="block_2 flex-row justify-start" v-for="(item,index) in projects.projectVos" :key="index" @click="clickItem(item.id)">
+
+                    <view class="flex-col justify-center ">
+                        <u-icon v-if="item.id === serviceProjectId" name="checkmark-circle-fill" color="#38db38" size="25"></u-icon>
+                        <u-icon v-else name="/static/order/ud9.png" color="green" size="25"></u-icon>
+                    </view>
+
+                    <view class="outView ">
+                        <text lines="1" class="text_3">{{item.serviceName}}</text>
+
+                            <view class="group_2 ">
+                                <view class="image-text_2">
+                                    <u-icon name="server-man" size="16"></u-icon>
+                                    <text lines="1" class="text-group_2">服务人员：</text>
+                                    <text lines="1" class="text_5">{{projects.personName}}</text>
+                                </view>
+                                <view class="group_3">
+                                    <u-icon name="clock" size="16"></u-icon>
+                                    <text lines="1" class="text-group_2">服务时间：</text>
+                                    <text lines="1" decode="true" class="text_5">2023-8-14&nbsp;12:33:55</text>
+                                </view>
                             </view>
+
+                        <view class="text-wrapper_3  flex-row justify-start">
+                            <text lines="1" class="text_7">标准价：</text>
+                            <text lines="1" class="text_8">¥{{item.standardPrice}}</text>
+                            <text lines="1" class="text_9 text_7">会员价：</text>
+                            <text lines="1" class="text_8">¥{{item.memberPrice}}</text>
                         </view>
-                        <view class="text-wrapper_2">
-                            <text lines="1" class="text_5">张三</text>
-                            <text lines="1" decode="true" class="text_6">2023-8-14&nbsp;12:33:55</text>
-                        </view>
-                    </view>
-                    <view class="text-wrapper_3">
-                        <text lines="1" class="text_7">订单总金额：</text>
-                        <text lines="1" class="text_8">¥48.00</text>
+                        <view class="box_4"></view>
                     </view>
-                    <view class="box_4"></view>
+
+
+
                 </view>
-                
-            </scroll-view>
+
             <view class="tabBarLineHeight"></view>
-            <view class="block_3">
-                <text lines="1" class="text_15">优惠券</text>
-                <view class="image-text_4">
-                    <text lines="1" class="text-group_4">未选择</text>
-                    <u-icon name="arrow-right" color="#666" size="18"></u-icon>
+
+            <view class="bottomView ">
+                <view class="flex-row justify-center">
+                    <view class="block_3 ">
+                        <text lines="1" class="text_15">优惠券</text>
+                        <view class="image-text_4">
+                            <text lines="1" class="text-group_4">未选择</text>
+                            <u-icon name="arrow-right" color="#666" size="18"></u-icon>
+                        </view>
+                    </view>
+                </view>
+
+                <view class="flex-row justify-center">
+                    <view class="submitButton" @click="addChildProject">确定</view>
                 </view>
             </view>
-            <view class="tabBarView">
-                <view class="submitButton">确定</view>
-            </view>
+
         </view>
     </view>
 </template>
 
 <script>
-import tabBar from "../../components/tabBar/tabBar";
 export default {
     components: {
-        tabBar
     },
     data() {
         return {
             title: 'Hello',
-            tabIndex: 3
+            tabIndex: 3,
+            projects:{},
+            serviceStationId:'',
+            orderId:'',
+            serviceProjectId:''
         }
     },
-    onLoad() {
-
+    onLoad(e) {
+        this.orderId=e.orderId
+        this.serviceStationId=e.serviceStationId
+        this.getStationById(e.serviceStationId)
     },
     methods: {
 
+        clickItem(id){
+            this.serviceProjectId = id
+        },
+
+        addChildProject(){
+            if (this.id === ''){
+                uni.$u.toast("请选择服务项目")
+            }
+            this.$api.addChildProject({
+                orderId:this.orderId,
+                serviceProjectId:this.serviceProjectId,
+                servicePersonId:this.projects.personId,
+                serviceStationId:this.serviceStationId,
+                couponIds:''
+            }).then(res=>{
+                uni.navigateTo({
+                    url:'/orderPages/orderDetail/index?id='+ this.orderId
+                })
+            })
+
+
+        },
+
+        getStationById(qeCode){
+            this.$api.getStationById({
+                stationId:qeCode
+            }).then(res=>{
+                console.log('++++++++getStationById+++++++++++',res)
+
+                this.projects=res.data.data
+
+            })
+        }
+
+
     }
 }
 </script>

pages/order/module/index.rpx.css

@@ -152,11 +152,12 @@
 
 
 .h-order-text {
-    margin-right: 6rpx;
     font-size: 28rpx;
+    font-family: PingFangSC-Medium, PingFang SC;
     font-weight: bold;
-    font-family: PingFangSC-Regular, PingFang SC;
-    color: #666666;
+    color: #333333;
+    line-height: 40rpx;
+    margin-top: 16rpx;
 }
 
 
@@ -326,11 +327,9 @@
 
 
 .flexLR {
-    border: 4rpx dotted #eeeeee;
     width: 100%;
     display: flex;
     justify-content: space-between;
-    overflow: hidden;
 }
 
 .nav-bar {

pages/order/module/mescrollUni-item.vue

@@ -68,7 +68,7 @@
 										<image src="/static/order/ud14.png" mode=""></image>
 									</view>
 									<view class="item-text">
-										排号时段：<text class="item-v">{{ item.createTime }}</text>
+										下单时间：<text class="item-v">{{ item.createTime }}</text>
 									</view>
 								</view>
 							</view>
@@ -80,9 +80,7 @@
 												<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>
+												服务日期：<text class="item-v">{{item.serviceDate.substring(0,10) || ''}}</text>
 											</view>
 										</view>
 										<view class="d-item-row ">
@@ -90,9 +88,7 @@
 												<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>
+												服务时段：<text>{{item.serviceStartTime || ''}}</text>
 											</view>
 										</view>
 										<view class="d-item-row ">
@@ -100,9 +96,7 @@
 												<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>
+												服务技师：<text class="item-v">{{item.servicePersonName || '签到成功自动分配'}}</text>
 											</view>
 										</view>
 									</view>
@@ -117,7 +111,7 @@
 							</view>
 						</view>
 						<view class="nav-bar">
-							<view class="btn" @click="scanCodeOrder()">
+							<view class="btn" @click="scanCodeOrder(item)">
 								<u-icon name="scan" size="18" />
 								<text>扫码</text>
 							</view>
@@ -214,21 +208,17 @@
 
 		created() {},
 
+
 		methods: {
-      scanCodeOrder(){
+      scanCodeOrder(item){
       	let that = this
         uni.scanCode({
 			scanType: ['qrCode'],
           success: function (res) {
-			  console.log('++++++++scanCode+++++++++++',res)
-			  that.$api.getStationById({
-				  stationId:res.result
-			  }).then(res1=>{
-				  console.log('++++++++getStationById+++++++++++',res1)
-
+			uni.navigateTo({
+				 url:'/orderPages/serviceItems/index?serviceStationId='+ res.result + '&orderId='+item.orderId
+			})
 
-
-			  })
           }
         })
       },
@@ -282,8 +272,10 @@
 				this.mescroll.resetUpScroll();
 			},
 
-			gotoUseCoupon(item) {
-				console.log(item)
+			orderDetail(item) {
+				uni.navigateTo({
+					url:'/orderPages/orderDetail/index?id='+ item.orderId
+				})
 			}
 
 		}