diff --git a/components/nav-bar/nav-bar.vue b/components/nav-bar/nav-bar.vue
index a493c5e..8b9b2fd 100644
--- a/components/nav-bar/nav-bar.vue
+++ b/components/nav-bar/nav-bar.vue
@@ -6,7 +6,7 @@
-
+
diff --git a/pages.json b/pages.json
index e196087..f3af044 100644
--- a/pages.json
+++ b/pages.json
@@ -336,6 +336,14 @@
"navigationBarTitleText": "证书",
"navigationStyle": "custom"
}
+ },
+ {
+ "path" : "about-this-iphone/about-this-iphone",
+ "style" :
+ {
+ "navigationBarTitleText" : "苹果关于本机",
+ "navigationStyle": "custom"
+ }
}
]
},
diff --git a/pages/index/index.nvue b/pages/index/index.nvue
index b6b33ed..54c137c 100644
--- a/pages/index/index.nvue
+++ b/pages/index/index.nvue
@@ -293,6 +293,11 @@ const otherList = [{
name: "锦旗",
path: "/pages/other/silkBanner/silkBanner"
},
+{
+ icon: "/static/image/index/qita/about-iphone.png",
+ name: "关于本机",
+ path: "/pages/other/about-this-iphone/about-this-iphone"
+},
]
const data = reactive({
diff --git a/pages/other/about-this-iphone/about-this-iphone.vue b/pages/other/about-this-iphone/about-this-iphone.vue
new file mode 100644
index 0000000..9286911
--- /dev/null
+++ b/pages/other/about-this-iphone/about-this-iphone.vue
@@ -0,0 +1,326 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ item.label }}
+
+ {{ item.value }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/shopping/taobao/shangou-order-detail/shangou-order-detail.vue b/pages/shopping/taobao/shangou-order-detail/shangou-order-detail.vue
index 9485865..d36b049 100644
--- a/pages/shopping/taobao/shangou-order-detail/shangou-order-detail.vue
+++ b/pages/shopping/taobao/shangou-order-detail/shangou-order-detail.vue
@@ -1,5 +1,5 @@
-
+
@@ -25,6 +25,43 @@
+
+
+
+
+
+ 骑手正在按序送货
+ 前方剩余2单,约11分钟送达
+
+
+
+
+
+
+
+ 蜂鸟准时达·超20分钟免单·号...
+
+
+
+
+
+
+
+
+
+
+
+ 尊敬的用户,骑手正在按顺序送货,请您耐心等待
+ 去看看
+
+
+
+
+
+
+
+
@@ -49,11 +86,16 @@
送至
-
+
金星哈哈哈哈哈哈哈和和哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈 王总(女士) 12563259856
-
- 修改
-
+
+
+ 修改
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ orderData.shopName }}
+
+
+
+
+
+
+ 共{{ orderData.goodsList.length }}件
+
+
+
+
+
+
+
+
+ {{ item.title }}
+ {{ item.spec }}
+ x {{ item.count }}
+
+
+ 实付¥{{
+ item.actualPrice }}
+ ¥{{ item.oriPrice }}
+
+
+
+
+
+ {{ fee.name }}
+
+
+
+ 实付¥{{
+ fee.actualPrice }}
+ ¥{{ fee.oriPrice }}
+
+
+
+
+
+ {{ comp.name }}
+
+
+
+ {{ comp.value }}
+
+
+
+
+
+
+ 价格明细
+
+
+
+ 总优惠
+ ¥
+ {{ orderData.priceDetail.totalDiscount }}
+
+ 实付¥{{
+ orderData.priceDetail.actualPay }}
+
+
+
+
+
+ {{ detail.name }}
+ {{
+ detail.value
+ }}
+
+
+
+
+
+
+
+ {{ info.label
+ }}
+
+ {{ info.value
+ }}
+
+ |
+ 修改
+
+
+ |
+ 设置
+
+
+
+
+
+ |
+ 复制
+
+
+
+
+
+ 订单信息
+
+
+
+
@@ -102,7 +274,69 @@
import { ref, reactive } from 'vue';
import { util } from '@/utils/common.js';
const order = ref({
- statusType: "wait_pay"
+ statusType: "wait_recv"
+})
+
+const orderData = ref({
+ isExpanded: false,
+ shopName: '沙县小吃(光电园总店)',
+ goodsList: [
+ {
+ image: '/static/image/shopping/taobao/waimai/leifan.png',
+ title: '好吃的蒜蓉剁椒 (限1份,多点 无效)',
+ count: 1,
+ actualPrice: '0.06',
+ oriPrice: '2',
+ tag: '折'
+ },
+ {
+ image: '/static/image/shopping/taobao/waimai/leifan.png',
+ title: '~福利鸡腿~',
+ count: 1,
+ actualPrice: '4.5',
+ oriPrice: '9.99',
+ tag: '折'
+ },
+ {
+ image: '/static/image/shopping/taobao/waimai/leifan.png',
+ title: '【减脂】五香鸡腿饭 (2份时蔬+卤蛋+豆干)',
+ count: 1,
+ actualPrice: '14.92',
+ oriPrice: '28',
+ tag: '折'
+ }
+ ],
+ fees: [
+ { name: '打包费', showQuestion: true, actualPrice: '1.3', oriPrice: '2' },
+ { name: '配送费', showQuestion: false, actualPrice: '0', oriPrice: '3.4' },
+ ],
+ compensations: [
+ { name: '超20分钟免单', showQuestion: true, value: '商家赠送', isRed: true },
+ { name: '满返红包', showQuestion: false, value: '满返¥2商家红包', isRed: true }
+ ],
+ priceDetail: {
+ totalDiscount: '24.61',
+ actualPay: '20.78',
+ details: [
+ { name: '总价', value: '¥45.39', isBold: true },
+ { name: '商品优惠', value: '-¥10.21', isRed: true },
+ { name: '配送费优惠', value: '-¥3.4', isRed: true },
+ { name: '红包/抵用券', value: '-¥9.0', isRed: true },
+ { name: '店铺活动/券(沙县小吃(光电园总店)专享券)', value: '-¥2.0', isRed: true }
+ ]
+ },
+ orderInfo: [
+ { label: '收货信息', value: '金星科技大厦A区金星科技大厦A区低楼4楼3A08 八条科技 罗婷(女士) 18725982563', hasModify: true },
+ { label: '联系不上时', value: '可设置暂存点放置外卖', hasSetting: true },
+ { label: '备注', value: '1份餐具' },
+ { label: '发票', value: '未添加开票信息', hasArrow: true },
+ { label: '配送方式', value: '蜂鸟准时达', hasArrow: true },
+ { label: '配送骑士', value: '赵乃炼', hasArrow: true },
+ { label: '订单号', value: '8034160313365695921', hasCopy: true },
+ { label: '送达时间', value: '03-31(周二)11:41-11:56' },
+ { label: '下单时间', value: '2026-03-31 11:11:55.220' },
+ { label: '支付方式', value: '支付宝免密支付' }
+ ]
})
const items = [
@@ -175,6 +409,12 @@ const items = [
padding-left: 34rpx;
}
+.wait-recv-page-container {
+ ::v-deep .placeholder-box {
+ display: none;
+ }
+}
+
.nav-bar {
background-color: #ffffff;
@@ -229,6 +469,112 @@ const items = [
}
}
+.map-box {
+ position: relative;
+ background-image: url('/static/image/shopping/taobao/waimai/map1.png');
+ background-size: 100% 100%;
+ background-repeat: no-repeat;
+
+ .qishou {
+ position: absolute;
+ left: 50%;
+ top: 50%;
+ transform: translateY(-50%);
+
+ .qishou-info {
+ background-color: #ffffff;
+ border-radius: 12rpx;
+ padding: 20rpx 16rpx;
+ margin-bottom: 8rpx;
+
+ .title {
+ font-size: 32rpx;
+ color: #1A1A1A;
+ line-height: 26rpx;
+ font-weight: 500;
+ margin-bottom: 12rpx;
+ }
+
+ .time {
+ font-size: 24rpx;
+ color: #7B7E8C;
+ line-height: 26rpx;
+ }
+ }
+ }
+
+ .bottom-box {
+ position: absolute;
+ bottom: 0;
+ left: 0;
+ width: calc(100% - 32rpx);
+ margin: 16rpx;
+
+ .tips-box {
+ display: inline-flex;
+ background-color: #ffffff;
+ height: 60rpx;
+ width: auto;
+ padding: 0 16rpx;
+ border-radius: 30rpx;
+
+ .icon {
+ width: 30rpx;
+ height: 30rpx;
+ }
+
+ .text {
+ font-size: 24rpx;
+ color: #7B7E8C;
+ line-height: 24rpx;
+ margin-left: 8rpx;
+ margin-right: 10rpx;
+ }
+ }
+ }
+
+ .dingdanzhushou {
+ margin-top: 16rpx;
+ background-color: #ffffff;
+ width: 100%;
+ border-radius: 16rpx;
+ padding: 16rpx 0;
+
+
+ .icon {
+ width: 88rpx;
+ height: 88rpx;
+ flex-shrink: 0;
+ }
+
+ .right-box {
+ margin-top: 16rpx;
+
+ .bottom {
+
+ text {
+ font-size: 26rpx;
+ color: #1A1A1A;
+ line-height: 40rpx;
+ margin-right: 70rpx;
+ margin-top: 12rpx;
+ }
+
+ .btn {
+ flex-shrink: 0;
+ padding: 0 32rpx;
+ height: 52rpx;
+ line-height: 52rpx;
+ background-color: #FB6504;
+ color: #ffffff;
+ border-radius: 8rpx;
+ margin-right: 26rpx;
+ }
+ }
+ }
+ }
+}
+
.wait_pay {
padding: 32rpx 16rpx;
padding-bottom: 18rpx;
@@ -305,10 +651,30 @@ const items = [
}
}
+ .delivery-photo {
+ width: 80rpx;
+ height: 80rpx;
+ border-radius: 12rpx;
+ overflow: hidden;
+ background-color: #F0F0F0;
+
+ &::before {
+ content: '+1';
+ background-color: #000000;
+ opacity: 0.5;
+ border-radius: 12rpx 0 12rpx 0;
+ font-size: 20rpx;
+ color: #FFFFFF;
+ line-height: 20rpx;
+ padding: 6rpx 8rpx;
+ }
+ }
+
}
.wait_pay-buttom {
padding: 0 32rpx;
+ padding-top: 42rpx;
background-color: #ffffff;
.button {
@@ -332,6 +698,12 @@ const items = [
overflow: hidden;
overflow-x: auto;
justify-content: space-around;
+
+ &::-webkit-scrollbar {
+ display: none;
+ width: 0;
+ height: 0;
+ }
}
.item {
@@ -363,9 +735,311 @@ const items = [
}
+.banner-box {
+ width: 100%;
+ padding: 16rpx 0 0;
+}
+
.orange {
color: #FE6306 !important;
}
+
+.product-info-box {
+ background-color: transparent;
+ margin-top: 16rpx;
+
+ .flex-between {
+ display: flex;
+ justify-content: space-between;
+ }
+
+ .info-card {
+ background-color: #FFFFFF;
+ padding: 24rpx 32rpx;
+ margin-bottom: 24rpx;
+
+ .shop-title-box {
+ margin-bottom: 30rpx;
+
+ .tag {
+ background-color: #FE6306;
+ color: #FFFFFF;
+ font-size: 20rpx;
+ padding: 2rpx 6rpx;
+ border-radius: 4rpx;
+ margin-right: 12rpx;
+ line-height: 28rpx;
+ }
+
+ .shop-name {
+ font-size: 30rpx;
+ font-weight: 500;
+ color: #1A1A1A;
+ margin-right: 6rpx;
+ line-height: 28rpx;
+ }
+ }
+
+ .goods-collapsed {
+ margin-bottom: 40rpx;
+
+ .images {
+ .img {
+ width: 80rpx;
+ height: 80rpx;
+ border-radius: 12rpx;
+ margin-right: 12rpx;
+ background-color: #F5F5F5;
+ flex-shrink: 0;
+ }
+ }
+
+ .count {
+ font-size: 24rpx;
+ color: #7C8495;
+ flex-shrink: 0;
+ margin-left: 20rpx;
+ }
+ }
+
+ .goods-item {
+ margin-bottom: 40rpx;
+ align-items: flex-start;
+
+ .goods-img-box {
+ position: relative;
+ width: 100rpx;
+ height: 100rpx;
+ margin-right: 16rpx;
+ border-radius: 12rpx;
+ flex-shrink: 0;
+
+ .goods-img {
+ width: 100%;
+ height: 100%;
+ border-radius: 12rpx;
+ background-color: #F5F5F5;
+ }
+ }
+
+ .goods-middle {
+ margin-right: 32rpx;
+
+ .title {
+ font-size: 26rpx;
+ color: #1A1A1A;
+ line-height: 32rpx;
+ }
+
+ .spec {
+ font-size: 24rpx;
+ color: #7C8495;
+ line-height: 36rpx;
+ margin-top: 4rpx;
+ }
+
+ .count {
+ font-size: 24rpx;
+ color: #7C8495;
+ line-height: 26rpx;
+ margin-top: 6rpx;
+ }
+ }
+
+ .goods-right {
+ .actual-price {
+ color: #1A1A1A;
+ line-height: 24rpx;
+ margin-top: 4rpx;
+
+ .label {
+ font-size: 24rpx;
+ margin-right: 4rpx;
+ }
+
+ .symbol {
+ font-size: 26rpx;
+ font-weight: 500;
+ }
+
+ .num {
+ font-size: 36rpx;
+ font-weight: 500;
+ }
+ }
+
+ .ori-price {
+ font-size: 24rpx;
+ line-height: 24rpx;
+ color: #7C8495;
+ margin-top: 10rpx;
+ text-align: right;
+ }
+ }
+ }
+
+ .fee-item {
+ margin-bottom: 32rpx;
+ line-height: 26rpx;
+ font-size: 26rpx;
+ align-items: flex-start;
+
+ .fee-left {
+ font-size: 26rpx;
+ color: #7C8495;
+ }
+
+ .fee-right {
+ .actual-price {
+ color: #1A1A1A;
+
+ .label {
+ font-size: 24rpx;
+ margin-right: 4rpx;
+ }
+
+ .symbol {
+ font-size: 26rpx;
+ }
+
+ .num {
+ font-size: 36rpx;
+ }
+ }
+
+ .ori-price {
+ font-size: 24rpx;
+ color: #7C8495;
+ margin-top: 10rpx;
+ text-align: right;
+ }
+
+ .red-text {
+ font-size: 26rpx;
+ color: #F83D3D;
+ }
+ }
+ }
+
+ .price-detail-title {
+ margin-top: 40rpx;
+ margin-bottom: 24rpx;
+ line-height: 30rpx;
+
+ .left {
+ font-size: 28rpx;
+ font-weight: bold;
+ color: #1A1A1A;
+ }
+
+ .right {
+ align-items: baseline;
+
+ .total-discount {
+ font-size: 24rpx;
+ color: #FF2020;
+ margin-right: 16rpx;
+
+ .symbol {
+ font-size: 22rpx;
+ }
+ }
+
+ .total-actual {
+ font-size: 24rpx;
+ color: #1A1A1A;
+
+ .symbol {
+ font-size: 24rpx;
+ }
+
+ .num {
+ font-size: 34rpx;
+ }
+ }
+ }
+ }
+
+ .price-detail-list {
+ background-color: #F1F5F8;
+ border-radius: 12rpx;
+ padding: 30rpx 16rpx;
+ margin-bottom: 16rpx;
+
+ .detail-item {
+ margin-bottom: 36rpx;
+ line-height: 26rpx;
+
+ &:last-child {
+ margin-bottom: 0;
+ }
+
+ .label {
+ font-size: 26rpx;
+ color: #7C8495;
+ }
+
+ .val {
+ font-size: 32rpx;
+ color: #1A1A1A;
+
+ &.red-val {
+ color: #F83D3D;
+ }
+ }
+ }
+ }
+
+ .divider-line {
+ height: 1rpx;
+ background-color: #D8D8D8;
+ margin-bottom: 32rpx;
+ }
+
+ .order-info-area {
+ .order-item {
+ margin-bottom: 36rpx;
+ line-height: 26rpx;
+
+ .label {
+ font-size: 26rpx;
+ color: #7C8495;
+ width: 140rpx;
+ flex-shrink: 0;
+ }
+
+ .val {
+ font-size: 24rpx;
+ line-height: 26rpx;
+ color: #1A1A1A;
+ word-break: break-all;
+
+ &.align-right {
+ text-align: right;
+ }
+
+ .split {
+ color: #D8D8D8;
+ font-size: 18rpx;
+ margin: 0 16rpx;
+ }
+
+ .copy-btn {
+ color: #7C8495;
+ white-space: nowrap;
+ }
+ }
+ }
+
+ .order-bottom-title {
+ font-size: 30rpx;
+ font-weight: bold;
+ color: #1A1A1A;
+ margin-top: 10rpx;
+ }
+ }
+ }
+}