diff --git a/src/components/BottomSheet/BottomSheet.vue b/src/components/BottomSheet/BottomSheet.vue
index c3e818c..9c5b849 100644
--- a/src/components/BottomSheet/BottomSheet.vue
+++ b/src/components/BottomSheet/BottomSheet.vue
@@ -1,907 +1,940 @@
-
-
+
+
-
-
-
-
-
-
- {{goodInfo.p_name}}
-
-
- ￥{{skuItem.real_price || '暂无'}}
- (限购{{maxCount}}副)
-
- -
- {{count}}
- +
-
-
-
-
-
- 选择使用人
-
-
- {{item.name}}
-
-
-
-
-
-
-
-
-
-
- 填写验光数据
-
- 没有验光数据？请到线下眼镜店验光哦～
-
-
-
- 验光单取名:
-
-
-
-
-
-
-
- {{pickerInfoList[0].nameC}}
- {{pickerInfoList[0].nameE}}
-
- 左 (OD)
-
-
-
- {{pickerInfoList[0].nameArray1[pickerInfoList[0].nameIndex1]}}
-
-
-
-
- 右 (OS)
-
-
-
- {{pickerInfoList[0].nameArray2[pickerInfoList[0].nameIndex2]}}
-
-
-
-
-
-
-
-
-
- {{pickerInfoList[1].nameC}}
- {{pickerInfoList[1].nameE}}
-
- 左 (OD)
-
-
-
- {{pickerInfoList[1].nameArray1[pickerInfoList[1].nameIndex1]}}
-
-
-
-
- 右 (OS)
-
-
-
- {{pickerInfoList[1].nameArray2[pickerInfoList[1].nameIndex2]}}
-
-
-
-
-
-
-
-
-
- {{pickerInfoList[2].nameC}}
- {{pickerInfoList[2].nameE}}
-
- 左 (OD)
-
-
- {{pickerInfoList[2].nameArray1[pickerInfoList[2].nameIndex1]}}
-
-
-
- 右 (OS)
-
-
-
- {{pickerInfoList[2].nameArray2[pickerInfoList[2].nameIndex2]}}
-
-
-
-
-
-
-
-
-
- 瞳距:
-
-
-
-
-
-
-
- {{pickerInfoList[3].nameC}}
-
- 年 (Y)
-
-
- {{pickerInfoList[3].nameArray1[pickerInfoList[3].nameIndex1]}}
-
-
-
- 月 (M)
-
-
- {{pickerInfoList[3].nameArray2[pickerInfoList[3].nameIndex2]}}
-
-
-
- 日 (D)
-
-
- {{pickerInfoList[3].nameArray3[pickerInfoList[3].nameIndex3]}}
-
-
-
-
-
-
-
- 镜片宽度
-
-
-
- 鼻梁宽度
-
-
-
- 镜腿长度
-
-
-
-
-
+
+
+
+
+ {{goodInfo.shop_wood_name}}
+
+
+
+ ￥{{0 || '暂无'}}
+ (限购{{maxCount}}副)
+
+ -
+ {{count}}
+
+ +
+
+
+
+
+
+ 选择使用人
+
+
+ {{item.name}}
+
+
+
+
+
+
+
+
+
+
+ 填写验光数据
+
+ 没有验光数据？请到线下眼镜店验光哦～
+
+
+
+ 验光单取名:
+
+
+
+
+
+
+
+ {{pickerInfoList[0].nameC}}
+ {{pickerInfoList[0].nameE}}
+
+ 左 (OD)
+
+
+
+ {{pickerInfoList[0].nameArray1[pickerInfoList[0].nameIndex1]}}
+
+
+
+
+ 右 (OS)
+
+
+
+ {{pickerInfoList[0].nameArray2[pickerInfoList[0].nameIndex2]}}
+
+
+
+
+
+
+
+
+
+ {{pickerInfoList[1].nameC}}
+ {{pickerInfoList[1].nameE}}
+
+ 左 (OD)
+
+
+
+ {{pickerInfoList[1].nameArray1[pickerInfoList[1].nameIndex1]}}
+
+
+
+
+ 右 (OS)
+
+
+
+ {{pickerInfoList[1].nameArray2[pickerInfoList[1].nameIndex2]}}
+
+
+
+
+
+
+
+
+
+ {{pickerInfoList[2].nameC}}
+ {{pickerInfoList[2].nameE}}
+
+ 左 (OD)
+
+
+ {{pickerInfoList[2].nameArray1[pickerInfoList[2].nameIndex1]}}
+
+
+
+ 右 (OS)
+
+
+
+ {{pickerInfoList[2].nameArray2[pickerInfoList[2].nameIndex2]}}
+
+
+
+
+
+
+
+
+
+ 瞳距:
+
+
+
+
+
+
+
+ {{pickerInfoList[3].nameC}}
+
+ 年 (Y)
+
+
+ {{pickerInfoList[3].nameArray1[pickerInfoList[3].nameIndex1]}}
+
+
+
+ 月 (M)
+
+
+ {{pickerInfoList[3].nameArray2[pickerInfoList[3].nameIndex2]}}
+
+
+
+ 日 (D)
+
+
+ {{pickerInfoList[3].nameArray3[pickerInfoList[3].nameIndex3]}}
+
+
+
+
+
+
+
+ 镜片宽度
+
+
+
+ 鼻梁宽度
+
+
+
+ 镜腿长度
+
+
+
+
+
-
-
-
-
-
- {{item.nameC}}
- {{item.nameArray1[item.nameIndex1]}}年
- {{item.nameArray2[item.nameIndex2]}}月
- {{item.nameArray3[item.nameIndex2]}}日
-
-
-
- *
-
-
- {{item.nameC}}
- 左 {{item.nameArray1[item.nameIndex1]}}
- 右 {{item.nameArray2[item.nameIndex2]}}
-
-
-
-
-
-
-
-
-
-
-
-
- {{one.name}}
-
-
- {{one.name}}
+
+
+
+
+
+ {{item.nameC}}
+ {{item.nameArray1[item.nameIndex1]}}年
+ {{item.nameArray2[item.nameIndex2]}}月
+ {{item.nameArray3[item.nameIndex2]}}日
+
+
+
+ *
+
+
+ {{item.nameC}}
+ 左 {{item.nameArray1[item.nameIndex1]}}
+ 右 {{item.nameArray2[item.nameIndex2]}}
+
+
+
-
-
-
- * {{attrList[index].attr[current[index]].name}}
-
-
-
- 加入购物车
-
-
- 立即结算
-
-
- 确定
-
+
+
+
+
+
+
+
+
+ {{one.name}}
+
+
+ {{one.name}}
+
+
+
+
+ *
+ {{attrList[index].attr[current[index]].name}}
+
+
+
+ 加入购物车
+
+
+ 立即结算
+
+
+ 确定
+
+ .wrap {
+ height: 100vh;
+ background-color: #f2f2f2;
+ font-family: PingFangSC-Regular;
+ letter-spacing: -0.23px;
+ padding-top: 19rpx;
+ }
+
+ .content {
+ background-color: #ffffff;
+ border:1px #000 solid;
+ border-radius: 8px;
+ border-radius: 8px;
+ padding: 40rpx 56rpx;
+ margin-left: 40rpx;
+ width: 670rpx;
+ box-sizing: border-box;
+
+ .item {
+ display: flex;
+ border:1px #000 solid;
+ justify-content: flex-start;
+ font-size: 14px;
+ align-items: center;
+ height: 112rpx;
+ border-bottom: 1rpx solid #e9e9e9;
+
+ .itemText {
+ width: 162rpx;
+ font-family: PingFangSC-Regular;
+ letter-spacing: -0.26px;
+ }
+
+ .btn {
+ color: #333333 !important;
+ }
+ }
+
+ .check {
+ justify-content: space-between;
+ }
+ }
+
+ .button {
+ position: fixed;
+ bottom: 0;
+ left: 0;
+ height: 112rpx;
+ width: 100%;
+ background: #ff6b4a;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ font-size: 16px;
+ color: #ffffff;
+ letter-spacing: -0.3px;
+ }
+
diff --git a/src/pages/address/addressList.vue b/src/pages/address/addressList.vue
index f949109..05e26ec 100644
--- a/src/pages/address/addressList.vue
+++ b/src/pages/address/addressList.vue
@@ -21,7 +21,8 @@
- {{item.address.replace(/[-]/g,' ')}}\n{{item.add_detail}}
+
+ {{item.province}}{{item.city}}{{item.address}}\n{{item.add_detail}}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{item.p_name}}
-
-
-
- 使用人：{{item.peopleName}}
-
-
- {{item.sku_name}}
-
-
-
-
-
-
-
- ￥{{item.nowPrice*item.num}}
- (限购{{maxCount}}副)
-
- -
- {{item.num}}
- +
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/pages/confirmOrder/confirmOrder.vue b/src/pages/confirmOrder/confirmOrder.vue
index 14eab55..34b816e 100644
--- a/src/pages/confirmOrder/confirmOrder.vue
+++ b/src/pages/confirmOrder/confirmOrder.vue
@@ -1,190 +1,123 @@
-
-
-
-
-
-
- {{addAddress}}
-
-
-
-
-
- 默认{{addressInfo.name}}
-
- {{addressInfo.mobile}}
-
-
-
- {{addressInfo.address}}\n{{addressInfo.add_detail}}
-
-
-
-
-
-
-
- 非常戴镜
-
-
-
-
-
-
- {{item.p_name}}
-
-
- ¥{{Number(item.nowPrice) * item.num}}
- ¥{{item.oldPrice*item.num}}
-
-
- -
- {{checkedCartLst[index].num}}
- +
-
-
-
-
-
- 规格
-
- {{item.sku_name}}/
-
-
- 使用人
- {{item.peopleName}}
-
- 配送方式 快递
- 买家留言
-
-
-
-
+
+
+
+
+
+
+ {{addAddress}}
+
+
+
+
+
+ 默认{{addressInfo.name}}
+
+ {{addressInfo.mobile}}
+
+
+
+ {{addressInfo.address}}\n{{addressInfo.add_detail}}
+
+
+
+
+
+
+
+ 非常戴镜
+
-
-
-
-
- {{goodInfo.p_name}}
-
-
- ¥{{buyItem.real_price * count}}
- ¥{{buyItem.out_price * count}}
-
-
- -
- {{count}}
- +
-
-
-
-
-
- 规格
-
- {{attrList[index].attr[item].name}}/
-
-
- 使用人
- {{name}}
-
- 配送方式 快递
- 买家留言
-
-
-
-
-
-
-
- 支付方式
-
-
-
-
- 微信支付
-
-
-
-
+
+
+ 使用人
+ {{item.peopleName}}
+
+ 配送方式 快递
+ 买家留言
+
+
+
+
+
+
+
+
+
+ {{goodInfo.p_name}}
+
+
+ ¥{{buyItem.real_price * count}}
+ ¥{{buyItem.out_price * count}}
+
+
+ -
+
+ {{count}}
+ +
+
+
+
+
+
+ 规格
+
+
+
+ 使用人
+ {{name}}
+
+ 配送方式 快递
+ 买家留言
+
+
+
+
+
+
+
+ 支付方式
+
+
+
+
+ 微信支付
+
+ 最高随机立减￥99
+
+
-
-
-
-
- 运费
-
- 免运费
-
-
-
- 合计
-
- ¥{{totalPrice}}
-
-
-
-
-
+
+
+
+
-
-
-
-
+
+
+
+
+ .wrap {
+ height: 100vh;
+ background-color: #f2f2f2;
+ font-family: PingFangSC-Regular;
+ letter-spacing: -0.23px;
+ position: absolute;
+ }
+
+ .addAddress {
+ background-color: #ffffff;
+ box-sizing: border-box;
+ height: 124rpx;
+ width: 100%;
+ display: flex;
+ align-items: center;
+ padding: 0 40rpx;
+
+ .addIcon {
+ background-color: #f2f2f2;
+ height: 56rpx;
+ width: 60rpx;
+ border-radius: 4rpx;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ margin-right: 40rpx;
+ }
+
+ image {
+ height: 28rpx;
+ width: 30rpx;
+ }
+
+ .addressText {
+ font-size: 28rpx;
+ color: #333333;
+ margin-right: 364rpx;
+ }
+ }
+
+ .content {
+ background-color: #f2f2f2;
+ width: 100%;
+ display: flex;
+ flex-direction: column;
+ justify-content: center;
+ align-items: center;
+ padding: 40rpx;
+ box-sizing: border-box;
+
+ .orderInfo {
+ width: 670rpx;
+ min-height: 488rpx;
+ background-color: #ffffff;
+ border-radius: 20rpx;
+ box-sizing: border-box;
+ padding: 0 40rpx 40rpx 40rpx;
+
+ .title {
+ display: flex;
+ align-items: center;
+ font-size: 28rpx;
+ color: #333333;
+ height: 60rpx;
+ line-height: 40rpx;
+ padding: 10rpx 10rpx 10rpx 0rpx;
+
+ image {
+ margin-right: 20rpx;
+ }
+ }
+
+ .infoBox {
+ margin-top: 42rpx;
+
+ .infoTop {
+ display: flex;
+ flex-direction: row;
+
+ image {
+ height: 188rpx;
+ width: 188rpx;
+ margin-right: 24rpx;
+ }
+
+ .infoRight {
+ width: 374rpx;
+ display: flex;
+ flex-direction: column;
+ align-items: flex-start;
+ justify-content: space-between;
+
+ .goodName {
+ font-size: 28rpx;
+ color: #333333;
+ }
+
+ .remarks {
+ font-size: 20rpx;
+ color: #999999;
+ }
+
+ .priceBox {
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+ width: 100%;
+
+ .price {
+ color: #ff6b4a;
+ font-size: 28rpx;
+
+ text {
+ margin-left: 10rpx;
+ }
+ }
+
+ .originCost {
+ text-decoration: line-through;
+ color: #999999;
+ font-size: 20rpx;
+ }
+
+ .counter {
+ display: flex;
+ flex-direction: row;
+ justify-content: space-between;
+ font-size: 28rpx;
+ color: #333333;
+ width: 122rpx;
+
+ .btn {
+ display: flex;
+ justify-content: center;
+ line-height: 32rpx;
+ height: 32rpx;
+ width: 32rpx;
+ background-color: #f2f2f2;
+ color: #cfcfcf;
+ }
+ }
+ }
+ }
+ }
+
+ .infoBottom {
+ display: flex;
+ flex-direction: column;
+ justify-content: flex-start;
+ font-size: 24rpx;
+ color: #333333;
+
+ text {
+ color: #999999;
+ margin-left: 20rpx;
+ }
+
+ .norm {
+ margin-top: 28rpx;
+ }
+
+ .shippingMethod {
+ margin-top: 12rpx;
+ }
+
+ .message {
+ display: flex;
+ flex-direction: row;
+ align-items: center;
+ margin-top: 18rpx;
+
+ input {
+ margin-left: 20rpx;
+ width: 75%;
+ }
+ }
+ }
+ }
+ }
+
+ .payWay {
+ height: 464rpx;
+ width: 670rpx;
+ background-color: #ffffff;
+ color: #333333;
+ font-size: 24rpx;
+ border-radius: 20rpx;
+ box-sizing: border-box;
+ padding: 0 52rpx 0rpx 40rpx;
+ margin-top: 20rpx;
+ display: flex;
+ flex-direction: column;
+ justify-content: center;
+ align-items: flex-start;
+
+ .item {
+ display: flex;
+ flex-direction: row;
+ justify-content: space-between;
+ align-items: center;
+ width: 100%;
+ height: 115rpx;
+
+ .itemRight {
+ display: flex;
+ flex-direction: row;
+ justify-content: space-between;
+ align-items: center;
+
+ image {
+ height: 24rpx;
+ width: 12rpx;
+ }
+
+ .rightText {
+ margin-right: 20rpx;
+ text-align: right;
+
+ .choosePayWay {
+ display: flex;
+ align-items: center;
+
+ text {
+ color: #333333;
+ }
+
+ image {
+ height: 36rpx;
+ width: 40rpx;
+ margin-right: 8px;
+ }
+ }
+
+ .randomSubstraction {
+ color: #ff6b4a;
+ }
+
+ .preferentialWay {
+ color: #999999;
+ }
+ }
+
+ .freight,
+ .total {
+ margin-right: 32rpx;
+ }
+
+ text {
+ color: #ff6b4a;
+ }
+ }
+ }
+ }
+
+ // .checkBox {
+ // height: 58rpx;
+ // line-height: 58rpx;
+ // width: 100%;
+ // margin-top: 36rpx;
+ // margin-left: 40rpx;
+ // font-size: 12px;
+ // color: #999999;
+ // }
+ }
+
+ .footer {
+ height: 112rpx;
+ width: 100%;
+ background-color: #fff;
+ font-size: 16px;
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+ position: fixed;
+ bottom: 0;
+ z-index: 9999;
+
+ .footerLeft {
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ width: 50%;
+ color: #333333;
+
+ text {
+ color: #ff6b4a;
+ }
+ }
+
+ .footerRight {
+ display: flex;
+ justify-content: flex-end;
+ align-items: center;
+ width: 50%;
+ margin-right: 26rpx;
+
+ .paybtn {
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ background: #ff6b4a;
+ border-radius: 20px;
+ border-radius: 20px;
+ color: #ffffff;
+ width: 204rpx;
+ height: 80rpx;
+ }
+ }
+ }
+
+ // 地址信息样式
+ .order-user {
+ width: 670rpx;
+ height: 228rpx;
+ background: #ffffff;
+ border-radius: 14rpx;
+ margin: 0 auto;
+ margin-top: 20rpx;
+ position: relative;
+
+ .order-user-head {
+ display: flex;
+ height: 108rpx;
+ width: 100%;
+ align-items: center;
+ padding-left: 126rpx;
+ box-sizing: border-box;
+
+ .name {
+ display: flex;
+ justify-content: space-between;
+ font-size: 14px;
+ color: #333333;
+ letter-spacing: -0.26px;
+ margin-right: 20rpx;
+
+ .default {
+ height: 40rpx;
+ width: 80rpx;
+ background-color: #4a90e2;
+ border-radius: 13px;
+ border-radius: 13px;
+ text-align: center;
+ margin-right: 20rpx;
+
+ text {
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ font-size: 12px;
+ color: #ffffff;
+ letter-spacing: -0.23px;
+ }
+ }
+ }
+
+ .mobile {
+ font-size: 14px;
+ color: #999999;
+ letter-spacing: -0.26px;
+ }
+ }
+
+ .order-user-body {
+ display: flex;
+ width: 100%;
+
+ image {
+ width: 24px;
+ height: 28px;
+ margin: 12rpx 32rpx 0 40rpx;
+ }
+
+ .address {
+ font-weight: bold;
+ font-size: 14px;
+ color: #333333;
+ letter-spacing: -0.26px;
+ }
+ }
+
+ .arrow {
+ width: 12px;
+ height: 12px;
+ position: absolute;
+ right: 40rpx;
+ bottom: 104rpx;
+ }
+ }
+
+ .last_zhanwei {
+ background: #f2f2f2;
+ height: 60px;
+ }
+
diff --git a/src/pages/details/components/Introduce.vue b/src/pages/details/components/Introduce.vue
index d99ef9c..af6f59b 100644
--- a/src/pages/details/components/Introduce.vue
+++ b/src/pages/details/components/Introduce.vue
@@ -1,113 +1,115 @@
-
+
+
年龄：
- {{item.label}}/
+ {{item}}/
-
+
颜色：
- {{item.label}}/
+ {{item}}/
-
+
脸型：
- {{item.label}}/
+ {{item}}/
-
+
赠品：
- {{item.label}}/
+ {{item}}/
-
+
+
材质：
- {{item.label}}/
+ {{item}}/
-
+
+
场景：
- {{item.label}}/
+ {{item}}/
-
+
性别：
- {{item.label}}/
+ {{item}}/
-
+
+
+
重量：
- {{item.label}}/
+ {{item}}/
@@ -117,7 +119,7 @@
+ .card {
+ width: 670rpx;
+ // height: 478rpx;
+ background: #ffffff;
+ box-shadow: 0 0 10px 0 rgba(177, 128, 128, 0.06);
+ border-radius: 8px;
+ border-radius: 8px;
+ margin-top: 20rpx;
+ padding: 40rpx;
+ box-sizing: border-box;
+
+ .cardHeader {
+ width: 100%;
+ height: 40rpx;
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+
+ .orderId {
+ font-size: 12px;
+ color: #999999;
+ }
+
+ .orderType {
+ font-size: 14px;
+ color: #ff6b4a;
+ }
+ }
+
+ .orderCardInfo {
+ width: 100%;
+ height: 188rpx;
+ display: flex;
+ flex-direction: row;
+ border: 1px #000 solid;
+ justify-content: space-between;
+ align-items: center;
+ margin-top: 40rpx;
+
+ image {
+ height: 188rpx;
+ width: 188rpx;
+ margin-right: 24rpx;
+ }
+
+ .infoText {
+ display: flex;
+ flex-direction: column;
+ justify-content: space-between;
+ align-items: flex-start;
+ height: 188rpx;
+ width: 368rpx;
+ }
+
+ .orderName {
+ font-size: 14px;
+ color: #333333;
+ display: -webkit-box;
+ overflow: hidden;
+ -webkit-box-orient: vertical;
+ -webkit-line-clamp: 2;
+ }
+
+ .orderDescrib {
+ font-size: 12px;
+ color: #999999;
+ display: -webkit-box;
+ overflow: hidden;
+ -webkit-box-orient: vertical;
+ -webkit-line-clamp: 2;
+ }
+
+ .infoText-bottom {
+ display: flex;
+ flex-direction: row;
+ justify-content: flex-start;
+ align-items: center;
+ width: 100%;
+
+ .markPrice {
+ font-size: 14px;
+ color: #ff6b4a;
+ margin-right: 20rpx;
+ }
+
+ .buy-num {
+ font-size: 12px;
+ color: #999999;
+ }
+ }
+ }
+
+ .payPrice {
+ text-align: right;
+ margin: 20rpx 0;
+ font-size: 14px;
+ color: #333333;
+
+ .priceNum {
+ font-size: 14px;
+ color: #ff6b4a;
+ }
+ }
+
+ .btns {
+ display: flex;
+ justify-content: flex-end;
+ // justify-content: justify-content-between;
+ align-items: center;
+ margin: 10rpx;
+
+ // margin-left: auto;
+ // border: 1px solid #000;
+ .btn-type1 {
+ height: 48rpx;
+ width: 156rpx;
+ border: 1px solid #ff6b4a;
+ // border: 1px solid #000;
+ border-radius: 12px;
+ border-radius: 12px;
+ text-align: center;
+ line-height: 48rpx;
+ font-size: 12px;
+ color: #ff6b4a;
+ }
+
+ .btn-type2 {
+ height: 48rpx;
+ width: 140rpx;
+ background: #ff6b4a;
+ // border: 1px solid #000;
+ border-radius: 12px;
+ border-radius: 12px;
+ text-align: center;
+ line-height: 48rpx;
+ font-size: 12px;
+ color: #ffffff;
+ margin-left: 20rpx;
+ }
+ }
+ }
+
diff --git a/src/pages/myOrder/myOrder.vue b/src/pages/myOrder/myOrder.vue
index 248eed4..58e7027 100644
--- a/src/pages/myOrder/myOrder.vue
+++ b/src/pages/myOrder/myOrder.vue
@@ -1,161 +1,169 @@
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+ .header {
+ background-color: #ffffff;
+ width: 100%;
+ // height: 232rpx;
+ padding: 20rpx 40rpx 16rpx 40rpx;
+ box-sizing: border-box;
+ position: fixed;
+ top: 0;
+ left: 0;
+ // .searchBar {
+ // width: 670rpx;
+ // display: flex;
+ // justify-content: center;
+ // align-items: center;
+ // box-sizing: border-box;
+ // padding: 0rpx 16rpx;
+ // border: 1px solid #ff6b4a;
+ // border-radius: 8rpx;
+ // background-color: #ffffff;
+ // }
+
+ .screenBar {
+ width: 670rpx;
+ // height: 110rpx;
+ height: 70rpx;
+ display: flex;
+ flex-direction: row;
+ justify-content: space-between;
+ align-items: center;
+ color: #333333;
+ font-size: 32rpx;
+ }
+
+ .screenItem {
+ height: 50rpx;
+ font-size: 32rpx;
+ color: #333333;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ transition: all 0.2s;
+ }
+
+ .active {
+ // font-size: 34rpx;
+ color: #ec5d3b;
+ }
+
+ .searchIpt {
+ height: 68rpx;
+ width: 670rpx;
+ padding: 16rpx;
+ font-size: 28rpx;
+ box-sizing: border-box;
+ }
+ }
+
+ .orderList {
+ // margin-top: 232rpx;
+ margin-top: 132rpx;
+ }
+
+ .footer {
+ font-size: 14px;
+ color: #b8b8b8;
+ margin: 40rpx 0;
+ }
+ }
+
diff --git a/src/pages/user/user.vue b/src/pages/user/user.vue
index 9150b6a..7171a3a 100644
--- a/src/pages/user/user.vue
+++ b/src/pages/user/user.vue
@@ -77,7 +77,7 @@
>
-