diff --git a/common.scss b/common.scss
index 0f52d15..1e22371 100644
--- a/common.scss
+++ b/common.scss
@@ -54,7 +54,7 @@
width: 100vw;
min-height: 100vh;
color: #181818;
- background: linear-gradient(#DAF3FF, #F4F4F4 200rpx, #F4F4F4);
+ background: linear-gradient(#DAF3FF, #F4F4F4 400rpx, #F4F4F4);
position: relative;
font-family: PingFang SC;
font-weight: 400;
diff --git a/components/base/navbar.vue b/components/base/navbar.vue
index 582b3f1..45beebe 100644
--- a/components/base/navbar.vue
+++ b/components/base/navbar.vue
@@ -15,7 +15,11 @@
@click="$emit('leftClick')"
:color="color" size="46rpx">
- {{ title }}
+
+
+ {{ title }}
+
+
-
-
-
-
-
- 鸿宇研学生
-
-
- 申请获取你的头像、昵称
-
-
-
-
-
-
-
- 头像
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
昵称
-
-
-
-
-
-
+
+
+
+
电话
@@ -73,16 +42,37 @@
-
-
-
-
+
+
+
+
+ 头像
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
+
+
\ No newline at end of file
diff --git a/pages_order/coupon/couponCard.vue b/pages_order/coupon/couponCard.vue
new file mode 100644
index 0000000..d46f091
--- /dev/null
+++ b/pages_order/coupon/couponCard.vue
@@ -0,0 +1,85 @@
+
+
+
+
+
+
+ ¥{{ data.price }}
+
+
+ {{ data.label }}
+ {{ `有效期至 ${data.validTime}` }}
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages_order/coupon/index.vue b/pages_order/coupon/index.vue
new file mode 100644
index 0000000..66d2d63
--- /dev/null
+++ b/pages_order/coupon/index.vue
@@ -0,0 +1,139 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages_order/order/components/contactMentorPopup.vue b/pages_order/order/components/contactMentorPopup.vue
new file mode 100644
index 0000000..2af80a2
--- /dev/null
+++ b/pages_order/order/components/contactMentorPopup.vue
@@ -0,0 +1,114 @@
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages_order/order/components/orderInfoView.vue b/pages_order/order/components/orderInfoView.vue
new file mode 100644
index 0000000..2fc1c4e
--- /dev/null
+++ b/pages_order/order/components/orderInfoView.vue
@@ -0,0 +1,230 @@
+
+
+
+
+
+
+
+ {{ item.name }}
+ {{ getTypeDesc(item.type) }}
+ {{ getTypeTips(item.type) }}
+
+ {{ item.idNo }}
+
+ ¥{{ item.price }}
+
+
+ 总价格
+
+
+ ¥
+ {{ totalPrice }}
+
+ {{ `优惠（${data.discount}）` }}
+
+
+
+
+
+
+
+
+ 真实姓名
+ {{ data.name }}
+
+
+ 手机号码
+ {{ data.phone }}
+
+
+
+
+
+ 订单编号
+ {{ data.orderNo }}
+
+
+ 下单时间
+ {{ data.createTime }}
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages_order/order/orderConfirm/productCard.vue b/pages_order/order/components/productCard.vue
similarity index 80%
rename from pages_order/order/orderConfirm/productCard.vue
rename to pages_order/order/components/productCard.vue
index 305ada6..5bd9cd6 100644
--- a/pages_order/order/orderConfirm/productCard.vue
+++ b/pages_order/order/components/productCard.vue
@@ -28,33 +28,33 @@
\ No newline at end of file
diff --git a/pages_order/order/orderConfirm/infoPopup.vue b/pages_order/order/orderConfirm/infoPopup.vue
index 9ba2c00..780f76a 100644
--- a/pages_order/order/orderConfirm/infoPopup.vue
+++ b/pages_order/order/orderConfirm/infoPopup.vue
@@ -127,7 +127,6 @@
},
form: {
handler(val) {
- console.log('watch form', val)
this.$refs.form.setRules(this.getRules())
},
deep: true
diff --git a/pages_order/order/orderConfirm/memberCard.vue b/pages_order/order/orderConfirm/memberCard.vue
new file mode 100644
index 0000000..ae45cc6
--- /dev/null
+++ b/pages_order/order/orderConfirm/memberCard.vue
@@ -0,0 +1,128 @@
+
+
+
+
+
+
+
+
+
+ {{ data.name }}
+ {{ typeDesc }}
+
+ {{ data.idNo }}
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages_order/order/orderConfirm/memberChooseView.vue b/pages_order/order/orderConfirm/memberChooseView.vue
new file mode 100644
index 0000000..de0e617
--- /dev/null
+++ b/pages_order/order/orderConfirm/memberChooseView.vue
@@ -0,0 +1,60 @@
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages_order/order/orderDetail/index.vue b/pages_order/order/orderDetail/index.vue
index 0d921d0..d9ab425 100644
--- a/pages_order/order/orderDetail/index.vue
+++ b/pages_order/order/orderDetail/index.vue
@@ -1,320 +1,254 @@
-
-
+
-
+
-
-
- 订单详情
- {{ statusDesc }}
-
-
-
-
-
- {{ item.productName }}
-
- 产品类型：
-
- {{ getTypeDesc(item.type) || '--' }}
-
-
- 产品内容：
-
- {{ item.content || '--' }}
-
-
- 价格：
- ¥{{ item.price }}
-
-
-
-
-
- 总价格
- ¥{{ orderData.orderAmount }}
-
-
-
-
-
- 售后信息
-
-
-
-
-
-
-
-
- {{ item.text }}
-
-
-
-
-
-
-
-
- 订单信息
-
-
-
- 订单编号
- {{ orderData.orderNo }}
-
-
- 下单时间
- {{ $dayjs(orderData.orderDate).format('YYYY-MM-DD HH:mm') }}
-
-
-
-
-
+
+
-
-
+
+
+
+
+
+
+
+
+ 我已阅读并同意
+
+ 《退订政策》
+
+ 《合同范本》
+
+ 《预订须知》
+
+ 《安全提示》
+
+
-
+
+
+
\ No newline at end of file
diff --git a/pages_order/order/styles/style.scss b/pages_order/order/styles/style.scss
new file mode 100644
index 0000000..5403631
--- /dev/null
+++ b/pages_order/order/styles/style.scss
@@ -0,0 +1,161 @@
+
+ .page__view {
+ width: 100vw;
+ min-height: 100vh;
+ position: relative;
+
+ /deep/ .nav-bar__view {
+ position: fixed;
+ top: 0;
+ left: 0;
+ }
+ }
+
+ .main {
+ padding: calc(var(--status-bar-height) + 144rpx) 32rpx 326rpx 32rpx;
+ }
+
+ .card {
+ margin-top: 24rpx;
+ padding: 32rpx;
+ font-family: PingFang SC;
+ font-weight: 400;
+ line-height: 1.4;
+ background: #FFFFFF;
+ border: 2rpx solid #FFFFFF;
+ border-radius: 32rpx;
+
+ &-header {
+ font-family: PingFang SC;
+ font-weight: 500;
+ font-size: 36rpx;
+ line-height: 1.4;
+ color: #252545;
+ }
+ }
+ .form {
+ &-item {
+ margin-top: 16rpx;
+ border-bottom: 2rpx solid #EEEEEE;
+
+ &-label {
+ font-family: PingFang SC;
+ font-weight: 400;
+ font-size: 26rpx;
+ line-height: 1.4;
+ color: #181818;
+
+ .icon {
+ margin-right: 8rpx;
+ width: 16rpx;
+ height: auto;
+ }
+ }
+
+ &-content {
+ .row {
+ justify-content: space-between;
+
+
+ .text {
+ padding: 2rpx 0;
+ font-family: PingFang SC;
+ font-weight: 400;
+ font-size: 32rpx;
+ line-height: 1.4;
+
+ &.placeholder {
+ color: #C6C6C6;
+ }
+ }
+ }
+ }
+ }
+ }
+
+ .notice {
+ margin-top: 40rpx;
+ font-family: PingFang SC;
+ font-weight: 400;
+
+ &-header {
+ font-size: 28rpx;
+ line-height: 1.4;
+ color: #393939;
+ }
+
+ &-content {
+ margin-top: 24rpx;
+ font-size: 24rpx;
+ line-height: 1.4;
+ color: #BABABA;
+ }
+ }
+
+ .bottom {
+ position: fixed;
+ left: 0;
+ bottom: 0;
+
+ width: 100vw;
+ // height: 270rpx;
+ background: #FFFFFF;
+ box-sizing: border-box;
+
+ .agreement {
+ display: flex;
+ align-items: center;
+ padding: 16rpx 40rpx;
+ background: #E9F8FF;
+ box-sizing: border-box;
+
+ /deep/ .uv-checkbox-group {
+ flex: none;
+ }
+
+ .desc {
+ flex: 1;
+ font-family: PingFang SC;
+ font-size: 24rpx;
+ font-weight: 400;
+ line-height: 40rpx;
+ color: #8B8B8B;
+ }
+
+ .highlight {
+ color: $uni-color;
+ }
+ }
+
+ .bar {
+ padding: 24rpx 40rpx;
+ padding-bottom: calc(env(safe-area-inset-bottom) + 24rpx);
+ box-sizing: border-box;
+ column-gap: 32rpx;
+
+ .col {
+ flex: 1;
+ }
+
+ .btn {
+ width: 100%;
+ // padding: 14rpx 74rpx;
+ padding: 14rpx 0;
+ font-family: PingFang SC;
+ font-weight: 500;
+ font-size: 36rpx;
+ line-height: 1;
+ color: #252545;
+ border: 2rpx solid #252545;
+ border-radius: 41rpx;
+
+ &-primary {
+ color: #FFFFFF;
+ background: linear-gradient(to right, #21FEEC, #019AF9);
+ border-color: #00A9FF;
+ }
+ }
+
+ }
+
+ }
diff --git a/pages_order/order/styles/tag.scss b/pages_order/order/styles/tag.scss
new file mode 100644
index 0000000..487491c
--- /dev/null
+++ b/pages_order/order/styles/tag.scss
@@ -0,0 +1,23 @@
+
+ .tag {
+ padding: 6rpx 24rpx;
+ font-size: 24rpx;
+ color: #252545;
+ background: #F3F3F3;
+ border-radius: 12rpx;
+
+ &-0 {
+ color: #FF860E;
+ background: #FFF4E9;
+ }
+
+ &-1 {
+ color: #2799E0;
+ background: #EEF7FD;
+ }
+
+ &-4 {
+ color: #E53C29;
+ background: #FDE7E5;
+ }
+ }
\ No newline at end of file
diff --git a/pages_order/traveler/travelerCard.vue b/pages_order/traveler/travelerCard.vue
index 634ca49..73d4bdf 100644
--- a/pages_order/traveler/travelerCard.vue
+++ b/pages_order/traveler/travelerCard.vue
@@ -37,7 +37,7 @@
>
- 默认地址
+ 默认出行人